4 files changed, 75 insertions, 6 deletions
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 0819bc07ee4d..0481f8937df8 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,4 +1,7 @@
+DIST xz-java-1.10.zip 179204 BLAKE2B ffe19ed1de7370879bb5c3c3f777e367fff9868c5113a2920c02409e7ab7a325cd03d30ddd2bcc95e1509d2f38723e51eaf21b4aa767792e7a3c9850cd658e36 SHA512 be293545b9510906334ecbc092834599b36abe7498836ab111726a195fd4fc8731d2cb57109b51ac0de7d14da8b59fea7a48aaa2f5c61075b4b16c0e1d4f5579
+DIST xz-java-1.10.zip.sig 566 BLAKE2B 4a0e146f9a8ccffbf62d775b6d7c647611464fbf23fe0f0d9fa0f768487c642c1a9277b820af9ebdaeb9cefb3f5bf399a226000622838c81c02747b31158441b SHA512 e9bfe7eb28a6f9d8f7eb4c7620fc1598fe70c08a03fd2bfc5a1183110b0f8539704921f6224de352080cb3b6affb33163fd739503f4e8f279e06533445ebe8a6
 DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
 DIST xz-java-1.9.zip.sig 566 BLAKE2B 9702fa3021c4274aacc74ef84903429ed5301eac11cae6bf79014a5bad590c51b169c35f64add85c964cb815129acf920a014e5601acfcd075147f5fb8e9df1e SHA512 5f511260da0f5a9338106ac56511b7a105996852103a3f40cc4a44a7e4e03dc39a645bb0a57ae99bcde8267d5a2d514a7c956a8bfe226c0472e1fa3c7d28e3d5
-EBUILD xz-java-1.9-r1.ebuild 904 BLAKE2B ebb0ff0f3503c888d178403239608882e35023e3ee5b3894134cb08c1df6514307188ccbc095580af1502865301f68c0910e19cdd76659d1510dd69c4c05b5a9 SHA512 f24ee3f21815971dcdfd7b230b6e9136aed59eabe4516ac745249212fb4a6c049123e8d39c6e3f2c53b6a77fcbd7ed94f704aa426f8c74db3b755384bf394497
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+EBUILD xz-java-1.10.ebuild 1426 BLAKE2B 5a1af1ee24964a9a97a0bfa1a7b0a7169e48eec343409517fd2b43adeef5ca128407552b7920c51ba4f24ef5b94800851446979abdac619b678bb2878e322a43 SHA512 d7a6386c3034c5d23c9a6a003e0af1d245d5900d409add83a6960f789a8d88a01dd7bfece847caaabd34c979221fb5f70e7cda3ec4748ab43c1d80650da9cb63
+EBUILD xz-java-1.9-r2.ebuild 957 BLAKE2B e5567a19d30742138ebb224d89ffd3f8f5fb73e58a0aa58c03fbd8e9dc45dd25d9346c86d165641d873f643291f66395d969b292f6dc5afc43d8a66436b685c5 SHA512 876d10b161b30db2476a53502624ff19f28e545a2473eae77dbc5a4c6b8178e7cc045889afb92bf39c6a1af9eecedd3a61c95f54d37dbba9f68a4e3cc2c8e7d4
+MISC metadata.xml 325 BLAKE2B e4efc81efa3a0ff3f09af74b2c1ae0250b47d94806e3162b2e1d1250a1a34d29d139ea45f42f536f3a86bd1021ae518e847064c1b5e34139427dd3146ac5a033 SHA512 867c7a2b17ad020b9640dc8e85bc9263fb2d80d5d1168cc911f9eac49bbd4a757fe899b0e60b6e6bc845c6cb2a3b0fea585aba4d7046ae9e51bf3c55e5de0559
diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml
index 4221e170cbc0..312995bd9c40 100644
--- a/dev-java/xz-java/metadata.xml
+++ b/dev-java/xz-java/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">tukaani-project/xz-java</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xz-java/xz-java-1.10.ebuild b/dev-java/xz-java/xz-java-1.10.ebuild
new file mode 100644
index 000000000000..5017fff07f60
--- /dev/null
+++ b/dev-java/xz-java/xz-java-1.10.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="org.tukaani:xz:1.10"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Implementation of xz data compression in pure java"
+HOMEPAGE="https://tukaani.org/xz/java.html"
+SRC_URI="https://tukaani.org/xz/${P}.zip
+	verify-sig? ( https://tukaani.org/xz/${P}.zip.sig )"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="
+	app-arch/unzip
+	verify-sig? ( sec-keys/openpgp-keys-lassecollin )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc"
+
+JAVA_SRC_DIR="src"
+
+DOCS=( {AUTHORS,NEWS,README,THANKS}.md )
+
+src_compile() {
+	local JAVA_MODULE_NAME="org.tukaani.xz"
+	JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar"
+	java-pkg-simple_src_compile	# creates a legacy jar file without module-info
+
+	# compile module-info.java
+	ejavac \
+		-source 9 -target 9 \
+		--patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \
+		-d target/versions/9 \
+		-sourcepath src9 \
+		$(find src9 -type f -name '*.java')
+
+	# package
+	JAVA_JAR_FILENAME="${PN}.jar"
+	jar cvf "${JAVA_JAR_FILENAME}" \
+		-C target/classes . \
+		--release 9 -C target/versions/9 . || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples src/*Demo.java
+}
diff --git a/dev-java/xz-java/xz-java-1.9-r1.ebuild b/dev-java/xz-java/xz-java-1.9-r2.ebuild
index 0b7ed480b07a..fbd9a461e6ca 100644
--- a/dev-java/xz-java/xz-java-1.9-r1.ebuild
+++ b/dev-java/xz-java/xz-java-1.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,9 +16,9 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64"
 
-DEPEND=">=virtual/jdk-1.8:*"
+DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
 
 BDEPEND="
@@ -28,10 +28,15 @@ BDEPEND="
 
 VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lassecollin.asc"
 
-JAVA_SRC_DIR="src/org"
+JAVA_SRC_DIR="src9"
 
 DOCS=( README NEWS COPYING THANKS )
 
+src_prepare() {
+	java-pkg-2_src_prepare
+	mv src{,9}/org || die
+}
+
 src_install() {
 	java-pkg-simple_src_install
 	use examples && java-pkg_doexamples src/*Demo.java