Version bump courtesy of William L. Thomson Jr. <wlt@obsidian-studios.com>. Fix bug 547938.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 151 insertions, 4 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 46b559bfddbe..11eb993394a4 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jdbc-jaybird
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.34 2011/01/23 21:19:20 xarthisius Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.35 2015/05/15 21:05:39 monsieurp Exp $
+
+*jdbc-jaybird-2.2.7 (15 May 2015)
+
+  15 May 2015; Patrice Clement <monsieurp@gentoo.org>
+  +jdbc-jaybird-2.2.7.ebuild:
+  Version bump courtesy of William L. Thomson Jr. <wlt@obsidian-studios.com>.
+  Fix bug 547938.
 
   23 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   jdbc-jaybird-2.1.6.ebuild:
@@ -176,4 +183,3 @@
   19 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> ChangeLog:
   ChangeLog Initial ebuilds for Jaybird JDBC driver for Firebird SQL databases
   which will replace the existing jdbc(2-3)-firebird ebuilds.
-
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index fa46af2040b7..9e68b224409b 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,10 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.1.6-remove-unused-ant-import.patch 586 SHA256 7fbb207fd9405977e502a0050edd154389b8cf7b9dabf9fea73afa6fb40f992a SHA512 b9497322c0c1f8b628e68ed562587290230523c51da162d1ba55ade0f173d29c55098dc71783825fbd6ba42b2bb2c76590a81c1ac3a0ddab467c45ab62513d62 WHIRLPOOL 26aaf74a9b3f1b7410887454aa41f20ece38aa7afb9b36aec17c8578291b56ce1163947a45d5d62d5d5ee5993e9dad94e854778e922a894a1473ac710f554a8f
 AUX archive-xml-2.1.0.patch 399 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a SHA512 3df81880ca13bf2589da303c18199281913829f6ab5c27f04c5458597209977c8ec7b9a9f7eb35b77b5e07b678ec17a2f668c3c0e0f372505af0ea91f2cf07fd WHIRLPOOL f2c57e550413d56fbd1f784d3edf0068e310a9f1d5703b3194b0a931f73e3491149772a09c6ec3ad60df302f5cb1a0183db93ea7080181e30d77f413c409f5bd
 AUX compile_xml-2.1.2.patch 892 SHA256 dcf1f38895dbe194532ee4f10f47aa1736db50d9689bea6625328339cda24a97 SHA512 4ee9107111d750754361283713ca0191700d3a8ca484e73f0d9472ab59e2b876b91508ca82e5e489906765c64cd70790c2dcc9c4c75740538f0563806116b69a WHIRLPOOL e6131868bfe086ad7f61f920f3c912162be26dcbbeb4fc2574d145a0592ce96b6e5f3b6a8352ab7ffcfe1d0d9371e9fae1c04d5594f9bc959c51b1c4240708d1
 DIST Jaybird-2.1.5-src.zip 6047595 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868 SHA512 e6d7eb70cf59d5d9a2dd7817bc11574ba5f014f2aae6cb6c4b141e7d0a172cf091b950e3475ee5d4389f3ca3efae3f34ed1efbc694b74a2a99adc2694c936a7e WHIRLPOOL ca5e3fedce5f13a00ea37f946f9f0141d3132ea3b9209623961b32868946dd0e36621d0280716263031bc02dbcc7f8cd80de29da5e0235127d9c0d9e4deea54e
 DIST Jaybird-2.1.6-src.zip 5849860 SHA256 819d47e37b91d0ea23f8b043d504a00f5b19d207d80556f2bf465abf1e50fa48 SHA512 756ad70e3eb7c80d59afffba132c207310c2e9346c6f08b6a023305db36fd46a351c33259ca7d73eff853e9f7ff2245234297de33c7d9042fe87c3a8df204014 WHIRLPOOL aa1c4bd03373dd7671c5d15db4210e1ccd319b41fd0259033944d1cfa75dac17a22293cf25a4c922dc17f4649ca4315d6136a878e1dad758664db7e6e03019ad
