commit: 342c4043a44d8412a4331c0513e9c2db17054add
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 24 14:01:38 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 24 14:03:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342c4043
dev-java/jdbc-mysql: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdbc-mysql/Manifest | 3 -
dev-java/jdbc-mysql/files/5.1.11-java6.patch | 34 -----------
dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild | 81 --------------------------
dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild | 81 --------------------------
dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild | 86 ----------------------------
5 files changed, 285 deletions(-)
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 67a2686..ad40d81 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,4 +1 @@
-DIST mysql-connector-java-5.1.14.tar.gz 3272153 SHA256
ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0 SHA512
42568335dce2e1dbce3e885dfbaafcba8456bf0bcdd9bcc3ec23f3c36af65d05b62968b56c0cda89f803e4d52f15effec8ae7ef40d16993ac542ae981991b6c6
WHIRLPOOL
a9f4bb2ed433eb078208f0780ca4a1d76d4b0e83c0c8f46e73fb80a1a00789266904dc4121dab7d227c3fe5752032cbee14e3cd0502cfac9a6ad2e10071dc4d3
-DIST mysql-connector-java-5.1.18.tar.gz 3834947 SHA256
e67216a40fba486dbba9d93fca8e2d5bd6e434edb08f4b47b07e08f27555f414 SHA512
ec6ac3892c9df1abe26a93b5b60f0ca6350dc4e35f3ba9862754d30c1e4a2a5ecb51eda3b2d8cb32a1b1503a472de0ccedc579144de30cbc12a40264f4e8b90d
WHIRLPOOL
3efcf5227ab8ce5d802f44458764d35a0705c89ff946902402c5e3e64a31bddd244f382622d9cecab18092df13e4da251894fc12a391f4cb53eddca29706e116
-DIST mysql-connector-java-5.1.23.tar.gz 3683852 SHA256
133e74bd7cd0cd5f20dd8d2a365f5fc0274693517b323a6faa960ff46e2c68dc SHA512
adeb464b52b4df717a81ceb0677901ce52e11d04b13f47c1f5312e1f4c45ab1be1a149acbbe147f73875330a0d5ed50265a1e5430657571d9223b39b34de6061
WHIRLPOOL
501b1558a4c6e1d07cc68e3d4764c4aba057436a46b075e30e852bca37db12570b8243744e58e81caaf02ac6ffed85d35cfa3b56823483ad6743037928dbdaad
DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256
fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512
93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879
WHIRLPOOL
9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9
diff --git a/dev-java/jdbc-mysql/files/5.1.11-java6.patch
b/dev-java/jdbc-mysql/files/5.1.11-java6.patch
deleted file mode 100644
index 1e3c21d..0000000
--- a/dev-java/jdbc-mysql/files/5.1.11-java6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
-+++ build.xml 2010-02-13 00:34:30.000000000 +0100
-@@ -124,7 +124,7 @@
- </if>
- </target>
-
-- <target name="init" depends="-compiler-check, -init-copy,
-init-no-crypto">
-+ <target name="init" depends="-init-copy, -init-no-crypto">
- <!-- If we're building under cruise control, update ourself -->
-
- <if>
-@@ -746,7 +746,8 @@
- <javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
- destdir="${compiler.output}"
- deprecation="off"
-- debug="${debug.enable}">
-+ debug="${debug.enable}"
-+ bootclasspath="${gentoo.bootclasspath}">
- <include name="**/*.java" />
- <exclude name="testsuite/**" />
- <exclude name="com/mysql/jdbc/integration/**" />
-@@ -763,11 +764,7 @@
- <javac destdir="${compiler.output}"
- deprecation="off"
- debug="${debug.enable}"
-- fork="yes"
-- executable="${com.mysql.jdbc.java6.javac}"
-- compiler="modern"
-- sourcepath="" srcdir="${buildDir}/${fullProdName}"
-- bootclasspath="${com.mysql.jdbc.java6.rtjar}">
-+ sourcepath="" srcdir="${buildDir}/${fullProdName}">
- <include name="**/JDBC4*.java" />
- <include name="com/mysql/jdbc/exceptions/jdbc4/*" />
-
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
deleted file mode 100644
index 5e4cb51..0000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-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="amd64 ppc ppc64 x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )
- dev-java/commons-logging"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND="virtual/jdk:1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- 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"
- # use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- 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
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # cannot use rewrite-bootclasspath because of the jdbc4 part
- local bcp="$(java-pkg_get-bootclasspath 1.5)"
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
-}
-
-# 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}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
- dodoc README CHANGES || die
- dohtml docs/*.html || die
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
deleted file mode 100644
index d3aee26..0000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-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="amd64 ~ppc ~ppc64 x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- dev-java/slf4j-api:0
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND="virtual/jdk:1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- 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"
- # use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- 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 slf4j-api
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # cannot use rewrite-bootclasspath because of the jdbc4 part
- local bcp="$(java-pkg_get-bootclasspath 1.5)"
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
-}
-
-# 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}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
- dodoc README CHANGES || die
- dohtml docs/*.html || die
- use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
deleted file mode 100644
index f3b8557..0000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-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="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="c3p0 log4j"
-
-COMMON_DEP="
- dev-java/slf4j-api:0
- log4j? ( dev-java/log4j )
- c3p0? ( dev-java/c3p0 )"
-
-RDEPEND=">=virtual/jre-1.6
- ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.6
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- 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"
-
- # Use java6 for everything except jdbc3 - #283848
- epatch "${FILESDIR}/5.1.14-java6.patch"
-
- find . -name '*.jar' -print -delete || die
-
- # use test && mkdir src/lib-nodist # needed, or ant will fail
-
- cd src/lib
- java-pkg_jar-from slf4j-api
- use log4j && java-pkg_jar-from log4j
- use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
- # Cannot use rewrite-bootclasspath because of the jdbc4 part.
- java-pkg-2_src_compile \
- -Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
-}
-
-# 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}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
-
- dodoc README CHANGES
- dohtml docs/*.html
-
- use source && java-pkg_dosrc src/com src/org
-}
