diff options
| author |   George Shapovalov <george@gentoo.org> | 2012-06-14 13:08:30 +0000 |
|---|---|---|
| committer | George Shapovalov <george@gentoo.org> | 2012-06-14 13:08:30 +0000 |
| commit | f1e7c49af4a016a3d5c04ead8a9770342c1f719b (patch) | |
| tree | c7dd4e67e925c1c77d372892d39d5a7a0000c0b2 /dev-ada | |
| parent | Set PYTHON to proeprly call python2 (diff) | |
| download | historical-f1e7c49af4a016a3d5c04ead8a9770342c1f719b.tar.gz historical-f1e7c49af4a016a3d5c04ead8a9770342c1f719b.tar.bz2 historical-f1e7c49af4a016a3d5c04ead8a9770342c1f719b.zip | |
the 4.4 needs this catch too.
Package-Manager: portage-2.1.10.62/cvs/Linux x86_64
Diffstat (limited to 'dev-ada')
| -rw-r--r-- | dev-ada/asis-gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-ada/asis-gcc/Manifest | 4 | ||||
| -rw-r--r-- | dev-ada/asis-gcc/asis-gcc-4.4.ebuild | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dev-ada/asis-gcc/ChangeLog b/dev-ada/asis-gcc/ChangeLog index a50a25bb33ed..3a73fbec6257 100644 --- a/dev-ada/asis-gcc/ChangeLog +++ b/dev-ada/asis-gcc/ChangeLog @@ -1,8 +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.19 2012/06/14 11:38:14 george Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/ChangeLog,v 1.20 2012/06/14 13:08:30 george Exp $ - 14 Jun 2012; george <george@gentoo.org> asis-gcc-4.3.1-r1.ebuild: + 14 Jun 2012; George Shapovalov <george@gentoo.org> asis-gcc-4.4.ebuild: + the 4.4 needs this catch too. + + 14 Jun 2012; George Shapovalov <george@gentoo.org> asis-gcc-4.3.1-r1.ebuild: added pkg_setup check to prevent build failure against already installed version diff --git a/dev-ada/asis-gcc/Manifest b/dev-ada/asis-gcc/Manifest index 97638861fd61..7a44ccae8b09 100644 --- a/dev-ada/asis-gcc/Manifest +++ b/dev-ada/asis-gcc/Manifest @@ -12,6 +12,6 @@ EBUILD asis-gcc-4.2.2.ebuild 4829 RMD160 25d643263966bcdb6145327d4ea6f084dad1ca8 EBUILD asis-gcc-4.3.0_pre132166.ebuild 4858 RMD160 ca4f8effd7ced9682075267862890c10f48e0e43 SHA1 35228e2be831c3c4c2d02225a6c795005c6ae36f SHA256 7d60d6373d16034622d949315c40765c64040462b369782f414c6126d2db055d 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 3249 RMD160 08bca1826c6c6deafd2bc860ea8a46a098ed2560 SHA1 fa230dc25310e92cb3cb6bfd2007b1db5c126558 SHA256 8f8bf30b122ea67360df5928f51ad0c686d61f11eb4d9f678fba423f66a934e9 +EBUILD asis-gcc-4.4.ebuild 4211 RMD160 8382f50bf9be0c7762fff8cb3a9327ca83983a5d SHA1 d58a8763712d753311fb5b6338e9caba12e9ae7c SHA256 54e42f3385facd164ad6c4d5de243bffc4be0b01ca9e5b48deeb6c9a3f6af7ec +MISC ChangeLog 3367 RMD160 c74130c36841cc3105476acd266acdbc8ddf6636 SHA1 0f3aff58519f5bbccb9308374f5bc33e9afbb46d SHA256 4376d962a9fc79081fa47cc5d6b830d903ab582e9440a29829699f73b9bb4dae MISC metadata.xml 697 RMD160 bb7db4aaaa1ac14f321b0f2d9958835b29d03cde SHA1 2a40deb3b8729e82013db46498802e6c49708c6f SHA256 d32f466670f99fd6e28bb2c1e1257adac3f78db0d8d325f9507a81f9b9a5f975 diff --git a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild b/dev-ada/asis-gcc/asis-gcc-4.4.ebuild index 46a4cd85603b..c0e80df5d302 100644 --- a/dev-ada/asis-gcc/asis-gcc-4.4.ebuild +++ b/dev-ada/asis-gcc/asis-gcc-4.4.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.4.ebuild,v 1.1 2012/04/27 14:33:30 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ada/asis-gcc/asis-gcc-4.4.ebuild,v 1.2 2012/06/14 13:08:30 george Exp $ inherit eutils flag-o-matic gnatbuild @@ -47,6 +47,14 @@ 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" + echo + die + fi } # we need to override the eclass defined src_unpack |