Version bump. Make log4j support optional via the log4j use flag. Fixes bug #156765. Thanks to Johan Bergström <bugs@bergstroem.nu>.

(Portage version: 2.1.2.5)

5 files changed, 135 insertions, 1 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index ba424d57d2c0..760f1caf5e56 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.41 2007/05/06 22:36:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.42 2007/05/07 21:11:19 betelgeuse Exp $
+
+*jdbc-mysql-5.0.5 (07 May 2007)
+
+  07 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/5.0.5-dist-target-depends.patch,
+  +files/5.0.5-remove-jboss-dependency-from-tests.patch,
+  +jdbc-mysql-5.0.5.ebuild:
+  Version bump. Make log4j support optional via the log4j use flag. Fixes bug
+  #156765. Thanks to Johan Bergström <bugs@bergstroem.nu>.
 
 *jdbc-mysql-3.1.13-r5 (06 May 2007)
 
diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
new file mode 100644
index 000000000000..28ffc7ad0dab
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2007-05-07 19:59:49.000000000 +0300
++++ build.xml	2007-05-07 20:01:21.000000000 +0300
+@@ -291,7 +291,7 @@
+ 		</if>
+ 	</target>
+ 
+-	<target name="dist" depends="init, compile">
++	<target name="dist" depends="init, compile-driver,compile.integration">
+ 
+ 		<delete file="${buildDir}/${fullProdName}-bin.jar" />
+ 		<delete file="${distDir}/${fullProdName}.jar" />
diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
new file mode 100644
index 000000000000..394830701fee
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
@@ -0,0 +1,39 @@
+--- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java	2007-03-01 17:48:47.000000000 +0100
++++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java	2007-04-12 09:53:05.000000000 +0200
+@@ -52,7 +52,6 @@
+ import testsuite.simple.DataSourceTest;
+ 
+ import com.mysql.jdbc.NonRegisteringDriver;
+-import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker;
+ import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory;
+@@ -315,28 +314,6 @@
+ 		assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize());
+ 	}
+ 	
+-	/**
+-	 * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't
+-	 * work with MySQLXADataSources.
+-	 * 
+-	 * @throws Exception if the test fails.
+-	 */
+-	public void testBug20242() throws Exception {
+-		if (versionMeetsMinimum(5, 0)) {
+-			try {
+-				Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker");
+-			} catch (Exception ex) {
+-				return; // class not available for testing
+-			}
+-			
+-			MysqlXADataSource xaDs = new MysqlXADataSource();
+-			xaDs.setUrl(dbUrl);
+-			
+-			MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker();
+-			assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection()));
+-		}	
+-	}
+-	
+ 	private void bindDataSource(String name, DataSource ds) throws Exception {
+ 		this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds);
+ 	}
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.5 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.5
new file mode 100644
index 000000000000..db0e2426ef99
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.5
@@ -0,0 +1,3 @@
+MD5 a10578fc0a27aa4a4256adab7996dba5 mysql-connector-java-5.0.5.tar.gz 8465846
+RMD160 f96925af13a04cb82970f9a7b779bbde6ead64e2 mysql-connector-java-5.0.5.tar.gz 8465846
+SHA256 39ebd9423db4fa20bb7165acaf02c745f9d93ec1c5c7b693ebc26c3445f6a692 mysql-connector-java-5.0.5.tar.gz 8465846
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.0.5.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.0.5.ebuild
new file mode 100644
index 000000000000..b706213f291c
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.0.5.ebuild
@@ -0,0 +1,72 @@
+# 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-5.0.5.ebuild,v 1.1 2007/05/07 21:11:19 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-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.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"
+	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"
+
+	rm -v *.jar debug/*.jar || die
+
+	java-ant_ignore-system-classes
+
+	# 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
+}
+
+EANT_BUILD_TARGET="dist"
+
+# 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() {
+	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
+}