gentoo auto-resync : 27:09:2024 - 01:25:47

20 files changed, 277 insertions, 12 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 6be1ad71e5d2..c79231ee4a62 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/cdi-api/Manifest b/dev-java/cdi-api/Manifest
index de3997d0aa6f..8fda65c1fd18 100644
--- a/dev-java/cdi-api/Manifest
+++ b/dev-java/cdi-api/Manifest
@@ -1,4 +1,5 @@
 AUX cdi-api-4.0.1-skip-tests.patch 2530 BLAKE2B 6b4fac604f1b3692ce4150b2e6f29d60a32004dd61a7cd4f12e092bb43e8bed6a1ddc33ad711e0f3025ec95f37a8aba11c305e9df23b3f11e29021baa3808e17 SHA512 0d7d99baea9cbc21e9bc435118f793c6a11d802968b24aed20a65b337b3cebb7d50e37a493084deaa7961c64bfd4f2b96f0750897b0589586b3e89077edf364e
 DIST cdi-api-4.0.1.tar.gz 280719 BLAKE2B 9c4cf34f1b0c096a3097bed658ba4c13ab6fa655cd8233b82b13a788dd047e1be89bcde69b3c69665c0987c4f62cd5e4596e51f6235c95db5239daf403dea4e9 SHA512 7f3e9ca45e0708b3c998ff6f743975a9995309d1fb93fde64ca8a0fca73e16ea653085ca743c921d52385f0fbcbdab10b45fd8b6e8b27c2e058871febbbeeb1e
 EBUILD cdi-api-4.0.1-r2.ebuild 2679 BLAKE2B 6adaa74cf6952e134cd03fda924c7fc5c97d7e0d271725b690de8df4f7fcc18f5c8c50be5305bcc010dc4009831ac4700376d1e2a785f57a896265beadbfdc6c SHA512 2aff7fa8ee65bedf952b70c1d6ae7163f1039cdd3230ef495553bff446226efd4378f27c3c7e162f887e4f08aa4c956deb726ed5c07fbd7492cccaad2a65b288
+EBUILD cdi-api-4.0.1-r3.ebuild 2933 BLAKE2B c75f8e1bd10f6c749606b045fa5751671ab4329d684cfc5699690027ff115f528c7233fca8e5e166c30e0dc745e52ad17d2d381ca3a1b53f562229ceaeb60377 SHA512 2cc05f03233cc42df70a4e2b3b0ffc32c3a18b79dfc7d01a598c6b371c6f70ac1e09376bcb83393e0450ea38eabc4a5bacfc9002d0837bd6913884119cff6412
 MISC metadata.xml 295 BLAKE2B 349f4209d0a1dac5a43b3cc197c78aadf3263cfb1e6ddfa39b4ea54bf5b4883a80e800b600720b745a86ee6defe57304736910fc4bb42ee1c1f57f35a3936ea0 SHA512 6f7bf9a1c0e9418a7a0d3cc2baa8f6cbbcf1b4a7abf7f4501d718355d778966b3a16f56bd30c5136d7fb96597d3377e61cbb9a9d840b53fa4da26e00cb3d72e1
