revision bump: ant moved to ant-core

17 files changed, 55 insertions, 154 deletions

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index b34511f5ee95..3bffa4bcd237 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,4 +1,4 @@
-MD5 d5548b984afdbe9a38e88cf7dd636191 ant-contrib-1.0_beta1-r1.ebuild 1161
-MD5 d066942e502983273d40e1c7115b1763 ChangeLog 668
+MD5 4ff1a0dc273761d2c6aecf29cc772a3a ant-contrib-1.0_beta1-r1.ebuild 1166
+MD5 9584402e5390dece1e5bf555f9ad6da9 ChangeLog 670
 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220
 MD5 ceb92d92286af34135f5d0bdcb5c67db files/digest-ant-contrib-1.0_beta1-r1 74
diff --git a/dev-java/ant-owanttask/ChangeLog b/dev-java/ant-owanttask/ChangeLog
index 8648c075e634..2b830e90dc6e 100644
--- a/dev-java/ant-owanttask/ChangeLog
+++ b/dev-java/ant-owanttask/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ant-owanttask
 # Copyright 2000-2004 Gentoo Foundation; Distributed unde the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.5 2004/08/24 03:21:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.6 2004/09/10 19:45:43 axxo Exp $
+
+*ant-owanttask-1.1-r1 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +ant-owanttask-1.1-r1.ebuild,
+  -ant-owanttask-1.1.ebuild:
+  revision bump: ant moved to ant-core
 
   23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> ant-owanttask-1.1.ebuild:
   Marking stable on x86
diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
index 2b3c70c6d894..c5b62efe8ccd 100644
--- a/dev-java/ant-owanttask/Manifest
+++ b/dev-java/ant-owanttask/Manifest
@@ -1,4 +1,4 @@
-MD5 b632314a796d073155f26b3d85e3a664 ChangeLog 564
-MD5 e0f0684ed171d81c9ce6e88c14cb463b ant-owanttask-1.1.ebuild 756
+MD5 9dd0aae1d69be33226663ceba1f9a0cf ant-owanttask-1.1-r1.ebuild 766
+MD5 5eb5e32650e705b68bfebd2a22b829b7 ChangeLog 749
 MD5 0cc53bfb30a3ec902aabe97af1698512 metadata.xml 158
-MD5 b01a96648b0649822b0012af93c8681e files/digest-ant-owanttask-1.1 71
+MD5 b01a96648b0649822b0012af93c8681e files/digest-ant-owanttask-1.1-r1 71
diff --git a/dev-java/ant-owanttask/ant-owanttask-1.1.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.1-r1.ebuild
index bb40a61bb42c..9fb20434548f 100644
--- a/dev-java/ant-owanttask/ant-owanttask-1.1.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.1-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-owanttask/ant-owanttask-1.1.ebuild,v 1.4 2004/08/24 03:21:50 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.1-r1.ebuild,v 1.1 2004/09/10 19:45:43 axxo Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar output/lib/ow_util_ant_tasks.jar
-	dodir /usr/share/ant/lib
-	dosym /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar /usr/share/ant/lib/
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar /usr/share/ant-core/lib/
 }
 
