fix info collision upon update

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

3 files changed, 142 insertions, 2 deletions

diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog
index bd45c2b34fd5..01b455718c54 100644
--- a/dev-ada/asis-gcc/ChangeLog
+++ b/dev-ada/asis-gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ada/asis-gcc
 # Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.15 2012/04/19 13:30:42 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.16 2012/04/27 13:53:11 george Exp $
+
+*asis-gcc-4.3.1-r1 (27 Apr 2012)
+
+  27 Apr 2012; george <george@gentoo.org> +asis-gcc-4.3.1-r1.ebuild:
+  fix info collision upon update
 
 *asis-gcc-4.3.1 (19 Apr 2012)
 
diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest
index 21e92065437b..568e7794b51d 100644
--- a/dev-ada/asis-gcc/Manifest
+++ b/dev-ada/asis-gcc/Manifest
@@ -9,6 +9,7 @@ EBUILD asis-gcc-4.1.2-r1.ebuild 4658 RMD160 d9f02591c1bcecfbf3f89c26d9f40e3ebaf7
 EBUILD asis-gcc-4.1.2.ebuild 4740 RMD160 7ecfa92a460f03ad2f1d117bb723777e9732e1e5 SHA1 962f315285d4fc93af60891b4cb037e01f546d8f SHA256 e4426f542ff34a2c9f36bd526dd2a670278d744c9cac4124581dd103900c3c13
 EBUILD asis-gcc-4.2.2.ebuild 4829 RMD160 25d643263966bcdb6145327d4ea6f084dad1ca8c SHA1 ffff71586e2e4c1b822b4b071fa4c63b226c8f66 SHA256 4698d921ba7968f8e035a1579e085df337a4682f74578db6d3e1f91197cd5b30
 EBUILD asis-gcc-4.3.0_pre132166.ebuild 4858 RMD160 ca4f8effd7ced9682075267862890c10f48e0e43 SHA1 35228e2be831c3c4c2d02225a6c795005c6ae36f SHA256 7d60d6373d16034622d949315c40765c64040462b369782f414c6126d2db055d
+EBUILD asis-gcc-4.3.1-r1.ebuild 3896 RMD160 4227e43b9f564b49f2e2b41756b55a1f6fbbad2c SHA1 6add3e5657f37aceb691231766a21c48f017ee4f SHA256 3adf24e8fab71dae184a001b42a25dbb8df5ab8c3abe27badd1f43d9581a8bcd
 EBUILD asis-gcc-4.3.1.ebuild 3887 RMD160 966803f5d37f040e09a98c2b51b1d2124dd29294 SHA1 7556d1c0418c02006e7002d41a0a4b26f47fb7ab SHA256 7ad186b2dc13bd45b015d71b53384d7cc850ecc0e2108a2f8b93663e9abf00c9
-MISC ChangeLog 2770 RMD160 81a01c03b4600175c98974d62bda0c1e46299f61 SHA1 a3c4b295cf240439c9db352da73993fd7b707689 SHA256 89eec8a9a160c01966bc166ac1ee3ea2760dff8de0980d112ed32e03538608e0
+MISC ChangeLog 2907 RMD160 249eab9eef79d81221293475236696b01936b032 SHA1 975732e736a19b19340fb9cb74855eb946f979d4 SHA256 ecb4d54c73e4df9fd55bc85f444c56021e385432b19162694871975edf711d6e
 MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975
diff --git a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..72dffb17fdb5
--- /dev/null
+++ b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 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.3.1-r1.ebuild,v 1.1 2012/04/27 13:53:11 george Exp $
+
+inherit eutils flag-o-matic gnatbuild
+
+ACT_Ver=2009
+Gnat_Name="gnat-gcc"
+
+DESCRIPTION="The Ada Semantic Interface Specification (semantic analysis and tools tied to compiler)"
+SRC_URI="http://dev.gentoo.org/~george/src/asis-gpl-${ACT_Ver}-src.tgz"
+HOMEPAGE="https://libre.adacore.com/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+RDEPEND="=dev-lang/gnat-gcc-${SLOT}*"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base
+	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-gcc 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 asis-gcc:${SLOT} 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}"/gnat/
+	# newer versions autogen snames.ad?
+	# Looks logical to keep it here, as this is a part of source prep
+	gnatmake xsnamest.adb
+	./xsnamest
+	mv snames.ns snames.ads
+	mv snames.nb snames.adb
+	# need to change gcc -> gnatgcc
+	cd "${S}"
+	for fn in asis/a4g-gnat_int.adb \
+		asis/a4g-contt.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 () {
+	# README asks to run make install, claiming that some sources are built at
+	# that point
+	make all install prefix="${D}"
+	# now manually move all the stuff to proper places
+	mkdir -p "${D}${LIBPATH}"
+	mv "${D}"lib/asis/ "${D}${LIBPATH}"/adalib
+	# install the shared lib
+	chmod 0755 obj/libasis-${ACT_Ver}.so
+	cp obj/libasis-${ACT_Ver}.so "${D}${LIBPATH}"/adalib
+	# make appropriate symlinks
+	pushd "${D}${LIBPATH}"/adalib
+		ln -s libasis-${ACT_Ver}.so libasis.so
+	popd
+	# sources
+	mv "${D}"include/asis/ "${D}${LIBPATH}"/adainclude
+
+	# tools
+	mkdir -p "${D}${BINPATH}"
+	find "${S}"/tools/ -type f -executable -exec cp {} "${D}${BINPATH}" \;
+	rm -f "${D}${BINPATH}"/Makefile*
+
+	# docs and examples
+	cd "${S}"/documentation/
+	dodoc  *.txt
+	dohtml *.html
+	cd "${S}"
+	insinto /usr/share/doc/${PF}
+	doins -r documentation/*.pdf documentation/*.info tutorial/ templates/
+
+	# cleanup empty dirs
+	rm -rf "${D}"/{bin,include,lib,share}
+}
+
+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
+}