diff --git a/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
new file mode 100644
index 000000000000..dc637e2dc427
--- /dev/null
+++ b/dev-java/cdi-api/cdi-api-4.0.1-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="APIs for CDI (Contexts and Dependency Injection for Java)"
+HOMEPAGE="https://projects.eclipse.org/projects/ee4j.cdi"
+SRC_URI="https://github.com/jakartaee/cdi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/cdi-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+EL_API_SLOT="5.0"
+
+DEPEND="
+	dev-java/injection-api:0
+	dev-java/jakarta-annotations-api:0
+	dev-java/jakarta-el-api:${EL_API_SLOT}
+	dev-java/jakarta-interceptors:0
+	>=virtual/jdk-11:*
+"
+RDEPEND=">=virtual/jre-11:*"
+
+DOCS=( CONTRIBUTING.adoc {NOTICE,README}.md )
+
+PATCHES=(
+	# https://bugs.gentoo.org/856412
+	# org.jboss.cdi.api.test.se.SeContainerInitializerTest # Tests run: 4, Failures: 1
+	# org.jboss.cdi.api.test.CDITest # Tests run: 11, Failures: 5
+	"${FILESDIR}/cdi-api-4.0.1-skip-tests.patch"
+)
+
+JAVA_GENTOO_CLASSPATH_EXTRA="cdi-api.jar"	# tests need it on classpath
+JAVA_TEST_EXCLUDES=(
+	# Tests run: 1, Failures: 1
+	org.jboss.cdi.api.test.privileged.CDIPrivilegedTest
+)
+JAVA_TEST_EXTRA_ARGS=( -DserviceDir="target/test-classes/META-INF/services" )
+JAVA_TEST_GENTOO_CLASSPATH="injection-api testng"
+JAVA_TEST_RESOURCE_DIRS="api/src/test/resources"
+JAVA_TEST_SRC_DIR="api/src/test/java"
+
+src_prepare(){
+	default #780585
+	java-pkg-2_src_prepare
+
+	# fixing the directory structure to allow multi-mode compilation
+	mkdir -p src/jakarta.cdi{,.lang.model} || die
+	cp -r api/src/main/java/* src/jakarta.cdi/ || die
+	cp -r lang-model/src/main/java/* src/jakarta.cdi.lang.model || die
+}
+
+src_compile() {
+	mkdir -p target/classes || die
+
+	# getting the modulepath
+	DEPENDENCIES=(
+		jakarta-el-api-${EL_API_SLOT}
+		jakarta-annotations-api
+		jakarta-interceptors
+		injection-api
+	)
+	local modulepath
+	for dependency in ${DEPENDENCIES[@]}; do
+		modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})"
+	done
+
+	# Multi-module compilation, https://openjdk.org/projects/jigsaw/quick-start
+	ejavac -d target/classes \
+		--module-version ${PV} \
+		--module-path "${modulepath}" \
+		--module-source-path ./src $(find src -type f -name '*.java') || die
+
+	if use doc; then
+		ejavadoc -d target/api \
+		--module-path "${modulepath}" \
+		--module-source-path ./src $(find src -type f -name '*.java') || die
+	fi
+
+	# packaging seems possible only per each module (?)
+	jar cvf cdi-api.jar -C target/classes/jakarta.cdi . || die
+	jar cvf lang-model.jar -C target/classes/jakarta.cdi.lang.model . || die
+
+	java-pkg_addres cdi-api.jar api/src/main/resources
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dojar "lang-model.jar"
+
+	if use source; then
+		java-pkg_dosrc "lang-model/src/main/java/*"
+		java-pkg_dosrc "api/src/main/java/*"
+	fi
+}
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index dac71bfd5856..d55b297128a3 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -3,5 +3,5 @@ DIST commons-codec-1.16.1-src.tar.gz.asc 488 BLAKE2B d3f193b602339714728875189ae
 DIST commons-codec-1.17.1-src.tar.gz 456746 BLAKE2B 9bf33c183d4344bdccdffa1c573f9b2cfe34db227cbcffa66a7baed85778a516339a736ddade637859989055e2ab86abb5464ab9bc57782e3c972cc8ed2c4dbd SHA512 c98456664396d4d9cb794c185a479e6bb4a5055ed1f526a8e358fe3a59409c057dbb16f59c251bb52976995dbca14d8f15857074c9d19fbc7bdfed625a13abf0
 DIST commons-codec-1.17.1-src.tar.gz.asc 488 BLAKE2B 63bd00bcf69ab41e58e1eb2b2e56749211aa044e769a16fe2eea6acdeeac85d59c7465597aaec671b6efe22c68b05cd64c2e7a4bd2dc2f7f2b235dd27a125153 SHA512 6e9475773162193ce005635a5af926e0c7bfbaaca4c801a66bdabe73de0a2d17ec489a77d904d7d69e5749bc2af07d5b0b97d5aef2a319c614a3f1db632d424c
 EBUILD commons-codec-1.16.1.ebuild 1277 BLAKE2B fd813ce6a6526624ea17689178c24acfbdff557a98de71f1a5ef2995dba57aa77060eea8f8a5b5704ece723fe3c96e53e313eea40885ee3fe2e028a3fa2abc92 SHA512 888b364b3b8866e4a45535a7851839af4b9b979f6202ae73217ff35b07e07703d05690a77e27ca805fa60120da25a148765547d31048e933f747c9f8e4211055
-EBUILD commons-codec-1.17.1.ebuild 1582 BLAKE2B d801583526ae97eb2c4ab246175e3a851c1e3e09a935bf4a3e43c20c9c6c036d143678405d7b079dabb39b54abc672cc1877386e5ee05c680f4b4f0cfd66b7bd SHA512 5c61a3260dac3f6109f4a1475b787115b3570a0d11277f99c725ee5b002aa7f350d04a660a3a799cf9e4018135a73f21e183a7fc9eb233a00aa10cc532ba92a6
+EBUILD commons-codec-1.17.1-r1.ebuild 1581 BLAKE2B 9a6d0a788d9802f98382a588bbefbf4bc2cc18cdc594b6596ded6e544458cdd3f3e2e76441452cdd2876f14a5a9891fbf4009bbac98f64b939cc0df05858ddb4 SHA512 d71a27753eb41426fbb914ceab9ec523122f3799fbc2efaedd88d922eb7a839e213040857b03023e33613ce1e5362ecb3a392d65ca482461e5e1862ac0a86377
 MISC metadata.xml 1443 BLAKE2B 9dc72c216ed78422e21ce8c25aab0ca901fe2947ab3d26076379701c7ed585def08c49d258e30d035ffb8e7f618540578cc34ca4246a30e21e1ebbab13c706bd SHA512 1ae390b599a1b817f1d7bc54e8d73dfe596de6a6829ef65554f4a27d16e79e1c99645302d1d761caefb48e46f54ba930cf0991985beedc93e7fb416b7146a920
diff --git a/dev-java/commons-codec/commons-codec-1.17.1.ebuild b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
index fe0b70801518..9b6bd0170923 100644
--- a/dev-java/commons-codec/commons-codec-1.17.1.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild
@@ -23,7 +23,7 @@ RESTRICT="test" #839681
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc"
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
 DEPEND="
-	>=virtual/jdk-1.8:*
+	>=virtual/jdk-11:*
 	test? (
 		dev-java/commons-lang:3.6
 		dev-java/hamcrest:0
diff --git a/dev-java/jetbrains-annotations/Manifest b/dev-java/jetbrains-annotations/Manifest
new file mode 100644
index 000000000000..7f739088b027
--- /dev/null
+++ b/dev-java/jetbrains-annotations/Manifest
@@ -0,0 +1,3 @@
+DIST jetbrains-annotations-24.1.0.tar.gz 84549 BLAKE2B 1c522e4eeb71520108d83305667571fd07b452977277a161ea0f6a940431212ccd3b7ca2980f77b0e8c015cce0b5a35500fefca73e74bf48c9859525332bdc81 SHA512 80dc35009eaac29b44a5126865bf76d1c2d20c0e9094a200b13bc9047d6ec327a25e49a06c462ba65c4aa6e3d201d0a3005614f27b07adcf107080c0189af9fa
+EBUILD jetbrains-annotations-24.1.0.ebuild 630 BLAKE2B c15408b095dfcc353df6c8a97dea6ba0e1ebde658675dfaad1d33176651743e3e762bc5c41d5068efa39b38c2476fa3111008c725de46093a6ea5c1733bb805d SHA512 f68ce6114d0b2dcdc77bfe1ca5128c256508515c6d094a7b0ba7c46010e9b3f7c77d34f70271255e1b6fc3034d0e8495a79f7275dc660b27ecef9bcebd5f4bb0
+MISC metadata.xml 308 BLAKE2B 66accc35b2da2b99b17d16d970773799227fcf57177caf19a258a3a7aac3bf107e63b472f61bfe4dc869f84634f032659fb8049a4e21c164533f988e437897f4 SHA512 2f6c2852f8cc5283186c8dd317265f80400b112eea45a1d8256f6abdd59448cca2cff8516c40922eddc52c98c30307b804139e454cb2e3ae8b84a7a12bca7dd0
diff --git a/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild b/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild
new file mode 100644
index 000000000000..5f359ddcbe74
--- /dev/null
+++ b/dev-java/jetbrains-annotations/jetbrains-annotations-24.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.jetbrains:annotations:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Annotations for JVM-based languages"
+HOMEPAGE="https://github.com/JetBrains/java-annotations"
+SRC_URI="https://github.com/JetBrains/java-annotations/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/jetbrains/java}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=">=virtual/jdk-11:*"	# module-info
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR=( {common,java8,module-info}/src/main/java )
diff --git a/dev-java/jetbrains-annotations/metadata.xml b/dev-java/jetbrains-annotations/metadata.xml
new file mode 100644
index 000000000000..9c299c51b5d6
--- /dev/null
+++ b/dev-java/jetbrains-annotations/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JetBrains/java-annotations</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/kafka-clients/Manifest b/dev-java/kafka-clients/Manifest
index 5eb24782d901..50dff38f7e94 100644
--- a/dev-java/kafka-clients/Manifest
+++ b/dev-java/kafka-clients/Manifest
@@ -1,3 +1,3 @@
 DIST kafka-1.1.1-src.tgz 6443963 BLAKE2B 721f9efb4bd2a1c605e1750a29a33f9939d346a1f81d380b980631d03a1dffcba2f435a91e9420a5876d2294f62c4e4ef39e951b0d37406c0b924f036947848d SHA512 26aa54fe5a761619fb748e4597dd2e3968a99c32d39312b56a83738df6df5e62052d7f883bf56cec25d1e31315d2ff856375fdc7f97a6029786abfa341769ecc
-EBUILD kafka-clients-1.1.1.ebuild 740 BLAKE2B 2f106e1388b02ab33e591281f2504d357e2ad080fd818bc82ff80c3b6c44e70a50260e7d9169fa4a94c43209a2367a5be12693f93180c7f842c2116a031749de SHA512 2c05add6e9527b8e352fe50950f93c90d402c0cf26362e5154051308e4e561dd478ea69b8765658143ea890cf4094db904c124d88cf15339a6cd09ed55a6ad18
+EBUILD kafka-clients-1.1.1-r2.ebuild 746 BLAKE2B 2bd50fa8a0a4fd29e73569ba0056ffc316ce57a184949eaedc57d8fee5e2893a7af942b769ebdcde0c42fb228ab2cc1d532031d06c8b2f209b53ba48193c6c68 SHA512 370151eb14ced06be7037d91116515842dfe470d2547a7dedfe78fbf2b01271f6af0031f1300cce7c4bdc5eeb1c11c41197585aa40d6d3e60d15f572e255558e
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild
index 88b5337e7ba3..1e48a4ed395b 100644
--- a/dev-java/kafka-clients/kafka-clients-1.1.1.ebuild
+++ b/dev-java/kafka-clients/kafka-clients-1.1.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,6 +11,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Apache Kafka distributed event streaming platform"
 HOMEPAGE="https://kafka.apache.org/"
 SRC_URI="https://archive.apache.org/dist/kafka/${PV}/kafka-${PV}-src.tgz"
+S="${WORKDIR}/kafka-${PV}-src/clients"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,7 +20,7 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 CP_DEPEND="
 	>=dev-java/lz4-java-1.4.1:0
 	>=dev-java/slf4j-api-1.7.25:0
-	>=dev-java/snappy-1.1.7.1:1.1
+	>=dev-java/snappy-java-1.1.10.5-r2:0
 "
 
 DEPEND="
@@ -32,6 +33,4 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/kafka-${PV}-src/clients"
-
 JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/snappy/Manifest b/dev-java/snappy-java/Manifest
index 0b6a1e7dccd2..4219d9fdd75e 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy-java/Manifest
@@ -5,6 +5,8 @@ AUX snappy-1.1.10.1-commons-lang3.patch 507 BLAKE2B 17a9219e4e9fbcf8900dff8ce067
 AUX snappy-1.1.10.1-unbundle-snappy.patch 1928 BLAKE2B cc67a38e53dcd08d208b33796a003d7ca73f79a54a8d0a4411de9f15aae1e09e079bc55c9230964e990f8a27e4be3872e9d5092fe7abb5af760ce91641b753c1 SHA512 78cef705a76c379ec7cc59e4f4c6012bbba5f54b4a24172b7ab2ef0ccd7a8e22cf3e469938c9dca5933e066990c3e973893c0c93368fecd90486010f9b8ad69f
 AUX snappy-1.1.10.5-SnappyOutputStreamTest.patch 1215 BLAKE2B 34005766546b28012ffbd86927b37d9368eab212b3fc2252492f2c49f7b639519cdf5bd197fb7dce3769108bab1175414f0b9287cf4893d41ad784e9f27ae8c0 SHA512 3c65030686fcdd1177c6865894510081ba41631db9c3945c52aeef921ccf049fa65083225af9f022a1537814e8a50de2ad0740292b9d6d8e8ee900176ff69267
 DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
-DIST snappy-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
-EBUILD snappy-1.1.10.5-r1.ebuild 2926 BLAKE2B 78c575879bf9a592ee7b77b7590dd763fbc64aa8a14b73f52eca9302b17df9ba60559d71eff5a659cc30d874bd82564e2137f41670e93179d1fa452a2f0cc5df SHA512 5183f238892d1fe9ad8733e7bd0c478ea4732594f46c70af6bc0da04fa4b3b7cf933365989a244a9334f97d1129b3d0c47ba881db0a81b58ce9f2ccc9e17f26b
+DIST snappy-java-1.1.10.5.tar.gz 3917442 BLAKE2B 0632fa7ba4d0a863801e88ced22098c3bc228c1f3e188c67cb9ff62807f9454b580b49fff15c7deee1e790db51f4664c50a6546259439eda18597097a5128329 SHA512 f84778f59635eb97c0072489766904a16208be4f41b28151b14eecd0fe84f3f04a44c18d452b9d79e752b22d5e5b9ab5b36064cc8aeec8de655d7635132093ea
+DIST snappy-java-1.1.10.7.tar.gz 3953515 BLAKE2B 40657085a25186b7c78024196406002a39afe26e97145f57a438d783fb512c0168b48ef3f38d9d123954458c56e593f8490a5069a1712bb7d4ec86cf425a828c SHA512 1d7f484202f6bfd59454d56a9f57b0795f0919ae607e0bfd4da0b58c0caae437ae3c3f8638699a94b0b4794197a03058c3b5e258c5cf87b95683587a3e8396fe
+EBUILD snappy-java-1.1.10.5-r2.ebuild 2922 BLAKE2B 25af341dc6335dc9f98b909a0e377f25db2abe3d2cdfdfffe8d99b18dda2b5ee691c279480e5eb2159d3571429530d5951fdcb6b2194fee4a42a33ae86b50765 SHA512 1ed635845def6d4f6a6e7095b31aaa5b3f3da082f8c21dc66e3411a19738237a82001abb54ca8f017773c80c39d71fa4e49479faa1ed5f0b2af117f37cab8678
+EBUILD snappy-java-1.1.10.7.ebuild 2875 BLAKE2B 4cf7226007f7729ca9ca7b88f25814bf394cecf01ae991faa426aa5ecb8e8336c4c9554f0b0e01b685d41239cce47d3366037e1e619ab2f791f64d6a8b9fdeba SHA512 e0bbc7f932d6d934ed94bfc7a34ae18084530aab998ea02f1df141b6c6c8eefbd1949be59cf32bb1c86b32da0b2bce73239ff016e7f04be58170d13db74b4abd
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/files/1.1.7.8-gentoo.patch b/dev-java/snappy-java/files/1.1.7.8-gentoo.patch
index b4a58e6482be..b4a58e6482be 100644
--- a/dev-java/snappy/files/1.1.7.8-gentoo.patch
+++ b/dev-java/snappy-java/files/1.1.7.8-gentoo.patch
diff --git a/dev-java/snappy/files/1.1.7.8-java-version-target.patch b/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
index a852d0bdb807..a852d0bdb807 100644
--- a/dev-java/snappy/files/1.1.7.8-java-version-target.patch
+++ b/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch
diff --git a/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch b/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
index e4f699ad123e..e4f699ad123e 100644
--- a/dev-java/snappy/files/1.1.7.8-unbundle-bitshuffle.patch
+++ b/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch b/dev-java/snappy-java/files/snappy-1.1.10.1-commons-lang3.patch
index 064482eabb7f..064482eabb7f 100644
--- a/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
+++ b/dev-java/snappy-java/files/snappy-1.1.10.1-commons-lang3.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch b/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
index d516495bb6a7..d516495bb6a7 100644
--- a/dev-java/snappy/files/snappy-1.1.10.1-unbundle-snappy.patch
+++ b/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch
diff --git a/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch b/dev-java/snappy-java/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
index 43272e9d4a7f..43272e9d4a7f 100644
--- a/dev-java/snappy/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
+++ b/dev-java/snappy-java/files/snappy-1.1.10.5-SnappyOutputStreamTest.patch
diff --git a/dev-java/snappy/metadata.xml b/dev-java/snappy-java/metadata.xml
index db7de7da5a64..db7de7da5a64 100644
--- a/dev-java/snappy/metadata.xml
+++ b/dev-java/snappy-java/metadata.xml
diff --git a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild
index 6e719db54841..b90ae8cf8058 100644
--- a/dev-java/snappy/snappy-1.1.10.5-r1.ebuild
+++ b/dev-java/snappy-java/snappy-java-1.1.10.5-r2.ebuild
@@ -16,17 +16,17 @@ HOMEPAGE="https://github.com/xerial/snappy-java/"
 HCV="3.3.5"
 SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
-S="${WORKDIR}/snappy-java-${PV}"
+S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
-SLOT="1.1"
+SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 CP_DEPEND="dev-java/osgi-core:0"
 
 CDEPEND="
 	app-arch/snappy
-	dev-libs/bitshuffle
+	>=dev-libs/bitshuffle-0.3.5-r1
 "
 
 DEPEND=">=virtual/jdk-1.8:*
diff --git a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
new file mode 100644
index 000000000000..8824060b3581
--- /dev/null
+++ b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xerial.snappy:snappy-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs
+
+DESCRIPTION="Snappy compressor/decompressor for Java"
+HOMEPAGE="https://github.com/xerial/snappy-java/"
+# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version.
+# It's used for testing only and does not get installed.
+HCV="3.3.5"
+SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )"
+S="${WORKDIR}/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CP_DEPEND="dev-java/osgi-core:0"
+
+CDEPEND="
+	app-arch/snappy
+	>=dev-libs/bitshuffle-0.3.5-r1
+"
+
+DEPEND=">=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	${CDEPEND}
+	test? (
+		>=dev-java/ant-1.10.14:0[junit4]
+		dev-java/commons-io:1
+		dev-java/commons-lang:3.6
+		dev-java/plexus-classworlds:0
+		dev-java/xerial-core:0
+	)"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CP_DEPEND}
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.1.7.8-java-version-target.patch"
+	"${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch"
+	"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
+	"${FILESDIR}/1.1.7.8-gentoo.patch"
+	"${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch"
+)
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+	commons-io-1
+	commons-lang-3.6
+	junit-4
+	plexus-classworlds
+	xerial-core
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+	if use test; then
+		# this is needed only for tests
+		CHECKREQS_MEMORY="2560M"
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_env
+}
+
+pkg_setup() {
+	check_env
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	# remove pre-compiled sofiles
+	rm -r src/main/resources/org/xerial/snappy/native || die
+	rm -r src/test/resources/lib || die
+}
+
+src_compile() {
+	emake \
+		CXX="$(tc-getCXX)" \
+		JAVA_SOURCE="$(java-pkg_get-source)" \
+		JAVA_TARGET="$(java-pkg_get-target)"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar"
+	JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} )
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -ge 17; then
+		java-pkg-simple_src_test
+	else
+		einfo "Tests need jdk-17 to pass."
+	fi
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	local jniext=.so
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		jniext=.jnilib
+		# avoid install_name check failure
+		install_name_tool -id "@loader_path/libsnappyjava${jniext}" \
+			"target/libsnappyjava${jniext}"
+	fi
+	java-pkg_doso "target/libsnappyjava${jniext}"
+}