Merged changes with gcj-overlay, bug #145765.

Package-Manager: portage-2.1.2_pre2

6 files changed, 126 insertions, 5 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index a733b8c977e6..cdd32df3090b 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.34 2006/08/11 02:54:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.35 2006/10/04 02:43:03 nichoj Exp $
+
+*jdbc-mysql-3.1.13-r4 (04 Oct 2006)
+
+  04 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/do-not-filter-png.diff, +files/no-testsuite.diff,
+  +jdbc-mysql-3.1.13-r4.ebuild:
+  Merged changes with gcj-overlay, bug #145765.
 
 *jdbc-mysql-3.1.13-r3 (11 Aug 2006)
 
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 0c21851f983c..40975c186d1f 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -2,6 +2,14 @@ AUX compile-without-log4j.patch 682 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb
 MD5 9275519a591f40e7ab6b3746d884f67f files/compile-without-log4j.patch 682
 RMD160 e2ec9338259d23d17a6a68235cf90f84d9acb0cc files/compile-without-log4j.patch 682
 SHA256 389c1b2c3467f39f52a7fb294ee88800431dd23e73a8ce165a04d0ee2d00a3db files/compile-without-log4j.patch 682
+AUX do-not-filter-png.diff 563 RMD160 07f7a15de30cce2dacc69f464a20e14a6066cb25 SHA1 d14612765737abfed8fb9b17fee95a77080e969c SHA256 6569ae305cc433a3bf8211dc743b341a16ba244f514d2ec84856e2e3e890635c
+MD5 d409ddf300695cda629209beb95c21c8 files/do-not-filter-png.diff 563
+RMD160 07f7a15de30cce2dacc69f464a20e14a6066cb25 files/do-not-filter-png.diff 563
+SHA256 6569ae305cc433a3bf8211dc743b341a16ba244f514d2ec84856e2e3e890635c files/do-not-filter-png.diff 563
+AUX no-testsuite.diff 501 RMD160 46641c802af3f3e38c89b6a5273f2f058a666347 SHA1 984e6cef8ac5481b3f39ed2d40d8f5ceeafe1b23 SHA256 7b99f9dfc9a4fc62edaded34ca0603f830c30dd752d1ffb7b804b3f8b6af207d
+MD5 dcaa57cf5b065bb2f8d7abf9f02bbf76 files/no-testsuite.diff 501
+RMD160 46641c802af3f3e38c89b6a5273f2f058a666347 files/no-testsuite.diff 501
+SHA256 7b99f9dfc9a4fc62edaded34ca0603f830c30dd752d1ffb7b804b3f8b6af207d files/no-testsuite.diff 501
 DIST mysql-connector-java-3.1.10.tar.gz 6892037 RMD160 30b54059ad0b5301a8fc4836d9ae1fb0a04fb6c4 SHA256 41ae162e8dd5a66b20cf3283d9a6d8d638acce0529783c99713e40d6bf7e8a87
 DIST mysql-connector-java-3.1.12.tar.gz 8014757 RMD160 f4c38716c79d0f9e2200f4446c7228e8e017672a SHA1 d194d6ff7614ea1c59e10ae9b4bd8e4e9c15945c SHA256 a23c73462260c6fad956c60ad814e3a48891ee601ae3cbeb0b9d94a2dd0ad726
 DIST mysql-connector-java-3.1.13.tar.gz 10454933 RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 SHA1 09a0da29bc28b3cf0b1a78d0b3720ffdbb63073d SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f
@@ -25,10 +33,14 @@ EBUILD jdbc-mysql-3.1.13-r3.ebuild 1473 RMD160 f9ae3516f4fc28fad333414eae4f388e6
 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
