backported gnatmake related fix from 4.1.2

Package-Manager: portage-2.1.2-r12

4 files changed, 66 insertions, 45 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index 1e5745025255..59b78fa46aa5 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ada/asis-gcc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.6 2007/02/27 11:49:07 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.7 2007/02/27 12:27:14 george Exp $
+
+  27 Feb 2007; George Shapovalov <george@gentoo.org> asis-gcc-4.1.1.ebuild, asis-gcc-3.4.6.ebuild:
+  backported gnatmake related fix from 4.1.2
 
 *asis-gcc-4.1.2-r1 (27 Feb 2007)
 
diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest
index 9ca773b4086e..f9de98ccfff4 100644
--- a/dev-ada/asis-gcc/Manifest
+++ b/dev-ada/asis-gcc/Manifest
@@ -1,14 +1,14 @@
 DIST asis-3.4.4.tar.bz2 2874938 RMD160 ec6acf720c4fb6a386fa6da8de40f88b5b9f310d SHA1 949725a605ffa92e30cdc53b397483d38078a90c SHA256 2d3546d04839801ef617005e60ee24be9a0004f8481c70e3ea51a17443d094d5
 DIST asis-gcc-4.1.1.tar.bz2 2938979 RMD160 08112f7c283543f1350d894ca363da1e7c1d1c7f SHA1 b3ec85d7da9be03d788def2a9c7060e350e06429 SHA256 712674ad21d21c9aec59e3f4db35cb92b01a6fbc1fc80450f801666f0ac2827e
 DIST asis-gcc-4.1.2.tar.bz2 2617806 RMD160 851e91181d396c60899858d922edea2ed6f170a6 SHA1 ce2043f9b246da196bc4d2af27f1e9860dee1bcd SHA256 37466312b6c43ada02b704893b509af449ab1833bc6e3cddea40344cb8972c5e
-EBUILD asis-gcc-3.4.6.ebuild 4107 RMD160 d372689ea962378ea55b803f0892701260fa8baf SHA1 b273cc78a0e4cf71a4cd113a3a041d099dc5de41 SHA256 dfc62ca0ced2df645c7dc299c29fa56c460f58bcea1ef99453f09f307cef9bc0
-MD5 12fba9c5fa1b7b43b6fee3f03804c8a6 asis-gcc-3.4.6.ebuild 4107
-RMD160 d372689ea962378ea55b803f0892701260fa8baf asis-gcc-3.4.6.ebuild 4107
-SHA256 dfc62ca0ced2df645c7dc299c29fa56c460f58bcea1ef99453f09f307cef9bc0 asis-gcc-3.4.6.ebuild 4107
-EBUILD asis-gcc-4.1.1.ebuild 4608 RMD160 9f1241ee604786638ab61b977cfe13c1890934cf SHA1 85a7c29a662ce2703d3eeedfb51d0b2ba3ea3583 SHA256 c0f88547b8ffe1f030e43cac5d9148b82bef1870b0a68c11b26971766bc39a94
-MD5 703ed827ce268c3d8bc8382fe722dd94 asis-gcc-4.1.1.ebuild 4608
-RMD160 9f1241ee604786638ab61b977cfe13c1890934cf asis-gcc-4.1.1.ebuild 4608
-SHA256 c0f88547b8ffe1f030e43cac5d9148b82bef1870b0a68c11b26971766bc39a94 asis-gcc-4.1.1.ebuild 4608
+EBUILD asis-gcc-3.4.6.ebuild 4460 RMD160 d893699eddccc8bb0c38816e5c2cfb677dd5bc4a SHA1 ba2167aa1045e1c8437156a879eb834e52050793 SHA256 e22b5d84eae975f429562b45702067ce798d0206810c1dcc76c6d30b27188252
+MD5 310c12e8bcaeec206cd790756040c266 asis-gcc-3.4.6.ebuild 4460
+RMD160 d893699eddccc8bb0c38816e5c2cfb677dd5bc4a asis-gcc-3.4.6.ebuild 4460
+SHA256 e22b5d84eae975f429562b45702067ce798d0206810c1dcc76c6d30b27188252 asis-gcc-3.4.6.ebuild 4460
+EBUILD asis-gcc-4.1.1.ebuild 4961 RMD160 65d4f5b904749a8907a5103e6ae379274e0715e1 SHA1 b780ea84bf2fc09f12c3e34698e4ba1ae53d11b0 SHA256 c03c9aa991aa2c7d9159961b1ea631e99043688309b957f3a5ece3b0bc8531f5
+MD5 2d9455f6cb81853f6bc4b577a9be27ba asis-gcc-4.1.1.ebuild 4961
+RMD160 65d4f5b904749a8907a5103e6ae379274e0715e1 asis-gcc-4.1.1.ebuild 4961
+SHA256 c03c9aa991aa2c7d9159961b1ea631e99043688309b957f3a5ece3b0bc8531f5 asis-gcc-4.1.1.ebuild 4961
 EBUILD asis-gcc-4.1.2-r1.ebuild 5033 RMD160 48d823ec4b86edd6a54d8e415f76ef2b49a60a97 SHA1 5657fbbbd2c92822f3f9c9cc3461791174509d72 SHA256 1a318fcd34ffaee35ec1589e42bf4706327e8d0f2773ebb628b3858767aada8b
 MD5 9d09717b6c44e182b48af1ec251e48a0 asis-gcc-4.1.2-r1.ebuild 5033
 RMD160 48d823ec4b86edd6a54d8e415f76ef2b49a60a97 asis-gcc-4.1.2-r1.ebuild 5033
