another fix for #191090

Package-Manager: portage-2.1.3.9

4 files changed, 143 insertions, 5 deletions

diff --git a/dev-ada/asis-gpl/ChangeLog b/dev-ada/asis-gpl/ChangeLog
index c48ebc0d77ca..e9816b1b6e22 100644
--- a/dev-ada/asis-gpl/ChangeLog
+++ b/dev-ada/asis-gpl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ada/asis-gpl
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/ChangeLog,v 1.5 2007/09/04 14:06:48 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/ChangeLog,v 1.6 2007/09/14 13:23:24 george Exp $
+
+*asis-gpl-4.1.3.2007-r2 (14 Sep 2007)
+
+  14 Sep 2007; <portage-cvs@gentoo.org> +asis-gpl-4.1.3.2007-r2.ebuild:
+  another fix for #191090
 
 *asis-gpl-4.1.3.2007-r1 (04 Sep 2007)
 
diff --git a/dev-ada/asis-gpl/Manifest b/dev-ada/asis-gpl/Manifest
index e9607273954a..46e400431c84 100644
--- a/dev-ada/asis-gpl/Manifest
+++ b/dev-ada/asis-gpl/Manifest
@@ -8,14 +8,18 @@ EBUILD asis-gpl-4.1.3.2007-r1.ebuild 3419 RMD160 e7a300ec4c62fb208f51fa0a67197dc
 MD5 e3a4245bf4051568dc7398a63d48cef2 asis-gpl-4.1.3.2007-r1.ebuild 3419
 RMD160 e7a300ec4c62fb208f51fa0a67197dc7659584c9 asis-gpl-4.1.3.2007-r1.ebuild 3419
 SHA256 e5d38614ee7b62fcca26f06f4c9ef5c16c19a48e33f94de4f15d0a589ddaeb6b asis-gpl-4.1.3.2007-r1.ebuild 3419
+EBUILD asis-gpl-4.1.3.2007-r2.ebuild 3464 RMD160 906fd98cd635bd76becef409191bed9c87054901 SHA1 565822bec28a455b1f87ae448ed1c075cfb82ac6 SHA256 f68cd2aa00929aeb46cd2ef45a8069b217b7a4a402e9bca4d9476b1d589353ca
+MD5 be10d2c0a1125a73d3c60dedeadbd329 asis-gpl-4.1.3.2007-r2.ebuild 3464
+RMD160 906fd98cd635bd76becef409191bed9c87054901 asis-gpl-4.1.3.2007-r2.ebuild 3464
+SHA256 f68cd2aa00929aeb46cd2ef45a8069b217b7a4a402e9bca4d9476b1d589353ca asis-gpl-4.1.3.2007-r2.ebuild 3464
 EBUILD asis-gpl-4.1.3.2007.ebuild 3227 RMD160 33bb47c84413f265504410851b569eb886a8a691 SHA1 de4bcc416098d207df9c87996470311b5e1380f1 SHA256 2afa8f0075a03f6ec7449cff0b3323ee4c6c04a59cd083a5b621c0876605e82e
 MD5 e072ebc246ab023af11f402a9f465cee asis-gpl-4.1.3.2007.ebuild 3227
 RMD160 33bb47c84413f265504410851b569eb886a8a691 asis-gpl-4.1.3.2007.ebuild 3227
 SHA256 2afa8f0075a03f6ec7449cff0b3323ee4c6c04a59cd083a5b621c0876605e82e asis-gpl-4.1.3.2007.ebuild 3227
