Revbump with patch to build with jdk 1.5 to satisfy ricers. Patch from bug #119080 by Mathias Hasselmann <mathias.hasselmann@gmx.de>. Forcing javac to compile because ecj doesn't like something in 1.5 API.

Package-Manager: portage-2.1.4_rc4

5 files changed, 102 insertions, 5 deletions

diff --git a/dev-java/mockobjects/ChangeLog b/dev-java/mockobjects/ChangeLog
index 7f1ead826f1c..5bafbc32b9fd 100644
--- a/dev-java/mockobjects/ChangeLog
+++ b/dev-java/mockobjects/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/mockobjects
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.20 2007/10/24 05:40:22 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.21 2007/12/02 13:37:30 caster Exp $
+
+*mockobjects-0.09-r3 (02 Dec 2007)
+
+  02 Dec 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/mockobjects-0.09-java15.patch, +mockobjects-0.09-r3.ebuild:
+  Revbump with patch to build with jdk 1.5 to satisfy ricers. Patch from bug
+  #119080 by Mathias Hasselmann <mathias.hasselmann@gmx.de>. Forcing javac to
+  compile because ecj doesn't like something in 1.5 API.
 
   24 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -mockobjects-0.09.ebuild, -mockobjects-0.09-r1.ebuild:
diff --git a/dev-java/mockobjects/Manifest b/dev-java/mockobjects/Manifest
index 190777218194..1f28bb164979 100644
--- a/dev-java/mockobjects/Manifest
+++ b/dev-java/mockobjects/Manifest
@@ -2,6 +2,10 @@ AUX mockobjects-0.09-gentoo.patch 3698 RMD160 14e20d2fee53057c0f8edcb404c88ea098
 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-java15.patch 364 RMD160 276c28f85348cf6c1a80c9e4d4d213d4bbc82570 SHA1 5443693143e79042128b2b9e8cbf196e714f3d47 SHA256 f1991cc7bdb644302743e5b2a905f2c2268e3b66928661d7e8feb10db0ebdfcc
+MD5 eca7c33159b3d55a89313b6818ba6a39 files/mockobjects-0.09-java15.patch 364
+RMD160 276c28f85348cf6c1a80c9e4d4d213d4bbc82570 files/mockobjects-0.09-java15.patch 364
+SHA256 f1991cc7bdb644302743e5b2a905f2c2268e3b66928661d7e8feb10db0ebdfcc files/mockobjects-0.09-java15.patch 364
 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
@@ -11,10 +15,14 @@ EBUILD mockobjects-0.09-r2.ebuild 1671 RMD160 f30b783487e83ca159e5498c9ad2b432c4
 MD5 33d6eb2b9db0ff6726576f75fc76b9c7 mockobjects-0.09-r2.ebuild 1671
 RMD160 f30b783487e83ca159e5498c9ad2b432c46d609d mockobjects-0.09-r2.ebuild 1671
 SHA256 0397e25182e491955f9da529041345943d72b12610b212102f8b1b55ca4f6274 mockobjects-0.09-r2.ebuild 1671