@@ -17,10 +17,10 @@ EBUILD asis-gcc-4.1.2.ebuild 4737 RMD160 6ac8977cb62cd906f98db0de44fbf4af076018e
 MD5 d817d1b7ecd038a6d2496a846efd44fc asis-gcc-4.1.2.ebuild 4737
 RMD160 6ac8977cb62cd906f98db0de44fbf4af076018e7 asis-gcc-4.1.2.ebuild 4737
 SHA256 3d104a3fc7544ebb2767d9c04631e5d005767192d2c0df50d8293b640072cb4a asis-gcc-4.1.2.ebuild 4737
-MISC ChangeLog 942 RMD160 27e875b6d2abe2b1563e1cef9bdb4b6d67d1ef21 SHA1 3a24ff907c4820103c8675d54d0e61965a5bbb4a SHA256 433fa6a9c015219c3c52ad63f27e5f69cadd387f99480f24fd8eea28b8f6f59a
-MD5 73ea37ef9d6e022909633a33746f45d5 ChangeLog 942
-RMD160 27e875b6d2abe2b1563e1cef9bdb4b6d67d1ef21 ChangeLog 942
-SHA256 433fa6a9c015219c3c52ad63f27e5f69cadd387f99480f24fd8eea28b8f6f59a ChangeLog 942
+MISC ChangeLog 1087 RMD160 956c513e037b0c76eed3074c1a9aed81fd2c3063 SHA1 421278fdeb2c53f3b34db29879cc0bb0901ebfe1 SHA256 04169c68736e119c818f17d6dd235b56d6b4a368263faef0eb8c9c900cb552b6
+MD5 cbe4ba3b9899a0538ef0ee2f52e4661e ChangeLog 1087
+RMD160 956c513e037b0c76eed3074c1a9aed81fd2c3063 ChangeLog 1087
+SHA256 04169c68736e119c818f17d6dd235b56d6b4a368263faef0eb8c9c900cb552b6 ChangeLog 1087
 MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975
 MD5 a971e1c05db3ed5d35a404fa7f1cf67b metadata.xml 697
 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde metadata.xml 697
diff --git a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
index 7d3e9837558c..7480e47bb593 100644
--- a/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.3 2007/01/25 23:41:35 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-3.4.6.ebuild,v 1.4 2007/02/27 12:27:14 george Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -34,6 +34,12 @@ QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-${SLOT}.so
 # 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-gcc instead of asis