-MISC ChangeLog 902 RMD160 501db0ce01f98dfec59e866f8f2916d234238bc7 SHA1 eb83a5a5d80e12503e585ad8c6c6bf75f8719418 SHA256 859b45ca3413875a8bb76df3501f0a4bbb1e1c5f2b4b8b01c3bdbece2352e9aa
-MD5 c70c7e439e034f18b34a45e955b440b8 ChangeLog 902
-RMD160 501db0ce01f98dfec59e866f8f2916d234238bc7 ChangeLog 902
-SHA256 859b45ca3413875a8bb76df3501f0a4bbb1e1c5f2b4b8b01c3bdbece2352e9aa ChangeLog 902
+MISC ChangeLog 1040 RMD160 1d2fc7890369991c2bd682488270ddc29f4697f6 SHA1 d88b6086eecae1898f4bcb81bc860f87722d77d9 SHA256 ef8145030d57182fdcb0db8c76429c835020e22bfe4056f3341829d64e4b30ff
+MD5 dbe2bd4a6d06bd7f48d8bdd0c4f392ca ChangeLog 1040
+RMD160 1d2fc7890369991c2bd682488270ddc29f4697f6 ChangeLog 1040
+SHA256 ef8145030d57182fdcb0db8c76429c835020e22bfe4056f3341829d64e4b30ff ChangeLog 1040
 MISC metadata.xml 637 RMD160 6df3899e69c0810ca05efcbcff060061a15a73ac SHA1 e1a007ec0c698ac861bea0644ade8d8b959beecb SHA256 308a2c7d3860cb42a0227e831e43c12da9c1e914696e3fc38013b31dc2896863
 MD5 e02eb39aefd967b3bccfdd0cc4771166 metadata.xml 637
 RMD160 6df3899e69c0810ca05efcbcff060061a15a73ac metadata.xml 637
@@ -29,3 +33,6 @@ SHA256 d64a976da1427ff676e6e24ab2f6d86a691471659997afb0c31e281db7db3c26 files/di
 MD5 629b1cd775bbdb31853c0054b4ce1465 files/digest-asis-gpl-4.1.3.2007-r1 247
 RMD160 be14b654d9546e7870c9a6639c647c8f5418a9dd files/digest-asis-gpl-4.1.3.2007-r1 247
 SHA256 d64a976da1427ff676e6e24ab2f6d86a691471659997afb0c31e281db7db3c26 files/digest-asis-gpl-4.1.3.2007-r1 247
