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.

(Portage version: 2.1.4_rc4)

4 files changed, 87 insertions, 1 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/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
+}