From d179ea4a5d7f3caf353fdae6186bf77d46c9494e Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Tue, 8 Jun 2021 10:10:15 +0200 Subject: [PATCH] dev-java/jdbc-mysql: remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: https://bugs.gentoo.org/786093 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/21157 Signed-off-by: Miroslav Šulc --- dev-java/jdbc-mysql/Manifest | 1 - .../files/5.0.5-dist-target-depends.patch | 11 --- ...5-remove-jboss-dependency-from-tests.patch | 39 --------- dev-java/jdbc-mysql/files/5.1.14-java6.patch | 34 -------- dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild | 83 ------------------- dev-java/jdbc-mysql/metadata.xml | 12 +-- 6 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch delete mode 100644 dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch delete mode 100644 dev-java/jdbc-mysql/files/5.1.14-java6.patch delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest index 6e4b900fedbff..d137555a18f7c 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -1,2 +1 @@ DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e -DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch deleted file mode 100644 index 28ffc7ad0dabf..0000000000000 --- a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2007-05-07 19:59:49.000000000 +0300 -+++ build.xml 2007-05-07 20:01:21.000000000 +0300 -@@ -291,7 +291,7 @@ - - - -- -+ - - - diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch deleted file mode 100644 index 394830701fee3..0000000000000 --- a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java 2007-03-01 17:48:47.000000000 +0100 -+++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java 2007-04-12 09:53:05.000000000 +0200 -@@ -52,7 +52,6 @@ - import testsuite.simple.DataSourceTest; - - import com.mysql.jdbc.NonRegisteringDriver; --import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker; - import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource; - import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; - import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory; -@@ -315,28 +314,6 @@ - assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize()); - } - -- /** -- * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't -- * work with MySQLXADataSources. -- * -- * @throws Exception if the test fails. -- */ -- public void testBug20242() throws Exception { -- if (versionMeetsMinimum(5, 0)) { -- try { -- Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker"); -- } catch (Exception ex) { -- return; // class not available for testing -- } -- -- MysqlXADataSource xaDs = new MysqlXADataSource(); -- xaDs.setUrl(dbUrl); -- -- MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker(); -- assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection())); -- } -- } -- - private void bindDataSource(String name, DataSource ds) throws Exception { - this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds); - } diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch deleted file mode 100644 index 49343706ad801..0000000000000 --- a/dev-java/jdbc-mysql/files/5.1.14-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 -@@ -131,7 +131,7 @@ - - - -- -+ - -@@ -746,7 +746,8 @@ - -+ debug="${debug.enable}" -+ bootclasspath="${gentoo.bootclasspath}"> - - - -@@ -763,11 +764,7 @@ - -+ sourcepath="" srcdir="${buildDir}/${fullProdName}"> - - - diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild deleted file mode 100644 index 0080138b8de19..0000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="source" -JAVA_PKG_WANT_BOOTCLASSPATH="1.5" -WANT_ANT_TASKS="ant-contrib" - -inherit epatch java-pkg-2 java-ant-2 - -MY_PN="mysql-connector-java" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="MySQL JDBC driver" -HOMEPAGE="https://www.mysql.com/products/connector/j/" -SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz" - -LICENSE="GPL-2-with-MySQL-FLOSS-exception" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -IUSE="c3p0 log4j" - -COMMON_DEP=" - dev-java/slf4j-api:0 - log4j? ( dev-java/log4j:0 ) - c3p0? ( dev-java/c3p0:0 )" - -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 - - 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 -} diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml index a285c6ded9425..952a4b9b605c5 100644 --- a/dev-java/jdbc-mysql/metadata.xml +++ b/dev-java/jdbc-mysql/metadata.xml @@ -1,12 +1,8 @@ - - java@gentoo.org - Java - - - Enable c3p0 support - Enable log4 support - + + java@gentoo.org + Java +