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

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686)

3 files changed, 118 insertions, 1 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/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
+}