Added jni use flag to 2.0.1 and 2.1.0 to control building of the native parts, the JDBC type 2 native part. Brought over 1.5.x from jdbc*-firebird, to prepare for that package removal/move.

(Portage version: 2.1.2_rc3-r1)

7 files changed, 252 insertions, 1 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index b85d6ffbfeff..9fb2a8d2d346 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/jdbc-jaybird
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.11 2006/11/08 07:55:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.12 2006/12/10 20:15:17 wltjr Exp $
+
+*jdbc-jaybird-2.1.0-r1 (10 Dec 2006)
+*jdbc-jaybird-2.0.1-r1 (10 Dec 2006)
+*jdbc-jaybird-1.5.6 (10 Dec 2006)
+
+  10 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +jdbc-jaybird-1.5.6.ebuild, +jdbc-jaybird-2.0.1-r1.ebuild,
+  +jdbc-jaybird-2.1.0-r1.ebuild:
+  Added jni use flag to 2.0.1 and 2.1.0 to control building of the native
+  parts, the JDBC type 2 native part. Brought over 1.5.x from jdbc*-firebird,
+  to prepare for that package removal/move.
 
   08 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
   jdbc-jaybird-2.1.0.ebuild:
diff --git a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6 b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
new file mode 100644
index 000000000000..73ad0522cb95
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
@@ -0,0 +1,3 @@
+MD5 f2eced657ef63465226560e0101bbdc1 FirebirdSQL-1.5.6JDK_1.4.zip 2747362
+RMD160 6648bd21c8a7cd0764edc1f8b3b591cad74ab972 FirebirdSQL-1.5.6JDK_1.4.zip 2747362
+SHA256 9eb1f53084692028461b0a13de490fc909352c2f3b32ae0fd5d5cbabda905f7d FirebirdSQL-1.5.6JDK_1.4.zip 2747362
diff --git a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.0.1-r1 b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.0.1-r1
new file mode 100644
index 000000000000..284bfa8de430
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.0.1-r1
@@ -0,0 +1,3 @@
+MD5 fc2b2f24c0998d736bd68d0bd0e2059f JayBird-2.0.1-src.zip 4899770
+RMD160 50e3fb99668ca08116fec3838892e1e6ff4b8e7d JayBird-2.0.1-src.zip 4899770
+SHA256 ad3d6ad4199419752281c0e11f445fd109542499d162b5356e98e6eceb25a914 JayBird-2.0.1-src.zip 4899770
diff --git a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.1.0-r1 b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.1.0-r1
new file mode 100644
index 000000000000..acdd35a63695
--- /dev/null
+++ b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-2.1.0-r1
@@ -0,0 +1,3 @@
+MD5 a1b30781c7d0d9918ae599058e769f34 Jaybird-2.1.0-src.zip 5004088
+RMD160 1066f39a393ff14812c907c38aeb094c407114da Jaybird-2.1.0-src.zip 5004088
+SHA256 a96cff648af0ef01b48e3471525d2447a76015e609bbf81a54c372d2963e0214 Jaybird-2.1.0-src.zip 5004088
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
new file mode 100644
index 000000000000..54e774663139
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild,v 1.1 2006/12/10 20:15:17 wltjr Exp $
+
+inherit java-pkg-2
+
+MY_P="FirebirdSQL-${PV}JDK_1.4"
+DESCRIPTION="JDBC Type 4 driver for Firebird SQL server"
+HOMEPAGE="http://jaybirdwiki.firebirdsql.org/"
+SRC_URI="mirror://sourceforge/firebird/${MY_P}.zip"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="doc"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	app-arch/unzip"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )"
+S=${WORKDIR}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	use doc && java-pkg_dohtml -r docs/
+	dodoc ChangeLog release_notes.html
+}
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..4c03a45ca7e7
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/12/10 20:15:17 wltjr Exp $
+
+inherit eutils java-pkg-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 ~x86"
+IUSE="doc examples jni source test"
+
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+		dev-java/log4j"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+		app-arch/unzip
+		dev-java/log4j
+		jni? ( dev-java/cpptasks )
+		test? (
+			dev-java/junit
+			dev-java/ant
+		)
+		!test? ( dev-java/ant-core )
+		source? ( app-arch/zip )"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="jaybird"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# make compiling of tests and examples optional, fix source/target
+	# disable checking for jdk version - default all to 1.4
+	# note that java-ant-2.eclass xml rewriting breaks here
+	epatch "${FILESDIR}/archive-xml-${PV}.patch"
+	epatch "${FILESDIR}/compile-xml-${PV}.patch"
+	epatch "${FILESDIR}/dist-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() {
+	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 libjaybird2.so || die \
+			"java-pkg_doso ${sodest}libjaybird2.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_dojavadoc docs
+	dodoc etc/FAQ.txt
+	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."
+	eant all-tests-pure-java
+}
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
new file mode 100644
index 000000000000..c41f9604f955
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 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.1 2006/12/10 20:15:17 wltjr Exp $
+
+inherit eutils java-pkg-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 ~x86"
+IUSE="doc examples jni source test"
+
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.5* )
+		dev-java/log4j"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+		app-arch/unzip
+		dev-java/log4j
+		jni? ( dev-java/cpptasks )
+		test? (
+			dev-java/junit
+			dev-java/ant
+		)
+		!test? ( dev-java/ant-core )
+		source? ( app-arch/zip )"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="jaybird"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/archive-xml-${PV}.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() {
+	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."
+	eant all-tests-pure-java
+}