added a fix to building due to gnatmake behavior. Issuing a revbump since the fixed problem might cause incomplete build.

Package-Manager: portage-2.1.2-r12

4 files changed, 186 insertions, 5 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index 4f71b33ef873..1e5745025255 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2007/02/17 12:58:25 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.6 2007/02/27 11:49:07 george Exp $
+
+*asis-gcc-4.1.2-r1 (27 Feb 2007)
+
+  27 Feb 2007; George Shapovalov <george@gentoo.org>
+  +asis-gcc-4.1.2-r1.ebuild:
+  added a fix to building due to gnatmake behavior.
 
 *asis-gcc-4.1.2 (17 Feb 2007)
 
diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest
index 67b8f7c46b9b..9ca773b4086e 100644
--- a/dev-ada/asis-gcc/Manifest
+++ b/dev-ada/asis-gcc/Manifest
@@ -1,5 +1,6 @@
 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
@@ -8,14 +9,18 @@ EBUILD asis-gcc-4.1.1.ebuild 4608 RMD160 9f1241ee604786638ab61b977cfe13c1890934c
 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-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
+SHA256 1a318fcd34ffaee35ec1589e42bf4706327e8d0f2773ebb628b3858767aada8b asis-gcc-4.1.2-r1.ebuild 5033
 EBUILD asis-gcc-4.1.2.ebuild 4737 RMD160 6ac8977cb62cd906f98db0de44fbf4af076018e7 SHA1 1564a17dbb4d375e092069d93803a1656908ae80 SHA256 3d104a3fc7544ebb2767d9c04631e5d005767192d2c0df50d8293b640072cb4a
 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 773 RMD160 8761bd29e6c52df6cc08913f8e320a5cf430f8c8 SHA1 804f7aab5305d9ce318e03914ba976dc0508c218 SHA256 1417f27e56aabbd50d2b02601f1d6ee42fc0dd28750d0dee9c21e3c09768ed54
-MD5 97af5cabd3e4a4693d977d840aa686ef ChangeLog 773
-RMD160 8761bd29e6c52df6cc08913f8e320a5cf430f8c8 ChangeLog 773
-SHA256 1417f27e56aabbd50d2b02601f1d6ee42fc0dd28750d0dee9c21e3c09768ed54 ChangeLog 773
+MISC ChangeLog 942 RMD160 27e875b6d2abe2b1563e1cef9bdb4b6d67d1ef21 SHA1 3a24ff907c4820103c8675d54d0e61965a5bbb4a SHA256 433fa6a9c015219c3c52ad63f27e5f69cadd387f99480f24fd8eea28b8f6f59a
+MD5 73ea37ef9d6e022909633a33746f45d5 ChangeLog 942
+RMD160 27e875b6d2abe2b1563e1cef9bdb4b6d67d1ef21 ChangeLog 942
+SHA256 433fa6a9c015219c3c52ad63f27e5f69cadd387f99480f24fd8eea28b8f6f59a ChangeLog 942
 MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975
 MD5 a971e1c05db3ed5d35a404fa7f1cf67b metadata.xml 697
 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde metadata.xml 697
@@ -29,3 +34,6 @@ SHA256 fc781f068a24f19ebd68aa7068c61bfcf7492c74dd0b2ea200310ee8079cc3e5 files/di
 MD5 c054158f91eabd49bd8f09bf17dc998c files/digest-asis-gcc-4.1.2 250
 RMD160 3b90efdfd59dbcc9c30ca5d121cf208d20e835a7 files/digest-asis-gcc-4.1.2 250
 SHA256 fc781f068a24f19ebd68aa7068c61bfcf7492c74dd0b2ea200310ee8079cc3e5 files/digest-asis-gcc-4.1.2 250
