From 8bcae5a5a332db9dc28c20b7a5f28337d8335254 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 5 Apr 2025 01:34:33 +0100 Subject: gentoo auto-resync : 05:04:2025 - 01:34:33 --- dev-java/Manifest.gz | Bin 56180 -> 56184 bytes dev-java/jdbc-mysql/Manifest | 2 +- dev-java/jdbc-mysql/jdbc-mysql-9.2.0-r1.ebuild | 78 +++++++++++++++++++++++++ dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild | 70 ---------------------- 4 files changed, 79 insertions(+), 71 deletions(-) create mode 100644 dev-java/jdbc-mysql/jdbc-mysql-9.2.0-r1.ebuild delete mode 100644 dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index f83e4f7b2678..f02201aca27e 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 049928685906..aa05b3f8ea93 100644 --- a/dev-java/jdbc-mysql/Manifest +++ b/dev-java/jdbc-mysql/Manifest @@ -2,5 +2,5 @@ DIST mysql-connector-j-9.2.0.tar.gz 4502257 BLAKE2B 00c2bddf27f090236ce67bbd31b7 DIST oci-java-sdk-common-3.29.0.jar 453619 BLAKE2B 41a68344a9cf4733c642e3a6e4254f3991f19c13edf57b3c61352b1e6ffdfabfe29cd8dccaa9b128fae618a492fb342007d14ad65b06cd614da572c787cf35ab SHA512 b6def960e114b69d3f34706d5e293f0a05b30c31a1443a92e454631712bb633eaea3795beeeabe4eb1303b8ad42ef2b73d69880b73d360e193f8f1b532bc3430 DIST opentelemetry-api-1.40.0.jar 141734 BLAKE2B 1f14ca7caadd0a3eed615da7ee528e5df72474d9a4eabcf5a820996830cf76c8fa3402de7d283598f1e4bb44b1a15c488b81863c4b5c0685ea35fe65f3fb12c2 SHA512 d4a1af66075b5f147ba297a8133a707716e323800d8aa2debcdace2bbe10046b2fee8a47d87fa9b6f1f11ad30f4da688670c546841990ad8daa7c8c0535498f2 DIST opentelemetry-context-1.40.0.jar 47251 BLAKE2B 7effcc63ec6695184467518686ec8165118cae1e7a4f1a7db273a3cbd1ff0b1e98c2a83252291db9536121e1e2999d1d77734acd7ddb5b272264138af4e6af74 SHA512 14ebc39edce8b603fe9f13d304faf54d7362abe3b1ae574aa84d5bbe37c43b133c8131976efd2bfedc94c646b2487054f7b3cce04e1f09efbce0f4ce5a6d5921 -EBUILD jdbc-mysql-9.2.0.ebuild 2158 BLAKE2B a356b72197caca1e8f17773603152ba6575270b974708a8d992d82cafa9edb7e05cf773db34dc7262f09bdeba92ad896318a40b9ec3f182f887173b4ab1b23f6 SHA512 b93c9e0ef8cc03ee4f785319fca1eeafd76b09cc601e9fcd346b2a3cd26ef0349f779e5432ddf8f218b9655096c39f13b7435a3bde6a181f2d5cc95c80c998de +EBUILD jdbc-mysql-9.2.0-r1.ebuild 2436 BLAKE2B 455891a103378c8d92c0db7ca23b232c585f53539f901eb243e6d7df07afd6136255a4a468e39186a009e87cf283317a69dd20b580f70f0c90ec5b57de44149d SHA512 cd1591715f2674075fb79c96fce760fb044125fdca1c9b15b472fd5d6bab575e3f920b24efde0964bfbf9e35c489c4c679fdaf5d55596b9d24ea3a0352360b4a MISC metadata.xml 325 BLAKE2B e1c3ff68e092bb0e4cd63ed17da632f053f938e8e119a3b5f9a68a3961aac6c1df48a03e281583c22e881576ac9c50b405f0a6b40323bd85a183541a02792a05 SHA512 f855f395f2cc16667e5c524b63c409f754e399d657e50e7aeaebaa99af850480e271a890460a313b8be3c5a66d3e51d26dd2ceaade8828ce3d700232b892fca8 diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.2.0-r1.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.2.0-r1.ebuild new file mode 100644 index 000000000000..719d7cf8e728 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-9.2.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# No tests, see bug #902723 +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.mysql:mysql-connector-j:9.1.0" +# JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +# Bundling binary versions of oci-java-sdk-common and opentelemetry +# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml +OSC="3.29.0" +OAV="1.40.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 + https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/${OAV}/opentelemetry-context-${OAV}.jar + https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/${OAV}/opentelemetry-api-${OAV}.jar" + +S="${WORKDIR}/mysql-connector-j-${PV}" + +LICENSE="GPL-2-with-MySQL-FLOSS-exception" +SLOT="0" +KEYWORDS="amd64 ~ppc64" + +CP_DEPEND=" + dev-java/c3p0:0 + >=dev-java/protobuf-java-4.27.2: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_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-context-${OAV}.jar" +JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-api-${OAV}.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" +) + +src_prepare() { + java-pkg-2_src_prepare + mkdir -p src/main/resources/META-INF/services || die "META-INF" + # populate META-INF/services according to line 801 build.xml + echo com.mysql.cj.jdbc.Driver \ + > src/main/resources/META-INF/services/java.sql.Driver || die "META-INF" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar + java-pkg_newjar "${DISTDIR}/opentelemetry-context-${OAV}.jar" opentelemetry-context.jar + java-pkg_newjar "${DISTDIR}/opentelemetry-api-${OAV}.jar" opentelemetry-api.jar + java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar" +} diff --git a/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild deleted file mode 100644 index bd1b2b48cde4..000000000000 --- a/dev-java/jdbc-mysql/jdbc-mysql-9.2.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No tests, see bug #902723 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.mysql:mysql-connector-j:9.1.0" -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -# Bundling binary versions of oci-java-sdk-common and opentelemetry -# https://github.com/oracle/oci-java-sdk/blob/v2.47.0/bmc-common/pom.xml -OSC="3.29.0" -OAV="1.40.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 - https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-context/${OAV}/opentelemetry-context-${OAV}.jar - https://repo1.maven.org/maven2/io/opentelemetry/opentelemetry-api/${OAV}/opentelemetry-api-${OAV}.jar" - -S="${WORKDIR}/mysql-connector-j-${PV}" - -LICENSE="GPL-2-with-MySQL-FLOSS-exception" -SLOT="0" -KEYWORDS="amd64 ~ppc64" - -CP_DEPEND=" - dev-java/c3p0:0 - >=dev-java/protobuf-java-4.27.2: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_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-context-${OAV}.jar" -JAVA_GENTOO_CLASSPATH_EXTRA+=":${DISTDIR}/opentelemetry-api-${OAV}.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" -) - -src_install() { - java-pkg-simple_src_install - java-pkg_newjar "${DISTDIR}/oci-java-sdk-common-${OSC}.jar" oci-java-sdk-common.jar - java-pkg_newjar "${DISTDIR}/opentelemetry-context-${OAV}.jar" opentelemetry-context.jar - java-pkg_newjar "${DISTDIR}/opentelemetry-api-${OAV}.jar" opentelemetry-api.jar - java-pkg_regjar "${ED}/usr/share/jdbc-mysql/lib/oci-java-sdk-common.jar" -} -- cgit v1.2.3