+EBUILD jdbc-mysql-3.1.13-r4.ebuild 1678 RMD160 f3f303fee31c870300b478f8007e02aee5502432 SHA1 60c0ae1c994e17312f53a1b554390c2ad6c3cdb5 SHA256 b0d8380322c589be78ba5c8eb50952fc1e2265927e9e6142bf1d379bb6ba4b2a
+MD5 1a74edd6dc8c4258404ba4798ac2d6c7 jdbc-mysql-3.1.13-r4.ebuild 1678
+RMD160 f3f303fee31c870300b478f8007e02aee5502432 jdbc-mysql-3.1.13-r4.ebuild 1678
+SHA256 b0d8380322c589be78ba5c8eb50952fc1e2265927e9e6142bf1d379bb6ba4b2a jdbc-mysql-3.1.13-r4.ebuild 1678
+MISC ChangeLog 8180 RMD160 afa15e4be1ed69bb7a507e1dbe59e456cc39299d SHA1 3e5cb8c63076fedf1de183c31d618c45ca0b305d SHA256 5cb6f74192ba9bcbcd914da520ddced2ad07cb12f7ff4960391c57fd9256819d
+MD5 0c75e0bd67c9d7b6ab54fdc232b7830c ChangeLog 8180
+RMD160 afa15e4be1ed69bb7a507e1dbe59e456cc39299d ChangeLog 8180
+SHA256 5cb6f74192ba9bcbcd914da520ddced2ad07cb12f7ff4960391c57fd9256819d ChangeLog 8180
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -48,3 +60,6 @@ SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/di
 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
+MD5 0b98ecbf341075a5406833bdbae31ac8 files/digest-jdbc-mysql-3.1.13-r4 289
+RMD160 c0d8b65ce73718936a300bb49f116875e278fb75 files/digest-jdbc-mysql-3.1.13-r4 289
+SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/digest-jdbc-mysql-3.1.13-r4 289
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r4 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r4
new file mode 100644
index 000000000000..9e1b9a4ef5e5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.13-r4
@@ -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/files/do-not-filter-png.diff b/dev-java/jdbc-mysql/files/do-not-filter-png.diff
new file mode 100644
index 000000000000..3aaabe5d3257
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/do-not-filter-png.diff
@@ -0,0 +1,18 @@
+--- mysql-connector-java-3.1.12/build.xml.orig	2006-04-19 12:37:46.000000000 +0200
++++ mysql-connector-java-3.1.12/build.xml	2006-04-19 12:57:52.000000000 +0200
+@@ -99,6 +99,7 @@
+ 				<patternset id="classjar" >
+ 					<exclude name="**/*.class*"/>
+ 					<exclude name="**/*.jar"/>
++					<exclude name="**/*.png"/>
+ 				</patternset>
+ 			</fileset>
+ 
+@@ -116,6 +117,7 @@
+ 			<fileset dir="${sourceDir}" excludes="**/CVS">
+ 				<patternset id="dojar" >
+ 					<include name="**/*.jar*"/>
++					<include name="**/*.png"/>
+ 				</patternset>
+ 			</fileset>
+ 		</copy>
diff --git a/dev-java/jdbc-mysql/files/no-testsuite.diff b/dev-java/jdbc-mysql/files/no-testsuite.diff
new file mode 100644
index 000000000000..43ae12f692b0
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/no-testsuite.diff
@@ -0,0 +1,11 @@
+--- mysql-connector-java-3.1.13/build.xml.orig	2006-07-20 19:26:47.000000000 +0200
++++ mysql-connector-java-3.1.13/build.xml	2006-07-20 19:26:59.000000000 +0200
+@@ -522,7 +522,7 @@
+ 	</target>
+ 
+ 
+-	<target name="compile" depends="init, -commercial-license, compile-driver, compile-testsuite, compile.integration"
++	<target name="compile" depends="init, -commercial-license, compile-driver, compile.integration"
+ 		description="Compiles the driver, testsuite, and integration classes.">
+ 	</target>
+ 
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild
new file mode 100644
index 000000000000..70b8a41603a7
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild
@@ -0,0 +1,67 @@
+# 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-r4.ebuild,v 1.1 2006/10/04 02:43:03 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}
+	# gcj hangs, but works for others -> why regexp over pictures?!
+	epatch ${FILESDIR}/do-not-filter-png.diff
+	# com.sun.* classes are used during testing
+	! use test && epatch ${FILESDIR}/no-testsuite.diff
+	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
+}