Version bump (bug #138421), which fixes bug #128290. Updated to use new Java system.

(Portage version: 2.1.1_pre1)

8 files changed, 83 insertions, 14 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 25aceedc7d07..2bd38deea5cd 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.28 2006/03/14 04:47:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.29 2006/07/18 01:28:00 nichoj Exp $
+
+*jdbc-mysql-3.1.13 (18 Jul 2006)
+
+  18 Jul 2006; Joshua Nichols <nichoj@gentoo.org> jdbc-mysql-3.0.11.ebuild,
+  jdbc-mysql-3.0.16.ebuild, jdbc-mysql-3.0.17.ebuild,
+  jdbc-mysql-3.1.10.ebuild, jdbc-mysql-3.1.12.ebuild,
+  +jdbc-mysql-3.1.13.ebuild:
+  Version bump (bug #138421), which fixes bug #128290. Updated to use new Java
+  system.
 
   14 Mar 2006; Joshua Nichols <nichoj@gentoo.org> jdbc-mysql-3.1.10.ebuild:
   Stable on amd64.
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13
new file mode 100644
index 000000000000..9e1b9a4ef5e5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13
@@ -0,0 +1,3 @@
+MD5 b2fc8cc8990d85629b183f284a8f46d8 mysql-connector-java-3.1.13.tar.gz 10454933
+RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 mysql-connector-java-3.1.13.tar.gz 10454933
+SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f mysql-connector-java-3.1.13.tar.gz 10454933
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild
index 8262513564a2..9b5892e91204 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild,v 1.6 2005/10/30 19:41:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.11.ebuild,v 1.7 2006/07/18 01:28:00 nichoj Exp $
 
 inherit java-pkg
 
 At=mysql-connector-java-${PV}-stable
 
 DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild
index f1ea53d9d026..e19a08507738 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild,v 1.5 2005/10/30 19:41:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.16.ebuild,v 1.6 2006/07/18 01:28:00 nichoj Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Connector/J: A MySQL JDBC connector"
-HOMEPAGE="http://dev.mysql.com/downloads/connector/j/3.0.html"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/mysql-connector-java-${PV}-ga.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild
index f57dd7ec12a7..d5bc4a4a8944 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild,v 1.8 2005/12/23 02:19:16 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.0.17.ebuild,v 1.9 2006/07/18 01:28:00 nichoj Exp $
 
 inherit eutils java-pkg
 
 At=mysql-connector-java-${PV}-ga
 
 DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild
index c762cd1f3a5c..af2adb39e3c0 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.8 2006/03/14 04:47:24 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild,v 1.9 2006/07/18 01:28:00 nichoj Exp $
 
 inherit eutils java-pkg
 
 At=mysql-connector-java-${PV}
 
 DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild
index 145b7e496573..20565c071430 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild,v 1.3 2006/03/14 01:34:04 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild,v 1.4 2006/07/18 01:28:00 nichoj Exp $
 
 inherit eutils java-pkg
 
@@ -8,7 +8,7 @@ MY_PN="mysql-connector-java"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com"
+HOMEPAGE="http://www.mysql.com/products/connector/j/"
 SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild
new file mode 100644
index 000000000000..9b076f8c26de
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13.ebuild,v 1.1 2006/07/18 01:28:00 nichoj Exp $
+
+inherit eutils java-pkg-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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="c3p0"
+COMMON_DEP="
+	dev-java/log4j
+	c3p0? ( dev-java/c3p0 )
+	dev-java/jdbc2-stdext"
+RDEPEND=">=virtual/jre-1.2
+	${COMMON_DEP}"
+# FIXME doesn't like Java 1.6's JDBC API
+DEPEND="|| (
+		=virtual/jdk-1.3*
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.5*
+	)
+	${COMMON_DEP}
+	sys-apps/sed
+	dev-java/ant-core
+	dev-java/junit"
+
+S="${WORKDIR}/${MY_P}"
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f *.jar
+
+	sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed"
+
+	mkdir src/lib-nodist # needed, or ant will fail
+	cd src/lib
+	rm -f *.jar
+	java-pkg_jar-from jdbc2-stdext
+	use c3p0 && java-pkg_jar-from c3p0
+}
+
+src_compile() {
+	eant dist
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
+	dodoc README CHANGES
+}