Migrate to split-ant, tweak style; remove unused version.

(Portage version: 2.1.2.7)

5 files changed, 19 insertions, 107 deletions

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index e592993ae965..0a088514d362 100644
--- a/dev-java/jmock/ChangeLog
+++ b/dev-java/jmock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jmock
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.9 2007/04/12 14:08:06 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.10 2007/05/07 17:08:43 caster Exp $
+
+  07 May 2007; Vlastimil Babka <caster@gentoo.org>
+  -files/jmock-1.0.1-buildxml.patch, -jmock-1.0.1.ebuild,
+  jmock-1.1.0-r2.ebuild:
+  Migrate to split-ant, tweak style; remove unused version.
 
   12 Apr 2007; <welp@gentoo.org> jmock-1.1.0-r1.ebuild:
   Stable on amd64 wrt bug 167517
diff --git a/dev-java/jmock/files/digest-jmock-1.0.1 b/dev-java/jmock/files/digest-jmock-1.0.1
deleted file mode 100644
index 1f242062e21f..000000000000
--- a/dev-java/jmock/files/digest-jmock-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 558ae9342df12aa980852e65221dcd95 jmock-1.0.1-src.jar 605139
-RMD160 8e0ab4da5f142853204114cdd3746132a60807b4 jmock-1.0.1-src.jar 605139
-SHA256 9f00a9907fecae2a45bd69a71d0b0b3c51c0ff3478a89c9c5b9d29a58c3f9a16 jmock-1.0.1-src.jar 605139
diff --git a/dev-java/jmock/files/jmock-1.0.1-buildxml.patch b/dev-java/jmock/files/jmock-1.0.1-buildxml.patch
deleted file mode 100644
index 6c479927d418..000000000000
--- a/dev-java/jmock/files/jmock-1.0.1-buildxml.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- build.xml.orig	2005-01-04 21:58:02.972060664 +0100
-+++ build.xml	2005-01-04 22:01:24.227465192 +0100
-@@ -22,13 +22,13 @@
-     <property name="core.src.dir" value="${core.dir}/src"/>

-     <property name="core.atest.dir" value="${core.dir}/acceptance-tests"/>

-     <property name="core.build.dir" value="build/core"/>

--    <property name="core.jar" value="${build.dist.bin.dir}/jmock-${version.archive}.jar"/>

-+    <property name="core.jar" value="${build.dist.bin.dir}/jmock.jar"/>

- 

-     <property name="cglib.dir" value="${extensions.dir}/cglib"/>

-     <property name="cglib.src.dir" value="${cglib.dir}/src"/>

-     <property name="cglib.atest.dir" value="${cglib.dir}/acceptance-tests"/>

-     <property name="cglib.build.dir" value="build/cglib"/>

--    <property name="cglib.jar" value="${build.dist.bin.dir}/jmock-cglib-${version.archive}.jar"/>

-+    <property name="cglib.jar" value="${build.dist.bin.dir}/jmock-cglib.jar"/>

- 

-     <property name="src.jar" value="${build.dist.src.dir}/jmock-${version.archive}-src.jar"/>

-     <property name="javadoc.jar" value="${build.dist.src.dir}/jmock-${version.archive}-javadoc.jar"/>

-@@ -107,7 +107,7 @@
-         </junit>

-     </target>

- 

--    <target name="core.jar" depends="core.test.unit">

-+    <target name="core.jar" depends="core.compile">

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

-         <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>

-     </target>

-@@ -168,7 +168,7 @@
-         </junit>

-     </target>

- 

--    <target name="cglib.jar" depends="cglib.test.unit">

-+    <target name="cglib.jar" depends="cglib.compile">

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

-         <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/>

-     </target>

diff --git a/dev-java/jmock/jmock-1.0.1.ebuild b/dev-java/jmock/jmock-1.0.1.ebuild
deleted file mode 100644
index 25d3387840e9..000000000000
--- a/dev-java/jmock/jmock-1.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.0.1.ebuild,v 1.5 2005/09/10 16:15:47 axxo Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Library for testing Java code using mock objects."
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.jar"
-HOMEPAGE="http://jmock.codehaus.org"
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="x86 amd64"
-IUSE="doc examples jikes"
-
-RDEPEND=">=virtual/jre-1.4
-	${RDEPEND}
-	=dev-java/cglib-2.0*"
-DEPEND=">=virtual/jdk-1.4
-	jikes? ( >=dev-java/jikes-1.21 )
-	dev-java/ant-core"
-
-src_unpack() {
-	jar xf ${DISTDIR}/${A} || die
-
-	cd ${S}
-	epatch ${FILESDIR}/jmock-1.0.1-buildxml.patch
-
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from cglib-2
-}
-
-src_compile() {
-	local antflags="core.jar cglib.jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "failed to build"
-}
-
-src_install() {
-	java-pkg_dojar build/dist/jars/*.jar
-	dodoc CHANGELOG VERSION
-
-	use doc && java-pkg_dohtml -r build/javadoc-${PV}/*
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-java/jmock/jmock-1.1.0-r2.ebuild b/dev-java/jmock/jmock-1.1.0-r2.ebuild
index 76629d31088c..ce5b2d329703 100644
--- a/dev-java/jmock/jmock-1.1.0-r2.ebuild
+++ b/dev-java/jmock/jmock-1.1.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.1.0-r2.ebuild,v 1.1 2007/04/07 19:15:36 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-1.1.0-r2.ebuild,v 1.2 2007/05/07 17:08:43 caster Exp $
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc examples source test"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Library for testing Java code using mock objects."
@@ -11,7 +11,7 @@ HOMEPAGE="http://jmock.codehaus.org"
 LICENSE="BSD"
 SLOT="1.0"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples test"
+IUSE=""
 
 COMMON_DEPEND="
 	=dev-java/cglib-2.0*
@@ -22,39 +22,34 @@ RDEPEND=">=virtual/jre-1.4
 
 DEPEND=">=virtual/jdk-1.4
 	${COMMON_DEPEND}
-	dev-java/ant-core
 	app-arch/unzip
-	test? ( dev-java/ant-tasks )"
+	test? ( dev-java/ant-junit )"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
 	epatch "${FILESDIR}/1.1.0-build.xml.patch"
 	epatch "${FILESDIR}/1.1.0-junit-3.8.2.patch"
 
-	cd ${S}/lib
-	rm *.jar
-	java-pkg_jar-from cglib-2
-	java-pkg_jar-from junit
+	cd ${S}/lib || die
+	rm -v *.jar || die
+	java-pkg_jar-from cglib-2,junit
 }
 
 EANT_BUILD_TARGET="core.jar cglib.jar"
 
 src_test() {
-	eant core.test.unit cglib.test.unit
+	ANT_TASKS="ant-junit" eant core.test.unit cglib.test.unit
 }
 
 src_install() {
-	java-pkg_newjar build/dist/jars/${PN}-SNAPSHOT.jar ${PN}.jar
+	java-pkg_newjar build/dist/jars/${PN}-SNAPSHOT.jar
 	java-pkg_newjar build/dist/jars/${PN}-cglib-SNAPSHOT.jar ${PN}-cglib.jar
-	dodoc CHANGELOG
-	dohtml overview.html
+	dodoc CHANGELOG || die
+	dohtml overview.html || die
 
 	use doc && java-pkg_dojavadoc build/javadoc-*
+	use examples && java-pkg_doexamples examples
 	use source && java-pkg_dosrc core/src/org
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r examples/* ${D}/usr/share/doc/${PF}/examples
-	fi
 }