Add dev-java/ant-core to RDEPEND for bug #174981. ant-core should not be --build...

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/xjavac/ChangeLog b/dev-java/xjavac/ChangeLog
index 692f142f811cbcf32dbe429df9c3a7c9dc91d591..582e8d1a9e2965bb23237b69809fb9a3bdde6d67 100644 (file)
--- a/dev-java/xjavac/ChangeLog
+++ b/dev-java/xjavac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xjavac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.22 2007/04/18 06:02:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/ChangeLog,v 1.23 2007/04/18 08:30:14 betelgeuse Exp $
+
+  18 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  xjavac-20041208-r5.ebuild:
+  Add dev-java/ant-core to RDEPEND for bug #174981. ant-core should not be
+  --build-only because xjavac calls into ant-core.
 
   18 Apr 2007; Vlastimil Babka <caster@gentoo.org>
   xjavac-20041208-r4.ebuild, xjavac-20041208-r5.ebuild:
@@ -45,7 +50,7 @@
 
   10 Sep 2006; Vlastimil Babka <caster@gentoo.org>
   +files/xjavac-more-vendors.patch, +xjavac-20041208-r4.ebuild:
-  Revision bump to fix building with jrockit-jdk-bin wrt bug #142692. Thanks to 
+  Revision bump to fix building with jrockit-jdk-bin wrt bug #142692. Thanks to
   masayuko <igarashi@gentoo.gr.jp> for the patch.
 
   10 Sep 2006; Joshua Nichols <nichoj@gentoo.org> xjavac-20041208-r3.ebuild:

diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 6bc1d1de5be5ca4b26e85cdd66a24a108988b01a..0dc21519ff60baf120500c03f8ca9a3737bb2d88 100644 (file)
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xjavac-20041208-build.xml 1088 RMD160 40b56a0816001a3b80816c785620ac30dda5f053 SHA1 110534c27b7801bd1946d04a035700ec6702cb38 SHA256 efed4720ae40840e8c8715c6925dc9fe54100202e7a710fd3998062d81e4e81b
 MD5 6fe9f96a234f0ef0c00816978f225959 files/xjavac-20041208-build.xml 1088
 RMD160 40b56a0816001a3b80816c785620ac30dda5f053 files/xjavac-20041208-build.xml 1088
@@ -15,14 +18,14 @@ EBUILD xjavac-20041208-r4.ebuild 1042 RMD160 ae0f3cbd4e91d0c67c4236a8693695b5ed3
 MD5 317c6c7712ac0ce2822fc735b210ac8f xjavac-20041208-r4.ebuild 1042
 RMD160 ae0f3cbd4e91d0c67c4236a8693695b5ed36df44 xjavac-20041208-r4.ebuild 1042
 SHA256 3d6ff06e3cd6f4680fa237a426c648f3a6895135add72270b9f72bf753fa1400 xjavac-20041208-r4.ebuild 1042
-EBUILD xjavac-20041208-r5.ebuild 1049 RMD160 a7403528eef69f00f9e2ea01db9310717b5c0617 SHA1 521a463cd0d119504fc8b2e03e63d929ba32f17e SHA256 3d02c37b759bb8140e348e19c1378acbf03b95987206d5e011fc0cae14ee15bf
-MD5 4b8bbf672e1c9777eb96888b5cd36ba2 xjavac-20041208-r5.ebuild 1049
-RMD160 a7403528eef69f00f9e2ea01db9310717b5c0617 xjavac-20041208-r5.ebuild 1049
-SHA256 3d02c37b759bb8140e348e19c1378acbf03b95987206d5e011fc0cae14ee15bf xjavac-20041208-r5.ebuild 1049
-MISC ChangeLog 3561 RMD160 ba609995f83ef6c59e09b8f8862ee6f7d90e65cf SHA1 50aa325beac22bcc9272983ce448a34a3e58788d SHA256 3e66449aa11cb9285f3e100b43c9d5fa30990ec8e0680a683f060bf53ef1dcf8
-MD5 da6afe44fb34439fcc6e038b21210bad ChangeLog 3561
-RMD160 ba609995f83ef6c59e09b8f8862ee6f7d90e65cf ChangeLog 3561
-SHA256 3e66449aa11cb9285f3e100b43c9d5fa30990ec8e0680a683f060bf53ef1dcf8 ChangeLog 3561
+EBUILD xjavac-20041208-r5.ebuild 1065 RMD160 673a9714afcd14a54046a16e03d042648d703844 SHA1 c1362fb96c27c83ea05029b54e6639e329ebb97b SHA256 24e2e1b6935112b2974ae85284d98c293c4d84fb7005fac0d911fac7858f441c
+MD5 b82c0a4b011ba687229d64f8cae4882a xjavac-20041208-r5.ebuild 1065
+RMD160 673a9714afcd14a54046a16e03d042648d703844 xjavac-20041208-r5.ebuild 1065
+SHA256 24e2e1b6935112b2974ae85284d98c293c4d84fb7005fac0d911fac7858f441c xjavac-20041208-r5.ebuild 1065
+MISC ChangeLog 3773 RMD160 4e50626df71a91574d4b06fd30a49b2fb9976247 SHA1 7766eb2ec1f95f39c70e1792daca115f7386760c SHA256 148ceea982e817f51bb992bbc0cbc19f541d837805ee307516b9e0cf7a0f91db
+MD5 a7e0797c96bdf6175d70d8ef488dc7de ChangeLog 3773
+RMD160 4e50626df71a91574d4b06fd30a49b2fb9976247 ChangeLog 3773
+SHA256 148ceea982e817f51bb992bbc0cbc19f541d837805ee307516b9e0cf7a0f91db ChangeLog 3773
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -33,3 +36,10 @@ SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/di
 MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r5 241
 RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r5 241
 SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r5 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGJdcfcxLzpIGCsLQRAlXpAJ40+XnOMClxXcz0GYTsRLKcvkixHgCcDWuw
+cuQu1F7JJh8coJhErTs/RA0=
+=Lnrd
+-----END PGP SIGNATURE-----

diff --git a/dev-java/xjavac/xjavac-20041208-r5.ebuild b/dev-java/xjavac/xjavac-20041208-r5.ebuild
index 6a361352e3967369c8829fe82d1e996dc83959c6..a84eb4b8b631865d828f90e68fd11b5ae4c9d640 100644 (file)
--- a/dev-java/xjavac/xjavac-20041208-r5.ebuild
+++ b/dev-java/xjavac/xjavac-20041208-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20041208-r5.ebuild,v 1.3 2007/04/18 06:02:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20041208-r5.ebuild,v 1.4 2007/04/18 08:30:14 betelgeuse Exp $
 
 # Does not install a symlink any more so ANT_TASKS is the only way to use this
 WANT_SPLIT_ANT="true"
@@ -14,7 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jdk-1.4
+       >=dev-java/ant-core-1.7"
 
 src_unpack() {
        unpack ${A}
@@ -26,7 +27,7 @@ src_unpack() {
 }
 
 src_compile() {
-       eant jar -Dclasspath=$(java-pkg_getjars --build-only ant-core)
+       eant jar -Dclasspath=$(java-pkg_getjars ant-core)
 }
 
 src_install() {