Do the same with 5.1.10, might help bug #292876 as well.

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

4 files changed, 14 insertions, 31 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 700879610bfb..3e6074c63762 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.67 2010/02/12 22:55:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.68 2010/02/12 23:07:40 caster Exp $
+
+  12 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  -files/5.1.6-java6-detection.patch, jdbc-mysql-5.1.10.ebuild:
+  Do the same with 5.1.10, might help bug #292876 as well.
 
   12 Feb 2010; Vlastimil Babka <caster@gentoo.org> jdbc-mysql-5.1.6.ebuild:
   Fix compilation with ibm-jdk-bin-1.6, mentioned in bug #284299.
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index b6ebfe49cadd..b1626a952b8c 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,12 +1,11 @@
 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 do-not-filter-png.diff 563 RMD160 07f7a15de30cce2dacc69f464a20e14a6066cb25 SHA1 d14612765737abfed8fb9b17fee95a77080e969c SHA256 6569ae305cc433a3bf8211dc743b341a16ba244f514d2ec84856e2e3e890635c
 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-5.0.8.ebuild 1877 RMD160 549095e41b5f03cdf0620349136f865fa4c407a8 SHA1 f56dc4dd05b6d9f8817625ad284603ef9afe027c SHA256 3f729bab450b6ad7aa1df43b2270c5fcee18e710ab30cc14bb6ad93ee139f3de
-EBUILD jdbc-mysql-5.1.10.ebuild 2467 RMD160 37b5b83f640e8dec4a00c97bae127ac53ecde406 SHA1 aad06bfe58a7ed079530aabe1adf937486f72de8 SHA256 10128b3a327e04045c3ae6b66277644e3429c1032c68aeaa61796bd70a3121c8
+EBUILD jdbc-mysql-5.1.10.ebuild 2537 RMD160 27e55621e3b53486a2cc60ee6b16011f3d1d0790 SHA1 eb9e224426c29011c26b261d16cd7cb139c958e4 SHA256 0642d991ee946f0ed06f4f051457ea783ae9e3a993d2bf1ff65100f98b6a0e5a
 EBUILD jdbc-mysql-5.1.6.ebuild 2438 RMD160 f8fc4b3c39142a783653e0110d25a8a0d822010e SHA1 7c01fbce3063abcf72881badb4bbfe60de9028bc SHA256 1d3c31647fdb2226c1c994bab31f4a68309d71dfb7500e1d037f8603989ce6ea
-MISC ChangeLog 12905 RMD160 253de6fe9c294d8ba8bc3303c034e2e4e8513b1c SHA1 fdaf2295a5fa465ca8e93055ed1201eb103803ec SHA256 ea20ba4870a4095ef01dca4bd5d706bc19372ccc83107d20c1dda8630b878baa
+MISC ChangeLog 13080 RMD160 4270c683dd55bd92eaf037e1d819071b82d57dbe SHA1 9c037f178346e8624b2a3f36915a3021fa820234 SHA256 31b7386b789f67656f0818397a63b450ee6e5d8d704e0bf8bdc51319e503ed70
 MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4
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
deleted file mode 100644
index a388db104cb6..000000000000
--- a/dev-java/jdbc-mysql/files/5.1.6-java6-detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
index 8105b7ad88f2..c92b8f52f62a 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.10.ebuild,v 1.2 2009/12/28 14:17:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild,v 1.3 2010/02/12 23:07:40 caster Exp $
 
 JAVA_PKG_IUSE="source"
 WANT_ANT_TASKS="ant-contrib"
@@ -40,7 +40,9 @@ src_unpack() {
 	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"
+
+	# checks fail if java6 bootclasspath is not a single jar
+	sed -i 's/depends="-compiler-check, /depends="/' build.xml || die
 
 	rm -v *.jar || die
 
@@ -61,10 +63,10 @@ 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
+	local rt=$(GENTOO_VM="${vm}" java-config -g BOOTCLASSPATH)
 	einfo "Using ${vm} to compile the JDBC4 driver"
 	einfo "javac: ${javac}"
-	einfo "rt.jar: ${rt}"
+	einfo "bootclasspath: ${rt}"
 	java-pkg-2_src_compile \
 		-Dcom.mysql.jdbc.java6.javac="${javac}" \
 		-Dcom.mysql.jdbc.java6.rtjar="${rt}"