-MISC ChangeLog 2719 RMD160 d3e0126db6e475d66152e5cb840d2412955a30c1 SHA1 b5e1755542d053784e43bb3ac8aa9524f310f714 SHA256 ac28ed59b0ad7bfd2dfddf94971a56d5312de736aad0e8c6c97fd7ee0b12060f
-MD5 7348bb8d24c7777a00581ba110849be4 ChangeLog 2719
-RMD160 d3e0126db6e475d66152e5cb840d2412955a30c1 ChangeLog 2719
-SHA256 ac28ed59b0ad7bfd2dfddf94971a56d5312de736aad0e8c6c97fd7ee0b12060f ChangeLog 2719
+EBUILD mockobjects-0.09-r3.ebuild 1867 RMD160 7ed3854d8bf1331438ead81ef665a8d4f7de0d5e SHA1 e8347c4dd07ac8e7ac9b5c5facdabd8e680f2d9b SHA256 d82e75d3b845a4a7a765138e2930b4394ef1602dc5e323a64df418797d5758b4
+MD5 fd30d952fa5930a596563dc4a2512729 mockobjects-0.09-r3.ebuild 1867
+RMD160 7ed3854d8bf1331438ead81ef665a8d4f7de0d5e mockobjects-0.09-r3.ebuild 1867
+SHA256 d82e75d3b845a4a7a765138e2930b4394ef1602dc5e323a64df418797d5758b4 mockobjects-0.09-r3.ebuild 1867
+MISC ChangeLog 3089 RMD160 d41e803d203c754746e9075021dafa34b90c81e9 SHA1 e359317643b3a8dc56f868732bd10f3d247c628d SHA256 41e951f3d2b89336fd04b6ace286d9eab3d0540bf94f9ee5bfff2a61bda37f3e
+MD5 bd0f62bec02be0678f6f42723f12575b ChangeLog 3089
+RMD160 d41e803d203c754746e9075021dafa34b90c81e9 ChangeLog 3089
+SHA256 41e951f3d2b89336fd04b6ace286d9eab3d0540bf94f9ee5bfff2a61bda37f3e ChangeLog 3089
 MISC metadata.xml 1548 RMD160 3171d36d420eecae9996bec960c34400c2a4f267 SHA1 819db15ec98c464be48babee562f6ca558a888fd SHA256 8e9a3c4a0d8d83cf2106fff04092e088101525a469fe06c21b722a926dd27b75
 MD5 36090122a8b5609d65e32b1f47333b61 metadata.xml 1548
 RMD160 3171d36d420eecae9996bec960c34400c2a4f267 metadata.xml 1548
@@ -22,3 +30,6 @@ SHA256 8e9a3c4a0d8d83cf2106fff04092e088101525a469fe06c21b722a926dd27b75 metadata
 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
+MD5 ab6ee145fc7812e74dac2379228ea01e files/digest-mockobjects-0.09-r3 286
+RMD160 1deeff07cf28f30c160026fc94bdd768c2ac1a92 files/digest-mockobjects-0.09-r3 286
+SHA256 b65d17ceb1b45101da7ff1c98feae2d209113b247d19557ab9d72cad0d2c06a3 files/digest-mockobjects-0.09-r3 286
diff --git a/dev-java/mockobjects/files/digest-mockobjects-0.09-r3 b/dev-java/mockobjects/files/digest-mockobjects-0.09-r3
new file mode 100644
index 000000000000..079fa30f49b9
--- /dev/null
+++ b/dev-java/mockobjects/files/digest-mockobjects-0.09-r3
@@ -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-java15.patch b/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
new file mode 100644
index 000000000000..6fc419a1b7ec
--- /dev/null
+++ b/dev-java/mockobjects/files/mockobjects-0.09-java15.patch
@@ -0,0 +1,11 @@
+--- src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:49:06.000000000 +0100
++++ src/jdk/common/alt/java/io/FileImpl.java	2006-01-15 13:47:59.000000000 +0100
+@@ -171,7 +171,7 @@
+     }
+ 
+     public int compareTo(Object o) {
+-        return file.compareTo(o);
++        return file.compareTo((java.io.File) o);
+     }
+ 
+     public java.io.File getRealFile() {
diff --git a/dev-java/mockobjects/mockobjects-0.09-r3.ebuild b/dev-java/mockobjects/mockobjects-0.09-r3.ebuild
new file mode 100644
index 000000000000..cb2b191dfbd1
--- /dev/null
+++ b/dev-java/mockobjects/mockobjects-0.09-r3.ebuild
@@ -0,0 +1,64 @@
+# 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-r3.ebuild,v 1.1 2007/12/02 13:37:30 caster Exp $
+
+JAVA_PKG_IUSE="doc examples source test"
+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=""
+
+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.5* =virtual/jdk-1.4* )
+	test? ( dev-java/ant-junit )"
+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"
+	epatch "${FILESDIR}/${P}-java15.patch"
+
+	mkdir -p out/jdk/classes || die
+
+	cd lib || die
+	java-pkg_jar-from junit
+}
+
+src_compile() {
+	# ecj doesn't like subclassing PrintWriter in 1.5
+	java-pkg_force-compiler javac
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	# doesn't seem any tests get actually run, why?
+	ANT_TASKS="ant-junit" 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 || die
+
+	use doc && java-pkg_dojavadoc out/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/core/com src/extensions/com \
+		src/jdk/common/com src/jdk/1.4/com
+}