Fixed installation of jars, see bug #160955, reported by David Emmett <daisy@xs4all.nl>.

(Portage version: 2.1.2_rc4-r4)

3 files changed, 70 insertions, 2 deletions

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index 08c22780638c..f89c0936844d 100644
--- a/dev-java/jmock/ChangeLog
+++ b/dev-java/jmock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jmock
-# 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 $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.5 2007/01/09 04:42:13 nichoj Exp $
+
+*jmock-1.1.0-r1 (09 Jan 2007)
+
+  09 Jan 2007; Joshua Nichols <nichoj@gentoo.org> +jmock-1.1.0-r1.ebuild:
+  Fixed installation of jars, see bug #160955, reported by David Emmett
+  <daisy@xs4all.nl>.
 
 *jmock-1.1.0 (22 Dec 2006)
 
diff --git a/dev-java/jmock/files/digest-jmock-1.1.0-r1 b/dev-java/jmock/files/digest-jmock-1.1.0-r1
new file mode 100644
index 000000000000..aca4c3080837
--- /dev/null
+++ b/dev-java/jmock/files/digest-jmock-1.1.0-r1
@@ -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-r1.ebuild b/dev-java/jmock/jmock-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..45a9daba535f
--- /dev/null
+++ b/dev-java/jmock/jmock-1.1.0-r1.ebuild
@@ -0,0 +1,59 @@
+# 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-r1.ebuild,v 1.1 2007/01/09 04:42:13 nichoj 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="~amd64 ~x86"
+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 *.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/${PN}-SNAPSHOT.jar ${PN}.jar
+	java-pkg_newjar build/dist/jars/${PN}-cglib-SNAPSHOT.jar ${PN}-cglib.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
+}