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

(Portage version: 2.1.2.7)

4 files changed, 7 insertions, 58 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/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