From 19ddca5b86ddaa0124a521aba39433e8dcbfbae5 Mon Sep 17 00:00:00 2001
From: Vlastimil Babka <caster@gentoo.org>
Date: Sat, 24 Feb 2007 00:32:20 +0000
Subject: [PATCH] Block on <dev-java/ant-1.7.0 to beat one possible source of
 bug #166077. Add java-ant-2 to inherit. Package-Manager: portage-2.1.2-r10

---
 dev-java/ant-core/ChangeLog             |  6 +++++-
 dev-java/ant-core/Manifest              | 16 ++++++++--------
 dev-java/ant-core/ant-core-1.7.0.ebuild | 14 +++++++++++---
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index 9537fddceb4d..0871bde50c1e 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for dev-java/ant-core
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.67 2007/01/27 00:48:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.68 2007/02/24 00:32:20 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.
 
+  24 Feb 2007; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.0.ebuild:
+  Block on <dev-java/ant-1.7.0 to beat one possible source of bug #166077.
+  Add java-ant-2 to inherit.
+
   27 Jan 2007; Vlastimil Babka <caster@gentoo.org> ant-core-1.7.0.ebuild:
   Add ~ia64 keyword, bug #159820.
 
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 98a2c7d11a5b..92257949225c 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -17,14 +17,14 @@ EBUILD ant-core-1.6.5-r14.ebuild 1918 RMD160 d4baa54a15d40ed6e1637647a9b47634604
 MD5 e215468b2b9040222c18bb54f932f85c ant-core-1.6.5-r14.ebuild 1918
 RMD160 d4baa54a15d40ed6e1637647a9b4763460483eef ant-core-1.6.5-r14.ebuild 1918
 SHA256 d6b721213737928c36e8bd8b426ccd214e81596f8a3a9202268cd391f43ea68b ant-core-1.6.5-r14.ebuild 1918
-EBUILD ant-core-1.7.0.ebuild 2172 RMD160 59a926ed4c590f30ad2337a4a6cc2537ad174d92 SHA1 4c55d942c25d64bf33367bd48b6ec8da8636a4e6 SHA256 a902aad16754e467796fbd4a799363ffd88b5fff0f7ac68525284581d13c9c3e
-MD5 8175107c8a1ccd1e5b3d3602da04757a ant-core-1.7.0.ebuild 2172
-RMD160 59a926ed4c590f30ad2337a4a6cc2537ad174d92 ant-core-1.7.0.ebuild 2172
-SHA256 a902aad16754e467796fbd4a799363ffd88b5fff0f7ac68525284581d13c9c3e ant-core-1.7.0.ebuild 2172
-MISC ChangeLog 23583 RMD160 4276687cc3190f13f0b34c49fe8122dfcc3c6854 SHA1 40e383ef9be1f5af614e6e48e7fa57608750978c SHA256 a27c40563fa0760a4e6d1cacda26df627dc3eeddd725d837474f1365c843f18a
-MD5 46d0a125f01c23a4edb8c3a15526388f ChangeLog 23583
-RMD160 4276687cc3190f13f0b34c49fe8122dfcc3c6854 ChangeLog 23583
-SHA256 a27c40563fa0760a4e6d1cacda26df627dc3eeddd725d837474f1365c843f18a ChangeLog 23583
+EBUILD ant-core-1.7.0.ebuild 2536 RMD160 8885e0da6a15396b8253a1d33182f1114871723c SHA1 9910d2cfd2ec56aa0a59e57ef201cf1f06103d9c SHA256 0cd763e19d0d3d48a4c23025c422d575871cf0659558bd5ee6de8dd78e514208
+MD5 701d1d149ca0415d5efe362a0a5b502b ant-core-1.7.0.ebuild 2536
+RMD160 8885e0da6a15396b8253a1d33182f1114871723c ant-core-1.7.0.ebuild 2536
+SHA256 0cd763e19d0d3d48a4c23025c422d575871cf0659558bd5ee6de8dd78e514208 ant-core-1.7.0.ebuild 2536
+MISC ChangeLog 23762 RMD160 3f2964abb0ff5e3af054650e5bbf5cd8f8dfb369 SHA1 3c233ca9fb8f909d19f71750ca2cfcdff104b306 SHA256 5bdc5308c4c516892b80b3252fff96964377d90bce07f1fb01d5d4b88b70c059
+MD5 54b24d21efefc2b04af0b067f39fc92f ChangeLog 23762
+RMD160 3f2964abb0ff5e3af054650e5bbf5cd8f8dfb369 ChangeLog 23762
+SHA256 5bdc5308c4c516892b80b3252fff96964377d90bce07f1fb01d5d4b88b70c059 ChangeLog 23762
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/ant-core/ant-core-1.7.0.ebuild b/dev-java/ant-core/ant-core-1.7.0.ebuild
index f99edc5a8aaa..bd7ba1ff83ef 100644
--- a/dev-java/ant-core/ant-core-1.7.0.ebuild
+++ b/dev-java/ant-core/ant-core-1.7.0.ebuild
@@ -1,8 +1,12 @@
 # Copyright 1999-2007 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.7.0.ebuild,v 1.7 2007/01/27 00:48:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0.ebuild,v 1.8 2007/02/24 00:32:20 caster Exp $
 
-inherit java-pkg-2
+# don't depend on itself
+JAVA_ANT_DISABLE_ANT_CORE_DEP=true
+# rewriting build.xml files for the testcases has no reason atm
+JAVA_PKG_BSFIX_ALL=no
+inherit java-pkg-2 java-ant-2
 
 MY_P="apache-ant-${PV}"
 
@@ -16,8 +20,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc source"
 
+# 1.7.0 instead of $PV in blocks is intentional, >1.7.0 upgrades should
+# be block free (but these fixed blocks should stay there for users upgrading
+# from <1.7.0 to >1.7.0 of course)
 RDEPEND=">=virtual/jdk-1.4
-	!<dev-java/ant-tasks-${PV}
+	!<dev-java/ant-tasks-1.7.0
+	!<dev-java/ant-1.7.0
 	!dev-java/ant-optional"
 DEPEND="${RDEPEND}
 	source? ( app-arch/zip )"
-- 
2.26.2