Block on older ant-tasks to prevent breakages during update, solves bug #149661.

Package-Manager: portage-2.1.2_pre2

3 files changed, 17 insertions, 21 deletions

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index b124a7c95e50..e1b79859e589 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.49 2006/09/17 03:53:12 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.50 2006/10/02 21:26:17 caster Exp $
 
 # Ant-core blocks lower/older versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2 packages
 # Please unemerge ant-tasks when updating ant-core.
 
+  02 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  ant-core-1.6.5-r14.ebuild:
+  Block on older ant-tasks to prevent breakages during update, solves bug
+  #149661.
+
   16 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   ant-core-1.6.5-r2.ebuild:
   stable on ppc, thanks to report by Carl Hudkins (Bug #147754)
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index c84e085bbd7c..0b775c245729 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.2-ant 5058 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 SHA1 fb423fa1d5c4776950bd4b640b58fc7fc1f73ecf SHA256 ea8b41190c6a5b89b7a111a9fc901ad6fa294d3696cfcb9ba58a0f969a305071
 MD5 816ea8a6a51471da4c8df2f59434fc9d files/1.6.2-ant 5058
 RMD160 fb75e9bf3c4a095297be865e0cd87620feab8643 files/1.6.2-ant 5058
@@ -27,18 +24,18 @@ EBUILD ant-core-1.6.2-r5.ebuild 2073 RMD160 f634b70f53e25e1bdba96f31cdb1f27c457f
 MD5 dfba7c36e7a153beaf22f7d4644de63a ant-core-1.6.2-r5.ebuild 2073
 RMD160 f634b70f53e25e1bdba96f31cdb1f27c457f3d49 ant-core-1.6.2-r5.ebuild 2073
 SHA256 e3b8a363c503557e3b0349b967ef4f678dc65e559428c7b11668c68fb27739d8 ant-core-1.6.2-r5.ebuild 2073
-EBUILD ant-core-1.6.5-r14.ebuild 1836 RMD160 97d0252fb94b0f4ec0f864e386a1b67801ee8c81 SHA1 f11d4bf1d593b83142fda4f982117771fecbf075 SHA256 8eb2568adaab6658011cbcc0d7d423c3ba7f9e021bde2272b7f14a238fb8a93f
-MD5 e46f2f87d28c4cbf60884b42474b1afe ant-core-1.6.5-r14.ebuild 1836
-RMD160 97d0252fb94b0f4ec0f864e386a1b67801ee8c81 ant-core-1.6.5-r14.ebuild 1836
-SHA256 8eb2568adaab6658011cbcc0d7d423c3ba7f9e021bde2272b7f14a238fb8a93f ant-core-1.6.5-r14.ebuild 1836
+EBUILD ant-core-1.6.5-r14.ebuild 1864 RMD160 f70ae9d140409a5e238949e93d60f9992daa9b59 SHA1 b942b5a7a3dc5b90eed1991079ce019ca13ff0c4 SHA256 12b036843a93a8aa3e94de815dcd87155b698fd1fdd6ab099b4f063a3741f32f
+MD5 5dc17fce9ba784c031b7d4e68f151357 ant-core-1.6.5-r14.ebuild 1864
+RMD160 f70ae9d140409a5e238949e93d60f9992daa9b59 ant-core-1.6.5-r14.ebuild 1864
+SHA256 12b036843a93a8aa3e94de815dcd87155b698fd1fdd6ab099b4f063a3741f32f ant-core-1.6.5-r14.ebuild 1864
 EBUILD ant-core-1.6.5-r2.ebuild 1982 RMD160 9167a088e361e7b724224da71bf24a60f4fd1931 SHA1 d4d68c0684785ea801d6b4dd1c2ef62485be9c1c SHA256 befd2c80a69ca0e9dd6b1183ea3b6063c5763f916927ff1edfe56d2c3dda8517
 MD5 ff1860f4887f0ec551acc611f1df8d3c ant-core-1.6.5-r2.ebuild 1982
 RMD160 9167a088e361e7b724224da71bf24a60f4fd1931 ant-core-1.6.5-r2.ebuild 1982
 SHA256 befd2c80a69ca0e9dd6b1183ea3b6063c5763f916927ff1edfe56d2c3dda8517 ant-core-1.6.5-r2.ebuild 1982
-MISC ChangeLog 21148 RMD160 add83551bf07a0db07308f9c7c50ac49d6c33cfd SHA1 5c313fc5e142aaf240a1dfcf55c07c4e594f4325 SHA256 afb38b33c50f58f4f6bda25d1c1df9f6205454878301136db824c76d69bd68ab
-MD5 67860ff52fdf75e980f1573223dd233f ChangeLog 21148
-RMD160 add83551bf07a0db07308f9c7c50ac49d6c33cfd ChangeLog 21148
-SHA256 afb38b33c50f58f4f6bda25d1c1df9f6205454878301136db824c76d69bd68ab ChangeLog 21148
+MISC ChangeLog 21315 RMD160 2edcd0807892ba87d40286f9f0c3f5246fe5f77c SHA1 9d1cd190071fc16efef4009a5e0266b3b69cbeb1 SHA256 ae3e2799551859fa60043cab1b58d086f6bf43727f926043d757fdc21faefc05
+MD5 945a870f7c957f9c00e1022af66699e1 ChangeLog 21315
+RMD160 2edcd0807892ba87d40286f9f0c3f5246fe5f77c ChangeLog 21315
+SHA256 ae3e2799551859fa60043cab1b58d086f6bf43727f926043d757fdc21faefc05 ChangeLog 21315
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -52,10 +49,3 @@ SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/di
 MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-core-1.6.5-r2 268
 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-core-1.6.5-r2 268
 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-core-1.6.5-r2 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFFDMW1/NoSW7FuNV8RAuizAKCh0w0DM+MD+kl5V5YbIjSTcAjEVQCbB4dT
-OzSzGJtlQZCKc8nUXPPcFCU=
-=1zel
------END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
index 595158d0e993..cb6fd6485575 100644
--- a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.1 2006/09/13 09:28:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.2 2006/10/02 21:26:17 caster Exp $
 
 inherit java-pkg-2 eutils toolchain-funcs java-ant-2
 
@@ -17,7 +17,8 @@ IUSE="doc source"
 
 DEPEND="${RDEPEND}
 	source? ( app-arch/zip )
-	>=virtual/jdk-1.4"
+	>=virtual/jdk-1.4
+	!<dev-java/ant-tasks-${PV}"
 RDEPEND=">=virtual/jdk-1.4
 	>=dev-java/java-config-1.2"