Version bump. Provides a jdbc4 driver that is always built but optional at runtime so DEPEND on two different JDK versions. Fixes bug #215858.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

4 files changed, 132 insertions, 2 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 17eba13aa2d8..4e22c9acabcf 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.61 2008/03/21 02:23:42 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.62 2008/07/08 22:21:51 betelgeuse Exp $
+
+*jdbc-mysql-5.1.6 (08 Jul 2008)
+
+  08 Jul 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +files/5.1.6-java6-detection.patch, +jdbc-mysql-5.1.6.ebuild:
+  Version bump. Provides a jdbc4 driver that is always built but optional at
+  runtime so DEPEND on two different JDK versions. Fixes bug #215858.
 
   21 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> jdbc-mysql-5.0.8.ebuild:
   amd64 stable, bug #212649
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 8f7047dfbf79..44ae4780c6af 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,13 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 5.0.5-dist-target-depends.patch 380 RMD160 bfa3729e0797815cbcf5cd21617857b9e07212ef SHA1 30c4ac01f51b4af5f3d2e080ce227aa04771778b SHA256 42d4e0a8ac2217045116403bc34642aed78eb99210aa259a8dfd8663a2e5cc84
 AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 RMD160 4e611f9b47fb4f1b9aa4617dcac6a9f1e05b6d46 SHA1 444af4911e25fce4207119b9dcd3c9cd627da404 SHA256 8c7cfb3116baafda7c708c8cad05b63e15ea5027ce7804b268f8b245e1e1a199
+AUX 5.1.6-java6-detection.patch 627 RMD160 b66fa5201554395be8219d0c5d5f3ededa803e18 SHA1 d7375709249097cf215ecd1da3a8d0c10bbde23d SHA256 b1fed472fa8ead1659361b35bcf207aa2259fdeef8aa2beca843aac75f74d4c2
 AUX compile-without-log4j.patch 682 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc SHA1 e22c85b6ab0aefef5c1a6ac75d77571ccec0f176 SHA256 389c1b2c3467f39f52a7fb294ee88800431dd23e73a8ce165a04d0ee2d00a3db
 AUX do-not-filter-png.diff 563 RMD160 07f7a15de30cce2dacc69f464a20e14a6066cb25 SHA1 d14612765737abfed8fb9b17fee95a77080e969c SHA256 6569ae305cc433a3bf8211dc743b341a16ba244f514d2ec84856e2e3e890635c
 AUX no-testsuite.diff 501 RMD160 46641c802af3f3e38c89b6a5273f2f058a666347 SHA1 984e6cef8ac5481b3f39ed2d40d8f5ceeafe1b23 SHA256 7b99f9dfc9a4fc62edaded34ca0603f830c30dd752d1ffb7b804b3f8b6af207d
 DIST mysql-connector-java-3.1.13.tar.gz 10454933 RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 SHA1 09a0da29bc28b3cf0b1a78d0b3720ffdbb63073d SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f
 DIST mysql-connector-java-5.0.6.tar.gz 8555883 RMD160 13aa2c228f0ffe9a44dc7089f43e128f34179f3c SHA1 336b4e86fc8d4a58d44270f400506dd03f6a4d85 SHA256 96d8dc7d0081f09a4e2c70886114acffad5aafdd3f00acb80cec36475abc91b3
 DIST mysql-connector-java-5.0.8.tar.gz 8652406 RMD160 8aba23c16c4a7c955be052cdbbecce8ef4286ac8 SHA1 c76df144d24b4c654dd5417b9b18e094534acba8 SHA256 660a0e2a2c88a5fe65f1c5baadb20535095d367bc3688e7248a622f4e71ad68d
+DIST mysql-connector-java-5.1.6.tar.gz 8611213 RMD160 f3b3c48662f6d006a927bf96cb075d1eddc3b382 SHA1 3ebbab405e1578d165fe8910e3c23d808e6fcdd1 SHA256 9dd676f95c38a7adbf25fe0f34ce315e7620260888e15fb6efd26f3f9183f0ec
 EBUILD jdbc-mysql-3.1.13-r5.ebuild 1571 RMD160 fc1bd245f4a3134211bfdb84e4a9052baaba2968 SHA1 f6b756b662114c2853f44822587472780166d0e7 SHA256 ef7a3c99a448e2d1f7cbe70417e42b4660f16dd25ae1bcce6f3f23e05ca9d4cd
 EBUILD jdbc-mysql-5.0.6.ebuild 1876 RMD160 fc59b5adde42bfffb042bca406d484391e62c46e SHA1 2d834d5367ebbee251e2afcaf8cf17dd4401ac7d SHA256 249b6980235aa503f85a90ac84386e27fe08eb716584f9ed0d125e4ef09471cd
 EBUILD jdbc-mysql-5.0.8.ebuild 1877 RMD160 549095e41b5f03cdf0620349136f865fa4c407a8 SHA1 f56dc4dd05b6d9f8817625ad284603ef9afe027c SHA256 3f729bab450b6ad7aa1df43b2270c5fcee18e710ab30cc14bb6ad93ee139f3de
