removed old version and promoted 4.1.2-r1 to stable to follow gnat-gcc changes (these two are closely tied)

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 3 insertions, 162 deletions

diff --git a/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild
deleted file mode 100644
index bfd27033fa1e..000000000000
--- a/dev-ada/asis-gcc/asis-gcc-4.1.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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.1.1.ebuild,v 1.8 2008/09/05 06:31:20 opfer Exp $
-
-inherit eutils flag-o-matic gnatbuild
-
-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="mirror://gentoo/${P}.tar.bz2"
-
-IUSE="doc"
-RDEPEND="=dev-lang/gnat-gcc-${PV}*"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base
-	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-4.1.so
-	usr/lib/gnat-gcc/*/${SLOT}/adalib/libasis.a
-	usr/*/gnat-gcc-bin/${SLOT}/*"
-
-# 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 }')
-	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 -Pasis  -cargs ${CFLAGS} || die "building libasis.a failed"
-	gnatmake -Pasis_dyn -f -cargs ${CFLAGS} || die "building libasis.so failed"
-
-	# 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
-	chmod 0755 lib_dyn/libasis.so
-	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}${My_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/asis-gcc-4.1.2-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
index 21198f6fcaf2..9b28c55931b5 100644
--- a/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
+++ b/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.6 2008/09/05 06:31:20 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.1.2-r1.ebuild,v 1.7 2009/02/06 20:06:27 george Exp $
 
 inherit eutils flag-o-matic gnatbuild
 
@@ -8,7 +8,7 @@ DESCRIPTION="The Ada Semantic Interface Specification (tools tied to compiler).
 HOMEPAGE="http://gnuada.sourceforge.net/"
 LICENSE="GMGPL"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 Gnat_Name="gnat-gcc"
 My_PN="asis"