revision bump: ant moved to ant-core

7 files changed, 26 insertions, 14 deletions

diff --git a/dev-java/ant-contrib/ChangeLog b/dev-java/ant-contrib/ChangeLog
index e99894249fc2..66d45b269d77 100644
--- a/dev-java/ant-contrib/ChangeLog
+++ b/dev-java/ant-contrib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-contrib
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.2 2004/08/31 03:34:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ChangeLog,v 1.3 2004/09/10 19:42:39 axxo Exp $
+
+*ant-contrib-1.0_beta1-r1 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org>
+  +ant-contrib-1.0_beta1-r1.ebuild, -ant-contrib-1.0_beta1.ebuild:
+  revision bump: ant moved to ant-core
 
   30 Aug 2004; Chris Aniszczyk <zx@gentoo.org> ant-contrib-1.0_beta1.ebuild:
   Marking x86
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 953e71f7e655..b34511f5ee95 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,4 +1,4 @@
-MD5 c300239791578a4b0c464f35c13cbb03 ChangeLog 471
-MD5 5c71fb4e3826a98362a5e659ae81e0be ant-contrib-1.0_beta1.ebuild 1151
+MD5 d5548b984afdbe9a38e88cf7dd636191 ant-contrib-1.0_beta1-r1.ebuild 1161
+MD5 d066942e502983273d40e1c7115b1763 ChangeLog 668
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
-MD5 ceb92d92286af34135f5d0bdcb5c67db files/digest-ant-contrib-1.0_beta1 74
+MD5 ceb92d92286af34135f5d0bdcb5c67db files/digest-ant-contrib-1.0_beta1-r1 74
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta1.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
index 45fd6b8e12fd..bafc340efa30 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta1.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_beta1.ebuild,v 1.3 2004/08/31 03:34:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-contrib/ant-contrib-1.0_beta1-r1.ebuild,v 1.1 2004/09/10 19:42:39 axxo Exp $
 
 inherit java-pkg
 
@@ -28,8 +28,8 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/lib/${PN}-${PV}.jar || die "pkg jar not found"
 
-	dodir /usr/share/ant/lib
-	dosym /usr/share/${PN}/lib/${PN}-${PV}.jar /usr/share/ant/lib/
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/${PN}/lib/${PN}-${PV}.jar /usr/share/ant-core/lib/
 
 	dodoc README.txt
 	use doc && dohtml -r build/docs
diff --git a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1 b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r1
index 8678e3405e57..8678e3405e57 100644
--- a/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1
+++ b/dev-java/ant-contrib/files/digest-ant-contrib-1.0_beta1-r1
diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index 1b9a0ad61939..9dc77586d509 100644
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.7 2004/09/05 06:03:15 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.8 2004/09/10 19:41:12 axxo Exp $
+
+*ant-tasks-1.6.2-r5 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -ant-tasks-1.6.2-r4.ebuild,
+  +ant-tasks-1.6.2-r5.ebuild:
+  revision bump: ant moved to ant-core
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild
index f195e28222ec..5a8b671bf29e 100644
--- a/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild
+++ b/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r4.ebuild,v 1.4 2004/09/04 12:58:55 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.6.2-r5.ebuild,v 1.1 2004/09/10 19:41:12 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ~amd64 ppc sparc"
 IUSE="javamail noantlr nobcel nobeanutils nobsh nocommonsnet nocommonslogging nojdepend nojsch nojython nolog4j nooro noregexp norhino noxalan noxerces"
 
-DEPEND="=dev-java/ant-1.6.2-r5
+DEPEND="=dev-java/ant-${PV}*
 	!dev-java/ant-optional
 	>=dev-java/java-config-1.2
 	>=dev-java/junit-3.8
@@ -45,7 +45,7 @@ src_compile() {
 		export THREADS_FLAG="green"
 	fi
 
-	local p="ant,junit"
+	local p="ant-core,junit"
 	use noantlr || p="${p},antlr"
 	use nobcel || p="${p},bcel"
 	use nobeanutils || p="${p},commons-beanutils"
@@ -67,7 +67,7 @@ src_compile() {
 	packages=${p}
 
 	libs=$(java-config -p ${packages})
-	./build.sh -Ddist.dir=${D}/usr/share/ant -lib ${libs} || die "build failed"
+	./build.sh -Ddist.dir=${D}/usr/share/ant-core -lib ${libs} || die "build failed"
 }
 
 src_install() {
@@ -88,10 +88,10 @@ src_install() {
 	use noxalan || jars="${jars} xalan1"
 	use javamail && jars="${jars} javamail"
 
-	dodir /usr/share/ant/lib
+	dodir /usr/share/ant-core/lib
 	for jar in ${jars}; do
 		java-pkg_dojar build/lib/ant-${jar}.jar
-		dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant/lib/
+		dosym /usr/share/${PN}/lib/ant-${jar}.jar /usr/share/ant-core/lib/
 	done
 }
 
diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4 b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5
index 511c4167d672..511c4167d672 100644
--- a/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r4
+++ b/dev-java/ant-tasks/files/digest-ant-tasks-1.6.2-r5