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

Package-Manager: portage-2.1.1_pre4-r4

4 files changed, 85 insertions, 15 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/Manifest b/dev-java/jdbc-mysql/Manifest
index 4944be25d9a0..0c21851f983c 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX compile-without-log4j.patch 682 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc SHA1 e22c85b6ab0aefef5c1a6ac75d77571ccec0f176 SHA256 389c1b2c3467f39f52a7fb294ee88800431dd23e73a8ce165a04d0ee2d00a3db
 MD5 9275519a591f40e7ab6b3746d884f67f files/compile-without-log4j.patch 682
 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc files/compile-without-log4j.patch 682
@@ -24,10 +21,14 @@ EBUILD jdbc-mysql-3.1.13-r2.ebuild 1388 RMD160 c3c44777435b65c7bc64a2d3ddbe313c5
 MD5 7a79fe5cfee24c9061681c6bdba1949e jdbc-mysql-3.1.13-r2.ebuild 1388
 RMD160 c3c44777435b65c7bc64a2d3ddbe313c523e1aed jdbc-mysql-3.1.13-r2.ebuild 1388
 SHA256 2e20fc6e6177133107eaece96b356d8b3a712d887e0e70c920783bf96abe1d98 jdbc-mysql-3.1.13-r2.ebuild 1388
-MISC ChangeLog 7723 RMD160 01c82793205357379477171efd11faf55d23695a SHA1 07fb1de183e8d750c1f0132d43e4c258d4e408df SHA256 0a39f64e69f250b82cb92c1bc1e8878d36062cea48f2d71bafe061592afd0f0b
-MD5 c5ef1e77de3b235c55cb67437b35151a ChangeLog 7723
-RMD160 01c82793205357379477171efd11faf55d23695a ChangeLog 7723
-SHA256 0a39f64e69f250b82cb92c1bc1e8878d36062cea48f2d71bafe061592afd0f0b ChangeLog 7723
+EBUILD jdbc-mysql-3.1.13-r3.ebuild 1473 RMD160 f9ae3516f4fc28fad333414eae4f388e6e868aae SHA1 0f368aeafe00113849418b8910b247003562a1be SHA256 7d4edb1be758fcbb03f4d29accedb2d49bbbff1a8da361330920cb6bd6700881
+MD5 2c705b0c43740ceaa83fefe2e13800fc jdbc-mysql-3.1.13-r3.ebuild 1473
+RMD160 f9ae3516f4fc28fad333414eae4f388e6e868aae jdbc-mysql-3.1.13-r3.ebuild 1473
+SHA256 7d4edb1be758fcbb03f4d29accedb2d49bbbff1a8da361330920cb6bd6700881 jdbc-mysql-3.1.13-r3.ebuild 1473
+MISC ChangeLog 7953 RMD160 33986b9b301a951dc69cfa4df4389ad64a4b5cb6 SHA1 c28a3226efa2aaa5529754e40fccde929b4949b0 SHA256 e32ab8422e3d94d98174ed49a9362e17b8583bd7b11868625668d56f051f9374
+MD5 91b6931acfa3be577353cf428361a746 ChangeLog 7953
+RMD160 33986b9b301a951dc69cfa4df4389ad64a4b5cb6 ChangeLog 7953
+SHA256 e32ab8422e3d94d98174ed49a9362e17b8583bd7b11868625668d56f051f9374 ChangeLog 7953
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -44,10 +45,6 @@ SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/di
 MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13-r2 289
 RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13-r2 289
 SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13-r2 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFE1IiJcxLzpIGCsLQRApNLAJ4whEOcQtcghop7Vo7K0T+2JP6GRgCeLalJ
-0gGm8mw2qkDyqKqrfLuCBp0=
-=eQHT
------END PGP SIGNATURE-----
+MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13-r3 289
+RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13-r3 289
+SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13-r3 289
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
+}