+MD5 4f41212d5a5def1b33ab55ca0db31ed4 files/digest-asis-gcc-4.1.2-r1 250
+RMD160 8a773a39413bcf98b8eb7394e9634b69e257a9ee files/digest-asis-gcc-4.1.2-r1 250
+SHA256 c69510c7283c9288b04fdf3fae4146bad3d07d090d4bb0a0c8e460f831c53995 files/digest-asis-gcc-4.1.2-r1 250
diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..a662513cad46
--- /dev/null
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
@@ -0,0 +1,164 @@
+# 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.2-r1.ebuild,v 1.1 2007/02/27 11:49:07 george Exp $
+
+inherit eutils flag-o-matic gnatbuild
+
+DESCRIPTION="The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler). GnuAda version"
+HOMEPAGE="http://gnuada.sourceforge.net/"
+LICENSE="GMGPL"
+
+KEYWORDS="~amd64 ~x86"
+
+Gnat_Name="gnat-gcc"
+My_PN="asis"
+# can reuse the same sources, but we need to force an upgrade
+SRC_URI="http://mirrors/gentoo/${P}.tar.bz2"
+
+
+IUSE="doc"
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
+DEPEND="${RDEPEND}
+	doc? ( virtual/tetex
+	app-text/texi2html )"
+
+# overwriting gnatboot's S
+S="${WORKDIR}/${My_PN}-${PV}"
+
+# Execstack is not nearly as dangerous in Ada as in C and would require a lot of
+# work to work around. See bug #141315.
+QA_EXECSTACK="usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis-${SLOT}.so
+	usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis.a
+	usr/*/gnat-gcc-bin/${SLOT}/*"
+
+
+# it may be even better to force plain -O2 -pipe 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() {
+	local 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/asis-${PV} again.."
+		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
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	# Build the shared library first, we need -fPIC here
+	gnatmake -f -Pasis_stat -cargs ${CFLAGS} || die "building libasis.a failed"
+	gnatmake -f -Pasis_dyn  -cargs ${CFLAGS} || die "building libasis.so failed"
+	chmod 0444 lib/*.ali
+
+	# build tools
+	# we need version.o generated for all the tools
+	gcc -c -o obj/version.o gnat/version.c
+	for fn in gnatelim gnatstub gnatpp ; do
+		pushd tools/${fn}
+			gnatmake -o ${fn} ${fn}-driver.adb -I../../asis/ -I../../gnat/ \
+				-I../tool_utils/ -I../tool_utils/templates/ \
+				-L../../lib -cargs ${CFLAGS} -largs -lasis ../../obj/version.o \
+				|| die "building ${fn} failed"
+		popd
+	done
+	pushd tools/gnatmetric
+		gnatmake -o gnatmetric metrics-simple_driver.adb -I../../asis/ -I../../gnat/ \
+			-I../tool_utils/ -I../tool_utils/templates/ \
+			-L../../lib -cargs ${CFLAGS} -largs -lasis ../../obj/version.o \
+			|| die "building ${fn} failed"
+	popd
+
+	pushd tools/adabrowse
+		gcc -c util-nl.c
+		gnatmake -I../../asis -I../../gnat adabrowse -L../../lib -cargs	${CFLAGS} \
+			-largs -lasis ../../obj/version.o || die
+	popd
+	pushd tools/semtools
+		gnatmake -I../../asis -I../../gnat adadep -L../../lib \
+			-cargs ${CFLAGS} -largs -lasis ../../obj/version.o || die
+		gnatmake -I../../asis -I../../gnat adasubst -L../../lib \
+			-cargs ${CFLAGS} -largs -lasis ../../obj/version.o || die
+	popd
+
+	# common stuff is just docs in this case
+	if use doc; then
+		pushd documentation
+		make all || die "Failed while compiling documentation"
+		for fn in *.ps; do ps2pdf ${fn}; done
+		popd
+	fi
+}
+
+
+src_install () {
+	# install the lib
+	dodir ${My_LIBPATH}/adalib
+	# doins grossly screws permissions
+	cp -dpP lib/* ${D}${My_LIBPATH}/adalib
+#	insinto ${LIBPATH}/adalib
+#	doins obj/*.ali
+#	doins lib/libasis*
+	# make appropriate symlinks
+#	pushd ${D}${LIBPATH}/adalib
+#	ln -s libasis-${SLOT}.so libasis.so
+#	popd
+	# sources
+	insinto ${My_LIBPATH}/adainclude
+	doins gnat/*.ad[sb]
+	doins asis/*.ad[sb]
+
+	# tools
+	mkdir -p ${D}${My_BINPATH}
+	for fn in tools/{adabrowse,gnatelim,gnatstub,gnatpp,gnatmetric}; do
+		cp ${fn}/${fn:6} ${D}${My_BINPATH}
+	done
+	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 ${My_DATAPATH}/info/
+		doins documentation/*.info
+
+		insinto /usr/share/doc/${PF}
+		doins -r documentation/*.pdf examples/ tutorial/ templates/
+
+		# this version also provides wiki contents, may be added at some point,
+		# however it seems to make sense to just use the online wiki..
+	fi
+}
+
+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-gcc/files/digest-asis-gcc-4.1.2-r1 b/dev-ada/asis-gcc/files/digest-asis-gcc-4.1.2-r1
new file mode 100644
index 000000000000..e1ae2a535c13
--- /dev/null
+++ b/dev-ada/asis-gcc/files/digest-asis-gcc-4.1.2-r1
@@ -0,0 +1,3 @@
+MD5 7af938b80b646e19f687e826318a559d asis-gcc-4.1.2.tar.bz2 2617806
+RMD160 851e91181d396c60899858d922edea2ed6f170a6 asis-gcc-4.1.2.tar.bz2 2617806
+SHA256 37466312b6c43ada02b704893b509af449ab1833bc6e3cddea40344cb8972c5e asis-gcc-4.1.2.tar.bz2 2617806