Now uses jars from dependencies explicitly, instead of relying on /usr/ bin/ant adding them to the classpath.

(Portage version: 2.1.1_pre4-r4)

3 files changed, 74 insertions, 1 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index b2fa37ffb897..a733b8c977e6 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2006/08/05 12:01:04 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.34 2006/08/11 02:54:13 nichoj Exp $
+
+*jdbc-mysql-3.1.13-r3 (11 Aug 2006)
+
+  11 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +jdbc-mysql-3.1.13-r3.ebuild:
+  Now uses jars from dependencies explicitly, instead of relying on /usr/
+  bin/ant adding them to the classpath.
 
   05 Aug 2006; Petteri Räty <betelgeuse@gentoo.org>
   -jdbc-mysql-3.0.11.ebuild, -jdbc-mysql-3.0.16.ebuild,
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r3 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r3
new file mode 100644
index 000000000000..9e1b9a4ef5e5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r3
@@ -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.1.13-r3.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r3.ebuild
new file mode 100644
index 000000000000..19a2f9f7748b
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r3.ebuild
@@ -0,0 +1,63 @@
+# 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-r3.ebuild,v 1.1 2006/08/11 02:54:13 nichoj Exp $
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="c3p0 source"
+COMMON_DEP="
+	dev-java/log4j
+	c3p0? ( dev-java/c3p0 )
+	dev-java/jdbc2-stdext
+	dev-java/commons-logging"
+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
+	source? ( app-arch/zip )"
+
+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 jdbc2-stdext
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from junit
+	java-pkg_jar-from log4j
+	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
+	use source && java-pkg_dosrc src/com src/org
+}