From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 15 Jun 2021 14:57:03 +0100
Subject: gentoo resync : 15.06.2021

---
 dev-java/jdbc-mysql/Manifest                       |  9 +--
 .../files/5.0.5-dist-target-depends.patch          | 11 ---
 .../5.0.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/jdbc-mysql-8.0.25.ebuild       | 54 ++++++++++++++
 dev-java/jdbc-mysql/metadata.xml                   | 12 ++--
 7 files changed, 61 insertions(+), 181 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
 create mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild

(limited to 'dev-java/jdbc-mysql')

diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index fb7147865ed6..f2d6a1b313b9 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,3 @@
-AUX 5.0.5-dist-target-depends.patch 380 BLAKE2B 2e4d8a025c986dd6bbd1e97b629875614ea9be28c0fc51bc24dca85244fc089798c09f3fdb125bbc94ba19355b133b2119e5e4e1573990616d1dc960fd2dacfa SHA512 407ba02b1e2b3a514a9e270356a15f97eaa19197117a9f2752ee6b78fba0dd7cab150f7eaac02f8d6cb9d3bfe6d0edd3e68f38457310d69123c97b9231d621c4
-AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 BLAKE2B 17c84606f144c3aedc6b61986f9f7d215ac539b044d2745682e9f98b22bd6a86996cdb693762b375fd57de21bbe09afeef4ed8a5e91d124a28ecd157a2761a3a SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5
-AUX 5.1.14-java6.patch 1301 BLAKE2B 605199c02b040a07306a26f1701ce3fb317ae7af41480329ae79491f0896847c143ae0e2c04358e291b9288c29a0eeebc613bee9d6b150a6993f6282fc8e7713 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1
-DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879
-EBUILD jdbc-mysql-5.1.26.ebuild 1881 BLAKE2B d610892dc558b8d17fd61331ae3d6b5560015b705fa6eb4b4a8f0ed689f6c5f775bff30e0aed2d1f867bb8e379257db93c1f8e3ae3d9650b4f8cbc188cdd2b57 SHA512 3f56080e2b0039474e91cfc4913c9b2fde3594e4e814d057d2a3fbdd146d3205ceb9183c58245f10e99e5f14590bf9a73f9a2c35c5f1b928b6cf642b1f9681e3
-MISC metadata.xml 358 BLAKE2B 634f9354e5f680e4313debca5f05fc117b44f1a43b018b3d71d92430cb8253a9da018f74e888bf535e0dbc64e79d240d4f5748d945a5caa14eba874b9e38dca9 SHA512 4db9ea2f30ecc92b4b97e5159d4338b73c59e3f8640336764d2766a1ca33760b7c0fa6caaac90125102555a5128fff3b2d95e20d92df22e705623f0e2b7914e9
+DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e
+EBUILD jdbc-mysql-8.0.25.ebuild 1569 BLAKE2B bc43d39641921dccf2d4bf61124d1c37fc0f89f98b581fc233ed82bedf833e09d295fdf52ce98436ef26edf850a53263ef603d18298866420a230bc8d5553e86 SHA512 cfdf865113f68213f45970553eb47f6d81bcb0811182d789589079759902c848f7c1eb5ad06fe316da0ae0b613017ee3394d0c8ffc5082fd8dc7c74389ef4a5f
+MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
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 28ffc7ad0dab..000000000000
--- 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 @@
- 		</if>
- 	</target>
- 
--	<target name="dist" depends="init, compile">
-+	<target name="dist" depends="init, compile-driver,compile.integration">
- 
- 		<delete file="${buildDir}/${fullProdName}-bin.jar" />
- 		<delete file="${distDir}/${fullProdName}.jar" />
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 394830701fee..000000000000
--- 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 49343706ad80..000000000000
--- 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 @@
- 		</if>	
- 	</target>
- 
--	<target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
-+	<target name="init" depends="-init-copy, -init-no-crypto">
-		<!-- We need the following for source distributions as there we
-             can't dynamically alter the classpath, and not having this
-		     directory present causes the build to fail -->
-@@ -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.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
deleted file mode 100644
index 0080138b8de1..000000000000
--- 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/jdbc-mysql-8.0.25.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild
new file mode 100644
index 000000000000..417722c0319f
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.0.25.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom mysql-connector-java-8.0.25.pom.xml --download-uri https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.25/mysql-connector-java-8.0.25-sources.jar --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild jdbc-mysql-8.0.25.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="mysql:mysql-connector-java:8.0.25"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JDBC Type 4 driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
+SRC_URI="https://repo1.maven.org/maven2/mysql/mysql-connector-java/${PV}/mysql-connector-java-${PV}-sources.jar -> ${P}-sources.jar"
+
+LICENSE="GPL-2-with-MySQL-FLOSS-exception"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+# Common dependencies
+# POM: mysql-connector-java-${PV}.pom.xml
+# com.google.protobuf:protobuf-java:3.11.4 -> !!!groupId-not-found!!!
+
+CDEPEND="dev-java/c3p0:0
+	dev-java/protobuf-java:0
+	dev-java/slf4j-api:0"
+DEPEND=" ${CDEPEND}
+	>=virtual/jdk-1.8:* "
+RDEPEND=" ${CDEPEND}
+	>=virtual/jre-1.8:* "
+BDEPEND="app-arch/unzip"
+
+DOCS=( META-INF/README )
+
+S="${WORKDIR}"
+
+JAVA_GENTOO_CLASSPATH="c3p0,protobuf-java,slf4j-api"
+
+JAVA_SRC_DIR="com"
+JAVA_RESOURCE_DIRS="res"
+
+src_prepare() {
+	default
+	mkdir --parents "${JAVA_RESOURCE_DIRS}" || die
+	cp -r "${JAVA_SRC_DIR}" "META-INF" "${JAVA_RESOURCE_DIRS}"
+	find "${JAVA_RESOURCE_DIRS}" -type f -name '*.java' -exec rm -rf {} + || die
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml
index a285c6ded942..952a4b9b605c 100644
--- a/dev-java/jdbc-mysql/metadata.xml
+++ b/dev-java/jdbc-mysql/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <use>
-    <flag name="c3p0">Enable c3p0 support</flag>
-    <flag name="log4j">Enable log4 support</flag>
-  </use>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-- 
cgit v1.2.3