Bumped to latest release. Introduced new java5/java6 use flags to control jdk versions and codebase shifts for jdbc driver versions. Fix for bug # 176775.

Package-Manager: portage-2.1.4.1

7 files changed, 156 insertions, 16 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 818c1acf1f4f..317817861d2e 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,16 @@
 # 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.23 2008/01/10 22:34:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.24 2008/02/13 20:11:50 wltjr Exp $
+
+*jdbc-jaybird-2.1.2 (13 Feb 2008)
+
+  13 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/compile_xml-2.1.2.patch, jdbc-jaybird-2.0.1.ebuild,
+  jdbc-jaybird-2.1.0.ebuild, jdbc-jaybird-2.1.0-r1.ebuild,
+  +jdbc-jaybird-2.1.2.ebuild:
+  Bumped to latest release. Introduced new java5/java6 use flags to control
+  jdk versions and codebase shifts for jdbc driver versions. Fix for bug #
+  176775.
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   jdbc-jaybird-2.0.1.ebuild, jdbc-jaybird-2.1.0.ebuild,
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index de8af3b22698..c867678db594 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -2,11 +2,14 @@ AUX archive-xml-2.0.1.patch 387 RMD160 7cfbbf7027cb80ed0f75fd6d3fee55735f1cd497
 AUX archive-xml-2.1.0.patch 399 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c SHA1 5bdf1fef96ce163cc90a8c6836ac3c9fc9f33f14 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a
 AUX compile-xml-2.0.1.patch 2905 RMD160 d5b616b649d284d99336232ed153d5c89e79db69 SHA1 1bbc825d884f19ae5e04d57fab9283f8a453cf01 SHA256 6305741ff6808857ceabd53c0c1578b218e954c531e8617e40c265ba5637f14c
 AUX compile-xml-2.1.0.patch 765 RMD160 6c05eda9ae904d06d8adb0cbaaf8c72a1881c736 SHA1 4259d97a0beab831c0fc3dc28038980bdec42b54 SHA256 f06048766fe9d9e3daf3824fd0c78a3e03cafc5de68e8a0c05d576170f499079
+AUX compile_xml-2.1.2.patch 892 RMD160 82f69ec15d1b1b13a9fc01ef14a956a368738f49 SHA1 2340cafff9e86bc6827a2749dcd367d5b16652d6 SHA256 dcf1f38895dbe194532ee4f10f47aa1736db50d9689bea6625328339cda24a97
 AUX dist-xml-2.0.1.patch 377 RMD160 8b385d472e126a5994a7862a5dbe304cf304932b SHA1 2714eacc7511394f663abcf5cbae29904a4d9f4e SHA256 dad962de758f785af7e0b4731a70ca2f32dc74acd5028572f93b4aa957d4a1dd
 DIST JayBird-2.0.1-src.zip 4899770 RMD160 50e3fb99668ca08116fec3838892e1e6ff4b8e7d SHA1 21adf4a88660c10f7afb2daddec2c4826d068fd7 SHA256 ad3d6ad4199419752281c0e11f445fd109542499d162b5356e98e6eceb25a914
 DIST Jaybird-2.1.0-src.zip 5004088 RMD160 1066f39a393ff14812c907c38aeb094c407114da SHA1 a99c4b0ed90ff1252d6f5b076bfad8087eda6faf SHA256 a96cff648af0ef01b48e3471525d2447a76015e609bbf81a54c372d2963e0214
