gentoo auto-resync : 27:06:2023 - 13:35:02

5 files changed, 80 insertions, 10 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 24e3c5d221a4..0fa2edee8d37 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 1a03ade88088..3e91c8db4656 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,5 +1,7 @@
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
 DIST apache-maven-3.9.2-bin.tar.gz 9248920 BLAKE2B 4aef801d463c7a5e1fb3d9e97459c7dca5e09033727ca43821e5b7296e5eedc158859980ff9231130aecc8c1507ac497206f24393291b37c33a751d795dc443c SHA512 900bdeeeae550d2d2b3920fe0e00e41b0069f32c019d566465015bdd1b3866395cbe016e22d95d25d51d3a5e614af2c83ec9b282d73309f644859bbad08b63db
+DIST apache-maven-3.9.3-bin.tar.gz 9258617 BLAKE2B fb73e0f8d9c9cf70912329c58f36044858021753ea7b3b0d0a2a95addd68202ad18c4c049c513af884ba2651165acef042500c3c0536ca52a5eabf883f43e97e SHA512 400fc5b6d000c158d5ee7937543faa06b6bda8408caa2444a9c947c21472fde0f0b64ac452b8cec8855d528c0335522ed5b6c8f77085811c7e29e1bedbb5daa2
 EBUILD maven-bin-3.8.8.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
 EBUILD maven-bin-3.9.2.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
+EBUILD maven-bin-3.9.3.ebuild 1374 BLAKE2B f29c698e5afb41cf62b0354414052f64473d4257ac89f4004f90bfc9717aec71adf18d9c91f9a592de4a07e95d635b64b15b61e4cd0533b762d86194901fecce SHA512 d415fd39d7a4cdab97fafe053c1f9b61d5c562e953b2502c8935f4a7ed6a2f2b55e6452e053a081ebc278b6453409c80015fc392761739a069e76bca7f6277a7
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.9.3.ebuild b/dev-java/maven-bin/maven-bin-3.9.3.ebuild
new file mode 100644
index 000000000000..6748f5927604
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	app-eselect/eselect-java"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+	dodir "${MAVEN_SHARE}"
+
+	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+	dodoc NOTICE README.txt
+
+	dodir /usr/bin
+	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+	# See bug #342901.
+	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+	doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+	eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+	eselect maven update
+}
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index c27e48953ce0..c15a9f623eb7 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,3 +1,4 @@
 DIST xz-java-1.9.zip 155868 BLAKE2B e1e355e75b3d14cae9a12dd00105ff38e25ab9c270cecafc83f27a7a03b36aa7a33647b40b7458b3592319a2b574e10cef9786413f0a12af585199a8f00731de SHA512 743f81ac715d7ac2760af8cee4c62d8fbeef156c0d3e0e85e4605ae08d6a71d1e6f6675e0558e7906a92d5fb3ca1feab9db015a1d42b5df73de2dec770a339cb
-EBUILD xz-java-1.9.ebuild 711 BLAKE2B 5611abe7f690efd53335fce15c9d1cb1e3ec5752059330fa88f8f93d2f9b6764bae2faafe7c6e23e09b6709a806a735c54c209c54fdbcb6e14f46aaca0d01a32 SHA512 0f1a36f22832496875b20f1c1c8005fdace83100d0c882057311954aaae7e570e0cd1fabbaae0165c021996f4a383554b1a6cf1b602b77ad4aff2a4975dbd3f4
+DIST xz-java-1.9.zip.sig 566 BLAKE2B 9702fa3021c4274aacc74ef84903429ed5301eac11cae6bf79014a5bad590c51b169c35f64add85c964cb815129acf920a014e5601acfcd075147f5fb8e9df1e SHA512 5f511260da0f5a9338106ac56511b7a105996852103a3f40cc4a44a7e4e03dc39a645bb0a57ae99bcde8267d5a2d514a7c956a8bfe226c0472e1fa3c7d28e3d5
+EBUILD xz-java-1.9-r1.ebuild 912 BLAKE2B 77184de615304eebb42007dc10534cdb244d53fa7e5154a64523832ea00ae2f729c13931c14fe03cd65dbe28679879a52d2f731cf92ce3f1048567f77960dc50 SHA512 63efdcdb69ff27d585ff4e324f456e99c2001ae6a17a71fd26bbfa1d165f81680129ae1d38378c17d300df1ff514fb06f2f30d77385e24ddff00b94663213168
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/xz-java/xz-java-1.9.ebuild b/dev-java/xz-java/xz-java-1.9-r1.ebuild
index 0a65a660b650..1c5bcb7c9831 100644
--- a/dev-java/xz-java/xz-java-1.9.ebuild
+++ b/dev-java/xz-java/xz-java-1.9-r1.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="doc examples source"
 MAVEN_ID="org.tukaani:xz:1.9"
 
-inherit java-pkg-2 java-pkg-simple
+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"
+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 ~arm arm64 ppc64 x86"
 
-RDEPEND="
-	>=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
 
-DEPEND="
+BDEPEND="
 	app-arch/unzip
-	>=virtual/jdk-1.8:*"
+	verify-sig? ( sec-keys/openpgp-keys-lassecollin )
+"
 
-S="${WORKDIR}"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/lassecollin.asc"
 
 JAVA_SRC_DIR="src/org"