diff --git a/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1 b/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r1
index 504189970907..504189970907 100644
--- a/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1
+++ b/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r1
diff --git a/dev-java/jdepend/ChangeLog b/dev-java/jdepend/ChangeLog
index 8a9bec9d80e5..0f17104f6e00 100644
--- a/dev-java/jdepend/ChangeLog
+++ b/dev-java/jdepend/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdepend
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.14 2004/09/04 12:28:38 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/ChangeLog,v 1.15 2004/09/10 19:48:24 axxo Exp $
+
+*jdepend-2.6-r1 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> +jdepend-2.6-r1.ebuild,
+  -jdepend-2.6.ebuild, +jdepend-2.8-r1.ebuild, -jdepend-2.8.ebuild:
+  revision bump: ant moved to ant-core
 
   04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> jdepend-2.6.ebuild:
   stable on sparc, fix digest
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index a81688d4b250..a6e50471d5ea 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1f35e8ff40868f3f51b8a391a4963e40 jdepend-2.6.ebuild 1417
-MD5 ce389849961642d53e09a8cf161cd534 jdepend-2.8.ebuild 1405
-MD5 c9130ba7a6bf48fd14c2e4bcd4b8e90e ChangeLog 1517
+MD5 d88083e6e4c2b58089114054a036f8dc jdepend-2.6-r1.ebuild 1432
+MD5 48f89f44fab162e6fab66bae517f7f03 jdepend-2.8-r1.ebuild 1420
+MD5 8c7a7d90c1d6d7101cbebcefa9c423ad ChangeLog 1729
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8edc146649c8fbc403b70d2bce7702f5 files/digest-jdepend-2.6 60
-MD5 bff97b12035abbf9e1411b1b40b87cfa files/digest-jdepend-2.8 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBObVB/rLF9B432nYRAhU6AJ9watsefI5ovgS7++6gdHdyOA2bowCgj0Bb
-37VnE7M8hlV3lETrSR2bEfw=
-=iMpK
------END PGP SIGNATURE-----
+MD5 8edc146649c8fbc403b70d2bce7702f5 files/digest-jdepend-2.6-r1 60
+MD5 bff97b12035abbf9e1411b1b40b87cfa files/digest-jdepend-2.8-r1 60
diff --git a/dev-java/jdepend/files/digest-jdepend-2.6 b/dev-java/jdepend/files/digest-jdepend-2.6-r1
index 7214ce0509b0..7214ce0509b0 100644
--- a/dev-java/jdepend/files/digest-jdepend-2.6
+++ b/dev-java/jdepend/files/digest-jdepend-2.6-r1
diff --git a/dev-java/jdepend/files/digest-jdepend-2.8 b/dev-java/jdepend/files/digest-jdepend-2.8-r1
index 412b69a59868..412b69a59868 100644
--- a/dev-java/jdepend/files/digest-jdepend-2.8
+++ b/dev-java/jdepend/files/digest-jdepend-2.8-r1
diff --git a/dev-java/jdepend/jdepend-2.6.ebuild b/dev-java/jdepend/jdepend-2.6-r1.ebuild
index 63809e8e4b32..d0abb24a25e5 100644
--- a/dev-java/jdepend/jdepend-2.6.ebuild
+++ b/dev-java/jdepend/jdepend-2.6-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/jdepend/jdepend-2.6.ebuild,v 1.11 2004/09/04 12:28:38 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.6-r1.ebuild,v 1.1 2004/09/10 19:48:25 axxo Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ IUSE="doc jikes"
 
 DEPEND=">=virtual/jdk-1.3
 		>=app-arch/unzip-5.50-r1
-		>=dev-java/ant-1.4
+		>=dev-java/ant-core-1.4
 		jikes? ( >=dev-java/jikes-1.17 )"
 RDEPEND=">=virtual/jdk-1.3"
 
