dev-java/jdbc-mysql

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 122 insertions, 3 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 6a155f43b8d0..2a79bd55b082 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.74 2010/10/17 12:21:19 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.75 2011/01/28 14:45:49 fordfrog Exp $
+
+*jdbc-mysql-5.1.14 (28 Jan 2011)
+
+  28 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> +files/5.1.14-java6.patch,
+  +jdbc-mysql-5.1.14.ebuild:
+  Version bump
 
   17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -jdbc-mysql-5.1.6.ebuild:
   Remove old.
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 21f4efd34122..83cfefc0b8ee 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,7 +1,10 @@
 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 5.1.14-java6.patch 1301 RMD160 75a88ccd44f534bf7f945da714f4a2e4fc9b1f14 SHA1 07f24ea31d049bff73d511b63002e1bb05de07fa SHA256 ec8a6063e3bd9c6e37dc5be646b47dfe86c0bc819411d280b19645951f7b3376
 DIST mysql-connector-java-5.1.11.tar.gz 3735062 RMD160 53c048d215bee69f35d3f8335bd61328d734ff21 SHA1 0183a6b52cfdb935826590f667e5272f6fffe943 SHA256 ad1522b5d35cd3c599008c3e5f5297797def115c310c3b66b4a07eed8ace14a7
+DIST mysql-connector-java-5.1.14.tar.gz 3272153 RMD160 d0e39c7513868de82d0bc1d31324356900bf9583 SHA1 dce1a36d81996890e6e5551b459189c585335e2f SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0
 EBUILD jdbc-mysql-5.1.11.ebuild 2060 RMD160 52616f702b8b1983064111bfbfad8c13831667b0 SHA1 a08b0489f7ff17c83acbf797131f392f95fba231 SHA256 7a12cd942beae28f39b7cb9b60b00216432652108d80f6b89d1c52a5481cae05
-MISC ChangeLog 13890 RMD160 b7c1a5ec231ae8c949f39c880963cc36c077b1b7 SHA1 50539f83488568187b9a6e59e4e3c8eb8bc1d224 SHA256 32f60305af6b228c473bc3d60da62b2ae585b889e2b4cf3097e0fd0de5c50806
+EBUILD jdbc-mysql-5.1.14.ebuild 2084 RMD160 5c012c2386e616c0bb3650cb7596d5d002c83de1 SHA1 5a306925860ffbbb66ebb186b6e3c918436c8094 SHA256 8cff30d148d3ec19c4c57e15efcff43838930f65f85c2420a0c752632efa235e
+MISC ChangeLog 14050 RMD160 29a159771131d9a740124a70976810ef29757afb SHA1 00eeb4b1766e82e3e953bbc9fa5a5ca4977f61f2 SHA256 ecc0124bbfb05b2961b55834fe96bfd160754304756923376ae1b92cfe9bd5bf
 MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4
diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch
new file mode 100644
index 000000000000..49343706ad80
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.1.14-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
+@@ -131,7 +131,7 @@
+ 		</if>	
+ 	</target>
+ 
+-	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
++	<target name="init" depends="-init-copy, -init-no-crypto">
+		<!-- We need the following for source distributions as there we
+             can't dynamically alter the classpath, and not having this
+		     directory present causes the build to fail -->
+@@ -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.14.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
new file mode 100644
index 000000000000..f358da694a79
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 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.14.ebuild,v 1.1 2011/01/28 14:45:49 fordfrog 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.14-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}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
+	dodoc README CHANGES || die
+	dohtml docs/*.html || die
+	use source && java-pkg_dosrc src/com src/org
+}