revision bump: ant moved to ant-core

6 files changed, 20 insertions, 121 deletions

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/
 }