7 files changed, 99 insertions, 3 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e1b6cc5fd7ef..730fe50547c4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/commons-net/Manifest b/dev-java/commons-net/Manifest
index f5f8c7555cc4..586c0519c414 100644
--- a/dev-java/commons-net/Manifest
+++ b/dev-java/commons-net/Manifest
@@ -1,3 +1,6 @@
 DIST commons-net-3.8.0.jar 437325 BLAKE2B 92bdbf2f95cc54f6a791a9de0a56878fe12b6d956d47a4116ae21df35f3dcc4d7b10f5c03c081fc7012a06416f5f9f6555060784bfe22ec9c8d70b17ee7ea215 SHA512 a16ed8c2966541cc052fe963338efcc6f9c42ccd6fefe246547e66d9f46c35cf42bc6d13cb983a1829a378ebd7a676bcb812acbc3aa0ed30e6fa206748dae620
+DIST commons-net-3.9.0-src.tar.gz 440911 BLAKE2B d7f24bff2e36d727bc12bf700b5a5ba9bf6b34a1d63cf892124b81ced113e4b66ebdb8b1eb54fbac33b76efcfc7333150c8d5ce87039cc7204ebf16bb64c8044 SHA512 a2d4ef4937701f28304fdb9a39a0d4a8fdd5fd7ae84c6d647a6b9e05eee68cb4fde8ae9eedd94f45fdc0194d160dd9f64b3c1cfbdd8bcea2214e9826ace32877
+DIST commons-net-3.9.0-src.tar.gz.asc 488 BLAKE2B 7999c63348fdb63de670cf1ace3c928796c663aa960494e0d4a398529b19c4834e9c3d2d8dbdb13e2ba392909e1761458c99332f35e39e0efb0f212b3c0f32de SHA512 72da1fe78bc6c0dea70d171c3c60c7eee8387bb28244f8b67bf38b66c3e7f2c183e4413c3f090a5b1a591ce64a6d43434093425f44c10a9dd03f0b354306e017
 EBUILD commons-net-3.8.0.ebuild 651 BLAKE2B 337169f22e210a515ff4db7f0c96c2da698fd22750f1c2f1170150b8f38efdbd779666a6c02403556f5263ccb1e0795a5b7af81b7448c36b862fe5825ffda6d3 SHA512 6e62d9b6e9606cd94be5a0ec0131010b28f30ddcb87aa2af593bc7af700d9d1de8182fa73694baba21ec35f9a011fb4797b5a5d0270296667d76a26611931d31
+EBUILD commons-net-3.9.0.ebuild 1294 BLAKE2B b75e439f339be4cfef4a5c192c9ef8f1585acbc5546e82aea3d22e64b302e1ff4e9c2c5b3215dab340b2052c25fec4a91661785570a34c01d09baccab45ca3ff SHA512 8560038037d2bc3075a8ec622731adf565e5163e0a23f54a8c6b7ec65d5d4379e5aadf0995df2388eeb7c0948a35bdf1439e514163c92a6ddff74b3175dbd353
 MISC metadata.xml 393 BLAKE2B 344ccb7c8387f2d977c30219cefde70b31255c859898f243ecfde94643641474047299f2438a4067f70cd77ace99fb754ff6dfc2ccdedd2772081870f1444d8f SHA512 75b957e0f6a08377b402e23f49b081ed9add10ff7b3a5d9f52009d48ef4f8d49bb78f48310b93a579b29857562af2d5261f5b4fe4405edd566c1f320ec729046
diff --git a/dev-java/commons-net/commons-net-3.9.0.ebuild b/dev-java/commons-net/commons-net-3.9.0.ebuild
new file mode 100644
index 000000000000..9c7298427146
--- /dev/null
+++ b/dev-java/commons-net/commons-net-3.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+MAVEN_ID="commons-net:commons-net:3.9.0"
+# No tests, junit-jupiter and junit-vintage are not packaged.
+# JAVA_TESTING_FRAMEWORKS="junit-vintage junit-jupiter"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Client-oriented Java library to implement many Internet protocols"
+HOMEPAGE="https://commons.apache.org/proper/commons-net/"
+SRC_URI="mirror://apache/commons/net/source/commons-net-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
+DOCS=(
+	CONTRIBUTING.md
+	NOTICE.txt
+	README.md
+	RELEASE-NOTES.txt
+)
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.net"
+JAVA_ENCODING="iso-8859-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index 42f8ae8b269e..6b777f5c2f92 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -1,3 +1,5 @@
 DIST sbt-1.3.10.tgz 57609786 BLAKE2B 35285d141d8ad38a8e15cc3dd18947fa34dbe307ce1fbdd267a0902ff7f5757a0ab80d56eb241c8bea79c4a13c270efb65a552a039416a6f571b6cd214739819 SHA512 93832c0eec51422d6db63078c722578cbad21e4611ca868e835471fb988ad225e8abdea47c6dcf6e19117db9598bc75296100d9dc7ba0d605b70adc592efb925