-MISC ChangeLog 11821 RMD160 04a1d3445400a39a656a0f612936ff7e0acd0c17 SHA1 413f14c518888a15cbd3f4e462725843d00fda61 SHA256 03b6ed5b3ec14168465a464c65ef85ce515e318f9461b4462f7deacc7fa31716
+EBUILD jdbc-mysql-5.1.6.ebuild 2371 RMD160 adc8a2228fe1e7ca3332f9ffbd724c9f9c810382 SHA1 9498ba6452dafa6c2c8956074b7da155fe273aaf SHA256 385a67f8df51d3da960f9671dbbb0d829ca188833b7c884a91794774c77cb81d
+MISC ChangeLog 12121 RMD160 a8a9d0b14b6bacdfe6e40c9ef001a54303ee739d SHA1 d9ccb6bd467d2749e3b530f35bd33c499c0b1d86 SHA256 e068aa92f3e6d7fa10cb203abb6ffcbf2922fc712cbbca8259b3d4d8f19fe453
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhz6IYACgkQcxLzpIGCsLRl6gCfarLmoj7QbGpSU/d81U3pizd2
+/p4AnRaDt6w99ed1VFdU+dZg/DbSd9iU
+=6VeG
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch b/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch
new file mode 100644
index 000000000000..a388db104cb6
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch
@@ -0,0 +1,22 @@
+Index: build.xml
+===================================================================
+--- build.xml	(revision 6792)
++++ build.xml	(working copy)
+@@ -97,7 +97,7 @@
+ 		
+ 	<target name="-compiler-check">
+ 		<if>
+-			<and>	
++			<or>	
+ 				<not>
+ 					<or>
+ 						<equals arg1="${ant.java.version}" arg2="1.4" />
+@@ -112,7 +112,7 @@
+ 						<available file="${com.mysql.jdbc.java6.rtjar}" />
+ 					</not>
+ 				</or>
+-			</and>
++			</or>
+ 			<then>
+ 				<echo>This version of MySQL Connector/J requires a compiler from Java-1.4 or Java-1.5 to be used, set your JAVA_HOME property to point to one of these versions of the JDK.
+ 							
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
new file mode 100644
index 000000000000..81f35cae4fce
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.1 2008/07/08 22:21:51 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source"
+WANT_ANT_TASKS="ant-contrib"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PN="mysql-connector-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL JDBC driver"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
+SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="c3p0 log4j"
+COMMON_DEP="
+	log4j? ( dev-java/log4j )
+	c3p0? ( dev-java/c3p0 )
+	dev-java/commons-logging"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_PKG_NV_DEPEND="
+	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )"
+
+DEPEND="${JAVA_PKG_NV_DEPEND}
+	>=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
+	# http://bugs.mysql.com/bug.php?id=28286
+	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
+	epatch "${FILESDIR}/5.1.6-java6-detection.patch"
+
+	rm -v *.jar || die
+
+	# use test && mkdir src/lib-nodist # needed, or ant will fail
+
+	cd src/lib
+	rm -v *.jar || die
+	java-pkg_jar-from commons-logging
+	use log4j && java-pkg_jar-from log4j
+	use c3p0 && java-pkg_jar-from c3p0
+}
+
+# Needs two different source/targets
+JAVA_PKG_BSFIX="off"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="dist"
+
+src_compile() {
+	local vm=$(depend-java-query -v ">=virtual/jdk-1.6")
+	local javac=$(GENTOO_VM="${vm}" java-config --javac)
+	local rt=$(GENTOO_VM="${vm}" java-config --jdk-home)/jre/lib/rt.jar
+	einfo "Using ${vm} to compile the JDBC4 driver"
+	einfo "javac: ${javac}"
+	einfo "rt.jar: ${rt}"
+	java-pkg-2_src_compile \
+		-Dcom.mysql.jdbc.java6.javac="${javac}" \
+		-Dcom.mysql.jdbc.java6.rtjar="${rt}"
+}
+
+# Tests need a mysql DB to exist
+RESTRICT="test"
+src_test() {
+	cd src/lib
+	java-pkg_jar-from junit
+	cd "${S}"
+	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
+}
+
+src_install() {
+	# Skip bytecode check because we want two versions there
+	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
+	dodoc README CHANGES || die
+	dohtml docs/*.html || die
+	use source && java-pkg_dosrc src/com src/org
+}