Stable on amd64, bug #179939. Removed older gen 1 version.

Package-Manager: portage-2.1.2.7

5 files changed, 15 insertions, 84 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 7fc6468efd87..dd15664c2d80 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,10 @@
 # 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.46 2007/05/31 15:49:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.47 2007/05/31 15:52:39 wltjr Exp $
+
+  31 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -jdbc-mysql-3.1.10.ebuild, jdbc-mysql-3.1.13-r5.ebuild:
+  Stable on amd64, bug #179939. Removed older gen 1 version.
 
   31 May 2007; Christian Faulhammer <opfer@gentoo.org>
   jdbc-mysql-3.1.13-r5.ebuild:
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 8a6fd46caaa7..8c460ba21915 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.5-dist-target-depends.patch 380 RMD160 bfa3729e0797815cbcf5cd21617857b9e07212ef SHA1 30c4ac01f51b4af5f3d2e080ce227aa04771778b SHA256 42d4e0a8ac2217045116403bc34642aed78eb99210aa259a8dfd8663a2e5cc84
 MD5 dc8cbc30739ac44f3daddcfe6608d9af files/5.0.5-dist-target-depends.patch 380
 RMD160 bfa3729e0797815cbcf5cd21617857b9e07212ef files/5.0.5-dist-target-depends.patch 380
@@ -21,22 +18,17 @@ AUX no-testsuite.diff 501 RMD160 46641c802af3f3e38c89b6a5273f2f058a666347 SHA1 9
 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 SHA1 d9e573e5c2e9f1344e7765c4085ef426c4fcf09c SHA256 41ae162e8dd5a66b20cf3283d9a6d8d638acce0529783c99713e40d6bf7e8a87
 DIST mysql-connector-java-3.1.13.tar.gz 10454933 RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 SHA1 09a0da29bc28b3cf0b1a78d0b3720ffdbb63073d SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f
 DIST mysql-connector-java-5.0.5.tar.gz 8465846 RMD160 f96925af13a04cb82970f9a7b779bbde6ead64e2 SHA1 6feeb52816978db678cb31b6079e465584d00d23 SHA256 39ebd9423db4fa20bb7165acaf02c745f9d93ec1c5c7b693ebc26c3445f6a692
 DIST mysql-connector-java-5.0.6.tar.gz 8555883 RMD160 13aa2c228f0ffe9a44dc7089f43e128f34179f3c SHA1 336b4e86fc8d4a58d44270f400506dd03f6a4d85 SHA256 96d8dc7d0081f09a4e2c70886114acffad5aafdd3f00acb80cec36475abc91b3
-EBUILD jdbc-mysql-3.1.10.ebuild 1225 RMD160 89013894bdc54460147cec148505d2a12c06dbf1 SHA1 212461f42849e22f793ed89e3fd2d7f19f45ef0f SHA256 30eb116dd8a8da4a0a5bf135b3f1c5a40b51f080ef5ea2f9a10b22925b5f6818
-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 1630 RMD160 000105ad266f9a75fa70dfa75c2cbe8c67957ea4 SHA1 19de6ace8f6b458e9aa71b0b77fa778bc063bb59 SHA256 8b0eaf81db9ac075a6e2f293f7b986fb839a7310438f99744a5318996e5db24d
 MD5 0eed4d5db94423e0d78f21a4db8d8a87 jdbc-mysql-3.1.13-r4.ebuild 1630
 RMD160 000105ad266f9a75fa70dfa75c2cbe8c67957ea4 jdbc-mysql-3.1.13-r4.ebuild 1630
 SHA256 8b0eaf81db9ac075a6e2f293f7b986fb839a7310438f99744a5318996e5db24d jdbc-mysql-3.1.13-r4.ebuild 1630
-EBUILD jdbc-mysql-3.1.13-r5.ebuild 1569 RMD160 1dcc5a0f8ed9ce251e9b5b49cc2a965696f42e2e SHA1 116d75b522cd43e390d3de2a2bf341b038baa38f SHA256 4b08bcf80ccdadca83ff5ce8caee1cdbcaebb5979bb630398f9658335abaa15e
-MD5 af0fc4e4735f164b7a011992b56ce17f jdbc-mysql-3.1.13-r5.ebuild 1569
-RMD160 1dcc5a0f8ed9ce251e9b5b49cc2a965696f42e2e jdbc-mysql-3.1.13-r5.ebuild 1569
-SHA256 4b08bcf80ccdadca83ff5ce8caee1cdbcaebb5979bb630398f9658335abaa15e jdbc-mysql-3.1.13-r5.ebuild 1569
+EBUILD jdbc-mysql-3.1.13-r5.ebuild 1568 RMD160 82e3b5d7f76e6ecc7b7bf4234d981f10b37b8d7d SHA1 436f7ec27464438308f11b4c1b40baa80e4343b3 SHA256 af9922cd2efcd71915438c0df6b2b4deecc22df5d1d4207a6caca48aa13544b8
+MD5 778acc8d2749bd6adadbfbd88a440ed5 jdbc-mysql-3.1.13-r5.ebuild 1568
+RMD160 82e3b5d7f76e6ecc7b7bf4234d981f10b37b8d7d jdbc-mysql-3.1.13-r5.ebuild 1568
+SHA256 af9922cd2efcd71915438c0df6b2b4deecc22df5d1d4207a6caca48aa13544b8 jdbc-mysql-3.1.13-r5.ebuild 1568
 EBUILD jdbc-mysql-5.0.5.ebuild 1849 RMD160 6ef9ef10f2d06f966f0475e72f99fa891af3c4b2 SHA1 9bf912f34fd6837374477a6d392d52b2489c3c95 SHA256 05f6924011b3d2c85d22448d62d50d4447f4bf962aa458bfbe2acfeb1f48b00e
 MD5 f2b337c1e43223a833d9ae3bd691aef0 jdbc-mysql-5.0.5.ebuild 1849
 RMD160 6ef9ef10f2d06f966f0475e72f99fa891af3c4b2 jdbc-mysql-5.0.5.ebuild 1849
