From 219eb0b8f5d279c28b38298e3229a9b59c5e786d Mon Sep 17 00:00:00 2001
From: Alfredo Tupone <tupone@gentoo.org>
Date: Fri, 25 Jun 2021 08:44:45 +0200
Subject: dev-ada/gnatcoll-core: change doc path to /usr/share/gnatdoc

Closes: https://bugs.gentoo.org/797640
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
---
 dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild | 77 ++++++++++++++++++++++
 dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild    | 75 ---------------------
 2 files changed, 77 insertions(+), 75 deletions(-)
 create mode 100644 dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
 delete mode 100644 dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild

(limited to 'dev-ada')

diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
new file mode 100644
index 000000000000..4312e1c8404c
--- /dev/null
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+ADA_COMPAT=( gnat_202{0..1} )
+inherit ada multiprocessing
+
+MYP=${P}-${PV}0518-19ADF
+ADAMIRROR=https://community.download.adacore.com/v1
+ID=425b044d5cb112f096c7ac5ebbafb0d8e5297913
+
+DESCRIPTION="GNAT Component Collection Core packages"
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+shared static-libs static-pic"
+
+RDEPEND="
+	>=dev-ada/libgpr-2021[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+"
+DEPEND="${RDEPEND}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}-src
+
+PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:@GNATLS@:${GNATLS}:g" \
+		src/gnatcoll-projects.ads \
+		|| die
+}
+
+src_configure() {
+	emake setup
+}
+
+src_compile() {
+	build () {
+		gprbuild -p -m -j$(makeopts_jobs) \
+			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
+			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
+			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	if use static-libs; then
+		build static
+	fi
+}
+
+src_install() {
+	if use shared; then
+		emake prefix="${D}"/usr install-relocatable
+	fi
+	if use static-pic; then
+		emake prefix="${D}"/usr install-static-pic
+	fi
+	if use static-libs; then
+		emake prefix="${D}"/usr install-static
+	fi
+	rm -r "${D}"/usr/share/gpr/manifests || die
+	einstalldocs
+	dodir /usr/share/gnatdoc
+	mv "${D}"/usr/share/doc/gnatcoll "${D}"/usr/share/gnatdoc/ || die
+}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
deleted file mode 100644
index 37e4d267930d..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ADA_COMPAT=( gnat_202{0..1} )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19ADF
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=425b044d5cb112f096c7ac5ebbafb0d8e5297913
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="
-	>=dev-ada/libgpr-2021[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}"/usr install-relocatable
-	fi
-	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
-	fi
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
-- 
cgit v1.2.3-65-gdbad