Remove old.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

2 files changed, 4 insertions, 91 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index ba183d1fc745..6a155f43b8d0 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.73 2010/10/14 16:49:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.74 2010/10/17 12:21:19 caster Exp $
+
+  17 Oct 2010; Vlastimil Babka <caster@gentoo.org> -jdbc-mysql-5.1.6.ebuild:
+  Remove old.
 
   14 Oct 2010; Brent Baude <ranger@gentoo.org> jdbc-mysql-5.1.11.ebuild:
   stable ppc, bug 309109
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
deleted file mode 100644
index 9359b280119e..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.6.ebuild,v 1.5 2010/06/30 20:46:26 caster Exp $
-
-JAVA_PKG_IUSE="source"
-WANT_ANT_TASKS="ant-contrib"
-
-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-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="c3p0 log4j"
-COMMON_DEP="
-	log4j? ( dev-java/log4j )
-	c3p0? ( dev-java/c3p0 )
-	dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-JAVA_PKG_NV_DEPEND="
-	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )"
-
-DEPEND="${JAVA_PKG_NV_DEPEND}
-	>=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-	# http://bugs.mysql.com/bug.php?id=28286
-	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-
-	# checks fail if java6 bootclasspath is not a single jar
-	sed -i 's/depends="-compiler-check, /depends="/' build.xml || die
-
-	rm -v *.jar || die
-
-	# use test && mkdir src/lib-nodist # needed, or ant will fail
-
-	cd src/lib
-	rm -v *.jar || die
-	java-pkg_jar-from commons-logging
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-# Needs two different source/targets
-JAVA_PKG_BSFIX="off"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
-	local vm=$(depend-java-query -v ">=virtual/jdk-1.6")
-	local javac=$(GENTOO_VM="${vm}" java-config --javac)
-	local rt=$(GENTOO_VM="${vm}" java-config -g BOOTCLASSPATH)
-	einfo "Using ${vm} to compile the JDBC4 driver"
-	einfo "javac: ${javac}"
-	einfo "bootclasspath: ${rt}"
-	java-pkg-2_src_compile \
-		-Dcom.mysql.jdbc.java6.javac="${javac}" \
-		-Dcom.mysql.jdbc.java6.rtjar="${rt}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
-	cd src/lib
-	java-pkg_jar-from junit
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
-	# Skip bytecode check because we want two versions there
-	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES || die
-	dohtml docs/*.html || die
-	use source && java-pkg_dosrc src/com src/org
-}