From 1b2c0d19f75523db182b267901484f87abf732cf Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 4 Oct 2023 23:52:39 +0100
Subject: gentoo auto-resync : 04:10:2023 - 23:52:39

---
 dev-java/Manifest.gz                         | Bin 58126 -> 58122 bytes
 dev-java/jdbc-mysql/Manifest                 |   4 +-
 dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild |  56 ---------------------------
 dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild  |   2 +-
 4 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild

(limited to 'dev-java')

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f51774e6d431..9c2a8b0eb53a 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 07bf9dbf78e1..15d33624879e 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,6 +1,4 @@
-DIST mysql-connector-j-8.0.32.tar.gz 4229102 BLAKE2B bb4f89ac9eb4ebc5ed4a8f3d0b63a75d0dbb237e0c434c705d970ec20bbbbec89526d6b0cb11cbceb5e9e5bb485b9d7b17420407d7b01017c7531d5d531c30d8 SHA512 96d920cd137c8aadd7669d3bdc84893bb1dd2c76e81128356844c4321104fc6d2debf950ca1dfdfe958d848b16cd91ee475aad7d3d9b52478f8ac58dbf51922b
 DIST mysql-connector-j-8.1.0.tar.gz 4241696 BLAKE2B 930257a876b1b512b598ebf8397125145bb9d1a438fe33bb55ca208dddfdd29bd436a365cc35b9128cdee6eee436da688dd53cc3ed6cd04efb22d1f5af731863 SHA512 f8a7c621397f49981dd7d19e880d92ee051015ad011c027380ac85760dc22ce2f4117fd27b8d72325c5e2bc40a1a9c22e9534f7200208916ee62bbf1e5ad0c75
 DIST oci-java-sdk-common-2.47.0.jar 439209 BLAKE2B b3b28bb0cf4b8dbca37bb34df7bb48029901be5d9f7754a2ccce888a9af4a06b3348cd545d480127f942687b9b0d63336c37b5f95ecb9f96111c9388a4bc6053 SHA512 73e7376c92d47d81e0630e2ad2d510a483068664874ae31622629dad6dc016d746499c2d29682563e5cdee35ddb6e9e59a2e7557d32e1eeec5fb12206f9d1d6e
-EBUILD jdbc-mysql-8.0.32.ebuild 1497 BLAKE2B 73cef4b5b5b59b5b2a28c705fe727b37856d68e7d64fa8e81f1c29a40c58b2a9fb00a97fad06e6d836d8149dc74ac4ea3b9ea3d14e42caad27370ac691df97f6 SHA512 3fa885dd13270c7ccd01634efdd0562bfecfcd333a39fca0142421d73f7a2442174aa4e7006bf36bf5f6c529e5ad15a30703ae817097bc2088dfaeca4daddead
-EBUILD jdbc-mysql-8.1.0.ebuild 1497 BLAKE2B dc0ee6c150af75b169ccc4205e79923b5a8d7b23cd9f2504625235b800dd0ed90d1a07ae2c16303af01f5639b441e742764ad8586e9bbb7c5372a711da70050f SHA512 81514bb073f6d901d2fd0e1595f6e31b81adb0e3fde1a48b404706c7577ed79a1d3d31ee368228a16c55d8b4fcf98717986c5ef341d09914c1f4cdb410e9c1f6
+EBUILD jdbc-mysql-8.1.0.ebuild 1496 BLAKE2B 738e010421ca1a13870d14aa63353d6d5e8981ddcf81292f0be1499e1449a49b22576a8db873d2519858c7e8a6d4e2c60c86c91123b9d4e978a199895b15c69d SHA512 628433db9e89ff506aa871d667220d4a44c5cf458b519c0bcd2c16eeea9721574ec5c2829f3abe046b119c0bd456c7ee969bad8dc50cc49dd7cfadd6a27b9212
 MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild
deleted file mode 100644
index 6b0870af39c9..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.0.32.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests disabled, see bug #902723
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="com.mysql:mysql-connector-j:8.0.32"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-# Bundling a binary version of oci-java-sdk-common
-# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml
-OSC="2.47.0"
-
-DESCRIPTION="JDBC Type 4 driver for MySQL"
-HOMEPAGE="https://dev.mysql.com/doc/connector-j/en/"
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${PV}.tar.gz
-	https://repo1.maven.org/maven2/com/oracle/oci/sdk/oci-java-sdk-common/${OSC}/oci-java-sdk-common-${OSC}.jar"
-
-S="${WORKDIR}/mysql-connector-j-${PV}"
-
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CP_DEPEND="
-	dev-java/c3p0:0
-	dev-java/protobuf-java:0
-	dev-java/slf4j-api:0
-"
-DEPEND=" ${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-"
-RDEPEND=" ${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DOCS=( CHANGES README )
-
-JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/oci-java-sdk-common-${OSC}.jar"
-JAVA_JAR_FILENAME="mysql-connector-j.jar"
-JAVA_RESOURCE_DIRS="src/main/resources"
-JAVA_SRC_DIR=(
-	"src/generated"
-	"src/legacy/java"
-	"src/main/core-api/java"
-	"src/main/core-impl/java"
-	"src/main/protocol-impl/java"
-	"src/main/user-api/java"
-	"src/main/user-impl/java"
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/config"
-JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
index 5f2f48390a09..09f0063500d1 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-8.1.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/mysql-connector-j-${PV}"
 
 LICENSE="GPL-2-with-MySQL-FLOSS-exception"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CP_DEPEND="
 	dev-java/c3p0:0
-- 
cgit v1.2.3