Corrected running of tests with dev-java/ant-1.7.0

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index 1d0658df7df28b44b579f9a617a5e2092ce15f5e..eb994184bed749f2243f68186cbd30b6303d2855 100644 (file)
--- 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.7 2007/02/20 23:42:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.8 2007/04/07 19:15:36 fordfrog Exp $
+
+*jmock-1.1.0-r2 (07 Apr 2007)
+
+  07 Apr 2007; Miroslav Šulc <fordfrog@gentoo.org> +jmock-1.1.0-r2.ebuild:
+  Corrected running of tests with dev-java/ant-1.7.0
 
   20 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   jmock-1.1.0-r1.ebuild:

diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index ccfd3df6d24ecd987631836f78dce2d8ff1fa50e..13cb7e5536d8a5ed0f82c325774f3a14cba513ab 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
@@ -23,10 +20,14 @@ EBUILD jmock-1.1.0-r1.ebuild 1397 RMD160 ae93e19b12b9afba9dce51529ab7e386d6753b1
 MD5 4c1b89ceaf93679b1f3ad4feb703c93f jmock-1.1.0-r1.ebuild 1397
 RMD160 ae93e19b12b9afba9dce51529ab7e386d6753b10 jmock-1.1.0-r1.ebuild 1397
 SHA256 9ba0032de276863b19df7bf0dca40fcd98963a7de8a7a268de4542dc2aae9580 jmock-1.1.0-r1.ebuild 1397
-MISC ChangeLog 1340 RMD160 fdcc7ed2e11205dbc39f6d40a210524b8e1bd4e4 SHA1 8e884b451a1b817c4c1f22dae1b297df9e478ada SHA256 93c7ec3fbea6a60a6e25163f2bf96751cfc0b2b6239ef0970d5f78a8a1aee957
-MD5 c7442d81e0c72e7bce7c80fb7653001f ChangeLog 1340
-RMD160 fdcc7ed2e11205dbc39f6d40a210524b8e1bd4e4 ChangeLog 1340
-SHA256 93c7ec3fbea6a60a6e25163f2bf96751cfc0b2b6239ef0970d5f78a8a1aee957 ChangeLog 1340
+EBUILD jmock-1.1.0-r2.ebuild 1426 RMD160 4410df586fe3b38a044ef0b5a463b210cb7e24b1 SHA1 e53d9daced64cf84ffafff774869b4435afd57e8 SHA256 2722c2e3bc8edf0023c87cc68e26de425da14c3de3204285a320da4ebdd1caf3
+MD5 f4243e20a339e13b9d9cb388d4e4ad9b jmock-1.1.0-r2.ebuild 1426
+RMD160 4410df586fe3b38a044ef0b5a463b210cb7e24b1 jmock-1.1.0-r2.ebuild 1426
+SHA256 2722c2e3bc8edf0023c87cc68e26de425da14c3de3204285a320da4ebdd1caf3 jmock-1.1.0-r2.ebuild 1426
+MISC ChangeLog 1504 RMD160 adcef35fed8360ecb0ff79705a94231e77f94b40 SHA1 ebb03dd85ee599279334486a09651ff2b2b9b9cd SHA256 dfec7725816158b818e131acf727304b0b5eafad357c9b9cbec9c816dd35c202
+MD5 86f8aaffd85aaac3f1f0ce0ae53ab601 ChangeLog 1504
+RMD160 adcef35fed8360ecb0ff79705a94231e77f94b40 ChangeLog 1504
+SHA256 dfec7725816158b818e131acf727304b0b5eafad357c9b9cbec9c816dd35c202 ChangeLog 1504
 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-r1 238
 RMD160 c90136b4684091e9a71e159b72dfee5156b60d74 files/digest-jmock-1.1.0-r1 238
 SHA256 2fd9eb714ae693f8bf77f49c9286f2dd1512bee34f53e1476331fe1ed05c493c files/digest-jmock-1.1.0-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF24c7NQqtfCuFneMRApVUAJ9lfy29UTlwF/Xvg7yaBHH658b48QCfQ0Or
-AdMEPHFwfgdoKaY677/G4fA=
-=S5Oo
------END PGP SIGNATURE-----
+MD5 f09a56ee5710eea9a8e93e835f18a50c files/digest-jmock-1.1.0-r2 238
+RMD160 c90136b4684091e9a71e159b72dfee5156b60d74 files/digest-jmock-1.1.0-r2 238
+SHA256 2fd9eb714ae693f8bf77f49c9286f2dd1512bee34f53e1476331fe1ed05c493c files/digest-jmock-1.1.0-r2 238

diff --git a/dev-java/jmock/files/digest-jmock-1.1.0-r2 b/dev-java/jmock/files/digest-jmock-1.1.0-r2
new file mode 100644 (file)
index 0000000..aca4c30
--- /dev/null
+++ b/dev-java/jmock/files/digest-jmock-1.1.0-r2
@@ -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-r2.ebuild b/dev-java/jmock/jmock-1.1.0-r2.ebuild
new file mode 100644 (file)
index 0000000..76629d3
--- /dev/null
+++ b/dev-java/jmock/jmock-1.1.0-r2.ebuild
@@ -0,0 +1,60 @@
+# 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 $
+
+JAVA_PKG_IUSE="doc source"
+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="examples test"
+
+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
+       test? ( dev-java/ant-tasks )"
+
+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
+}