Junit is not needed because we are not building the testcases and general ebuild cleanup.

Package-Manager: portage-2.1.2.4

3 files changed, 28 insertions, 24 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index e35198ebdcab..765bb4470841 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.37 2007/02/18 17:46:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.38 2007/04/25 17:24:06 betelgeuse Exp $
+
+  25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jdbc-mysql-3.1.13-r4.ebuild:
+  Junit is not needed because we are not building the testcases and general
+  ebuild cleanup.
 
   18 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
   -jdbc-mysql-3.1.12.ebuild, -jdbc-mysql-3.1.13-r1.ebuild,
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index e31aae0705bc..1d234f32e661 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -19,14 +19,14 @@ EBUILD jdbc-mysql-3.1.10.ebuild 1225 RMD160 89013894bdc54460147cec148505d2a12c06
 MD5 ca4ddc0de46174a7b16011720bed22d6 jdbc-mysql-3.1.10.ebuild 1225
 RMD160 89013894bdc54460147cec148505d2a12c06dbf1 jdbc-mysql-3.1.10.ebuild 1225
 SHA256 30eb116dd8a8da4a0a5bf135b3f1c5a40b51f080ef5ea2f9a10b22925b5f6818 jdbc-mysql-3.1.10.ebuild 1225
-EBUILD jdbc-mysql-3.1.13-r4.ebuild 1685 RMD160 5696d525a9c31eebb85a652efe7cbf096197cae6 SHA1 3c372886c9d60f3b4879c6e4e4f9c13387597a31 SHA256 cfd71e4fdac34dd7432e7e0fcf896e0af2b55c28afe5c51ebe7c963c6156b9e0
-MD5 4fdd99742ea3dfbdfd53d299468fb7db jdbc-mysql-3.1.13-r4.ebuild 1685
-RMD160 5696d525a9c31eebb85a652efe7cbf096197cae6 jdbc-mysql-3.1.13-r4.ebuild 1685
-SHA256 cfd71e4fdac34dd7432e7e0fcf896e0af2b55c28afe5c51ebe7c963c6156b9e0 jdbc-mysql-3.1.13-r4.ebuild 1685
-MISC ChangeLog 8492 RMD160 4e1e65db1d35d084d38124e1e430b48535731fef SHA1 cc6a3a5bf753c2d956cf0f307cf6d064392edad3 SHA256 2517563334210a0c1c0a815e5cc1b242f46a6f88222e5d74fbae10c00b112408
-MD5 a8aab9cb97cb2a5d3d1d0e78ed6b55bf ChangeLog 8492
-RMD160 4e1e65db1d35d084d38124e1e430b48535731fef ChangeLog 8492
-SHA256 2517563334210a0c1c0a815e5cc1b242f46a6f88222e5d74fbae10c00b112408 ChangeLog 8492
+EBUILD jdbc-mysql-3.1.13-r4.ebuild 1632 RMD160 51250b7f40426856b33a53e71ba82414be5fadd7 SHA1 719c9f0a499b1e51009690b3fb74816bfe63154a SHA256 8386d3b6b7ec54a1386261b42152ed24e6177d932b0d9ca23af973d90b2b5510
+MD5 5a893f7f9ca954e6db295f7b96ebbccf jdbc-mysql-3.1.13-r4.ebuild 1632
+RMD160 51250b7f40426856b33a53e71ba82414be5fadd7 jdbc-mysql-3.1.13-r4.ebuild 1632
+SHA256 8386d3b6b7ec54a1386261b42152ed24e6177d932b0d9ca23af973d90b2b5510 jdbc-mysql-3.1.13-r4.ebuild 1632
+MISC ChangeLog 8671 RMD160 9b2cb4cc6e3abb10a6bea25a1758b17bcc8624d9 SHA1 a2cebf8b34a2c7ec53ac0afca0c9cddde4b96ac1 SHA256 5232b703319d1ad3a20102a4171aa6bbce9e5d9ad887f380b8e5df8dbaaf5f83
+MD5 e33814d620016bc6bcf1576afd171fc3 ChangeLog 8671
+RMD160 9b2cb4cc6e3abb10a6bea25a1758b17bcc8624d9 ChangeLog 8671
+SHA256 5232b703319d1ad3a20102a4171aa6bbce9e5d9ad887f380b8e5df8dbaaf5f83 ChangeLog 8671
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -38,9 +38,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF2JA6cxLzpIGCsLQRAnNxAJ9A1E1G/8qf7AaTpHvGpkoBEiXzVwCeJTjf
-wUbOhcmtUInToUvbQzDeca0=
-=d8V/
+iD8DBQFGL463cxLzpIGCsLQRAqZmAJ9DCXDWOMDW04xv8YNf2BqTRmqTXACeIUcZ
+htCUic+n05nPiPQEBl9utaU=
+=b2gW
 -----END PGP SIGNATURE-----
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
index 1045a1c405f2..81745e061e89 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 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.2 2007/01/11 13:51:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r4.ebuild,v 1.3 2007/04/25 17:24:06 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -13,7 +15,7 @@ SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 ~x86"
-IUSE="c3p0 source"
+IUSE="c3p0 test"
 COMMON_DEP="
 	dev-java/log4j
 	c3p0? ( dev-java/c3p0 )
@@ -23,21 +25,17 @@ 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*
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.3*
 	)
-	${COMMON_DEP}
-	sys-apps/sed
-	dev-java/ant-core
-	dev-java/junit
-	source? ( app-arch/zip )"
+	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	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
@@ -51,7 +49,6 @@ src_unpack() {
 	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
 }
@@ -60,6 +57,8 @@ src_compile() {
 	eant dist
 }
 
+#TODO add src_test
+
 src_install() {
 	java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
 	dodoc README CHANGES