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.

(Portage version: 2.1.4.1)

6 files changed, 149 insertions, 12 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/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
+}