Fix dependency on ecj, eselect-ecj's PDEPEND doesn't guarantee it's availability...

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

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index b42716d893a139261f0aac81c65e4b1a4547a464..f78e6cd3985df1d2ee0c9209493707a96e19c07b 100644 (file)
--- 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/Manifest b/dev-java/cacao/Manifest
index 337129986fa8560293ef18bcd4fe9d1a69c589fb..985b9f57b5b6ee6c0653520004c4c009e24e9b04 100644 (file)
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.93-no-exec-stack.patch 403 RMD160 d2bc6ca0bff8752cef513a05deb1484732d63b09 SHA1 16ae9f71bab51865325c9058a7257690bde2258d SHA256 79097e272e0250f8a40e87f2c6801f9e05e51c755b7f9b2b835c04d51f2af898
 AUX cacao.env 620 RMD160 0b36b8e9d9f29ab8ec2f9480afbac27043cf9fac SHA1 b59e72357e4435eca3e4da3add7b1c1adad4bb21 SHA256 156f3291b54c372b619785624aee308ac25d5ae8666eab152db4a45a5aabdd6d
 DIST cacao-0.99.4.tar.bz2 2876200 RMD160 94aff00e7e9c10cd36f626e86a9ad8100a72d79b SHA1 e786a21c0f3f8fc1394e5a2a7a3e5607116760ec SHA256 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56
-EBUILD cacao-0.99.4.ebuild 2429 RMD160 580894ed45b85a368de4e5cc2beeac122e45a93b SHA1 78370ed42411352f7e3c545349ee0f49abd07ff6 SHA256 509f3e60498ee4aef562bd0ca9f6d191140380764230a14555d73dc595604a67
-MISC ChangeLog 2472 RMD160 b4714c0610750202b8eca1302264e3c156cfb4c5 SHA1 e1d154d9c8d6f8583503c00fc2f1e9a11e7d8d7f SHA256 c7459ff944fa047d9f9dae569dc6777133bff5bd74212e988387aebee3efbc52
+EBUILD cacao-0.99.4.ebuild 2446 RMD160 9a318d4319a78769cb3d4d3421823175a6fca0d0 SHA1 76ca61890dee3bee2125fa87c85cd3dc80b400db SHA256 9580489981820538bbdaa731ef0db8a4508830bf0b422f3fd85a1b2ea910b0c2
+MISC ChangeLog 2638 RMD160 4c98828ce04746f2cc249ce6f9a3567c6b6b29e4 SHA1 7ff95f5391b08f701699d59dc1e9da8e914afabd SHA256 2d765d969456093d0063b817195a30cb8cfe8ee1640aa26db236d627eea44983
 MISC metadata.xml 364 RMD160 75afe3d567961bdf4084cd1ee368785c46347158 SHA1 86a25ea9b92d0daeffffa4b15ec7cc3df97c5c68 SHA256 4d63397a708380d2d8dbd5c15b9a246c4edb9d63cf630a06d16c3533ad17ab66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkv5OX4ACgkQcxLzpIGCsLRnuACff+/RhPt+bYilDGW+k7bYgtRp
-HhoAn2VYYagVZ8qSTO56aBRuk/pDDMh2
-=8yk1
------END PGP SIGNATURE-----

diff --git a/dev-java/cacao/cacao-0.99.4.ebuild b/dev-java/cacao/cacao-0.99.4.ebuild
index 9963344300473192b353732d0832fd93ddf95a2a..2808cf016da95ae4830980b8dd6f989e06ff9362 100644 (file)
--- 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}