-EBUILD sbt-bin-1.3.10.ebuild 812 BLAKE2B d6f0207d2ddf3a573bbda5e6bd3e071ba2953945d815a4f3b664bd61555e27f026ce8b7b37936aee758704d4a40f3e943133c50dd1f3e698fc06958186c35d42 SHA512 70d7292450bc03317fd89a1c28e5fecc75eb4252612041ad3a86b32daae2786cab46c7b7d276381e426f20383de048d1cd4854b18943b4926b9551e76ed19f25
-MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
+DIST sbt-1.8.0.tgz 29165245 BLAKE2B 7b2895e2f748cefd76bd4db12b9903448b77345bfa2c7be9fdf55e959a72828eb73d7b560885c8fb3c691571330fb6b94526820b611e3daf5a4e5f8f093656c9 SHA512 e53817cc7a15a37883ea3cef094e297a813388116e3f0c4bf29c70021c5df01f1e08bccfd20f20cfae007b88fd6c2915f82478ee44274bf5ddcea12df2de7f49
+EBUILD sbt-bin-1.3.10.ebuild 817 BLAKE2B 4ee377bb3da823088c4a29ebc318624dca35768283fb807266a7b95e64f42a2579ba40b1cf86f39132d322f70f4cffd5a6a3ad6dce1d4cf7f1623842a81aee50 SHA512 cb3c07db6eb6a08e04398ad16dfd83073fb3ecfb4d24448ab7589ffd93782571c067c36842e0805bc2c7f68dc4ea39dfc8c6db2b3385ef5387458fd524e65de4
+EBUILD sbt-bin-1.8.0.ebuild 896 BLAKE2B f57fe27d76f3bbe9b8d902051fd21decd1a457e8a981811b139dc22046a594e76718e1b717d886ab3c373828ff90a1d4e9fe1d246ba6a863cc1c2ab56cb90a22 SHA512 41222878b01c8a1bfba671a337d5b7024cdc3e23170013bd5fa1814bde6f61330d62bb63dfd0be39d00fbb63fa2fb11fbf498fc7f8bb6161fc1540c3007a514d
+MISC metadata.xml 309 BLAKE2B 9212aa241860bd211d86ea047b98fd2b3356663f4f57ff2f4446c78a8928ac81378a5c71099f9040e870f87e5e64975a34fbba32bf1b7078f9b2573d4fe1d895 SHA512 59582edfd9efe51a30158c392ba7808d9204ac52fcd79923d4bd620ec2ccfc7ca622a9616a20feae2f73df8350e048a3abaa2f57964e89ba8e49c1733b83bd96
diff --git a/dev-java/sbt-bin/metadata.xml b/dev-java/sbt-bin/metadata.xml
index 4221e170cbc0..9506418c076b 100644
--- a/dev-java/sbt-bin/metadata.xml
+++ b/dev-java/sbt-bin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">sbt/sbt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
index 68c3ba963b1d..e492707aeaf3 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.10.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit java-pkg-2
 
 DESCRIPTION="sbt, a build tool for Scala"
-HOMEPAGE="https://scala-sbt.org"
+HOMEPAGE="https://www.scala-sbt.org/"
 SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
 
 LICENSE="BSD"
diff --git a/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild b/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild
new file mode 100644
index 000000000000..5df89d429600
--- /dev/null
+++ b/dev-java/sbt-bin/sbt-bin-1.8.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+DESCRIPTION="sbt, a build tool for Scala"
+HOMEPAGE="https://www.scala-sbt.org/"
+SRC_URI="https://github.com/sbt/sbt/releases/download/v${PV}/${PN/-bin}-${PV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8
+	!dev-java/sbt"
+
+QA_TEXTRELS="usr/share/sbt-bin/lib/sbtn-x86_64-pc-linux"
+QA_FLAGS_IGNORED="usr/share/sbt-bin/lib/sbtn-x86_64-pc-linux"
+
+S="${WORKDIR}/sbt"
+
+src_prepare() {
+	default
+	java-pkg_init_paths_
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dest="${JAVA_PKG_SHAREPATH}"
+
+	rm -v bin/sbt.bat || die
+	sed -i -e 's#bin/sbt-launch.jar#lib/sbt-launch.jar#g;' \
+		bin/sbt || die
+
+	insinto "${dest}/lib"
+	doins bin/*
+
+	insinto "${dest}"
+	doins -r conf
+
+	fperms 0755 "${dest}/lib/sbt"
+	dosym "${dest}/lib/sbt" /usr/bin/sbt
+}