-EBUILD jdbc-jaybird-2.0.1.ebuild 2834 RMD160 92e769e4756ffd2885805d1e56b465d361ae6448 SHA1 e51f0610eed6c76be6fa33e8c6d3e36285564587 SHA256 d9fd3dffef6b0bca82972e5d1bcfdd5e5d55f59c1bdc51c3869b0adf58d5d631
-EBUILD jdbc-jaybird-2.1.0-r1.ebuild 2823 RMD160 9782370f6e4d32497842e3e12328dbf3a6b840f6 SHA1 41ce526f85fea33405133f15185e17888613ef1b SHA256 5fbf591deb57df5ade4cd8c03c552c0995b8554f16b85ec2ff47b5f634b79194
-EBUILD jdbc-jaybird-2.1.0.ebuild 2629 RMD160 bf39b3cd854b17e20721beeac826588d7a54e4bf SHA1 7ffee257896d814bbb080e2f0740ebdc786e822b SHA256 5e3c4fab1b692c9af2940c6079cb6d71e99a40a7820d18e05619a4cb70ceb590
-MISC ChangeLog 4548 RMD160 ed2ca97e8e9bcc5eefaa2839dc1838d753f71014 SHA1 f4b5a93f12b4a4d4a1388fcd75ac54af19b1c7d3 SHA256 4787426dbedda191c344f3f36a13ac28bb91b59efd79b61451ab66c1e34e52ac
+DIST Jaybird-2.1.2-src.zip 5835474 RMD160 089e606c073e43d247b8ec121955bcd3b9367ae7 SHA1 8c614373dd18ca05d5de1ae31dd7a955097517ac SHA256 fde4ce32e3bbedb6f2953c541b8d5d94ddeeb6f7aeaf38f3f9dd186f8925612c
+EBUILD jdbc-jaybird-2.0.1.ebuild 2837 RMD160 2c127d8b1625d64754fa18311868b0c6314452eb SHA1 cddf0e6ec30a5d459343bc8f5b3f120b1d4fcc52 SHA256 d5c2cc16f392fd01f366f99f69b40c5c99e3e412bf11f57e9f41bc5570b2035d
+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
+MISC ChangeLog 4951 RMD160 76bb9a8ee692ab14a100bfdbcde445b4376c3217 SHA1 cc17f86fe76d6e38af30fd72f05c202615fefd48 SHA256 492f14339051aed81c214b6132c34b6f4c29d0d7fa0fb60f892bb7e0350f7afc
 MISC metadata.xml 428 RMD160 2c8aa4639fd5675819c5a105d24fbc538f9bb471 SHA1 76b3cd6dba37cfabeb1ef69314b1e05b8cd7bd12 SHA256 8c5b2d28256190682037a14b86a7d4a29d2b79671ccde3631c1eb5d656223091
diff --git a/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
new file mode 100644
index 000000000000..d66e7bf40049
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/compile_xml-2.1.2.patch
@@ -0,0 +1,21 @@
+diff -Naur client-java_orig/build/compile.xml client-java/build/compile.xml
+--- client-java_orig/build/compile.xml	2008-02-07 20:46:24.000000000 -0500
++++ client-java/build/compile.xml	2008-02-13 14:46:08.000000000 -0500
+@@ -13,7 +13,7 @@
+     <ant antfile="build_native.xml"/>

+   </target>

+  

+-  <target name="compile-examples">

++  <target name="compile-examples" if="examples">

+   	<mkdir dir="${build.examples}"/>

+     <javac srcdir="${source.examples}"

+            destdir="${build.examples}"

+@@ -154,7 +154,7 @@
+     </path>

+   </target>

+ 

+-  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test">

++  <target name="compile-tests" depends="compile-pool,set-jdbc-20-test,set-jdbc-30-test,set-jdbc-30-test" if="tests">

+     <mkdir dir="${build.test}"/>

+     <javac srcdir="${source.test}"

+            destdir="${build.test}"

diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
index b1e306b37c62..99cd56ca9c7a 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.1.ebuild,v 1.15 2008/01/10 22:34:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.16 2008/02/13 20:11:50 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -47,9 +47,9 @@ src_unpack() {
 
 	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}"
+	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}"
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
 
 	java-pkg_jar-from log4j log4j.jar log4j-core.jar
 }
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
index 8a7525b28148..966d697ae50f 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0-r1.ebuild,v 1.8 2008/01/10 22:34:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.9 2008/02/13 20:11:50 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source examples test"
 
@@ -35,7 +35,7 @@ MY_PN="jaybird"
 JAVA_PKG_BSFIX="off"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/archive-xml-${PV}.patch"
@@ -47,9 +47,9 @@ src_unpack() {
 
 	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}"
+	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}"
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
 
 	java-pkg_jar-from log4j log4j.jar log4j-core.jar
 }
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
index c62c9c9f18fe..1edebe5aba41 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.0.ebuild,v 1.13 2008/01/10 22:34:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.14 2008/02/13 20:11:50 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -31,7 +31,7 @@ S="${WORKDIR}/client-java"
 MY_PN="jaybird"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/archive-xml-${PV}.patch"
@@ -43,9 +43,9 @@ src_unpack() {
 
 	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}"
+	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}"
+	mv "${T}"/mini-j2ee.jar . || die "Failed to move mini-j2ee.jar back from ${T}"
 
 	java-pkg_jar-from log4j log4j.jar log4j-core.jar
 }
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild
new file mode 100644
index 000000000000..9381a264fd42
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 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.2.ebuild,v 1.1 2008/02/13 20:11:50 wltjr 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 java5 java6"
+
+RDEPEND="java6? ( =virtual/jre-1.6* )
+	java5? ( =virtual/jre-1.5* )
+	!java6? ( !java5? ( =virtual/jre-1.4* ) )
+	dev-java/log4j"
+DEPEND="java6? ( =virtual/jdk-1.6* )
+	java5? ( =virtual/jdk-1.5* )
+	!java6? ( !java5? ( =virtual/jdk-1.4* ) )
+	app-arch/unzip
+	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-${PV}.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}"
+
+	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
+}