Version bump. Remove dependency on 1.5 JDK using bootclasspath magic, fixes bug #283848.

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

4 files changed, 123 insertions, 2 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 3e6074c63762..d539022e44e8 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # 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.68 2010/02/12 23:07:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.69 2010/02/13 00:02:57 caster Exp $
+
+*jdbc-mysql-5.1.11 (12 Feb 2010)
+
+  12 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +files/5.1.11-java6.patch, +jdbc-mysql-5.1.11.ebuild:
+  Version bump. Remove dependency on 1.5 JDK using bootclasspath magic,
+  fixes bug #283848.
 
   12 Feb 2010; Vlastimil Babka <caster@gentoo.org>
   -files/5.1.6-java6-detection.patch, jdbc-mysql-5.1.10.ebuild:
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index b1626a952b8c..10d308583893 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,11 +1,14 @@
 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.11-java6.patch 1188 RMD160 15fedbb3e7737a3a7b0da8ffd90cec88cc908a16 SHA1 f698393ea828c57b0e906b7e8f86decbf836d7fe SHA256 69f6d028a489d5dda58286aa4488a24827f998300a04a8126fe78ec7ae163ada
 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.11.tar.gz 3735062 RMD160 53c048d215bee69f35d3f8335bd61328d734ff21 SHA1 0183a6b52cfdb935826590f667e5272f6fffe943 SHA256 ad1522b5d35cd3c599008c3e5f5297797def115c310c3b66b4a07eed8ace14a7
 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 2537 RMD160 27e55621e3b53486a2cc60ee6b16011f3d1d0790 SHA1 eb9e224426c29011c26b261d16cd7cb139c958e4 SHA256 0642d991ee946f0ed06f4f051457ea783ae9e3a993d2bf1ff65100f98b6a0e5a
+EBUILD jdbc-mysql-5.1.11.ebuild 2065 RMD160 9ae912b14ab19db61c4fa972c35e62d30b717a34 SHA1 2b9963e453d72922f345f53bab43b29a90a9f716 SHA256 1f2b74e2b6d156bacc2a6580c2c5d58bf0056e6666cd29e932c8374ae9c135ba
 EBUILD jdbc-mysql-5.1.6.ebuild 2438 RMD160 f8fc4b3c39142a783653e0110d25a8a0d822010e SHA1 7c01fbce3063abcf72881badb4bbfe60de9028bc SHA256 1d3c31647fdb2226c1c994bab31f4a68309d71dfb7500e1d037f8603989ce6ea
-MISC ChangeLog 13080 RMD160 4270c683dd55bd92eaf037e1d819071b82d57dbe SHA1 9c037f178346e8624b2a3f36915a3021fa820234 SHA256 31b7386b789f67656f0818397a63b450ee6e5d8d704e0bf8bdc51319e503ed70
+MISC ChangeLog 13315 RMD160 5a25b2a5c11a0243c6174bfc2146ef9f9fee00e3 SHA1 7c064f3dc1a156806324705e13cce2d2eec1dd97 SHA256 12398d8c3a33a3e976d13a179657018c7e372885efe3a3279d9c52e60d3bae6f
 MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4
diff --git a/dev-java/jdbc-mysql/files/5.1.11-java6.patch b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
new file mode 100644
index 000000000000..1e3c21d16612
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
@@ -0,0 +1,34 @@
+--- build.xml.orig	2010-01-20 19:45:30.000000000 +0100
++++ build.xml	2010-02-13 00:34:30.000000000 +0100
+@@ -124,7 +124,7 @@
+ 		</if>	
+ 	</target>
+ 
+-	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
++	<target name="init" depends="-init-copy, -init-no-crypto">
+ 		<!-- If we're building under cruise control, update ourself -->
+ 		
+ 		<if>
+@@ -746,7 +746,8 @@
+ 		<javac sourcepath="" srcdir="${buildDir}/${fullProdName}" 
+ 			destdir="${compiler.output}" 
+ 			deprecation="off" 
+-			debug="${debug.enable}">
++			debug="${debug.enable}"
++			bootclasspath="${gentoo.bootclasspath}">
+ 			<include name="**/*.java" />
+ 			<exclude name="testsuite/**" />
+ 			<exclude name="com/mysql/jdbc/integration/**" />
+@@ -763,11 +764,7 @@
+ 		<javac destdir="${compiler.output}" 
+ 			deprecation="off" 
+ 			debug="${debug.enable}"
+-			fork="yes"
+-			executable="${com.mysql.jdbc.java6.javac}"
+-			compiler="modern"
+-			sourcepath="" srcdir="${buildDir}/${fullProdName}"
+-			bootclasspath="${com.mysql.jdbc.java6.rtjar}">
++			sourcepath="" srcdir="${buildDir}/${fullProdName}">
+ 			<include name="**/JDBC4*.java" />
+ 			<include name="com/mysql/jdbc/exceptions/jdbc4/*" />
+ 			
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild
new file mode 100644
index 000000000000..7dd94611f931
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild
@@ -0,0 +1,77 @@
+# 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.11.ebuild,v 1.1 2010/02/13 00:02:57 caster Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+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.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	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"
+	# use java6 for everything except jdbc3 - #283848
+	epatch "${FILESDIR}/5.1.11-java6.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
+}
+
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="dist"
+
+src_compile() {
+	# cannot use rewrite-bootclasspath because of the jdbc4 part
+	local bcp="$(java-pkg_get-bootclasspath 1.5)"
+	java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
+}
+
+# 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
+}
+