added (finally) an asis version for gnat-gcc-4.2 series.

Package-Manager: portage-2.1.4.1

4 files changed, 165 insertions, 4 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index 59b78fa46aa5..f74af04eabce 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.7 2007/02/27 12:27:14 george Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.8 2008/02/08 14:33:08 george Exp $
+
+*asis-gcc-4.2.2 (08 Feb 2008)
+
+  08 Feb 2008; George Shapovalov <george@gentoo.org> +asis-gcc-4.2.2.ebuild:
+  added (finally) an asis version for gnat-gcc-4.2 series. Only one per major
+  version seems sufficient now, as Ada stuff in gcc is kept stable between
+  major releases. Adjusted DEPEND correspondingly.
 
   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
diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest
index 885c221fc88d..37f6d3733ae5 100644
--- a/dev-ada/asis-gcc/Manifest
+++ b/dev-ada/asis-gcc/Manifest
@@ -1,9 +1,11 @@
 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
+DIST asis-gcc-4.2.2.tar.bz2 2474021 RMD160 93d91edf9f974a85857a07f6148ce48ba75c53e2 SHA1 37453442bd803602fce15048f893ce397f30bac8 SHA256 b38528b6250d56123d32d8967f5165dddcc7e67953649c77606f1e9f56b47eba
 EBUILD asis-gcc-3.4.6.ebuild 4439 RMD160 c710027ebe17a84314f40c021e3b08c92bc05d4a SHA1 6878685cbec9eec20376d3c36f859326b1238dd8 SHA256 f4bab3b026974dbedf05e6455bf8b1837706f5fbbef2232bed176acae9007f7c
 EBUILD asis-gcc-4.1.1.ebuild 4939 RMD160 d1c0362951eed2ce8f5f8fe25274efd4b0dee8fd SHA1 c86be95b745901a5e6b812c73c1743f1a2ee5973 SHA256 10f10a9c58f7cc07d290f9f3bd9526130174cf6965f9c9c3224c45117b5e13c7
 EBUILD asis-gcc-4.1.2-r1.ebuild 4637 RMD160 880779b9e7598d757893b8c975e00f41ec09c225 SHA1 38e70b518767a7d87c395375554ada89a9a05677 SHA256 802e3b2e72a2b5817d0e2f8d197198ed442c240601458bc946dbfe35d317ba39
 EBUILD asis-gcc-4.1.2.ebuild 4717 RMD160 49db19085bbef61b2e03c438f158cb6b8c9b1f18 SHA1 54aad1843d0fe971f1cb8e3aac8d9f57eb9982bb SHA256 a1230b54ca4bc010a8658434b9cd7cc08ddc5b1ef58c1448b6812f77ec5b58f2
-MISC ChangeLog 1087 RMD160 956c513e037b0c76eed3074c1a9aed81fd2c3063 SHA1 421278fdeb2c53f3b34db29879cc0bb0901ebfe1 SHA256 04169c68736e119c818f17d6dd235b56d6b4a368263faef0eb8c9c900cb552b6
+EBUILD asis-gcc-4.2.2.ebuild 4798 RMD160 78422063bfe68389437d11f7430b786918954f70 SHA1 3b7f1a0ffaf77059699c02ddd6b29ac237b17f8e SHA256 b930baedbc7742ea424fb57b8a25f600e3104c897cfb9c10aaa415109c324acf
+MISC ChangeLog 1400 RMD160 40d68dab9a482cd38c64a107b9ead3067c0c5db0 SHA1 9a746cace3739e7f4b14577b597678aefc8d7cc2 SHA256 8afb97a2021e0a6d323755e7c97827ba9f194f937b40e3ad9748600b5922aa3d
 MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975
diff --git a/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
new file mode 100644
index 000000000000..1cc5b62bd89e
--- /dev/null
+++ b/dev-ada/asis-gcc/asis-gcc-4.2.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2008 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.2.2.ebuild,v 1.1 2008/02/08 14:33:08 george Exp $
+
+inherit eutils flag-o-matic gnatbuild multilib
+
+DESCRIPTION="The Ada Semantic Interface Specification (tools tied to compiler). GnuAda version"
+HOMEPAGE="http://gnuada.sourceforge.net/"
+LICENSE="GMGPL"
+
+KEYWORDS="~amd64 ~x86"
+
+Gnat_Name="gnat-gcc"
+My_PN="asis"
+SRC_URI="http://dev.gentoo.org/~george/src/${P}.tar.bz2"
+
+IUSE="doc"
+RDEPEND="=dev-lang/gnat-gcc-${SLOT}*"
+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/$(get_libdir)/gnat-gcc/*/${SLOT}/adalib/libasis-${SLOT}.so
+	usr/$(get_libdir)/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 forcing 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
+	# sources
+	insinto ${My_LIBPATH}/adainclude
+	doins gnat/*.ad[sb]
+	doins asis/*.ad[sb]
+	# two files are already part of gnat, removing to avoid collision
+	rm "${D}${My_LIBPATH}"/adainclude/g-string.ad?
+
+	# 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/
+	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/florist/Manifest b/dev-ada/florist/Manifest
index 5a609569be76..4e6a1c5624c3 100644
--- a/dev-ada/florist/Manifest
+++ b/dev-ada/florist/Manifest
@@ -1,6 +1,6 @@
 DIST florist-2006.0.tar.bz2 177530 RMD160 ee8956074a7ec04e69d24447551f6ae5a8e3285a SHA1 31902a09c43f6f7c28b4520779c7f994986e93bf SHA256 ed379c0e1f5d57342dfb199b014ec5ce41cc81d109951de00f8ea2757e433d10
 DIST florist-2007.0.tar.bz2 167089 RMD160 c3daa44b2019ab2c33b2bf7d477a4c26a1c8757c SHA1 376886a80d459ce24d97984d5d71618f3df00505 SHA256 e6047390bba1fc70feeafd2009a7a00b6bb6126bb64520e0c0f973aa6ced838a
 EBUILD florist-2006.0.ebuild 1224 RMD160 e4d51d6fa1c97444c7dc9c027b1ffca57d8888c6 SHA1 fa5e2b04cee9fea514144db18eeb02515ff918d8 SHA256 556030c327661afde3cd9fa18245e68f61e49c4b25c2438434b400c4fcd65fcf
-EBUILD florist-2007.0.ebuild 1224 RMD160 d3171ee43d9dc9fdc20ff93209310785dbb9ef93 SHA1 47302a96e2f7c8f0cf7313b062a72f059a61c259 SHA256 6dc9690dfc3d7453122c7034ea57306b2d23492f3cf53041accb206a4e7af3c4
+EBUILD florist-2007.0.ebuild 1206 RMD160 12caf60f6dbd9e14a3f6406e482ae34a09bd51dc SHA1 5de1832085e2488bc980c6d5043d5b445ee26048 SHA256 fb703ca216f2b8e42757e4ef0148e8fe3e0d9a2e6fd0bc4927180386e89637a3
 MISC ChangeLog 1993 RMD160 9814f7d7db77b5b307d5e12219b524e96674d8d0 SHA1 c1e3adb7487debccf98f8384622893fe770871e4 SHA256 786cc9bf8ac74a73dc54e655d587a93d7d5305ad8bd4a0f04406be86bf4f6f08
 MISC metadata.xml 611 RMD160 6fd600af26c65651c71cb158f05aa10e8cf43d64 SHA1 e1ec9b762eebae044b117fca849bb7db79c2def9 SHA256 9c4212646c77150684ce307141f19188844bbcafac2c99ac6266d6027952065a