Version bump, bug #290456. Remove old.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

6 files changed, 40 insertions, 123 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/Manifest b/dev-java/jdbc-mysql/Manifest
index 04a9fc1e4c29..35316c2d64e0 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,26 +1,12 @@
------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.10.tar.gz 3666173 RMD160 ef5b6cf4cceaac0c6d32858920c362bab6004bc1 SHA1 32938f3004c70a657a7481496bc3813b85df20de SHA256 d156857f85737d7cca5d8ab9ba77e2809756c94b2e9a40bc333e08a00da8e1e8
 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
+EBUILD jdbc-mysql-5.1.10.ebuild 2368 RMD160 d0f38566b0f22d79103c3ef545af51026ed02e45 SHA1 fd7c8553c3d9c8ac16dded23b56c20c40d5cecce SHA256 e91cdb1766c29874ce01bbc23ba7780f52acc5f48949abd0ded4ca4601950818
 EBUILD jdbc-mysql-5.1.6.ebuild 2365 RMD160 676ce3ea4ce6652e4c6fdd7ab5010dae14773bf0 SHA1 f223f965484f0ef647a35e5f97ccb73f5714c0ee SHA256 64b388fb2f92c7387f296d76dad5cecd6e80eadf72253ec10d4e97f143250141
-MISC ChangeLog 12223 RMD160 426222c703dc3af1c033c398e2c19916f0abf60a SHA1 a4b509637f6133b6c9d80deb0e51dcf088f59d19 SHA256 6648339c4758ac8e1a0223666718c679740888c7bfaddb5e1f27d502d685f693
+MISC ChangeLog 12501 RMD160 70e738668c63ea67c8a1d8ab05200a76dbb843db SHA1 cba3cf70bd891e37c9e976a7e6e758aa9bfb7bd3 SHA256 c83c96b530b8c11df30085d5bb5066e36c6560c6a25e9d0e5000a15906284881
 MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqqylsACgkQkKaRLQcq0GJKkACeIiIu2N41ZprEgav07v3J6ZMg
-32cAni0jgp6CElNfLozHd/0p5UI1iPZY
-=e52d
------END PGP SIGNATURE-----
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