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

Package-Manager: portage-2.1.2_rc4-r4

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index 08c22780638c79640b7c088a5e3739f2ab649955..f89c0936844d470b1604e7692e3a8f167d1f2ba6 100644 (file)
--- 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/Manifest b/dev-java/jmock/Manifest
index eb1a1371ade88e5d0bef5342467ac2a5a41647e4..deb5ab21b4d99b5c83dff260fe181a9df1b5c5be 100644 (file)
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.1.0-build.xml.patch 837 RMD160 8cd54912042c3bc82cfcd3a4c1da88e8f8fd0fa2 SHA1 2bdb27224974e5eed9e095156b700bb550116bb8 SHA256 257408d1b0cc1abbb3f7666736d3db5de514a00f49a2de66590770ac96a2769f
 MD5 18c71e9bbd03b860feb0d8d93f031b01 files/1.1.0-build.xml.patch 837
 RMD160 8cd54912042c3bc82cfcd3a4c1da88e8f8fd0fa2 files/1.1.0-build.xml.patch 837
@@ -19,14 +16,18 @@ EBUILD jmock-1.0.1.ebuild 1238 RMD160 f6ae9670080e5d1463adc004e5f8048b8845e11e S
 MD5 096b9a1b56cbbfb868f108fd5bfb6cbc jmock-1.0.1.ebuild 1238
 RMD160 f6ae9670080e5d1463adc004e5f8048b8845e11e jmock-1.0.1.ebuild 1238
 SHA256 d80fd3aac7a79d3305eb4d60b012f4ec97fdaf62d385d40fa5bb8d5fb7b4af4e jmock-1.0.1.ebuild 1238
+EBUILD jmock-1.1.0-r1.ebuild 1399 RMD160 3f6dc4bc5db3a6491f780e61c5658faf1c62620c SHA1 51858dcafad8fd5c590eef7da855e657cc8239ac SHA256 37f66f1542d1a2e2639a476cd9050a5de580b07591a8b7e8e684ccaff33c572b
+MD5 e224355f381cccf51fdd8a53e51744fd jmock-1.1.0-r1.ebuild 1399
+RMD160 3f6dc4bc5db3a6491f780e61c5658faf1c62620c jmock-1.1.0-r1.ebuild 1399
+SHA256 37f66f1542d1a2e2639a476cd9050a5de580b07591a8b7e8e684ccaff33c572b jmock-1.1.0-r1.ebuild 1399
 EBUILD jmock-1.1.0.ebuild 1397 RMD160 3617e66665f46d53398f8771a0160bac2d512594 SHA1 a94f9147a473ba13234346111e2ff4d605727584 SHA256 82147ed9f3c93e7e3ed23e8b9183698bb56150a6e904b4b737e1f6f912b7ab99
 MD5 70d9fcd5e3f7eb08e32afb662df116ad jmock-1.1.0.ebuild 1397
 RMD160 3617e66665f46d53398f8771a0160bac2d512594 jmock-1.1.0.ebuild 1397
 SHA256 82147ed9f3c93e7e3ed23e8b9183698bb56150a6e904b4b737e1f6f912b7ab99 jmock-1.1.0.ebuild 1397
-MISC ChangeLog 941 RMD160 456fd8e0fb5523080bebeae04d2142acda3a0e7b SHA1 6789840cf0f81a6a7d948e6ea62739341b9e9abe SHA256 0e5cb09f72f0959abc15d090fb0e964817edceba3de42f7c95451b39ab2a40e2
-MD5 f8551c6800c4ece142f53e2b01afc517 ChangeLog 941
-RMD160 456fd8e0fb5523080bebeae04d2142acda3a0e7b ChangeLog 941
-SHA256 0e5cb09f72f0959abc15d090fb0e964817edceba3de42f7c95451b39ab2a40e2 ChangeLog 941
+MISC ChangeLog 1136 RMD160 d46372c2e80704bb8540366b1101dd486500a75e SHA1 ac9d007d34c69fe82159060161f1b513c6325d8e SHA256 4aed3033a68dbdbfd9be6bbfec7ea17e961992bebc9497b9035a482168aa0385
+MD5 33414e6a6a7d1a052e06da2fdc136982 ChangeLog 1136
+RMD160 d46372c2e80704bb8540366b1101dd486500a75e ChangeLog 1136
+SHA256 4aed3033a68dbdbfd9be6bbfec7ea17e961992bebc9497b9035a482168aa0385 ChangeLog 1136
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -37,10 +38,6 @@ SHA256 ac1d1a144a3c4142afefd7533fb60c596bd8af562388fc07d2a31b528bef9899 files/di
 MD5 f09a56ee5710eea9a8e93e835f18a50c files/digest-jmock-1.1.0 238
 RMD160 c90136b4684091e9a71e159b72dfee5156b60d74 files/digest-jmock-1.1.0 238
 SHA256 2fd9eb714ae693f8bf77f49c9286f2dd1512bee34f53e1476331fe1ed05c493c files/digest-jmock-1.1.0 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFjFvncxLzpIGCsLQRAk9aAJ9yYBBFzVUmihzkZzzlPxq07kFNmgCfTsWY
-eMbI9HWFi/JLMVf2UCAZprc=
-=FI4r
------END PGP SIGNATURE-----
+MD5 f09a56ee5710eea9a8e93e835f18a50c files/digest-jmock-1.1.0-r1 238
+RMD160 c90136b4684091e9a71e159b72dfee5156b60d74 files/digest-jmock-1.1.0-r1 238
+SHA256 2fd9eb714ae693f8bf77f49c9286f2dd1512bee34f53e1476331fe1ed05c493c files/digest-jmock-1.1.0-r1 238

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 (file)
index 0000000..aca4c30
--- /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 (file)
index 0000000..45a9dab
--- /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
+}