Version bump, bug #290456. Remove old.

(Portage version: 2.2_rc48/cvs/Linux x86_64)

5 files changed, 37 insertions, 106 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 689b69fa110f..b864dbf59da1 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.63 2009/09/11 22:07:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.64 2009/11/03 20:14:33 caster Exp $
+
+*jdbc-mysql-5.1.10 (03 Nov 2009)
+
+  03 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -files/compile-without-log4j.patch, -jdbc-mysql-3.1.13-r5.ebuild,
+  -jdbc-mysql-5.0.6.ebuild, +jdbc-mysql-5.1.10.ebuild,
+  -files/no-testsuite.diff:
+  Version bump, bug #290456. Remove old.
 
   11 Sep 2009; Markus Meier <maekke@gentoo.org> jdbc-mysql-5.1.6.ebuild:
   amd64/x86 stable, bug #284299
diff --git a/dev-java/jdbc-mysql/files/compile-without-log4j.patch b/dev-java/jdbc-mysql/files/compile-without-log4j.patch
deleted file mode 100644
index 48d78338719a..000000000000
--- a/dev-java/jdbc-mysql/files/compile-without-log4j.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/com/mysql/jdbc/ConnectionProperties.java.orig	2005-07-10 20:42:46.000000000 +0200
-+++ src/com/mysql/jdbc/ConnectionProperties.java	2005-07-10 20:43:16.000000000 +0200
-@@ -26,7 +26,6 @@
- 
- import com.mysql.jdbc.log.Jdk14Logger;
- import com.mysql.jdbc.log.Log;
--import com.mysql.jdbc.log.Log4JLogger;
- import com.mysql.jdbc.log.StandardLogger;
- 
- import java.io.UnsupportedEncodingException;
-@@ -2392,7 +2391,7 @@
- 				try {
- 					// Is Log4J available?
- 					Class.forName("org.apache.log4j.Level");
--					setLogger(Log4JLogger.class.getName());
-+					setLogger("com.mysql.jdbc.log.Log4JLogger");
- 				} catch (Throwable t) {
- 					try {
- 						// Are we running on JDK-1.4?
diff --git a/dev-java/jdbc-mysql/files/no-testsuite.diff b/dev-java/jdbc-mysql/files/no-testsuite.diff
deleted file mode 100644
index 43ae12f692b0..000000000000
--- a/dev-java/jdbc-mysql/files/no-testsuite.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-connector-java-3.1.13/build.xml.orig	2006-07-20 19:26:47.000000000 +0200
-+++ mysql-connector-java-3.1.13/build.xml	2006-07-20 19:26:59.000000000 +0200
-@@ -522,7 +522,7 @@
- 	</target>
- 
- 
--	<target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration"
-+	<target name="compile" depends="init, -commercial-license, compile-driver, compile.integration"
- 		description="Compiles the driver, testsuite, and integration classes.">
- 	</target>
- 
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild
deleted file mode 100644
index dfc61f555423..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild,v 1.5 2007/06/02 21:49:43 betelgeuse Exp $
-
-JAVA_PKG_IUSE="source"
-
-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"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="c3p0 test"
-COMMON_DEP="
-	dev-java/log4j
-	c3p0? ( dev-java/c3p0 )
-	dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-# FIXME doesn't like Java 1.6's JDBC API
-DEPEND="|| (
-		=virtual/jdk-1.5*
-		=virtual/jdk-1.4*
-	)
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# gcj hangs, but works for others -> why regexp over pictures?!
-	epatch ${FILESDIR}/do-not-filter-png.diff
-	# com.sun.* classes are used during testing
-	! use test && epatch ${FILESDIR}/no-testsuite.diff
-	rm -v *.jar || die
-
-	sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed"
-
-	mkdir src/lib-nodist # needed, or ant will fail
-	cd src/lib
-	rm -v *.jar || die
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-EANT_BUILD_TARGET="dist"
-
-#TODO add src_test
-
-src_install() {
-	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES || die
-	use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.0.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
index 0b0d621946e6..ba13fc96622e 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.0.6.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.0.6.ebuild,v 1.7 2007/10/07 14:18:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild,v 1.1 2009/11/03 20:14:33 caster Exp $
 
 JAVA_PKG_IUSE="source"
 WANT_ANT_TASKS="ant-contrib"
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="c3p0 log4j"
 COMMON_DEP="
 	log4j? ( dev-java/log4j )
@@ -23,11 +23,12 @@ COMMON_DEP="
 	dev-java/commons-logging"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEP}"
-# FIXME doesn't like Java 1.6's JDBC API
-DEPEND="|| (
-		=virtual/jdk-1.5*
-		=virtual/jdk-1.4*
-	)
+
+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}"
@@ -36,15 +37,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# gcj hangs, but works for others -> why regexp over pictures?!
-	epatch "${FILESDIR}/do-not-filter-png.diff"
 	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 debug/*.jar || die
-
-	java-ant_ignore-system-classes
+	rm -v *.jar || die
 
 	# use test && mkdir src/lib-nodist # needed, or ant will fail
 
@@ -55,8 +53,23 @@ src_unpack() {
 	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() {
@@ -67,7 +80,8 @@ src_test() {
 }
 
 src_install() {
-	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
+	# 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