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

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

3 files changed, 74 insertions, 13 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/Manifest b/dev-java/castor/Manifest
index 400a2fb94ce5..68fc4c41bb92 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.5.3-jikes.patch 1316 RMD160 aee024aa5b1ec75cba60c1f6b27e213178fee51f SHA1 24f4b7df0cc8f6dd8a2f9d51470507e19bafec28 SHA256 e6e7b56cdf09eedef1e09bb4599d60837af1cc4251cfa0ac637c3994a135519f
 AUX 1.1.1-jdk-1.4.patch 1403 RMD160 7fff35b713fa4da38cc5236e60268a1a848573e3 SHA1 c35fb38155f1befbc2bb47a75752d38749b4c035 SHA256 5d49640c380ffedbc54223944226f6320636a9996e328abe280b8de9344248dc
 DIST castor-0.9.9.1-src.tgz 6794995 RMD160 b308fa49edb708963f6abbde2719b7995ba168ed SHA1 e7baee694f48b56b20af77adead2144cb7b70bca SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81
 DIST castor-1.1.1-src.tgz 9067936 RMD160 85c0379d3d9e71a1e365075ae6465018793165fe SHA1 9747840c2c0ce7640f94fdeb33dd90889b2daa69 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda
 EBUILD castor-0.9.9.1-r5.ebuild 1782 RMD160 961b46a413885cfcc3aed8cbda6649d9ba6de840 SHA1 9160b67caa2b6b257af61cfde01484addacad6ba SHA256 dd1715916581b43064522fc4546c8d835991d1d0504f1cf6a3f87aa68f4905b9
+EBUILD castor-0.9.9.1-r6.ebuild 1817 RMD160 526c7bbd141e0d8c49bc366514f1a45a593f1aa1 SHA1 d33967682cf9288dcb286e11d298548bffe5f0be SHA256 7a3ee79f7a31cb7516d7d6929cac1d3553c52f42189601af1ab847eaabbb529c
 EBUILD castor-1.1.1-r2.ebuild 2483 RMD160 a0bc161573a98b5f6eeb60a994e097c3126af0f5 SHA1 02212e65f1f9c74ac4a5f9ec0c5b195537964962 SHA256 c647f145f0662f5dbf3aeba63ce6272a71fb2490e2972ae423f96af11526540e
-MISC ChangeLog 6998 RMD160 47f089cd72dd22ee483a02cd1ce0ae683a43f2b3 SHA1 c4e47718ad5ecf5e7495a55ce091ecc353d9e155 SHA256 98bf03f9e4c5ba64f5096f8f49891826790eeb826fa0bad2c48d3329739856b8
+MISC ChangeLog 7166 RMD160 423801b643261032599b80f6a3c8392bda4bf3bb SHA1 6484177af6c3c52b94c2c710b1eb02717d4ad2bf SHA256 2d86278df8af4770c8acbaee9822cf70510c7db1a2aa5c374d3c044e88a7690f
 MISC metadata.xml 414 RMD160 ae2ab751d67371740056ee20caaf7e597f78b429 SHA1 c6a7294af545b1ccdbd2f6476840f306e141c8e3 SHA256 fc981b706c1199b5fdd5636a4514f7e214c5a504e9f44c2a4dcd6ca17946c575
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmJiPQACgkQcxLzpIGCsLRhsgCgmm1Ewo0qg11UeiNgNuUciBt+
-X2gAmgPp/HrTakGctIFrRc57RoRnxcM6
-=LdDf
------END PGP SIGNATURE-----
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
+}