+My_LIBPATH=${LIBPATH/${PN}/${Gnat_Name}}
+My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
+My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
+
 
 pkg_setup() {
 	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
@@ -48,6 +54,15 @@ pkg_setup() {
 		echo
 		die
 	fi
+	if [[ -e ${My_LIBPATH}/adalib/libasis.a ]] ; then
+		echo
+		ewarn "gnatmake of gnat-gcc unfortunately has problems forcind the build"
+		ewarn "if the package is already installed."
+		eerror "Please unmerge asis-gcc first and then resume the merge:"
+		eerror "emerge --unmerge asis-gcc && emerge asis-gcc"
+		echo
+		die
+	fi
 }
 
 src_unpack() {
@@ -93,41 +108,35 @@ src_compile() {
 
 
 src_install () {
-	# we need to adjust some vars defined in gnatbuild.eclass so that they use
-	# gnat-gcc instead of asis
-	LIBPATH=${LIBPATH/${PN}/${Gnat_Name}}
-	BINPATH=${BINPATH/${PN}/${Gnat_Name}}
-	DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
-
 	# install the lib
-	dodir ${LIBPATH}/adalib
+	dodir ${My_LIBPATH}/adalib
 	chmod 0755 lib_dyn/libasis.so
-	cp lib_dyn/libasis.so ${D}${LIBPATH}/adalib/libasis-${SLOT}.so
-	insinto ${LIBPATH}/adalib
+	cp lib_dyn/libasis.so ${D}${My_LIBPATH}/adalib/libasis-${SLOT}.so
+	insinto ${My_LIBPATH}/adalib
 	doins obj/*.ali
 	doins lib/libasis.a
 	# make appropriate symlinks
-	pushd ${D}${LIBPATH}/adalib
+	pushd ${D}${My_LIBPATH}/adalib
 	ln -s libasis-${SLOT}.so libasis.so
 	popd
 	# sources
-	insinto ${LIBPATH}/adainclude
+	insinto ${My_LIBPATH}/adainclude
 	doins gnat/*.ad[sb]
 	doins asis/*.ad[sb]
 
 	# tools
-	mkdir -p ${D}${BINPATH}
+	mkdir -p ${D}${My_BINPATH}
 	for fn in tools/{adabrowse,asistant,gnatelim,gnatstub}; do
-		cp ${fn}/${fn:6} ${D}${BINPATH}
+		cp ${fn}/${fn:6} ${D}${My_BINPATH}
 	done
-	cp tools/semtools/ada{dep,subst} ${D}${BINPATH}
+	cp tools/semtools/ada{dep,subst} ${D}${My_BINPATH}
 
 	if use doc; then
 		# docs and examples
 		dodoc documentation/*.{txt,ps}
 		dohtml documentation/*.html
 		# info's should go into gnat-gpl dirs
-		insinto ${DATAPATH}/info/
+		insinto ${My_DATAPATH}/info/
 		doins documentation/*.info
 	fi
 
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild
index 54fcbe5ee28e..ec4a27837082 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild,v 1.3 2007/01/25 23:41:35 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild,v 1.4 2007/02/27 12:27:14 george Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -34,6 +34,12 @@ QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-4.1.so
 # 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-gcc instead of asis
+My_LIBPATH=${LIBPATH/${PN}/${Gnat_Name}}
+My_BINPATH=${BINPATH/${PN}/${Gnat_Name}}
+My_DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
+
 
 pkg_setup() {
 	currGnat=$(eselect --no-color gnat show | grep "gnat-" | awk '{ print $1 }')
@@ -48,6 +54,15 @@ pkg_setup() {
 		echo
 		die
 	fi
+	if [[ -e ${My_LIBPATH}/adalib/libasis.a ]] ; then
+		echo
+		ewarn "gnatmake of gnat-gcc unfortunately has problems forcind the build"
+		ewarn "if the package is already installed."
+		eerror "Please unmerge asis-gcc first and then resume the merge:"
+		eerror "emerge --unmerge asis-gcc && emerge asis-gcc"
+		echo
+		die
+	fi
 }
 
 # we need to avoid calling gnatboot_src_unpack
@@ -101,41 +116,35 @@ src_compile() {
 
 
 src_install () {
-	# we need to adjust some vars defined in gnatbuild.eclass so that they use
-	# gnat-gcc instead of asis
-	LIBPATH=${LIBPATH/${PN}/${Gnat_Name}}
-	BINPATH=${BINPATH/${PN}/${Gnat_Name}}
-	DATAPATH=${DATAPATH/${PN}/${Gnat_Name}}
-
 	# install the lib
-	dodir ${LIBPATH}/adalib
+	dodir ${My_LIBPATH}/adalib
 	chmod 0755 lib_dyn/libasis.so
-	cp lib_dyn/libasis.so ${D}${LIBPATH}/adalib/libasis-${SLOT}.so
-	insinto ${LIBPATH}/adalib
+	cp lib_dyn/libasis.so ${D}${My_LIBPATH}/adalib/libasis-${SLOT}.so
+	insinto ${My_LIBPATH}/adalib
 	doins obj/*.ali
 	doins lib/libasis.a
 	# make appropriate symlinks
-	pushd ${D}${LIBPATH}/adalib
+	pushd ${D}${My_LIBPATH}/adalib
 	ln -s libasis-${SLOT}.so libasis.so
 	popd
 	# sources
-	insinto ${LIBPATH}/adainclude
+	insinto ${My_LIBPATH}/adainclude
 	doins gnat/*.ad[sb]
 	doins asis/*.ad[sb]
 
 	# tools
-	mkdir -p ${D}${BINPATH}
+	mkdir -p ${D}${My_BINPATH}
 	for fn in tools/{adabrowse,gnatelim,gnatstub,gnatpp,gnatmetric}; do
-		cp ${fn}/${fn:6} ${D}${BINPATH}
+		cp ${fn}/${fn:6} ${D}${My_BINPATH}
 	done
-	cp tools/semtools/ada{dep,subst} ${D}${BINPATH}
+	cp tools/semtools/ada{dep,subst} ${D}${My_BINPATH}
 
 	# docs and examples
 	if use doc ; then
 		dodoc documentation/*.{txt,ps}
 		dohtml documentation/*.html
 		# info's should go into gnat-gpl dirs
-		insinto ${DATAPATH}/info/
+		insinto ${My_DATAPATH}/info/
 		doins documentation/*.info
 
 		insinto /usr/share/doc/${PF}