From 43f697a47e55f713387c01342c9b2f4ec4b6bc3d Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 7 Jan 2007 16:34:52 +0000 Subject: [PATCH] Revbump to migrate to gen-2 eclasses and to fix bug #119080 with a patch for compatibility with junit-3.8.2. Updated build.xml patch also disables autodetection of j2ee.jar because it can break and we don't install mockobjects-j2ee.jar anyway. Package-Manager: portage-2.1.2_rc4-r5 --- dev-java/mockobjects/ChangeLog | 14 +++- dev-java/mockobjects/Manifest | 41 ++++++++-- .../mockobjects/files/digest-mockobjects-0.09 | 2 + .../files/digest-mockobjects-0.09-r1 | 2 + .../files/digest-mockobjects-0.09-r2 | 3 + .../files/mockobjects-0.09-gentoo.patch | 78 +++++++++++++++++-- .../files/mockobjects-0.09-junit.patch | 11 +++ .../mockobjects/mockobjects-0.09-r2.ebuild | 56 +++++++++++++ 8 files changed, 194 insertions(+), 13 deletions(-) create mode 100644 dev-java/mockobjects/files/digest-mockobjects-0.09-r2 create mode 100644 dev-java/mockobjects/files/mockobjects-0.09-junit.patch create mode 100644 dev-java/mockobjects/mockobjects-0.09-r2.ebuild diff --git a/dev-java/mockobjects/ChangeLog b/dev-java/mockobjects/ChangeLog index 8e957c3490f0..ee1d388ce05a 100644 --- a/dev-java/mockobjects/ChangeLog +++ b/dev-java/mockobjects/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for dev-java/mockobjects -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.13 2005/11/13 20:59:15 hansmi Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.14 2007/01/07 16:34:52 caster Exp $ + +*mockobjects-0.09-r2 (07 Jan 2007) + + 07 Jan 2007; Vlastimil Babka + files/mockobjects-0.09-gentoo.patch, +files/mockobjects-0.09-junit.patch, + +mockobjects-0.09-r2.ebuild: + Revbump to migrate to gen-2 eclasses and to fix bug #119080 with a patch for + compatibility with junit-3.8.2. Updated build.xml patch also disables + autodetection of j2ee.jar because it can break and we don't install + mockobjects-j2ee.jar anyway. 13 Nov 2005; Michael Hanselmann mockobjects-0.09-r1.ebuild: diff --git a/dev-java/mockobjects/Manifest b/dev-java/mockobjects/Manifest index f52a56cabadd..af1e6543ed10 100644 --- a/dev-java/mockobjects/Manifest +++ b/dev-java/mockobjects/Manifest @@ -1,7 +1,38 @@ -MD5 f89f2898e7abc07cbe6147fee6981075 ChangeLog 1641 -MD5 c83c1a17a4d055ee848accd6747b9094 files/digest-mockobjects-0.09 80 -MD5 c83c1a17a4d055ee848accd6747b9094 files/digest-mockobjects-0.09-r1 80 -MD5 02a51d54e27c62cdc252e29f1c3e4579 files/mockobjects-0.09-gentoo.patch 1428 -MD5 36090122a8b5609d65e32b1f47333b61 metadata.xml 1548 +AUX mockobjects-0.09-gentoo.patch 3698 RMD160 14e20d2fee53057c0f8edcb404c88ea0981a0d24 SHA1 a8bdb8c97a8d04f5ac632e5319fe7adeb09041e8 SHA256 d4ea83f7fa3455e3f367e84582f15775ebea58c73e00eb468ca0b80a2ca22eb1 +MD5 df722a8ae74ecadeb16c5724e49ad939 files/mockobjects-0.09-gentoo.patch 3698 +RMD160 14e20d2fee53057c0f8edcb404c88ea0981a0d24 files/mockobjects-0.09-gentoo.patch 3698 +SHA256 d4ea83f7fa3455e3f367e84582f15775ebea58c73e00eb468ca0b80a2ca22eb1 files/mockobjects-0.09-gentoo.patch 3698 +AUX mockobjects-0.09-junit.patch 418 RMD160 62864d00888b35e583f21a30cbac4f0e9cc52130 SHA1 200a72f6e391e82e95d415a7a6ad85329f1d178b SHA256 79d45534277d06caf5126a6c965a054dc7e8e0dc473e0a4696bf470b664f4359 +MD5 d5c3217f96c3b3d11f47134a551a5a2e files/mockobjects-0.09-junit.patch 418 +RMD160 62864d00888b35e583f21a30cbac4f0e9cc52130 files/mockobjects-0.09-junit.patch 418 +SHA256 79d45534277d06caf5126a6c965a054dc7e8e0dc473e0a4696bf470b664f4359 files/mockobjects-0.09-junit.patch 418 +DIST mockobjects-java-0.09-gentoo.tar.bz2 98965 RMD160 7f84c28249c4fa0c13d7f433b47eebf5571edc79 SHA1 48ac9cc065e4f6cc7538b325df33fb3ef985f812 SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 +EBUILD mockobjects-0.09-r1.ebuild 1487 RMD160 2262ab7674b7b8e8658f30c8d762321b4e9495d1 SHA1 23ae899462cbac82fbf98efcbbaa12fd4d0ed94e SHA256 07bacb7aff13a3d6661b95aa92cee31061c03afe940e1970f896b885984b33fd MD5 167f7faadedd0dd64c43c61c62fdd6f2 mockobjects-0.09-r1.ebuild 1487 +RMD160 2262ab7674b7b8e8658f30c8d762321b4e9495d1 mockobjects-0.09-r1.ebuild 1487 +SHA256 07bacb7aff13a3d6661b95aa92cee31061c03afe940e1970f896b885984b33fd mockobjects-0.09-r1.ebuild 1487 +EBUILD mockobjects-0.09-r2.ebuild 1544 RMD160 e81f38e943cb37a9bf08ad17ae67949e99df13f9 SHA1 fe84947477ab735d48be569c6b3554c1d4937072 SHA256 797db9e56a4cd500f4f2307bd823b6721a953c7bc865130da2ff0c22f49462a4 +MD5 0f88927dc35710acd3751405c611d2e9 mockobjects-0.09-r2.ebuild 1544 +RMD160 e81f38e943cb37a9bf08ad17ae67949e99df13f9 mockobjects-0.09-r2.ebuild 1544 +SHA256 797db9e56a4cd500f4f2307bd823b6721a953c7bc865130da2ff0c22f49462a4 mockobjects-0.09-r2.ebuild 1544 +EBUILD mockobjects-0.09.ebuild 1321 RMD160 cb5a539f2d2809ce29f34fcf08c9dc2af3ea42da SHA1 7d380ab985ec86991981c0cd9409be94472150f7 SHA256 81b8ede8506a58ce6ff50968052e278e5f72a4e2d4c04cc6f96b75c10c33525a MD5 4ee9277cc4012256831f3d104316cd66 mockobjects-0.09.ebuild 1321 +RMD160 cb5a539f2d2809ce29f34fcf08c9dc2af3ea42da mockobjects-0.09.ebuild 1321 +SHA256 81b8ede8506a58ce6ff50968052e278e5f72a4e2d4c04cc6f96b75c10c33525a mockobjects-0.09.ebuild 1321 +MISC ChangeLog 2088 RMD160 b624f8a88c6726f186d6d65f6704601eb9bbe2ed SHA1 beb944cd4e7b5eb13c8c2a93afc7ab70bd74006f SHA256 eaf0440f45fbde579dffbb754113260182cee8383a5f2e7c9343356dec272df6 +MD5 4ec5153e09c41aede395a31307b38a4d ChangeLog 2088 +RMD160 b624f8a88c6726f186d6d65f6704601eb9bbe2ed ChangeLog 2088 +SHA256 eaf0440f45fbde579dffbb754113260182cee8383a5f2e7c9343356dec272df6 ChangeLog 2088 +MISC metadata.xml 1548 RMD160 3171d36d420eecae9996bec960c34400c2a4f267 SHA1 819db15ec98c464be48babee562f6ca558a888fd SHA256 8e9a3c4a0d8d83cf2106fff04092e088101525a469fe06c21b722a926dd27b75 +MD5 36090122a8b5609d65e32b1f47333b61 metadata.xml 1548 +RMD160 3171d36d420eecae9996bec960c34400c2a4f267 metadata.xml 1548 +SHA256 8e9a3c4a0d8d83cf2106fff04092e088101525a469fe06c21b722a926dd27b75 metadata.xml 1548 +MD5 ab6ee145fc7812e74dac2379228ea01e files/digest-mockobjects-0.09 286 +RMD160 1deeff07cf28f30c160026fc94bdd768c2ac1a92 files/digest-mockobjects-0.09 286 +SHA256 b65d17ceb1b45101da7ff1c98feae2d209113b247d19557ab9d72cad0d2c06a3 files/digest-mockobjects-0.09 286 +MD5 ab6ee145fc7812e74dac2379228ea01e files/digest-mockobjects-0.09-r1 286 +RMD160 1deeff07cf28f30c160026fc94bdd768c2ac1a92 files/digest-mockobjects-0.09-r1 286 +SHA256 b65d17ceb1b45101da7ff1c98feae2d209113b247d19557ab9d72cad0d2c06a3 files/digest-mockobjects-0.09-r1 286 +MD5 ab6ee145fc7812e74dac2379228ea01e files/digest-mockobjects-0.09-r2 286 +RMD160 1deeff07cf28f30c160026fc94bdd768c2ac1a92 files/digest-mockobjects-0.09-r2 286 +SHA256 b65d17ceb1b45101da7ff1c98feae2d209113b247d19557ab9d72cad0d2c06a3 files/digest-mockobjects-0.09-r2 286 diff --git a/dev-java/mockobjects/files/digest-mockobjects-0.09 b/dev-java/mockobjects/files/digest-mockobjects-0.09 index 685fa5f49337..079fa30f49b9 100644 --- a/dev-java/mockobjects/files/digest-mockobjects-0.09 +++ b/dev-java/mockobjects/files/digest-mockobjects-0.09 @@ -1 +1,3 @@ MD5 7303d44625729f914c7b93296ba72d9d mockobjects-java-0.09-gentoo.tar.bz2 98965 +RMD160 7f84c28249c4fa0c13d7f433b47eebf5571edc79 mockobjects-java-0.09-gentoo.tar.bz2 98965 +SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 mockobjects-java-0.09-gentoo.tar.bz2 98965 diff --git a/dev-java/mockobjects/files/digest-mockobjects-0.09-r1 b/dev-java/mockobjects/files/digest-mockobjects-0.09-r1 index 685fa5f49337..079fa30f49b9 100644 --- a/dev-java/mockobjects/files/digest-mockobjects-0.09-r1 +++ b/dev-java/mockobjects/files/digest-mockobjects-0.09-r1 @@ -1 +1,3 @@ MD5 7303d44625729f914c7b93296ba72d9d mockobjects-java-0.09-gentoo.tar.bz2 98965 +RMD160 7f84c28249c4fa0c13d7f433b47eebf5571edc79 mockobjects-java-0.09-gentoo.tar.bz2 98965 +SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 mockobjects-java-0.09-gentoo.tar.bz2 98965 diff --git a/dev-java/mockobjects/files/digest-mockobjects-0.09-r2 b/dev-java/mockobjects/files/digest-mockobjects-0.09-r2 new file mode 100644 index 000000000000..079fa30f49b9 --- /dev/null +++ b/dev-java/mockobjects/files/digest-mockobjects-0.09-r2 @@ -0,0 +1,3 @@ +MD5 7303d44625729f914c7b93296ba72d9d mockobjects-java-0.09-gentoo.tar.bz2 98965 +RMD160 7f84c28249c4fa0c13d7f433b47eebf5571edc79 mockobjects-java-0.09-gentoo.tar.bz2 98965 +SHA256 e869b4cb103e07d041f06f5fa5dfaa5e6eaad2d709ab2cf5446c9fff3b4f5d16 mockobjects-java-0.09-gentoo.tar.bz2 98965 diff --git a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch index 826f5c1051ae..22ac56cf5c08 100644 --- a/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch +++ b/dev-java/mockobjects/files/mockobjects-0.09-gentoo.patch @@ -1,6 +1,64 @@ ---- build.xml.orig 2005-01-04 18:34:23.272737328 +0100 -+++ build.xml 2005-01-04 19:37:21.623340728 +0100 -@@ -234,7 +234,7 @@ +--- build.xml.orig 2007-01-07 15:54:42.000000000 +0100 ++++ build.xml 2007-01-07 16:40:45.000000000 +0100 +@@ -70,7 +70,8 @@ + + + +- + ++ --> + + + +@@ -118,7 +120,6 @@ + srcdir="${src.core.dir}"> + + +- + + + +@@ -134,7 +135,6 @@ + + + +- + + + +@@ -158,7 +158,6 @@ + + + +- + + + +@@ -179,7 +178,6 @@ + + + +- + + + +@@ -222,7 +220,6 @@ + + + +- + + + +@@ -234,7 +231,7 @@ -@@ -401,8 +401,8 @@ +@@ -322,7 +319,6 @@ + + + +- + + + +@@ -401,8 +397,8 @@ ======================================================================== --> -@@ -423,5 +423,12 @@ +@@ -423,5 +419,12 @@ diff --git a/dev-java/mockobjects/files/mockobjects-0.09-junit.patch b/dev-java/mockobjects/files/mockobjects-0.09-junit.patch new file mode 100644 index 000000000000..fe80135a8bee --- /dev/null +++ b/dev-java/mockobjects/files/mockobjects-0.09-junit.patch @@ -0,0 +1,11 @@ +--- src/core/com/mockobjects/util/AssertMo.java 2003-05-18 22:59:40.000000000 +0200 ++++ src/core/com/mockobjects/util/AssertMo.java 2007-01-07 14:46:34.000000000 +0100 +@@ -77,7 +77,7 @@ + assertTrue("Should not have verified", threwException); + } + +- static protected void failNotEquals( ++ static public void failNotEquals( + String message, + Object expected, + Object actual) { diff --git a/dev-java/mockobjects/mockobjects-0.09-r2.ebuild b/dev-java/mockobjects/mockobjects-0.09-r2.ebuild new file mode 100644 index 000000000000..5a629f45fd59 --- /dev/null +++ b/dev-java/mockobjects/mockobjects-0.09-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09-r2.ebuild,v 1.1 2007/01/07 16:34:52 caster Exp $ + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Test-first development process for building object-oriented software" +HOMEPAGE="http://mockobjects.sf.net" +SRC_URI="http://dev.gentoo.org/~karltk/java/distfiles/mockobjects-java-${PV}-gentoo.tar.bz2" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc source test" + +CDEPEND="=dev-java/junit-3.8*" +# limiting to 1.4 jdk because there's some jdk-specific tests in build.xml that end with 1.4 +# also there's bug #119080 +# feel free to fix that and investigate workingness with 1.5+ +DEPEND="${CDEPEND} + =virtual/jdk-1.4* + !test? ( dev-java/ant-core ) + test? ( dev-java/ant ) + source? ( app-arch/zip )" +RDEPEND="${CDEPEND} + >=virtual/jre-1.4" + +S="${WORKDIR}/mockobjects-java-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch ${FILESDIR}/${P}-gentoo.patch + epatch ${FILESDIR}/${P}-junit.patch + + mkdir -p out/jdk/classes + + cd lib + java-pkg_jar-from junit +} + +src_test() { + # doesn't seem any tests get actually run, why? + eant junit +} + +src_install() { + java-pkg_newjar out/${PN}-alt-jdk1.4-${PV}.jar ${PN}-alt-jdk1.4.jar + java-pkg_newjar out/${PN}-jdk1.4-${PV}.jar ${PN}-jdk1.4.jar + java-pkg_newjar out/${PN}-core-${PV}.jar ${PN}-core.jar + dodoc doc/README + + use doc && java-pkg_dojavadoc out/doc/javadoc + use source && java-pkg_dosrc ${S}/src/* +} -- 2.26.2