+MD5 629b1cd775bbdb31853c0054b4ce1465 files/digest-asis-gpl-4.1.3.2007-r2 247
+RMD160 be14b654d9546e7870c9a6639c647c8f5418a9dd files/digest-asis-gpl-4.1.3.2007-r2 247
+SHA256 d64a976da1427ff676e6e24ab2f6d86a691471659997afb0c31e281db7db3c26 files/digest-asis-gpl-4.1.3.2007-r2 247
diff --git a/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild
new file mode 100644
index 000000000000..a67e42f25569
--- /dev/null
+++ b/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gpl/asis-gpl-4.1.3.2007-r2.ebuild,v 1.1 2007/09/14 13:23:24 george Exp $
+
+inherit eutils flag-o-matic gnatbuild
+
+ACT_Ver=$(get_version_component_range 4)
+Gnat_Name="gnat-gpl"
+
+DESCRIPTION="The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)"
+SRC_URI="mirror://gentoo/${PN}-${ACT_Ver}-src.tgz"
+HOMEPAGE="https://libre.adacore.com/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+RDEPEND="=dev-lang/gnat-gpl-${PV}*"
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex
+	app-text/texi2html )"
+
+S="${WORKDIR}/asis-${ACT_Ver}-src"
+
+# it may be even better to force plain -O2 -pipe -ftracer here
+replace-flags -O3 -O2
+
+# we need to adjust some vars defined in gnatbuild.eclass so that they use
+# gnat-gpl instead of asis
+LIBPATH=${LIBPATH/${PN}/${Gnat_Name}}
+BINPATH=${BINPATH/${PN}/${Gnat_Name}}
+DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
+
+QA_EXECSTACK="${BINPATH:1}/*
+	${LIBPATH:1}/adalib/libasis-${ACT_Ver}.so"
+
+pkg_setup() {
+	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
+	if [[ "${currGnat}" != "${CTARGET}-${Gnat_Name}-${SLOT}" ]]; then
+		echo
+		eerror "The active gnat profile does not correspond to the selected"
+		eerror "version of asis!  Please install the appropriate gnat (if you"
+		eerror "did not so yet) and run:"
+		eerror "eselect gnat set ${CTARGET}-${Gnat_Name}-${SLOT}"
+		eerror "env-update && source /etc/profile"
+		eerror "and then emerge =dev-ada/${P} again.."
+		echo
+		die
+	fi
+}
+
+# we need to override the eclass defined src_unpack
+# and change gcc to gnatgcc where appropriate
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	for fn in asis/a4g-gnat_int.adb gnat/snames.adb \
+		tools/tool_utils/asis_ul-common.adb \
+		tools/gnatmetric/metrics-compute.adb; do
+		sed -i -e "s:\"gcc:\"gnatgcc:" ${fn}
+	done
+}
+
+src_compile() {
+	# Build the shared library first, we need -fPIC here
+	gnatmake -Pasis_bld -XBLD=prod -XOPSYS=default_Unix -cargs ${CFLAGS} -fPIC \
+		|| die "building libasis.a failed"
+	gnatgcc -shared -Wl,-soname,libasis-${ACT_Ver}.so \
+		-o obj/libasis-${ACT_Ver}.so obj/*.o -lc \
+		|| die "building libasis.so failed"
+
+	# build tools
+	for fn in tools/*; do
+		pushd ${fn}
+			gnatmake -P${fn:6}.gpr || die "building ${fn:6} failed"
+		popd
+	done
+
+	# common stuff is just docs in this case
+	if use doc; then
+		emake -C documentation all || die "Failed while compiling documentation"
+	fi
+}
+
+src_install () {
+	# install the lib
+	mkdir -p ${D}${LIBPATH}/adalib
+	chmod 0755 obj/libasis-${ACT_Ver}.so
+	cp obj/libasis-${ACT_Ver}.so ${D}${LIBPATH}/adalib
+	insinto ${LIBPATH}/adalib
+	doins obj/*.ali lib/libasis.a
+	# make appropriate symlinks
+	pushd ${D}${LIBPATH}/adalib
+	ln -s libasis-${ACT_Ver}.so libasis.so
+	popd
+	# sources
+	insinto ${LIBPATH}/adainclude
+	doins gnat/*.ad[sb]
+	doins asis/*.ad[sb]
+
+	# tools
+	mkdir -p ${D}${BINPATH}
+	for fn in tools/{asistant,gnat*}; do
+		cp ${fn}/${fn:6} ${D}${BINPATH}
+	done
+
+	# docs and examples
+	dodoc documentation/*.txt
+	dohtml documentation/*.html
+	# info's should go into gnat-gpl dirs
+	insinto ${DATAPATH}/info/
+	doins documentation/*.info
+
+	insinto /usr/share/doc/${PF}
+	doins -r documentation/*.pdf examples/ tutorial/ templates/
+}
+
+pkg_postinst() {
+	echo
+	elog "The ASIS is installed for the active gnat compiler at gnat's	location."
+	elog "No further configuration is necessary. Enjoy."
+	echo
+}
diff --git a/dev-ada/asis-gpl/files/digest-asis-gpl-4.1.3.2007-r2 b/dev-ada/asis-gpl/files/digest-asis-gpl-4.1.3.2007-r2
new file mode 100644
index 000000000000..c6d8e94b0ca4
--- /dev/null
+++ b/dev-ada/asis-gpl/files/digest-asis-gpl-4.1.3.2007-r2
@@ -0,0 +1,3 @@
+MD5 051c9c956498bf020d031f9b769f3924 asis-gpl-2007-src.tgz 2268673
+RMD160 571d43d4ef719fdfd9e75e82901cc527ff1622b2 asis-gpl-2007-src.tgz 2268673
+SHA256 6b8f5d3372bcfa83a49e991550f8e7ecb66d3fc59cac3d1cbc835eee32da189b asis-gpl-2007-src.tgz 2268673