@@ -40,8 +40,8 @@ src_install() {
 	java-pkg_dojar lib/jdepend.jar || die "Failed Installing"
 	dodoc LICENSE README
 
-	dodir /usr/share/ant/lib
-	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant/lib
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
 
 	if use doc; then
 		dohtml docs/JDepend.html
diff --git a/dev-java/jdepend/jdepend-2.8.ebuild b/dev-java/jdepend/jdepend-2.8-r1.ebuild
index 9af19cbf7ca4..5228b8d42790 100644
--- a/dev-java/jdepend/jdepend-2.8.ebuild
+++ b/dev-java/jdepend/jdepend-2.8-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/jdepend/jdepend-2.8.ebuild,v 1.1 2004/08/31 03:54:12 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdepend/jdepend-2.8-r1.ebuild,v 1.1 2004/09/10 19:48:25 axxo Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86"
 IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.3
 	>=app-arch/unzip-5.50-r1
-	>=dev-java/ant-1.4
+	>=dev-java/ant-core-1.4
 	jikes? ( >=dev-java/jikes-1.17 )"
 RDEPEND=">=virtual/jdk-1.3"
 RESTRICT="nomirror"
@@ -39,8 +39,8 @@ src_install() {
 	java-pkg_dojar lib/jdepend.jar || die "Failed Installing"
 	dodoc LICENSE README
 
-	dodir /usr/share/ant/lib
-	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant/lib
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/jdepend/lib/jdepend.jar /usr/share/ant-core/lib
 
 	if use doc; then
 		dohtml docs/JDepend.html
diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 5f1d61960773..6cbd0af4b422 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/junit
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.13 2004/06/24 22:37:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.14 2004/09/10 19:49:12 axxo Exp $
+
+*junit-3.8.1-r1 (10 Sep 2004)
+
+  10 Sep 2004; Thomas Matthijs <axxo@gentoo.org> -files/junit-3.7-build.xml,
+  +junit-3.8.1-r1.ebuild, -junit-3.8.1.ebuild:
+  revision bump: ant moved to ant-core
 
   19 Jan 2004; Adrian Almenar <strider@gentoo.org> junit-3.8.1.ebuild:
   Added amd64 keyword.
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 3d2a4352a71e..ffb5697b51fb 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,4 @@
-MD5 6f1c1e9fa45fab6c54849e744ea6e588 junit-3.8.1.ebuild 933
-MD5 bb6070e68f191634a5cf69069ad19a0c ChangeLog 2221
+MD5 ca4636efcb841cd8871df6ac8acebe26 junit-3.8.1-r1.ebuild 973
+MD5 edcbba351636813fe083fcce54bed5bb ChangeLog 2416
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 0325b468b0d03b4ad6924d32d0479047 files/junit-3.7-build.xml 2938
-MD5 1c7ec0b03d2615cf8ca8450b475c276d files/digest-junit-3.8.1 189
+MD5 bab94fdc8a6c2abf20e0f2cee4849a4e files/digest-junit-3.8.1-r1 59
diff --git a/dev-java/junit/files/digest-junit-3.8.1 b/dev-java/junit/files/digest-junit-3.8.1
deleted file mode 100644
index c227c40f1c72..000000000000
--- a/dev-java/junit/files/digest-junit-3.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0325b468b0d03b4ad6924d32d0479047 /files/junit-3.7-build.xml 2938
-MD5 1a6eb3c43eeb2d6ab3753b5a167f40a3 /junit-3.8.1.ebuild 851
-MD5 5110326e4b7f7497dfa60ede4b626751 junit3.8.1.zip 441665
diff --git a/dev-java/junit/files/digest-junit-3.8.1-r1 b/dev-java/junit/files/digest-junit-3.8.1-r1
new file mode 100644
index 000000000000..a324b2b56a38
--- /dev/null
+++ b/dev-java/junit/files/digest-junit-3.8.1-r1
@@ -0,0 +1 @@
+MD5 5110326e4b7f7497dfa60ede4b626751 junit3.8.1.zip 441665
diff --git a/dev-java/junit/files/junit-3.7-build.xml b/dev-java/junit/files/junit-3.7-build.xml
deleted file mode 100644
index 50060e0c3f22..000000000000
--- a/dev-java/junit/files/junit-3.7-build.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<!-- JUnit build script using ant 1.3 -->

-<project name="junit" default="dist" basedir=".">

-	<target name="init">

-		<tstamp/>

-		<property name="version" value="3.7" />

-		<property name="dist"  value="junit${version}" />

-		<property name="versionfile"  value="junit/runner/Version.java" />

-		<property name="zipfile"  value="${dist}.zip" />

-	</target>

-

-	<target name="versiontag" depends="init">

-		<filter token="version" value="${version}" />

-		<copy 

-			file="${versionfile}" 

-			tofile="${versionfile}tmp" 

-			filtering="on"

-		/>

-		<move file="${versionfile}tmp" tofile="${versionfile}" />

-	</target>

-

-	<target name="build" depends="versiontag">

-		<javac 

-			srcdir="."

-			destdir="."

-			debug="on"

-  		/>	

-	</target>

-

-	<target name="dist" depends="build">

-		<delete dir="${dist}" />

-		<mkdir dir="${dist}" />

-		<jar 

-			jarfile="${dist}/src.jar"

-			basedir="."

-			excludes="${dist}/src.jar, junit/tests/**, junit/samples/**, **/*.class, doc/**, README.html, build.xml"

-		/>

-		<jar 

-			jarfile="${dist}/junit.jar"

-			basedir="."

-			excludes="${dist}/junit.jar, junit/tests/**, junit/samples/**, **/*.java, doc/**, README.html, jar-manifest.txt"

-		/>

-		<copy todir="${dist}/junit/samples">

-			<fileset dir="junit/samples" />

-		</copy>

-		<copy todir="${dist}/junit/tests">

-			<fileset dir="junit/tests" />

-		</copy>

-		<delete file="${dist}/junit/tests/test.jar"/>

-		<jar 

-			jarfile="${dist}/junit/tests/test.jar"

-			basedir="."

-			includes="junit/tests/LoadedFromJar.class"

-		/>

-		<mkdir dir="${dist}/javadoc" />

-		<javadoc 

-			sourcepath="."

-			packagenames="junit.framework.*, junit.extensions.*"

-			destdir="${dist}/javadoc"

-			author="false"

-			version="false"

-			use="false"

-			windowtitle="JUnit API"

-		/>

-		<copy todir="${dist}/doc">

-			<fileset dir="doc"/>

-		</copy>		

-		<copy file="README.html" tofile="${dist}/README.html" />

-		

-		<java classname="junit.textui.TestRunner" fork="yes">

-			<arg value="junit.samples.AllTests" />

-			<classpath>

-				<pathelement location="${dist}" />

-				<pathelement location="${dist}/junit.jar" />

-			</classpath>

-		</java>

-	</target>

-	

-	<target name="zip">

-		<!-- !!! hard code names, variable substitution doesn't work !!! -->

-		<zip 

-			zipfile="junit3.6.zip"

-			basedir="."

-			includes="junit3.6/**"

-		/>

-	</target>

-	

-	<target name="awtui" depends="dist">

-		<java classname="junit.awtui.TestRunner" fork="yes">

-			<arg value="junit.samples.AllTests" />

-			<classpath>

-				<pathelement location="${dist}" />

-				<pathelement location="${dist}/junit.jar" />

-			</classpath>

-		</java>

-	</target>

-	

-	<target name="swingui" depends="dist">

-		<java classname="junit.swingui.TestRunner" fork="yes">

-			<arg value="junit.samples.AllTests" />

-			<classpath>

-				<pathelement location="${dist}" />

-				<pathelement location="${dist}/junit.jar" />

-			</classpath>

-		</java>

-	</target>

-</project>

diff --git a/dev-java/junit/junit-3.8.1.ebuild b/dev-java/junit/junit-3.8.1-r1.ebuild
index 61d68525eada..13d53ac5ee4a 100644
--- a/dev-java/junit/junit-3.8.1.ebuild
+++ b/dev-java/junit/junit-3.8.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1.ebuild,v 1.12 2004/07/14 02:42:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-3.8.1-r1.ebuild,v 1.1 2004/09/10 19:49:12 axxo Exp $
+
+inherit java-pkg
 
 NP=${P/-/}
 S=${WORKDIR}/${NP}
@@ -12,7 +14,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
 IUSE=""
 DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4
+	>=dev-java/ant-core-1.4
 	>=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jdk-1.3"
 RESTRICT="nomirror"
@@ -30,9 +32,9 @@ src_compile() {
 
 src_install() {
 	cd ${NP}
-	dojar junit.jar
-	dodir /usr/share/ant/lib
-	dosym /usr/share/junit/lib/junit.jar /usr/share/ant/lib/
-	dohtml -r README.html cpl-v10.html doc javadoc
-	cp javadoc/package-list ${D}/usr/share/doc/${PN}-${PV}/html/javadoc/package-list
+	java-pkg_dojar junit.jar
+	dodir /usr/share/ant-core/lib
+	dosym /usr/share/junit/lib/junit.jar /usr/share/ant-core/lib/
+	dohtml -A package-list -r README.html cpl-v10.html doc javadoc
+	cp javadoc/package-list	${D}/usr/share/doc/${PF}/html/javadoc/
 }