+DIST Jaybird-2.2.7-src.tar.gz 9548804 SHA256 ff88c4b2297b153a9693bc6fd57761f6c0472518f12dcd5892cf72e31721cbad SHA512 53a5fb13f82f57cb1dd1febba81cb43d92dabe4973b4cb0df185188e3a48bbb0a206132297759459708b2e44d155f5936015f547fed834f7cc2287d5aa423f22 WHIRLPOOL 0297f49d2c866ba2dbd250fea5f928d2e04cbab4f22497c4d12449295054ba33d109e21260ab6cf0bdf41b8cfbb539018994432c4e8f418bfe10cb46322edaf7
 EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2575 SHA256 7621c378815806714d931f2ecac04a3a6d63ece22beaf7dca39a62b4a226ef08 SHA512 0726cc93606b84339e399c4baa997a4611e71e5b22f83f4ec37b4a9db62d11f68280daa774199c350eb49355c04f5dc04f3d17aa7f031b42996f951e338715d8 WHIRLPOOL 3065d737763df8ed1aa1b028df0fb34dfc4b7aa631827cbb0845b7fa9bceb6bd2460261e7426e25f13f862b70b0370c288dafe23aaddc633d7b29fb0c373abdc
 EBUILD jdbc-jaybird-2.1.5-r2.ebuild 2984 SHA256 1912c2c650c967663146f1dd34dc62b479814d2317330307eea2523caf94013e SHA512 173dc5b3a862af51b4409b7ac1ad83ca2ecd6245bacd013b589a22848fb672414dc5d172075e5ef9bdb169d183d55890ddee792e6fa00b1c7220b1496f27e5be WHIRLPOOL f2dd45c7c9eae4f143454ad23e1efac6e7fbeb0b32b93591fd76902d970edb5920324b8ddd7cc19619e44834d8fefdd7c254e04752b951ee0f3b43492ea9c508
 EBUILD jdbc-jaybird-2.1.6.ebuild 2886 SHA256 f40c30de4c5896cc7c682e482b7dd7b19f43522a168c37f1b5f4ba26f6059317 SHA512 b97441622126e5a1660ceffd176dfe5c13d61eb82909634f0856ce52df3ff5f6a14507d2983a0cd6d6c9d009c890cd933b6751c51e189dd650ba4ca6403e4c8c WHIRLPOOL e711c3014203cc8040704af26e0d7290244096cc2231b9cd1348180027776f38b36ad2ab5c4b960007f95ef7a7a56f4e42c3f7e4cc42c4bbee00c617c4176bc8
-MISC ChangeLog 6788 SHA256 ee5d98795a33bb15c997244e7db08f6c410502f70389281d94c4c3ea7f86d799 SHA512 8dc8ab94315099158a75be7e1f3f675ebf063f043e16203f2ecdf92de0229c29b35d9f92477d41cc2fb4097c11078bad08712a9d8339d2c6dfe302cafccfc0cd WHIRLPOOL 0e232fe49c6fa494e07a091a85de663fe452a86f8df555a06f47b80bb20a433e3a2a67a8c5cdfec613a8a9fc7f145e66b8cda2dd9e21daddab6b791985368764
+EBUILD jdbc-jaybird-2.2.7.ebuild 3403 SHA256 b93d128788ebcd9efee468b00174d056562621342c5ee83a01f3f4a145085291 SHA512 cffe9eef20ff6995290002211cc4fe7bb8543b803e0aef37fb16493e6ae095b7a64b1daf02798a35959bc1b311af34efc5d18661c24a0305ad3ec2950f6364e6 WHIRLPOOL f48651cf71c1eabe8eb5db493609625bdfcbd34d151db04393f4ce2d63c62f4c83b30055e0261dbbf5caa60ce2699837a712d2b7b4a216ab51811384dc12045c
+MISC ChangeLog 7002 SHA256 fa87e3c143deebc42164bad9f343b826a46785929c2f82e19c1fe8c6b4db3866 SHA512 9bac4ec2839dce3fb7eaf7bf9d432608232abd803fac23a2b6c2679e731a49306b937e312993022a2e8408ad3f416760a61cf2816978a475987c7fd36d9d3071 WHIRLPOOL 10713eb24763143c918363c6f5df9d0b05b74865190e3e847fc1e62ea5526ca244c428f503760a67aa609b2dcc160120fe3b57fbe457a0568c8f24e856365c20
 MISC metadata.xml 414 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4 SHA512 84ffe94d59fb0bff0fd0b47254d68c3a94adab8d1fc849c5754ac33082d70d04f837b492b47da5c01c63f8f1f212d1cf53185a30b265c194fd97cd394967b06c WHIRLPOOL 206f0341af8a5bf9a6183634bb9f644481e8fb6ee56fcd9a5d8c8400028f0770545297d2634aa4f2562253021ccdd5167d3c7d309058d6dc9d40f482e2bf03e8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVVl9HAAoJEJGRpfGTSRu4YMsIAKghZ7gNEDbQ4RPX+k1iwk8C
