Add dev-java/ant-core to RDEPEND.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index f99c12dc7c6b410d9a360b9e08e0670603e9afbb..49844283b775d0051ccf291a21a02e290f8ab2d1 100644 (file)
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-contrib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.14 2006/11/30 15:22:07 caster Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.15 2007/04/25 16:19:56 betelgeuse Exp $
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  ant-contrib-1.0_beta2-r1.ebuild:
+  Add dev-java/ant-core to RDEPEND.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org>
   ant-contrib-1.0_beta2.ebuild, ant-contrib-1.0_beta2-r1.ebuild:
@@ -18,6 +22,8 @@
   ant-contrib-1.0_beta2-r1.ebuild:
   ant_src_unpack -> src_unpack
 
+*ant-contrib-1.0_beta2-r1 (02 Jul 2006)
+
   02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +ant-contrib-1.0_beta2-r1.ebuild:
   Revision bump to support new Java system. Added source use flag.

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index c583adb80ef99d6ba16864d54f415f562ba98aa9..c1eb9f85ae302cb0a45cd60605410a98b2ab2f15 100644 (file)
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST ant-contrib-1.0b2-src.tar.bz2 118216 RMD160 75a47ea59e6af1df723e48899b8e5cc124597573 SHA1 b93f62923922d9ec718239e4ecb3c1677c14a125 SHA256 29bdd00ee0df1d7b24e55b08bfff5641edf3f805e45a278641d42c0bf0ce9269
-EBUILD ant-contrib-1.0_beta2-r1.ebuild 1279 RMD160 2a0e45429cd9fd1498fbc7013cb7d5adfbe418ff SHA1 34c1bb770ab42203c5e2aab18e3e01e6bda1a9ff SHA256 d2dfd4f61584aa0d4799083f3af6e02863e3b9c1513c015fd1bbb85a2b1c54b7
-MD5 09a2f3635269eaa5a45c7bd5c21e9386 ant-contrib-1.0_beta2-r1.ebuild 1279
-RMD160 2a0e45429cd9fd1498fbc7013cb7d5adfbe418ff ant-contrib-1.0_beta2-r1.ebuild 1279
-SHA256 d2dfd4f61584aa0d4799083f3af6e02863e3b9c1513c015fd1bbb85a2b1c54b7 ant-contrib-1.0_beta2-r1.ebuild 1279
+EBUILD ant-contrib-1.0_beta2-r1.ebuild 1277 RMD160 57372f4728325e5e168e0978521bc828dd1f8b08 SHA1 71d28cc944a1b5496c14a0a50cc4626813777ff1 SHA256 8d6316dd5d18de2b66892399b3d15e031f3d7ead41653335798b74a2a40f793a
+MD5 3ae387e75ef3e2e005580c20d12910b6 ant-contrib-1.0_beta2-r1.ebuild 1277
+RMD160 57372f4728325e5e168e0978521bc828dd1f8b08 ant-contrib-1.0_beta2-r1.ebuild 1277
+SHA256 8d6316dd5d18de2b66892399b3d15e031f3d7ead41653335798b74a2a40f793a ant-contrib-1.0_beta2-r1.ebuild 1277
 EBUILD ant-contrib-1.0_beta2.ebuild 1311 RMD160 0a784067f749cc4c5cc214caf2c5f22ec67ddf83 SHA1 8309a73b148fd065e947d22f8d2a208f4e0c7983 SHA256 9469e6d6844245aeba20c844e840f9812d00273083fbe38dc13459d51dde0014
 MD5 ba488fa93be822e473b4bd214f46751f ant-contrib-1.0_beta2.ebuild 1311
 RMD160 0a784067f749cc4c5cc214caf2c5f22ec67ddf83 ant-contrib-1.0_beta2.ebuild 1311
 SHA256 9469e6d6844245aeba20c844e840f9812d00273083fbe38dc13459d51dde0014 ant-contrib-1.0_beta2.ebuild 1311
-MISC ChangeLog 2059 RMD160 270f10df139ec97ddbb4b9115e53dbd2f20dfbc3 SHA1 e99ff2df60ca78241b00b0e4c596f6b992862fc7 SHA256 d05f32ae1702b08fcbab78b4fe639c361ea9337643e7dbbe5a53a7cf465a5c49
-MD5 d224c80eced1c11d8b93cb345ae8661c ChangeLog 2059
-RMD160 270f10df139ec97ddbb4b9115e53dbd2f20dfbc3 ChangeLog 2059
-SHA256 d05f32ae1702b08fcbab78b4fe639c361ea9337643e7dbbe5a53a7cf465a5c49 ChangeLog 2059
+MISC ChangeLog 2229 RMD160 24f7364f3a730b35eb0928a62a4a3f582aab559a SHA1 a9adee802128396d58336b717c8a4b88241e1bb7 SHA256 5b975fab0d26466fb70b59cf428e957ba8f424492bec1a93ee5fd70287521486
+MD5 7f8defa383ce4a219708fbf4c5dac0bb ChangeLog 2229
+RMD160 24f7364f3a730b35eb0928a62a4a3f582aab559a ChangeLog 2229
+SHA256 5b975fab0d26466fb70b59cf428e957ba8f424492bec1a93ee5fd70287521486 ChangeLog 2229
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -21,3 +24,10 @@ SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/di
 MD5 a1efe17f9c88aa58d63072ac53c0f94c files/digest-ant-contrib-1.0_beta2-r1 268
 RMD160 51de18e8f2ce7da67489214bd131f0ebee6d7495 files/digest-ant-contrib-1.0_beta2-r1 268
 SHA256 bcea7aa4dc2e733d733b03643cc2955c7e91f761e8ee82c56e55dd8c49a209c4 files/digest-ant-contrib-1.0_beta2-r1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGL3+ucxLzpIGCsLQRArzbAJ9U2XgtgxH0KXyj0hXUFx6TdayA9gCbBtGv
+LCU+w/d6RiTXzEZuUl01SPo=
+=I51T
+-----END PGP SIGNATURE-----

diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild
index 6fbc3449eaa1bd6302ef4376d7c728a36b135978..2586760ee54c826954c8be8c7c37d40710377b38 100644 (file)
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild,v 1.5 2006/11/30 15:22:07 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta2-r1.ebuild,v 1.6 2007/04/25 16:19:56 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -14,11 +16,10 @@ IUSE="doc source"
 
 RDEPEND=">=virtual/jre-1.4
        >=dev-java/bcel-5.1
-       >=dev-java/xerces-2.7"
+       >=dev-java/xerces-2.7
+       dev-java/ant-core"
 DEPEND=">=virtual/jdk-1.4
-       ${RDEPEND}
-       >=dev-java/ant-core-1.6.2
-       source? ( app-arch/zip )"
+       ${RDEPEND}"
 
 S=${WORKDIR}/${PN}