diff options
Diffstat (limited to 'dev-ada')
| -rw-r--r-- | dev-ada/asis-gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ada/asis-gcc/Manifest | 4 | ||||
| -rw-r--r-- | dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog index c2dd2acba901..a50a25bb33ed 100644 --- a/dev-ada/asis-gcc/ChangeLog +++ b/dev-ada/asis-gcc/ChangeLog @@ -1,6 +1,10 @@ # 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.18 2012/06/14 11:35:30 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.19 2012/06/14 11:38:14 george Exp $ + + 14 Jun 2012; george <george@gentoo.org> asis-gcc-4.3.1-r1.ebuild: + added pkg_setup check to prevent build failure against already installed + version *asis-gcc-4.4 (27 Apr 2012) diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest index 50050b180ba1..97638861fd61 100644 --- a/dev-ada/asis-gcc/Manifest +++ b/dev-ada/asis-gcc/Manifest @@ -10,8 +10,8 @@ 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-r1.ebuild 4186 RMD160 29cf1b0a32122ebfe375d9bd63953c0e8ef4edd1 SHA1 8e83515747f908ec626043268077e30ce728ab67 SHA256 bd59e4f5b9967c6e967c67e79f11f20bfb1cbc7980486efd500be5b5f69a27ed EBUILD asis-gcc-4.3.1.ebuild 3887 RMD160 966803f5d37f040e09a98c2b51b1d2124dd29294 SHA1 7556d1c0418c02006e7002d41a0a4b26f47fb7ab SHA256 7ad186b2dc13bd45b015d71b53384d7cc850ecc0e2108a2f8b93663e9abf00c9 EBUILD asis-gcc-4.4.ebuild 3929 RMD160 0aae61fec7e4e4a1d8475ab1dd27d40b20911d98 SHA1 ef811a7f2471836c4041173c3422593c731b521b SHA256 dae190698f9e233c709e50ca04b2279355ba3bc6839ef4f57d1023fddf4709fb -MISC ChangeLog 3095 RMD160 6328416aa83d61cdc8e593cf0e50d64c0a65b359 SHA1 e0dfef98c9224837432b9c107d242751a68b41f0 SHA256 11236a0ef91e651715a980abd15de57793a68f459209551b6489e23204c38845 +MISC ChangeLog 3249 RMD160 08bca1826c6c6deafd2bc860ea8a46a098ed2560 SHA1 fa230dc25310e92cb3cb6bfd2007b1db5c126558 SHA256 8f8bf30b122ea67360df5928f51ad0c686d61f11eb4d9f678fba423f66a934e9 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 index 72dffb17fdb5..ae33e9b68b79 100644 --- a/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild +++ b/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild,v 1.2 2012/06/14 11:38:14 george Exp $ inherit eutils flag-o-matic gnatbuild @@ -47,6 +47,15 @@ pkg_setup() { echo die fi + if [[ -e ${LIBPATH}/adalib/libasis.a ]] ; then + echo + ewarn "Already installed asis appears to interfer with the build." + eerror "Please unmerge matching asis-gcc first and then resume the merge:" + eerror "emerge --unmerge asis-gcc:${SLOT} && emerge asis-gcc" + ewarn + echo + die + fi } # we need to override the eclass defined src_unpack |