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

(Portage version: 2.2_rc48/cvs/Linux x86_64)

2 files changed, 72 insertions, 2 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 6f73f6744acb..f75c4f376563 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/castor
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.53 2009/02/04 12:22:37 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.54 2009/11/08 20:56:00 caster Exp $
+
+*castor-0.9.9.1-r6 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +castor-0.9.9.1-r6.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
   04 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> -castor-1.1.1.ebuild,
   -castor-1.1.1-r1.ebuild:
diff --git a/dev-java/castor/castor-0.9.9.1-r6.ebuild b/dev-java/castor/castor-0.9.9.1-r6.ebuild
new file mode 100644
index 000000000000..bb1805f6d17d
--- /dev/null
+++ b/dev-java/castor/castor-0.9.9.1-r6.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/castor/castor-0.9.9.1-r6.ebuild,v 1.1 2009/11/08 20:56:00 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="Data binding framework for Java"
+SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
+HOMEPAGE="http://www.castor.org"
+LICENSE="Exolab"
+KEYWORDS="~amd64 ~x86"
+SLOT="0.9"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/commons-logging-1.0.4
+	dev-java/jakarta-oro:2.0
+	dev-java/jakarta-regexp:1.3
+	dev-java/ldapsdk:4.1
+	dev-java/xerces:1.3
+	dev-java/cglib:2
+	java-virtuals/transaction-api"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+java_prepare() {
+	# TODO this should be filed upstream
+	epatch "${FILESDIR}/0.9.5.3-jikes.patch"
+
+	# Does not like Java 1.6's JDBC API
+	java-ant_rewrite-bootclasspath 1.5 src/build.xml
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	#FIXME: uses these bundled classes
+	rm -v tests/*.jar || die
+	java-pkg_jar-from --build-only ant-core ant.jar
+	#Only used by examples and tests and we aren't building them
+	#java-pkg_jar-from adaptx-0.9
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from cglib-2
+	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+	java-pkg_jar-from xerces-1.3
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from transaction-api
+}
+
+EANT_BUILD_XML="src/build.xml"
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
+
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/main/org
+}