Added source useflag, for bug #141885

Package-Manager: portage-2.1.1_pre3-r5

4 files changed, 80 insertions, 15 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index afa479cfd171..79a8f06b5425 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2006/07/22 21:16:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.31 2006/07/29 15:30:20 nichoj Exp $
+
+*jdbc-mysql-3.1.13-r2 (29 Jul 2006)
+
+  29 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +jdbc-mysql-3.1.13-r2.ebuild:
+  Added source useflag, for bug #141885
 
 *jdbc-mysql-3.1.13-r1 (22 Jul 2006)
 
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index ad87d0623e7e..9f5268136f7c 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
@@ -35,10 +32,14 @@ EBUILD jdbc-mysql-3.1.13-r1.ebuild 1285 RMD160 58ba8b0adcc5d34b8ad49841fc173e944
 MD5 ae805172024b3ec7e4362f5661c1dace jdbc-mysql-3.1.13-r1.ebuild 1285
 RMD160 58ba8b0adcc5d34b8ad49841fc173e944d3f9e74 jdbc-mysql-3.1.13-r1.ebuild 1285
 SHA256 c5ef6c025ae0e116d634fc065d574893e9970c44eaef1d9ca606884bed828720 jdbc-mysql-3.1.13-r1.ebuild 1285
-MISC ChangeLog 7260 RMD160 67f9782d80ba028b94ec8facb813b0fbc4e420d7 SHA1 1ce26c66ffe0371610305e96bce8f81e3396ed89 SHA256 eef1b68091a1b91ad79b46a2aaad8f24872f8fae3dcd83636350784b8d84b81a
-MD5 d90d69a74e4a36873f7dcf419017f5e2 ChangeLog 7260
-RMD160 67f9782d80ba028b94ec8facb813b0fbc4e420d7 ChangeLog 7260
-SHA256 eef1b68091a1b91ad79b46a2aaad8f24872f8fae3dcd83636350784b8d84b81a ChangeLog 7260
+EBUILD jdbc-mysql-3.1.13-r2.ebuild 1362 RMD160 4aef1ca03147537d9e520af2ea434c586ac38fc8 SHA1 b9b64c3e92aebeabb67ecc01b3297180d45b7d84 SHA256 ad0ab7a2466482e15b8375c11c40bf4a97543b79d3ecb66f910f3569b86b55b9
+MD5 95c749fd15adbd70c3303c37c9025b16 jdbc-mysql-3.1.13-r2.ebuild 1362
+RMD160 4aef1ca03147537d9e520af2ea434c586ac38fc8 jdbc-mysql-3.1.13-r2.ebuild 1362
+SHA256 ad0ab7a2466482e15b8375c11c40bf4a97543b79d3ecb66f910f3569b86b55b9 jdbc-mysql-3.1.13-r2.ebuild 1362
+MISC ChangeLog 7418 RMD160 f23d62d65679ddfd4748188caf268e02fcda3a4d SHA1 be669e5c87e63acb29edfda208a3540755b33329 SHA256 120642b6c6c73696230801ba08be1c50db47ce97c5bb51eddb2e81b613a3f249
+MD5 6a8800caf83790d309be89417e92facb ChangeLog 7418
+RMD160 f23d62d65679ddfd4748188caf268e02fcda3a4d ChangeLog 7418
+SHA256 120642b6c6c73696230801ba08be1c50db47ce97c5bb51eddb2e81b613a3f249 ChangeLog 7418
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -61,10 +62,6 @@ SHA256 2705923d8cae10fb921ace045a7c374fdc605d6cef413217b53fe87e4f309719 files/di
 MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13-r1 289
 RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13-r1 289
 SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13-r1 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwpWvgo/w9rxVVVERAsuQAJ9S3EtIjMXx2FQec1IWrc9XZP1e0gCfYefy
-dU1FM/dNLm00oBD9Xfw2pyo=
-=N0AX
------END PGP SIGNATURE-----
+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
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r2 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r2
new file mode 100644
index 000000000000..9e1b9a4ef5e5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r2
@@ -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-r2.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r2.ebuild
new file mode 100644
index 000000000000..f92891216eee
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r2.ebuild
@@ -0,0 +1,59 @@
+# 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-r2.ebuild,v 1.1 2006/07/29 15:30:20 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"
+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
+	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
+}