diff options
| author |   George Shapovalov <george@gentoo.org> | 2012-06-14 11:38:14 +0000 |
|---|---|---|
| committer | George Shapovalov <george@gentoo.org> | 2012-06-14 11:38:14 +0000 |
| commit | d2fc7d5d82e32082894d9ab59a483057b80870a3 (patch) | |
| tree | be581776b6a2e084c0dd1de4199dd32bd14b2486 /dev-ada/asis-gcc | |
| parent | Mask also poppler-0.20.1 (diff) | |
| download | gentoo-2-d2fc7d5d82e32082894d9ab59a483057b80870a3.tar.gz gentoo-2-d2fc7d5d82e32082894d9ab59a483057b80870a3.tar.bz2 gentoo-2-d2fc7d5d82e32082894d9ab59a483057b80870a3.zip | |
added pkg_setup check to prevent build failure against already installed version
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'dev-ada/asis-gcc')
| -rw-r--r-- | dev-ada/asis-gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ada/asis-gcc/asis-gcc-4.3.1-r1.ebuild | 11 |
2 files changed, 15 insertions, 2 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/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 |