Version bump to 5.1.26. Fixes bug #484710, reported by Michael Orlitzky.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

2 files changed, 90 insertions, 1 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 6dad96f5f53c..9d56f373db4b 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.84 2013/08/14 11:18:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.85 2013/09/14 13:38:22 tomwij Exp $
+
+*jdbc-mysql-5.1.26 (14 Sep 2013)
+
+  14 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +jdbc-mysql-5.1.26.ebuild:
+  Version bump to 5.1.26. Fixes bug #484710, reported by Michael Orlitzky.
 
   14 Aug 2013; Patrick Lauer <patrick@gentoo.org> jdbc-mysql-5.1.23.ebuild:
   Whitespace
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
new file mode 100644
index 000000000000..2c10a6adbe70
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2013 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.26.ebuild,v 1.1 2013/09/14 13:38:22 tomwij Exp $
+
+EAPI="5"
+
+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="
+	dev-java/slf4j-api:0
+	log4j? ( dev-java/log4j:0 )
+	c3p0? ( dev-java/c3p0:0 )"
+
+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"
+
+	find . -name '*.jar' -print -delete || die
+
+	cd src/lib
+	java-pkg_jar-from slf4j-api
+	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.
+	java-pkg-2_src_compile \
+		-Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
+}
+
+# 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
+	dohtml docs/*.html
+
+	use source && java-pkg_dosrc src/com src/org
+}