Filtered jikes compiler due to compile issues. Accidentally brought over 1.5.6 -bin package. Corrected and changed to the compile from source version, and migrated to gen 2

(Portage version: 2.1.2-r1)

7 files changed, 104 insertions, 27 deletions

diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index 6e050ba90e2d..f74d48456cb5 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2007/01/05 00:35:58 wltjr Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.14 2007/01/26 16:19:38 wltjr Exp $
+
+  26 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  jdbc-jaybird-1.5.6.ebuild, jdbc-jaybird-2.0.1.ebuild,
+  jdbc-jaybird-2.0.1-r1.ebuild, jdbc-jaybird-2.1.0.ebuild,
+  jdbc-jaybird-2.1.0-r1.ebuild:
+  Filtered jikes compiler due to compile issues. Accidentally brought over
+  1.5.6 -bin package. Corrected and changed to the compile from source
+  version, and migrated to gen 2
 
   27 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
   jdbc-jaybird-1.5.6.ebuild, jdbc-jaybird-2.0.1.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
index 73ad0522cb95..7487cbbf439a 100644
--- a/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
+++ b/dev-java/jdbc-jaybird/files/digest-jdbc-jaybird-1.5.6
@@ -1,3 +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
+MD5 483cc4fe22c5febd8caf947b7fff9a21 FirebirdSQL-1.5.6-src.zip 5073013
+RMD160 95f855b67762d460d5ada06e7f7721cbfca9a0fc FirebirdSQL-1.5.6-src.zip 5073013
+SHA256 a442191e450aa348270157cf0a5ebd683e4249c9c8d187a65f635b540fed83e7 FirebirdSQL-1.5.6-src.zip 5073013
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
index 06aa967229f1..dfef1eebef5e 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild
@@ -1,25 +1,90 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2007/01/05 00:35:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-1.5.6.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $
 
-inherit java-pkg-2
+inherit eutils 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"
+At="FirebirdSQL-${PV}-src"
+DESCRIPTION="JDBC3 driver for Firebird SQL server"
+HOMEPAGE="http://firebird.sourceforge.net"
+SRC_URI="mirror://sourceforge/firebird/${At}.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}
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples test source"
+
+COMMON_DEPEND="dev-java/log4j
+				dev-java/concurrent-util"
+RDEPEND="|| ( =virtual/jre-1.3 =virtual/jre-1.4* )
+		${COMMON_DEPEND}"
+DEPEND="|| ( =virtual/jdk-1.3 =virtual/jdk-1.4* )
+		app-arch/unzip
+		test? (
+			dev-java/junit
+			dev-java/ant
+		)
+		!test? ( dev-java/ant-core )
+		source? ( app-arch/zip )
+		${COMMON_DEPEND}"
+
+S="${WORKDIR}/client-java"
+
+MY_PN="firebirdsql"
+
+pkg_setup() {
+	JAVA_PKG_WANT_SOURCE="1.2"
+	JAVA_PKG_WANT_TARGET="1.2"
+}
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}/lib/"
+	use test && java-pkg_jar-from --build-only junit junit.jar
+
+	cd "${S}/src/lib/"
+	rm *.jar *.zip
+	java-pkg_jar-from concurrent-util
+	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_doc javadocs)
+}
 
 src_install() {
+	cd "${S}/output/lib"
+	rm mini*.jar
 	java-pkg_dojar *.jar
 
+	if use test; then
+		java-pkg_newjar ${MY_PN}-test.jar || die "java-pkg_newjar ${MY_PN}-${jar}.jar 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
+
+	dodoc ChangeLog
+
+	cd "${S}/output"
 	use doc && java-pkg_dohtml -r docs/
-	dodoc ChangeLog release_notes.html
+	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
 }
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
index 3afc377f61ed..13145f69c99c 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2007/01/05 00:35:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1-r1.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -55,6 +55,7 @@ src_unpack() {
 }
 
 src_compile() {
+	java-pkg_filter-compiler jikes
 	eant $(use test && echo "-Dtests=true") jars \
 		$(use jni && echo "compile-native") \
 		$(use_doc javadocs)
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 856e5c7526bc..484f53c1f798 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.10 2007/01/05 00:35:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.0.1.ebuild,v 1.11 2007/01/26 16:19:38 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -56,6 +56,7 @@ src_unpack() {
 }
 
 src_compile() {
+	java-pkg_filter-compiler jikes
 	eant $(use test && echo "-Dtests=true") jars compile-native \
 		$(use_doc javadocs)
 }
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 17ca37485d67..a6023e4c37b6 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2007/01/05 00:35:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0-r1.ebuild,v 1.3 2007/01/26 16:19:38 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -51,6 +51,7 @@ src_unpack() {
 }
 
 src_compile() {
+	java-pkg_filter-compiler jikes
 	eant $(use test && echo "-Dtests=true") jars \
 		$(use jni && echo "compile-native") \
 		$(use_doc javadocs)
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 1240a9e076af..62c3deb5f548 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.8 2007/01/05 00:35:58 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.0.ebuild,v 1.9 2007/01/26 16:19:38 wltjr Exp $
 
 inherit eutils java-pkg-2
 
@@ -52,6 +52,7 @@ src_unpack() {
 }
 
 src_compile() {
+	java-pkg_filter-compiler jikes
 	eant $(use test && echo "-Dtests=true") jars compile-native \
 		$(use_doc javadocs)
 }