@@ -45,17 +37,14 @@ EBUILD jdbc-mysql-5.0.6.ebuild 1876 RMD160 9ba4ffc665576589952b5f21e625c44252f94
 MD5 782a6c9e6f976f3838b49380aa6653f5 jdbc-mysql-5.0.6.ebuild 1876
 RMD160 9ba4ffc665576589952b5f21e625c44252f94f0b jdbc-mysql-5.0.6.ebuild 1876
 SHA256 50797ea6c468c281766ac9a1992760a69a3b0e76d4caa5d3136827a088fb8265 jdbc-mysql-5.0.6.ebuild 1876
-MISC ChangeLog 10123 RMD160 8d420c5ad1acb686b6719953fbce583d6db6b6c6 SHA1 6ce23b449846eff4a700cf9a1969235b48e97696 SHA256 8c03f997518ab73cc00399eb952d350248659febc02d5c24067626fec177fa54
-MD5 2f51ae02f3b774fc1bde27e8bdc180eb ChangeLog 10123
-RMD160 8d420c5ad1acb686b6719953fbce583d6db6b6c6 ChangeLog 10123
-SHA256 8c03f997518ab73cc00399eb952d350248659febc02d5c24067626fec177fa54 ChangeLog 10123
+MISC ChangeLog 10300 RMD160 d65c22a118a0b586656b88f5172ee5469b365cfc SHA1 00ba916c9329b8ba9f04178899b975ae41d7487c SHA256 d878aceb5ad458950782f4c500a4450b4c8e3a8d3135312752e75025ec1a5671
+MD5 45a19d66e59c3151900495386ced8691 ChangeLog 10300
+RMD160 d65c22a118a0b586656b88f5172ee5469b365cfc ChangeLog 10300
+SHA256 d878aceb5ad458950782f4c500a4450b4c8e3a8d3135312752e75025ec1a5671 ChangeLog 10300
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 d006033735ce1a86921589d9b4710f1b files/digest-jdbc-mysql-3.1.10 286
-RMD160 9257e6a1be011788b4a55c89331f182e4cdf0e7e files/digest-jdbc-mysql-3.1.10 286
-SHA256 2e43592d00cb188b079064d3b3b2d245097f26b2a9f7257e84883ad8c3490381 files/digest-jdbc-mysql-3.1.10 286
 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
@@ -68,10 +57,3 @@ SHA256 694ff597b2fe0c1065c0f2063df10bdbf2823db29236a597af07ce069c1a4ba4 files/di
 MD5 d2ff5b12e0e51eab4f41ae0a09b46d62 files/digest-jdbc-mysql-5.0.6 283
 RMD160 21f105efc5963b17a07c36ab0a8298eba1e756bc files/digest-jdbc-mysql-5.0.6 283
 SHA256 03e0d5790732169f67d565df1beeff7d8d1353a2e7b2ce261754999b610c5c38 files/digest-jdbc-mysql-5.0.6 283
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGXu6aNQqtfCuFneMRAs7aAJ90rEB+ycpXXFs8e+24d0lYruKPoACePtsb
-iojI+fRRXFr9zR9szsKmhyQ=
-=8AP0
------END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10
deleted file mode 100644
index 78abca27873f..000000000000
--- a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-3.1.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 337f7f31e726fb615d3f4f062030d1b5 mysql-connector-java-3.1.10.tar.gz 6892037
-RMD160 30b54059ad0b5301a8fc4836d9ae1fb0a04fb6c4 mysql-connector-java-3.1.10.tar.gz 6892037
-SHA256 41ae162e8dd5a66b20cf3283d9a6d8d638acce0529783c99713e40d6bf7e8a87 mysql-connector-java-3.1.10.tar.gz 6892037
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild
deleted file mode 100644
index af2adb39e3c0..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.10.ebuild,v 1.9 2006/07/18 01:28:00 nichoj Exp $
-
-inherit eutils java-pkg
-
-At=mysql-connector-java-${PV}
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${At}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="log4j c3p0"
-RDEPEND=">=virtual/jre-1.2
-	log4j? ( dev-java/log4j )
-	c3p0? ( dev-java/c3p0 )
-	dev-java/jdbc2-stdext"
-DEPEND=">=virtual/jdk-1.2
-	${RDEPEND}
-	dev-java/junit
-	dev-java/ant-core"
-
-S=${WORKDIR}/${At}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f *.jar
-	epatch ${FILESDIR}/compile-without-log4j.patch
-
-	sed -i 's,{buildDir}/MANIFEST.MF,{buildDir}/META-INF/MANIFEST.MF,' build.xml || die "sed failed"
-
-	mkdir src/lib-nodist
-	cd src/lib
-	rm -f *.jar
-	java-pkg_jar-from jdbc2-stdext
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-src_compile() {
-	local antflags="dist"
-	ant ${antflags} || die "build failed!"
-}
-
-src_install() {
-	java-pkg_newjar build/${At}/${At}-bin.jar ${PN}.jar
-	dodoc README CHANGES
-}
-
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild
index c3ea87ae23c1..8dd0ff63b6c1 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r5.ebuild,v 1.2 2007/05/31 15:49:29 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-3.1.13-r5.ebuild,v 1.3 2007/05/31 15:52:39 wltjr Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -14,7 +14,7 @@ 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 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="c3p0 test"
 COMMON_DEP="
 	dev-java/log4j