+h4gT3p46Eb8T+zZejGBXh7QqZuKgf1CzUpzeWE/dpGrmi8EHXhi/FVtBpgRlVFUs
+yG1/SFTlmQCAjHOqBm/lKKFPuJ7AtMP6NR0jSqZ8+dFhSz6Xp6VsEcWh7RMiFkh2
+f8mtVhkY8qAjjj5T0KY4mT3zzPRdkraMwIl/pyyZZP/RbAHxyZraAkONY36JJZWr
+ernlVX9dqKA/Wdr4DdfhdXrvgEaLgLpPeyjy+W/EmvE7YAuVBTxUaB8SPKRmuP/r
++dbfa2pFOTVBAjj8P8AxCGkJ4BdU5tCiHg9s2ObiY2ts92lX6Vb+KIdHqbSCQ90=
+=BWeu
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
new file mode 100644
index 000000000000..3c7c65709ce7
--- /dev/null
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.2.7.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 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.2.7.ebuild,v 1.1 2015/05/15 21:05:39 monsieurp Exp $
+
+EAPI="5"
+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}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jni"
+
+RDEPEND=">=virtual/jre-1.6
+	dev-java/junit:4
+	dev-java/antlr:4
+	dev-java/log4j:0
+	dev-java/glassfish-connector-api:0"
+DEPEND=">=virtual/jdk-1.6
+	${RDEPEND}
+	app-arch/unzip
+	jni? ( dev-java/cpptasks )
+	test? ( dev-java/ant-junit:0 )"
+
+S="${WORKDIR}/${At}"
+
+MY_PN="jaybird"
+
+java_prepare() {
+	# prevent test/sources/javadoc from being built unless wanted
+	sed -i -e 's|name="jar-test" depends="compile"|name="jar-test" depends="compile" if="tests"|' \
+		"${S}/build/archive.xml" || die
+	sed -i -e 's|name="compile-examples"|name="compile-examples" if="examples"|' \
+		-e 's|,set-jdbc-42-test"|,set-jdbc-42-test" if="tests"|' \
+		"${S}/build/compile.xml" || die
+
+	# JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+	java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
+	cd "${S}/lib/"
+	rm -v *.jar
+
+	cd "${S}/src/lib/"
+	rm -v *.jar *.zip
+
+	java-pkg_jar-from --build-only glassfish-connector-api \
+		glassfish-connector-api.jar connector-api-1.5.jar
+
+	# the build.xml unpacks this and uses stuff
+	touch empty
+	jar cf mini-j2ee.jar empty
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="antlr:4,glassfish-connector-api,log4j"
+EANT_BUILD_TARGET="jars"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+	use jni && ANT_TASKS="cpptasks"
+
+	# This is nonsense, I know, but it works.
+	if use test; then
+		EANT_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+	fi
+
+	java-pkg-2_src_compile $(use test && echo "-Dtests=true") \
+		$(use jni && echo "compile-native")
+}
+
+src_install() {
+	cd "${S}/output/lib/"
+	java-pkg_newjar ${MY_PN}-${PV}.jar ${PN}.jar
+
+	for jar in full; 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/"
+		local so_arch
+		if use amd64; then
+			so_arch="x64"
+		elif use x86; then
+			so_arch="x86"
+		fi
+		java-pkg_doso libjaybird22_${so_arch}.so || die \
+			"java-pkg_doso ${sodest}libjaybird22.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/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
+}