Version bump using generation 2. Adds support for the source use flag, unit tests and builds with junit 3.8.2. Fixes bug #151415.

(Portage version: 2.1.2_rc3-r9)

6 files changed, 107 insertions, 2 deletions

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index 8a32b40b6e46..08c22780638c 100644
--- a/dev-java/jmock/ChangeLog
+++ b/dev-java/jmock/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jmock
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.3 2005/05/17 18:08:43 luckyduck Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.4 2006/12/22 22:27:42 betelgeuse Exp $
+
+*jmock-1.1.0 (22 Dec 2006)
+
+  22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.1.0-junit-3.8.2.patch, +files/1.1.0-build.xml.patch,
+  +jmock-1.1.0.ebuild:
+  Version bump using generation 2. Adds support for the source use flag, unit
+  tests and builds with junit 3.8.2. Fixes bug #151415.
 
   17 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jmock-1.0.1.ebuild:
   stable on amd64 and x86
diff --git a/dev-java/jmock/files/1.1.0-build.xml.patch b/dev-java/jmock/files/1.1.0-build.xml.patch
new file mode 100644
index 000000000000..22b47eefa23a
--- /dev/null
+++ b/dev-java/jmock/files/1.1.0-build.xml.patch
@@ -0,0 +1,21 @@
+diff -ur jmock-1.1.0.old/build.xml jmock-1.1.0/build.xml
+--- jmock-1.1.0.old/build.xml	2006-12-23 00:06:19.000000000 +0200
++++ jmock-1.1.0/build.xml	2006-12-23 00:06:49.000000000 +0200
+@@ -116,7 +116,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>
+@@ -181,7 +181,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/files/1.1.0-junit-3.8.2.patch b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
new file mode 100644
index 000000000000..411e2423a0a7
--- /dev/null
+++ b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
@@ -0,0 +1,12 @@
+diff -ur jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java
+--- jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java	2006-12-22 23:56:07.000000000 +0200
++++ jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java	2006-12-22 23:56:17.000000000 +0200
+@@ -73,7 +73,7 @@
+         assertTrue("Should not have verified", threwException);
+     }
+ 
+-    static protected void failNotEquals( String message,
++    static public void failNotEquals( String message,
+                                          Object expected,
+                                          Object actual ) {
+         String formatted = "";
diff --git a/dev-java/jmock/files/digest-jmock-1.0.1 b/dev-java/jmock/files/digest-jmock-1.0.1
index 5fa19cce4674..1f242062e21f 100644
--- a/dev-java/jmock/files/digest-jmock-1.0.1
+++ b/dev-java/jmock/files/digest-jmock-1.0.1
@@ -1 +1,3 @@
 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/digest-jmock-1.1.0 b/dev-java/jmock/files/digest-jmock-1.1.0
new file mode 100644
index 000000000000..aca4c3080837
--- /dev/null
+++ b/dev-java/jmock/files/digest-jmock-1.1.0
@@ -0,0 +1,3 @@
+MD5 878de051e1a92db928cb67ad51f33aeb jmock-1.1.0-src.zip 579355
+RMD160 0e8313e404c444ef84e2eebfb946e73bfac65b42 jmock-1.1.0-src.zip 579355
+SHA256 3f9fbfe322e2e09878a9418c86c9f440bf135ea09487e117d151f12cfc93050e jmock-1.1.0-src.zip 579355
diff --git a/dev-java/jmock/jmock-1.1.0.ebuild b/dev-java/jmock/jmock-1.1.0.ebuild
new file mode 100644
index 000000000000..34006f375565
--- /dev/null
+++ b/dev-java/jmock/jmock-1.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/12/22 22:27:42 betelgeuse Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Library for testing Java code using mock objects."
+SRC_URI="http://${PN}.codehaus.org/${P}-src.zip"
+HOMEPAGE="http://jmock.codehaus.org"
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc examples source"
+
+COMMON_DEPEND="
+	=dev-java/cglib-2.0*
+	=dev-java/junit-3*"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPEND}
+	dev-java/ant-core
+	app-arch/unzip
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch "${FILESDIR}/1.1.0-build.xml.patch"
+	epatch "${FILESDIR}/1.1.0-junit-3.8.2.patch"
+
+	cd ${S}/lib
+	rm -v *.jar
+	java-pkg_jar-from cglib-2
+	java-pkg_jar-from junit
+}
+
+EANT_BUILD_TARGET="core.jar cglib.jar"
+
+src_test() {
+	eant core.test.unit cglib.test.unit
+}
+
+src_install() {
+	java-pkg_newjar build/dist/jars/jmock-SNAPSHOT.jar jmock.jar
+	java-pkg_newjar build/dist/jars/jmock-cglib-SNAPSHOT.jar jmock.jar
+	dodoc CHANGELOG
+	dohtml overview.html
+
+	use doc && java-pkg_dojavadoc build/javadoc-*
+	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
+}