summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2011-12-18 08:08:44 +0000
committerRalph Sennhauser <sera@gentoo.org>2011-12-18 08:08:44 +0000
commita39c261906a9987d2bd55ebef29a629d6317656f (patch)
tree7dc5382db95cd92a3cd074b51756a0d927fbb503
parentVersion bumps. Re-introduced some older flags and fixed linking of zlib. Adde... (diff)
downloadgentoo-2-a39c261906a9987d2bd55ebef29a629d6317656f.tar.gz
gentoo-2-a39c261906a9987d2bd55ebef29a629d6317656f.tar.bz2
gentoo-2-a39c261906a9987d2bd55ebef29a629d6317656f.zip
Fix dependency on ecj, eselect-ecj's PDEPEND doesn't guarantee it's availability at build time.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
-rw-r--r--dev-java/cacao/ChangeLog8
-rw-r--r--dev-java/cacao/cacao-0.99.4.ebuild6
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index b42716d893a1..f78e6cd3985d 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/cacao
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.20 2010/05/23 14:18:49 betelgeuse Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.21 2011/12/18 08:08:44 sera Exp $
+
+ 18 Dec 2011; Ralph Sennhauser <sera@gentoo.org> cacao-0.99.4.ebuild:
+ Fix dependency on ecj, eselect-ecj's PDEPEND doesn't guarantee it's
+ availability at build time.
23 May 2010; Petteri Räty <betelgeuse@gentoo.org> cacao-0.99.4.ebuild:
Fix tests to find junit4. They still fail. See bug #321189.
diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
index 996334430047..2808cf016da9 100644
--- a/dev-java/cacao/cacao-0.99.4.ebuild
+++ b/dev-java/cacao/cacao-0.99.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.5 2010/05/23 14:18:49 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/cacao-0.99.4.ebuild,v 1.6 2011/12/18 08:08:44 sera Exp $
EAPI=2
AUTOTOOLS_AUTO_DEPEND="no"
@@ -17,7 +17,7 @@ IUSE="test"
CLASSPATH_SLOT=0.98
COMMON_DEPEND="
dev-java/gnu-classpath:${CLASSPATH_SLOT}
- app-admin/eselect-ecj
+ || ( dev-java/eclipse-ecj dev-java/ecj-gcj )
"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}