Revbump to remove dependency on 1.5 jdk - bug #292001.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

14 files changed, 540 insertions, 11 deletions

diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog
index ef2ac9cae1a5..d691d67102df 100644
--- a/dev-java/commons-dbcp/ChangeLog
+++ b/dev-java/commons-dbcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-dbcp
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.43 2008/01/27 19:22:53 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.44 2009/11/08 21:01:12 caster Exp $
+
+*commons-dbcp-1.2.2-r1 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +commons-dbcp-1.2.2-r1.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   27 Jan 2008; Petteri Räty <betelgeuse@gentoo.org>
   commons-dbcp-1.2.2.ebuild:
diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..e0a3b16989ec
--- /dev/null
+++ b/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.2-r1.ebuild,v 1.1 2009/11/08 21:01:12 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Jakarta component providing database connection pooling API"
+HOMEPAGE="http://jakarta.apache.org/commons/dbcp/"
+SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz"
+COMMON_DEP=">=dev-java/commons-pool-1.3"
+RDEPEND=">=virtual/jre-1.5
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+		test? (
+			dev-java/junit:0
+			www-servers/tomcat:6
+			dev-java/xerces:2
+		)
+		${COMMON_DEP}"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+java_prepare() {
+	echo "commons-pool.jar=$(java-pkg_getjars commons-pool)" >> build.properties
+	rm -v *.jar || die
+	java-ant_rewrite-bootclasspath 1.5
+}
+
+EANT_BUILD_TARGET="build-jar"
+
+src_test() {
+	eant test -Djunit.jar="$(java-pkg_getjars junit)" \
+		-Dnaming-java.jar="$(java-pkg_getjar tomcat-6 catalina.jar)" \
+		-Dxerces.jar="$(java-pkg_getjars xerces-2)"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}*.jar || die "Unable to install"
+	dodoc README.txt RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/hibernate/ChangeLog b/dev-java/hibernate/ChangeLog
index eed18752fbf9..722dc6f1dbef 100644
--- a/dev-java/hibernate/ChangeLog
+++ b/dev-java/hibernate/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/hibernate
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.43 2009/10/15 08:13:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/ChangeLog,v 1.44 2009/11/08 21:04:46 caster Exp $
+
+*hibernate-3.1.3-r3 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +hibernate-3.1.3-r3.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> hibernate-3.1.3-r2.ebuild:
   amd64/x86 stable, bug #284313
