Version bump (bug #109927) and some cleanup.

(Portage version: 2.1_pre1)

4 files changed, 62 insertions, 2 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 09560f3b8f51..d86cfbdeaf65 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.23 2005/09/03 21:07:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.24 2005/12/20 04:13:38 nichoj Exp $
+
+*jdbc-mysql-3.1.12 (20 Dec 2005)
+
+  20 Dec 2005; Joshua Nichols <nichoj@gentoo.org> +jdbc-mysql-3.1.12.ebuild:
+  Version bump (bug #109927) and some cleanup.
 
   03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   jdbc-mysql-3.0.17.ebuild:
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 77e1349012bd..12d42ae8a4b4 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,11 +1,13 @@
-MD5 93eba048f2140ff5153feb1edad6c0dd ChangeLog 6084
+MD5 70bc8152e5b75d0c52424169f88338ed ChangeLog 6243
 MD5 9275519a591f40e7ab6b3746d884f67f files/compile-without-log4j.patch 682
 MD5 96778981695f92599ce9eac1c669a9b0 files/digest-jdbc-mysql-3.0.11 86
 MD5 702d2b80aba3c4eb8db59e08716c954a files/digest-jdbc-mysql-3.0.16 83
 MD5 d3e310eef0498efe3d56ad6ddcd306d9 files/digest-jdbc-mysql-3.0.17 83
 MD5 28a1e7fdcedd48ae04a5f1631ac8b3b3 files/digest-jdbc-mysql-3.1.10 80
+MD5 972907f3edeae4c8be52372e59ca2933 files/digest-jdbc-mysql-3.1.12 80
 MD5 195d60230c6e608837d0f52a9b1a7307 jdbc-mysql-3.0.11.ebuild 620
 MD5 18ff702419d20ada88479df002fe38a3 jdbc-mysql-3.0.16.ebuild 856
 MD5 1b7d74a6cba1094d5ec19d4b9665552c jdbc-mysql-3.0.17.ebuild 1002
 MD5 310bec7e82bd7f2bb2e1c8efc9221466 jdbc-mysql-3.1.10.ebuild 1240
+MD5 2a23d5cf997d30275e24a0592e86477d jdbc-mysql-3.1.12.ebuild 1190
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.12 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.12
new file mode 100644
index 000000000000..18955a358262
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.12
@@ -0,0 +1 @@
+MD5 c8c15443dfa9541545aad02d744a077b mysql-connector-java-3.1.12.tar.gz 8014757
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild
new file mode 100644
index 000000000000..e12f5468f4d8
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 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.1 2005/12/20 04:13:38 nichoj Exp $
+
+inherit eutils java-pkg
+
+MY_PN="mysql-connector-java"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MySQL JDBC driver"
+HOMEPAGE="http://www.mysql.com"
+SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="c3p0"
+RDEPEND=">=virtual/jre-1.2
+	dev-java/jta
+	dev-java/log4j
+	c3p0? ( dev-java/c3p0 )
+	dev-java/jdbc2-stdext"
+DEPEND=">=virtual/jdk-1.2
+	${RDEPEND}
+	sys-apps/sed
+	dev-java/ant-core"
+
+S="${WORKDIR}/${MY_P}"
+
+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 jta
+	java-pkg_jar-from jdbc2-stdext
+	use c3p0 && java-pkg_jar-from c3p0
+}
+
+src_compile() {
+	local antflags="dist"
+	ant ${antflags} || die "ant failed"
+}
+
+src_install() {
+	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
+	dodoc README CHANGES
+}