Revbump to remove java5 useflag, and default to java5.

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

3 files changed, 118 insertions, 3 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 8c5eae559b26..97b817b1f89d 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-jaybird
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.26 2008/12/08 02:27:29 jmbsvicetto Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.27 2009/10/03 21:00:21 caster Exp $
+
+*jdbc-jaybird-2.1.5-r1 (03 Oct 2009)
+
+  03 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  +jdbc-jaybird-2.1.5-r1.ebuild:
+  Revbump to remove java5 useflag, and default to java5.
 
   08 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml:
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index 385bb1b94c56..e2c6b3b14a00 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -12,6 +12,7 @@ EBUILD jdbc-jaybird-2.0.1.ebuild 2837 RMD160 2c127d8b1625d64754fa18311868b0c6314
 EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2824 RMD160 6ab2f83ae6f4aa17398a36b044b1b706ed97a02d SHA1 9ee0ff0673c8349491dc44012417d1667ee39c2f SHA256 c11f6a9161fa865dcfdebb219d1cfd924a0c88b03bbc1105817dc753840c5c40
 EBUILD jdbc-jaybird-2.1.0.ebuild 2630 RMD160 85592522b38e57a43ef14def193517610d4d50a8 SHA1 b4d7928557538d186b3bfe5b8931e1b82c0e34a2 SHA256 edb4e3c109cf06e8c41f74beca6a829928250106b55b8251924620f27d5d5e2e
 EBUILD jdbc-jaybird-2.1.2.ebuild 2853 RMD160 261881f7049ada3509eba8d61ab241d9afdd91a9 SHA1 abdb5bb38f1199e404298dafb69b26f49770e185 SHA256 197314c5a4d8aafbac92ecb62f9665aac3e0abd9a71ade71014499a9bc0d73e8
+EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2900 RMD160 5761392b614b74169a0c671c046fb523170f5884 SHA1 9d92dae42c45c64c03276ada1e70beedc5efe3db SHA256 4e635198398cfdb5ea0859cae076bd946f8c6bde98ee4e7236cf10b28b311b19
 EBUILD jdbc-jaybird-2.1.5.ebuild 2986 RMD160 c4e06210bd8c821d3f57cf8de755f3a7db36767b SHA1 8ec272a076de6cb9c0d9dc2ab02a4cc65e77b8d8 SHA256 21c9e420c3fff1f5f9a77d54f30c7fdacab10e2590caffe48b624584ed73cb6e
-MISC ChangeLog 5290 RMD160 38a1771273215d0ebf4413e5bc6ec30fa0a466e2 SHA1 331b1af5a9f749caedf53a9d5b572491e0386501 SHA256 84d72c8ece2eb8d5f5289f8257e5667382f2125b4742998bb8fc116194f98ca6
+MISC ChangeLog 5465 RMD160 4abbfdf3616d745ce81c14da33de768ea1f62c7e SHA1 91c73cb29c030b66e32d2caada81309840e9c89d SHA256 cd49533342abaa051158689f71807363517c60b063a3fd5c22a0fbfe4f239dcb
 MISC metadata.xml 414 RMD160 a7cdce874ba139f5314bcb45cf8393cc3fc01eb6 SHA1 162a57f24ec42e9204e70841d1a20a24ab8cdfc1 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..fbdd7210548f
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r1.ebuild,v 1.1 2009/10/03 21:00:21 caster Exp $
+
+JAVA_PKG_IUSE="doc source examples test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+At="Jaybird-${PV/_/}-src"
+DESCRIPTION="JDBC Type 2 and 4 drivers for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${At}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="jni java6"
+
+RDEPEND="java6? ( >=virtual/jre-1.6 )
+	!java6? ( >=virtual/jre-1.5 )
+	dev-java/ant-core
+	dev-java/log4j"
+DEPEND="java6? ( =virtual/jdk-1.6* )
+	!java6? ( =virtual/jdk-1.5* )
+	app-arch/unzip
+	dev-java/ant-core
+	dev-java/log4j
+	jni? ( dev-java/cpptasks )
+	test? (
+		=dev-java/junit-3.8*
+		dev-java/ant-junit
+	)"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="jaybird"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/archive-xml-2.1.0.patch"
+	epatch "${FILESDIR}/compile_xml-2.1.2.patch"
+
+	cd "${S}/lib/"
+	rm -v *.jar
+	use test && java-pkg_jar-from --build-only junit junit.jar
+
+	cd "${S}/src/lib/"
+	# the build.xml unpacks this and uses stuff
+	mv mini-j2ee.jar "${T}" || die "Failed to move mini-j2ee.jar to ${T}"
+	rm -v *.jar *.zip
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
+
+	# Hack to add ant.jar to classpath without patch
+	java-pkg_jar-from ant-core ant.jar jaas.jar
+	java-pkg_jar-from log4j log4j.jar log4j-core.jar
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	eant $(use test && echo "-Dtests=true") jars \
+		$(use jni && echo "compile-native") \
+		$(use_doc javadocs)
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full pool; do
+		java-pkg_newjar ${MY_PN}-${jar}-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	done
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test-${PV}.jar ${MY_PN}-${jar}.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar failed"
+	fi
+
+	if use jni; then
+		cd "${S}/output/native"
+		sodest="/usr/lib/"
+		java-pkg_doso libjaybird21.so || die \
+			"java-pkg_doso ${sodest}libjaybird21.so failed"
+	fi
+
+	cd "${S}"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples || die "installing examples failed"
+	fi
+
+	use source && java-pkg_dosrc "${S}"/src/*/org
+
+	cd "${S}/output"
+	use doc && java-pkg_dohtml -r docs/
+	dodoc etc/{*.txt,default.mf}
+	dohtml etc/*.html
+}
+
+src_test() {
+	#
+	# Warning about timeouts without Firebird installed and running Locally
+	#
+	ewarn "You will experience long timeouts when running junit tests"
+	ewarn "without Firebird installed and running locally. The tests will"
+	ewarn "complete without Firebird, but network timeouts prolong the"
+	ewarn "testing phase considerably."
+	ANT_TASKS="ant-junit" eant all-tests-pure-java
+}