diff --git a/dev-java/hibernate/hibernate-3.1.3-r3.ebuild b/dev-java/hibernate/hibernate-3.1.3-r3.ebuild
new file mode 100644
index 000000000000..9c151b90db3e
--- /dev/null
+++ b/dev-java/hibernate/hibernate-3.1.3-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hibernate/hibernate-3.1.3-r3.ebuild,v 1.1 2009/11/08 21:04:46 caster Exp $
+
+EAPI="2"
+WANT_ANT_TASKS="ant-antlr ant-swing ant-junit"
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PV="3.1"
+DESCRIPTION="A powerful, ultra-high performance object / relational persistence and query service for Java."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.hibernate.org"
+LICENSE="LGPL-2"
+IUSE=""
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/c3p0:0
+	dev-java/cglib:2.2
+	dev-java/commons-collections:0
+	dev-java/commons-logging:0
+	dev-java/dom4j:1
+	dev-java/ehcache:0
+	dev-java/oscache:0
+	dev-java/proxool:0
+	dev-java/swarmcache:1.0
+	java-virtuals/transaction-api
+	dev-java/sun-jacc-api:0
+	dev-java/ant-core:0
+	dev-java/asm:2.2"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+java_prepare() {
+	java-ant_rewrite-bootclasspath 1.5
+
+	# this depends on jboss
+	rm src/org/hibernate/cache/JndiBoundTreeCacheProvider.java \
+		src/org/hibernate/cache/TreeCache.java \
+		src/org/hibernate/cache/TreeCacheProvider.java
+
+	rm -v *.jar lib/*.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+c3p0,commons-collections,commons-logging,cglib-2.2,transaction-api
+dom4j-1,ehcache,oscache,proxool,swarmcache-1.0
+sun-jacc-api,antlr,ant-core,asm-2.2
+"
+EANT_EXTRA_ARGS="-Dnosplash -Ddist.dir=dist"
+
+src_install() {
+	java-pkg_dojar hibernate3.jar
+	dodoc changelog.txt readme.txt
+	use doc && java-pkg_dohtml -r dist/doc/api doc/other doc/reference
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index bdcd1f9d9dc6..bb8567d2cf4e 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jakarta-jstl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.19 2008/03/10 11:24:32 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.20 2009/11/08 21:09:34 caster Exp $
+
+*jakarta-jstl-1.1.2-r2 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +jakarta-jstl-1.1.2-r2.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   10 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
   jakarta-jstl-1.1.2-r1.ebuild:
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..3357fb285a38
--- /dev/null
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r2.ebuild,v 1.1 2009/11/08 21:09:34 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+MY_PN="jakarta-taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
+HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
+SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/servletapi:2.4
+	dev-java/xalan"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+#	test? ( dev-java/ant-junit )
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}-src/standard"
+
+# Needs cactus packaged
+# http://bugs.gentoo.org/show_bug.cgi?id=212890
+RESTRICT="test"
+
+java_prepare() {
+	# put xalan from bootclasspath to classpath
+	epatch "${FILESDIR}/build-xml.patch"
+	# due to JDBC API changes
+	java-ant_rewrite-bootclasspath 1.5
+
+	echo -e "base.dir=..\n" \
+		"build.dir = \${base.dir}/build\n" \
+		"build.classes=\${build.dir}/standard/standard/classes\n" \
+		"dist.dir = \${base.dir}/dist\n" \
+		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
+		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
+		"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
+		> build.properties
+	#use test && echo "junit.jar=$(java-pkg_getjars --build-only junit)" >> build.properties
+	java-pkg_filter-compiler jikes
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="javadoc-dist"
+EANT_TEST_TARGET="run.junit"
+
+src_install() {
+	java-pkg_dojar "${S}"/../build/standard/standard/lib/*.jar
+
+	use doc && java-pkg_dohtml -r "${S}"/doc/web/* "${S}"/../dist/standard/javadoc/
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc "${S}"/src/*
+}
diff --git a/dev-java/jax-ws/ChangeLog b/dev-java/jax-ws/ChangeLog
index a190d678e1ca..ac624b306dca 100644
--- a/dev-java/jax-ws/ChangeLog
+++ b/dev-java/jax-ws/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jax-ws
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/ChangeLog,v 1.8 2008/03/28 18:14:20 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/ChangeLog,v 1.9 2009/11/08 21:13:14 caster Exp $
+
+*jax-ws-2.0.1-r1 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org> +jax-ws-2.0.1-r1.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   28 Mar 2008; nixnut <nixnut@gentoo.org> jax-ws-2.0.1.ebuild:
   Stable on ppc wrt bug 214778
diff --git a/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..28a1d2afc56f
--- /dev/null
+++ b/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-ws/jax-ws-2.0.1-r1.ebuild,v 1.1 2009/11/08 21:13:14 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference implementation of the Java API for XML Web Services"
+HOMEPAGE="http://jax-ws.dev.java.net/"
+DATE="20060817"
+MY_P="JAXWS${PV}m1_source_${DATE}.jar"
+SRC_URI="https://jax-ws.dev.java.net/jax-ws-201-m1/${MY_P}"
+
+LICENSE="CDDL"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="dev-java/istack-commons-runtime:0
+	dev-java/jax-ws-api:2
+	dev-java/jaxb:2
+	dev-java/jsr173:0
+	>=dev-java/jsr181-1.0
+	dev-java/jsr250:0
+	dev-java/sun-httpserver-bin:2
+	dev-java/jsr67:0
+	dev-java/saaj:0
+	dev-java/sjsxp:0
+	dev-java/stax-ex:0
+	dev-java/sun-jaf:0
+	dev-java/txw2-runtime:0
+	dev-java/xmlstreambuffer:0
+	dev-java/xml-commons-resolver:0"
+
+# abstract interface problems with 1.5
+# https://bugs.gentoo.org/show_bug.cgi?id=207633
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jaxws-si"
+
+src_unpack() {
+	echo "A" | java -jar "${DISTDIR}/${A}" -console > /dev/null || die "unpack failed"
+
+	unpack ./jaxws-src.zip || die "unzip failed"
+}
+
+java_prepare() {
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom istack-commons-runtime
+	java-pkg_jarfrom jax-ws-api-2
+	java-pkg_jarfrom jaxb-2
+	java-pkg_jarfrom jsr173
+	java-pkg_jarfrom jsr181
+	java-pkg_jarfrom jsr250
+	java-pkg_jarfrom jsr67
+	java-pkg_jarfrom saaj
+	java-pkg_jarfrom sjsxp
+	java-pkg_jarfrom sun-httpserver-bin-2
+	java-pkg_jarfrom stax-ex
+	java-pkg_jarfrom sun-jaf
+	java-pkg_jarfrom txw2-runtime
+	java-pkg_jarfrom xml-commons-resolver
+	java-pkg_jarfrom xmlstreambuffer
+
+	cp \
+		"${S}"/src/rt/build/gen-src/com/sun/xml/ws/resources/*.java \
+		"${S}"/src/rt/src/com/sun/xml/ws/resources/ || die "cp failed"
+
+	find "${S}/src/" -name '*.java' -exec \
+		sed -i -e \
+			's,com.sun.org.apache.xml.internal.resolver,org.apache.xml.resolver,g' \
+			{} \;
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	java-ant_rewrite-bootclasspath auto build.xml "$(java-pkg_getjars jax-ws-api-2)"
+}
+
+EANT_BUILD_TARGET="build"
+
+src_install() {
+	java-pkg_dojar jax-ws.jar
+
+	use source && java-pkg_dosrc src/rt/src/*
+}
diff --git a/dev-java/mckoi/ChangeLog b/dev-java/mckoi/ChangeLog
index 18e9707cf490..2643f3beb81b 100644
--- a/dev-java/mckoi/ChangeLog
+++ b/dev-java/mckoi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/mckoi
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.13 2008/11/01 09:15:45 serkan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.14 2009/11/08 21:17:02 caster Exp $
+
+*mckoi-1.0.3-r2 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org> +mckoi-1.0.3-r2.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   01 Nov 2008; Serkan Kaba <serkan@gentoo.org> mckoi-1.0.3-r1.ebuild:
   Keyword for amd64.
diff --git a/dev-java/mckoi/mckoi-1.0.3-r2.ebuild b/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
new file mode 100644
index 000000000000..c348b0ffa404
--- /dev/null
+++ b/dev-java/mckoi/mckoi-1.0.3-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.3-r2.ebuild,v 1.1 2009/11/08 21:17:02 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Mckoi Java SQL Database System"
+HOMEPAGE="http://mckoi.com/database/"
+SRC_URI="http://www.mckoi.com/database/ver/${P/-/}.zip"
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+COMMON_DEP="=dev-java/gnu-regexp-1.1*"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-/}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-jikes.patch"
+
+	cp "${FILESDIR}/build.xml" . || die
+	java-ant_rewrite-classpath
+	java-ant_rewrite-bootclasspath 1.5
+
+	rm -v gnu-regexp-*
+	rm -v *.jar
+	find demo -name '*.class' -delete
+	# some contrib stuff depending on jboss
+	rm -rf src/net
+}
+
+EANT_DOC_TARGET="docs"
+EANT_GENTOO_CLASSPATH="gnu-regexp-1"
+
+src_install() {
+	java-pkg_dojar dist/mckoidb.jar
+
+	dodoc README.txt db.conf
+
+	# apidocs are in expected place
+	use doc && java-pkg_dohtml -r docs/*
+	use examples && java-pkg_doexamples demo
+	use source && java-pkg_dosrc src/*
+}
diff --git a/dev-java/mockobjects/ChangeLog b/dev-java/mockobjects/ChangeLog
index 6d1b7a413d24..6c028587d210 100644
--- a/dev-java/mockobjects/ChangeLog
+++ b/dev-java/mockobjects/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/mockobjects
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.24 2009/05/18 19:31:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/ChangeLog,v 1.25 2009/11/08 21:19:19 caster Exp $
+
+*mockobjects-0.09-r4 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +mockobjects-0.09-r4.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   18 May 2009; Petteri Räty <betelgeuse@gentoo.org>
   -mockobjects-0.09-r2.ebuild:
diff --git a/dev-java/mockobjects/mockobjects-0.09-r4.ebuild b/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
new file mode 100644
index 000000000000..6fe55b5f3ab5
--- /dev/null
+++ b/dev-java/mockobjects/mockobjects-0.09-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockobjects/mockobjects-0.09-r4.ebuild,v 1.1 2009/11/08 21:19:19 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source test"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+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
+	test? ( dev-java/ant-junit )"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+
+S="${WORKDIR}/mockobjects-java-${PV}"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-junit.patch"
+	epatch "${FILESDIR}/${P}-java15.patch"
+
+	java-ant_rewrite-bootclasspath 1.5
+
+	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
+}
diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index 6cc6d8dab3fd..6cd500428394 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/openjms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.30 2009/11/01 19:20:34 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.31 2009/11/08 21:22:18 caster Exp $
+
+*openjms-0.7.6.1-r8 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +openjms-0.7.6.1-r8.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   01 Nov 2009; Vlastimil Babka <caster@gentoo.org>
   -openjms-0.7.6.1-r5.ebuild, -openjms-0.7.6.1-r6.ebuild,
diff --git a/dev-java/openjms/openjms-0.7.6.1-r8.ebuild b/dev-java/openjms/openjms-0.7.6.1-r8.ebuild
new file mode 100644
index 000000000000..59a26ca5bad3
--- /dev/null
+++ b/dev-java/openjms/openjms-0.7.6.1-r8.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/openjms-0.7.6.1-r8.ebuild,v 1.1 2009/11/08 21:22:18 caster Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc"
+WANT_ANT_TASKS="ant-antlr"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+SLOT="0"
+LICENSE="GPL-2"
+DESCRIPTION="Open Java Messaging System"
+HOMEPAGE="http://openjms.sourceforge.net/"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz mirror://gentoo/${P}-scripts.tar.gz"
+IUSE=""
+CDEPEND=">=dev-java/antlr-2.7.7:0[java]
+	dev-java/castor:0.9
+	dev-java/commons-dbcp:0
+	dev-java/commons-logging:0
+	dev-java/concurrent-util:0
+	dev-java/exolabcore:0
+	java-virtuals/jms
+	java-virtuals/transaction-api
+	dev-java/log4j:0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	dev-java/xerces:2"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+java_prepare() {
+	unpack ${A}
+	mv "${WORKDIR}/bin" "${S}"
+	mv "${WORKDIR}/config" "${S}"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/buildfile.patch"
+	epatch "${FILESDIR}/${PV}/source.patch"
+	java-ant_rewrite-bootclasspath 1.5
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from antlr
+	java-pkg_jar-from castor-0.9
+	java-pkg_jar-from commons-dbcp
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from concurrent-util
+	java-pkg_jar-from exolabcore
+	java-pkg_jar-from --virtual jms
+	java-pkg_jar-from --virtual transaction-api
+	java-pkg_jar-from log4j
+	java-pkg_jar-from --virtual servlet-api-2.3
+	# The build.xml runs java with something that uses xerces
+	java-pkg_jar-from --with-dependencies --build-only xerces-2
+	java-pkg_jar-from jakarta-oro-2.0
+}
+
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="jar war"
+EANT_EXTRA_ARGS="-Disjdk1.4=true"
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	java-pkg_newjar lib/${PN}-client-${PV}.jar ${PN}-client.jar
+	java-pkg_dowar lib/${PN}.war
+
+	dodir /opt/${PN}
+	cp -rP {bin,config,lib} "${D}"/opt/${PN}/
+	#use doc && cp -rP {docs,src} "${D}"/opt/${PN}/
+
+	fperms 755 /opt/${PN}/bin/*
+	newenvd "${FILESDIR}"/${PV}/10${P} 10${PN}
+	newinitd "${FILESDIR}"/${PV}/rc2 openjms
+	newconfd "${FILESDIR}"/${PV}/conf openjms
+}