Block older dev-java/ant

Package-Manager: portage-2.0.52-r1

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 1af3ed63fd7d43606eac3dc140b0f24d0dbaf07c..27e7fa651cde7c140d20b9e522fd9403eee9f01f 100644 (file)
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.31 2005/08/25 01:38:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.32 2005/09/10 15:00:01 axxo Exp $
 
 # ant-core blocks lower versions of ant-tasks, 
 # since it will not run when there is a version mismatch betwean the 2
 # Please unemerge ant-tasks when updating ant.
 
+  10 Sep 2005; Thomas Matthijs <axxo@gentoo.org> ant-core-1.5.4-r2.ebuild,
+  ant-core-1.6.2-r3.ebuild, ant-core-1.6.2-r4.ebuild,
+  ant-core-1.6.5-r1.ebuild:
+  Block older dev-java/ant
+
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org> ant-core-1.6.5-r1.ebuild:
   add ~ia64
 

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 44a020404f97189181a7c7381d3cd478ee07364c..63c3c3f8b6385e90ced4dc1580b1eb15c211feed 100644 (file)
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cd27d8e483b3c181b28fe4a7eadaca3e ant-core-1.6.2-r4.ebuild 2061
-MD5 a91d5f2459c3e4e8729668a7ccda42cf ant-core-1.5.4-r2.ebuild 3088
-MD5 3cfecf9dbb1e8ae16fe19fdb8a17f8a2 ant-core-1.6.2-r3.ebuild 2059
-MD5 1d2c5162e8feba2c2d5f949fb7547849 ChangeLog 18496
-MD5 ac1ba5a946434776b5ff690e4de24104 ant-core-1.6.5-r1.ebuild 1982
+MD5 43a6435dab806e054d253b663d5d6074 ant-core-1.6.2-r4.ebuild 2084
+MD5 8a460466542e1596853795633ba2cd35 ant-core-1.5.4-r2.ebuild 3113
+MD5 621e8875e05714658fc444a25734e93e ant-core-1.6.2-r3.ebuild 2084
+MD5 0ca7a63588b27b5c3b25826da5f5870b ChangeLog 18677
+MD5 a2726ec2447e0716200fd95d68b1da1d ant-core-1.6.5-r1.ebuild 1999
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 d7186edf4c71dc0531330f90e2c08fe9 files/1.5.4-ant 2283
 MD5 b22aa4539abd02d5aaca2621ed67cc29 files/1.6.2-ant 5044
@@ -20,7 +20,7 @@ MD5 8c69a473b88559829069ac80730f2f1b files/1.6.2-scp.patch 877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIsNP/rLF9B432nYRAq3cAJ4yRNhtpO/mHQh4w7hatTFUoshffQCfbB1s
-bv5yYM85cMWJvBNEHnkbAgU=
-=GbT8
+iD8DBQFDIvUK/rLF9B432nYRAlZeAJ93HxynXJY9H6AcHTHcUvNOBCc4vQCgrzRe
+NiXI5TGTHCyq0keW/Mo9f7A=
+=pxI1
 -----END PGP SIGNATURE-----

diff --git a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
index 4bbb2ec5904a406d47e2465741ab04a78f0940e1..f55598e2d21fa2ef529e39e8e3ba0e2090e0b8d7 100644 (file)
--- a/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
+++ b/dev-java/ant-core/ant-core-1.5.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.5.4-r2.ebuild,v 1.4 2005/07/09 15:46:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.5.4-r2.ebuild,v 1.5 2005/09/10 15:00:01 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -15,6 +15,7 @@ KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc source"
 
 DEPEND="virtual/libc
+       !<dev-java/ant-1.5.4-r2
        >=virtual/jdk-1.3
        source? ( app-arch/zip )
        >=app-arch/unzip-5.50-r1"

diff --git a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
index d2ed03f010dbbc17bd9bf592b749096ef646fcd7..fbb1d018869da8cd88b8540926871b6f89867bde 100644 (file)
--- a/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2-r3.ebuild,v 1.2 2005/07/09 15:46:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r3.ebuild,v 1.3 2005/09/10 15:00:01 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -16,6 +16,7 @@ KEYWORDS="x86 amd64 ppc sparc ppc64"
 IUSE="doc source"
 
 DEPEND="virtual/libc
+       !<dev-java/ant-1.5.4-r2
        !<dev-java/ant-tasks-${PV}
        source? ( app-arch/zip )
        >=virtual/jdk-1.4"

diff --git a/dev-java/ant-core/ant-core-1.6.2-r4.ebuild b/dev-java/ant-core/ant-core-1.6.2-r4.ebuild
index 44d3705a12a6afac6d796969550ad83cf2bdc01b..50ae767b48221f403e8c82aeca1f5b9ff089218a 100644 (file)
--- a/dev-java/ant-core/ant-core-1.6.2-r4.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.2-r4.ebuild,v 1.1 2005/07/25 23:56:27 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.2-r4.ebuild,v 1.2 2005/09/10 15:00:01 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -16,6 +16,7 @@ KEYWORDS="x86 amd64 ppc sparc ppc64"
 IUSE="doc source"
 
 DEPEND="virtual/libc
+       !<dev-java/ant-1.5.4-r2
        !<dev-java/ant-tasks-${PV}
        source? ( app-arch/zip )
        >=virtual/jdk-1.4"

diff --git a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild b/dev-java/ant-core/ant-core-1.6.5-r1.ebuild
index 5fd6472410e3b1f68d7014fb45aafb3fcf5bbffe..2d4ef21b5ffd93798021498ecbeea5f4063e57f7 100644 (file)
--- a/dev-java/ant-core/ant-core-1.6.5-r1.ebuild
+++ b/dev-java/ant-core/ant-core-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.3 2005/08/25 01:38:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r1.ebuild,v 1.4 2005/09/10 15:00:01 axxo Exp $
 
 inherit java-pkg eutils toolchain-funcs
 
@@ -18,11 +18,12 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc source"
 
 DEPEND="virtual/libc
-               >=virtual/jdk-1.4
-               !<dev-java/ant-tasks-${PV}
-               source? ( app-arch/zip )"
+       !<dev-java/ant-1.5.4-r2
+       >=virtual/jdk-1.4
+       !<dev-java/ant-tasks-${PV}
+       source? ( app-arch/zip )"
 RDEPEND=">=virtual/jdk-1.4
-                >=dev-java/java-config-1.2"
+        >=dev-java/java-config-1.2"
 
 S="${WORKDIR}/apache-ant-${MY_PV}"