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

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

3 files changed, 95 insertions, 2 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index fabe0a3a5b0b..e2758a2aeeee 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.14 2009/09/18 07:20:21 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.15 2009/11/08 20:47:20 caster Exp $
+
+*octopus-3.0.1-r3 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org> +octopus-3.0.1-r3.ebuild:
+  Revbump to remove dependency on 1.5 jdk - bug #292001.
 
 *octopus-3.0.1-r2 (18 Sep 2009)
 
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 6bab614f1306..0e7135323156 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -4,5 +4,6 @@ DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e
 DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
 EBUILD octopus-3.0.1-r1.ebuild 1852 RMD160 4d2385fad2a48a6853e55b2ab6d2c2b35bd7a5c9 SHA1 28014889582bd59ba9d00669a3ec24f2a8431d25 SHA256 7c3d582184e8575bea53216462eb34a5e62ed1df441d8ac7b8cd3761576ebf8c
 EBUILD octopus-3.0.1-r2.ebuild 1971 RMD160 55a708d17d10a5bbf2dfcf33dd52fa0da50b43bb SHA1 d0377590a0647ff7d19d1ad0d26bedbdbdf5bfff SHA256 3babdd8bdbd8c7cf21ca9836a5274c6efbef400f3254b02b7dd095b37b0d16c0
-MISC ChangeLog 2271 RMD160 86c36ae34fa9e969a5716198eb6af9fffa7635b0 SHA1 e6b5cb123da1ebc1e2018d412240c4fb4172efd4 SHA256 f68a375c87252348a74cc0f9c18d4fa0ba008a78f2210d0a8af5370f9ffe37a0
+EBUILD octopus-3.0.1-r3.ebuild 2013 RMD160 93ef774e9982e42be17dcfb4da04e746c85f6dcf SHA1 b5ed604f07a119aa99e7fe0f2e6e1fbdcc9d9738 SHA256 9bae5b64b595a3cf79a78ccd4ff35e1f6704c89d769a8f2fbeb66b18f3a2a617
+MISC ChangeLog 2437 RMD160 065092bcf8a7438c94a58875a48e1a24423b51a8 SHA1 fd802bb402848fa276bedfb57b325441601770eb SHA256 bf1088d02f2861f4d21c1fe31e214b7720845b3c1efdf3cd3a14cc7bd16e32ab
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
diff --git a/dev-db/octopus/octopus-3.0.1-r3.ebuild b/dev-db/octopus/octopus-3.0.1-r3.ebuild
new file mode 100644
index 000000000000..c168b3d5be3c
--- /dev/null
+++ b/dev-db/octopus/octopus-3.0.1-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r3.ebuild,v 1.1 2009/11/08 20:47:20 caster Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PV=${PV//./-}
+MY_PV=${MY_PV/-/.}
+DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool."
+SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
+	mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
+HOMEPAGE="http://octopus.objectweb.org"
+LICENSE="LGPL-2.1"
+SLOT="3.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+COMMON_DEP="
+	>=dev-java/xerces-2.7
+	>=dev-java/log4j-1.2.8
+	=dev-java/rhino-1.6*
+	=dev-java/junit-3.8*
+	>=dev-java/ant-core-1.4"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEP}"
+
+# uses enum as identifier
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+TOPDIR="${PN}-$(get_version_component_range 1-2)"
+S=${WORKDIR}/${TOPDIR}/Octopus-src
+
+java_prepare() {
+	rm -fr ${TOPDIR}/maven
+
+	mv "${WORKDIR}/xmls" "${S}/modules/Octopus"
+
+	cd "${S}"/modules
+	cp "${FILESDIR}/${P}-gentoo-build.xml" build.xml
+	java-ant_rewrite-classpath build.xml
+	java-pkg_filter-compiler jikes
+	java-ant_rewrite-bootclasspath 1.5
+
+	epatch "${FILESDIR}/${PN}-jdk-1.5.patch"
+}
+
+EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
+
+src_compile() {
+	cd "${S}/modules"
+
+	use source && antflags="${antflags} sourcezip-all"
+
+	eant jar-all $(use_doc docs-all) ${antflags}
+}
+
+RESTRICT="test"
+
+# Would need maven to work properly as the build.xml just launches maven
+#src_test() {
+#	eant test
+#}
+
+src_install() {
+	dodoc ChangeLog.txt ReleaseNotes.txt
+
+	cd "${S}/modules"
+	java-pkg_dojar dist/*.jar
+
+	if use source; then
+		dodir /usr/share/doc/${PF}/source
+		cp dist/*-src.zip "${D}usr/share/doc/${PF}/source"
+	fi
+	if use doc; then
+		docinto html/api
+		# Has multiple javadoc subdirs here
+		java-pkg_dohtml -r docs/*
+	fi
+}