Adding metadata

38 files changed, 58 insertions, 369 deletions

diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
index 2749b9e70173..720f27959e1a 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,5 +44,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
index de1022b748c7..a7881b3908e8 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,5 +46,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
index 478fe1efa829..8dfdbb8d8264 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
@@ -46,5 +46,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
index 197be6d643e4..0b394b88d26a 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.21.ebuild
@@ -50,5 +50,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
index 3656f27ea48d..72245b3883f7 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,5 +44,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
index 3e841d328273..8260b02e4de7 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,5 +44,5 @@ src_install() {
 	java-pkg-simple_src_install
 	insinto /usr/share/java-config-2/compiler
 	doins "${FILESDIR}/ecj-${SLOT}"
-	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
 }
diff --git a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
index 5e67269064c2..5e26db26f1a7 100644
--- a/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
+++ b/dev-java/apache-rat-core/apache-rat-core-0.13.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin."
+DESCRIPTION="The core functionality, shared by the Ant tasks and the Maven plugin"
 HOMEPAGE="https://creadur.apache.org/rat/apache-rat-core/"
 SRC_URI="mirror://apache//creadur/apache-rat-${PV}/apache-rat-${PV}-src.tar.bz2"
 LICENSE="Apache-2.0"
diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
index f7048a2fa233..8860918b9973 100644
--- a/dev-java/commons-csv/commons-csv-1.9.0.ebuild
+++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-csv:1.9.0"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Simple interface for reading and writing CSV files of various types."
+DESCRIPTION="Simple interface for reading and writing CSV files of various types"
 HOMEPAGE="https://commons.apache.org/proper/commons-csv/"
 SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild
index 8aa24e232dfb..f6f4b5f8feb0 100644
--- a/dev-java/commons-io/commons-io-2.11.0.ebuild
+++ b/dev-java/commons-io/commons-io-2.11.0.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="commons-io:commons-io:2.11.0"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Utility classes, stream implementations, file filters, and much more."
+DESCRIPTION="Utility classes, stream implementations, file filters, and much more"
 HOMEPAGE="https://commons.apache.org/proper/commons-io/"
 SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
index 67823fa867ac..530b720f0f19 100644
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.apache.commons:commons-text:1.9"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings."
+DESCRIPTION="Apache Commons Text is a library focused on algorithms working on strings"
 HOMEPAGE="https://commons.apache.org/proper/commons-text"
 SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
index 1dbd7e477390..a04c6e5dd6ac 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.1.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="43815fc"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
index ebab256dc34e..f54ad2867014 100644
--- a/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
+++ b/dev-java/core-specs-alpha/core-specs-alpha-0.2.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="d69f559"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions."
+DESCRIPTION="A Clojure library with specs to describe Clojure core macros and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/core.specs.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/jackcess/jackcess-4.0.0.ebuild b/dev-java/jackcess/jackcess-4.0.0.ebuild
index 7d2a8161da68..2d583cbc5fe7 100644
--- a/dev-java/jackcess/jackcess-4.0.0.ebuild
+++ b/dev-java/jackcess/jackcess-4.0.0.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="A pure Java library for reading from and writing to MS Access databases."
+DESCRIPTION="A pure Java library for reading from and writing to MS Access databases"
 HOMEPAGE="https://jackcess.sourceforge.io"
 SRC_URI="https://github.com/jahlborn/${PN}/archive/refs/tags/${P}.tar.gz -> ${P}-sources.tar.gz"
 
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
index a5a06c63d545..405fd366f61b 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9."
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
 HOMEPAGE="https://tomcat.apache.org"
 SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 211abc53f20a..263da0bf4a88 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Jaxen is a universal XPath engine for Java."
+DESCRIPTION="Jaxen is a universal XPath engine for Java"
 HOMEPAGE="http://www.cafeconleche.org/jaxen/"
 SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
index 6c6b7d259e42..ef103551c7d9 100644
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ b/dev-java/jffi/jffi-1.2.9-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
 
 CDEPEND="dev-libs/libffi:0="
 
diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
index 20c56e8735fd..2c4a9a83197d 100644
--- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
+++ b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-3 )"
 SLOT="2"
-KEYWORDS="ppc64"
+KEYWORDS="~arm ppc64"
 
 # Fixing https://bugs.gentoo.org/736830 would cost too much time.
 RESTRICT="test"
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
deleted file mode 100644
index 08f711777829..000000000000
--- a/dev-java/jss/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
deleted file mode 100644
index 5d5ce6409654..000000000000
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/mozilla/security/jss/build_java.pl
-+++ b/mozilla/security/jss/build_java.pl
-@@ -190,7 +190,7 @@
-     #
-     if( scalar(@source_list) > 0 ) {
-         ensure_dir_exists($class_dir);
--        print_do("$javac $javac_opt_flag -sourcepath . -d $class_dir " .
-+        print_do("$javac $ENV{JAVA_GENTOO_OPTS} $javac_opt_flag -sourcepath . -d $class_dir " .
-             "$classpath " . join(" ",@source_list));
-     }
- 
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
deleted file mode 100644
index adf2862c90e6..000000000000
--- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Submitted By: Mario Fetka (mario-fetka at gmx dot at)
-Date: 2007-10-06
-Initial Package Version: 4.2.5
-Origin: me
-Upstream Status: #392775 UNCONFIRMED 
-Description: this patch adds pkgconfig support to jss coreconf 
-!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
- 
---- a/mozilla/security/coreconf/location.mk
-+++ b/mozilla/security/coreconf/location.mk
-@@ -67,6 +67,13 @@
- 
- GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
- 
-+ifdef USE_PKGCONFIG
-+    NSPR_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSPR_PKGCONFIG)`
-+    NSPR_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSPR_PKGCONFIG)`
-+    NSS_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSS_PKGCONFIG)`
-+    NSS_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSS_PKGCONFIG)`
-+endif
-+
- ifdef NSPR_INCLUDE_DIR
-     INCLUDES += -I$(NSPR_INCLUDE_DIR)
- endif
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
deleted file mode 100644
index 8b9705ca1e3d..000000000000
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/command.mk
-+++ b/security/coreconf/command.mk
-@@ -45,7 +45,7 @@
- CCF           = $(CC) $(CFLAGS)
- LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
- LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
--CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
-+CFLAGS       += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
- 		$(XCFLAGS)
- PERL          = perl
- RANLIB        = echo
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
deleted file mode 100644
index 87941029bcee..000000000000
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/jss/build_java.pl
-+++ b/security/jss/build_java.pl
-@@ -323,7 +323,7 @@
-     ensure_dir_exists("$dist_dir/jssdoc");
-     my $targets = join(" ", @packages);
-     print "$targets\n";
--    print_do("$javadoc -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-+    print_do("$javadoc -Xdoclint:none -breakiterator -sourcepath . -d $dist_dir/jssdoc $html_header_opt $targets");
-     print_do("cp $dist_dir/jssdoc/index.html $dist_dir/jssdoc/index.html.bak");
-     print_do("cp $dist_dir/jssdoc/overview-summary.html $dist_dir/jssdoc/index.html");
- }
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
deleted file mode 100644
index a215bc628ea7..000000000000
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ /dev/null
@@ -1,154 +0,0 @@
---- a/security/jss/org/mozilla/jss/CryptoManager.c
-+++ b/security/jss/org/mozilla/jss/CryptoManager.c
-@@ -35,7 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- #include "_jni/org_mozilla_jss_CryptoManager.h"
- 
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secmod.h>
- #include <cert.h>
- #include <certt.h>
---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
-@@ -36,7 +36,7 @@
- 
- #include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
-+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
- 
- #include <plarena.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <keyt.h>   /* for PQGParams */
- #include <pk11pqg.h>
---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
-@@ -36,7 +36,7 @@
- 
- #include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <pk11sdr.h>
- #include <jss_exceptions.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
-@@ -40,7 +40,7 @@
- #include <pk11pqg.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- #include <jssutil.h>
- #include <pk11util.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <keyt.h>
- 
- /* JSS includes */
---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
-@@ -40,7 +40,7 @@
- #include <plarena.h>
- #include <seccomon.h>
- #include <pk11func.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- /* JSS includes */
- #include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
-@@ -43,7 +43,7 @@
- #include <secerr.h>
- #include <nspr.h>
- #include <key.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- 
- #include <jss_bigint.h>
- #include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
-@@ -35,7 +35,7 @@
-  * ***** END LICENSE BLOCK ***** */
- 
- #include <nspr.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <secoidt.h>
- #include <secmodt.h>
- #include <pk11func.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
-@@ -53,7 +53,7 @@
- #include <jss_bigint.h>
- #include <Algorithm.h>
- 
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "java_ids.h"
- 
- #include "pk11util.h"
---- a/security/jss/org/mozilla/jss/ssl/callbacks.c
-+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
-@@ -39,7 +39,7 @@
- #include <nspr.h>
- #include <java_ids.h>
- #include <jss_exceptions.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include <jssutil.h>
- #include <certt.h>
- #include <keythi.h>
---- a/security/jss/org/mozilla/jss/util/jssutil.c
-+++ b/security/jss/org/mozilla/jss/util/jssutil.c
-@@ -38,7 +38,7 @@
- #include <nspr.h>
- #include <plstr.h>
- #include <seccomon.h>
--#include <secitem.h>
-+#include <nss/secitem.h>
- #include "jssutil.h"
- #include "jss_bigint.h"
- #include "jss_exceptions.h"
---- a/security/jss/org/mozilla/jss/util/jssutil.h
-+++ b/security/jss/org/mozilla/jss/util/jssutil.h
-@@ -39,7 +39,7 @@
- /* Need to include these first.
-  * #include <nspr.h>
-  * #include <jni.h>
-- * #include <secitem.h>
-+ * #include <nss/secitem.h>
-  */
- 
- PR_BEGIN_EXTERN_C
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
deleted file mode 100644
index 11687fac4a09..000000000000
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/security/coreconf/Linux.mk
-+++ b/security/coreconf/Linux.mk
-@@ -142,7 +142,7 @@
- ARCH			= linux
- 
- DSO_CFLAGS		= -fPIC
--DSO_LDOPTS		= -shared $(ARCHFLAG)
-+DSO_LDOPTS		= $(LDFLAGS) -shared $(ARCHFLAG)
- # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
- # incorrectly reports undefined references in the libraries we link with, so
- # we don't use -z defs there.
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
deleted file mode 100644
index 5c5137e81997..000000000000
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit multilib toolchain-funcs java-pkg-2
-
-DESCRIPTION="Network Security Services for Java (JSS)"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/JSS"
-# 4.3.2 was released but was seemingly never announced. The binary jar
-# exists on Mozilla's servers but Chewi could only find a source tarball
-# at https://obs.kolabsys.com/package/show/Kolab:3.4/jss. However, you
-# need to register in order to download it, hence he has mirrored it.
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.bz2"
-LICENSE="MPL-1.1"
-SLOT="3.4"
-KEYWORDS="amd64 x86"
-IUSE="examples test"
-
-CDEPEND=">=dev-libs/nspr-4.7.1
-	>=dev-libs/nss-3.12.5"
-
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	>=virtual/jdk-1.6
-	virtual/pkgconfig
-	test? ( dev-libs/nss[utils] )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}/mozilla"
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-target_source.patch
-	epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch
-	epatch "${FILESDIR}"/${PN}-4.3-cflags.patch
-	epatch "${FILESDIR}"/${PN}-4.3.2-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-4.3-secitem.patch
-
-	if java-pkg_is-vm-version-ge 1.8; then
-		epatch "${FILESDIR}"/${PN}-4.3-javadoc.patch
-	fi
-}
-
-src_compile() {
-	local ARGS=(
-		"CC=$(tc-getCC)"
-		"AR=$(tc-getAR) cr \$@"
-		"OS_RELEASE=2.6"
-		"BUILD_OPT=1"
-	)
-
-	tc-export PKG_CONFIG
-
-	export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
-	use amd64 && export USE_64=1
-
-	cd "${S}/security/coreconf" || die
-	emake -j1 "${ARGS[@]}"
-
-	cd "${S}/security/jss" || die
-	emake -j1 "${ARGS[@]}" USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr
-	use doc && emake -j1 "${ARGS[@]}" javadoc
-}
-
-# Chewi has managed to reach a test pass rate of 31/40 (78%) but the
-# remainder fail due to JSS not having kept pace with the ciphersuites
-# in NSS. There's not much we can do about that. The suite also leaves
-# java processes running and exits successfully on failure.
-RESTRICT="test"
-
-src_test() {
-	# Parts of NSS are required for the tests.
-	ln -snf "${EROOT}usr/$(get_libdir)/libnssckbi.so" dist/Linux*.OBJ/lib/ || die
-	ln -snf "${EROOT}usr/bin" dist/Linux*.OBJ/ || die
-
-	# The tests must be run from this directory.
-	cd security/jss/org/mozilla/jss/tests || die
-	BUILD_OPT=1 perl all.pl dist "${S}"/dist/Linux*.OBJ/ || die "tests failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-
-	# Use this instead of the one in dist because it is a symlink
-	# and doso handles symlinks by just symlinking to the original
-	java-pkg_doso ./security/${PN}/lib/*/*.so
-
-	use doc && java-pkg_dojavadoc dist/jssdoc
-	use source && java-pkg_dosrc ./security/jss/org
-	use examples && java-pkg_doexamples ./security/jss/samples
-}
diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
deleted file mode 100644
index 5185880c91a8..000000000000
--- a/dev-java/jss/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- <longdescription>
-
-Network Security Services for Java (JSS) is a Java interface to NSS. It supports
-most of the security standards and encryption technologies supported by NSS. JSS
-also provides a pure Java interface for ASN.1 types and BER/DER encoding.
-
-</longdescription>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
index 9a946560a51c..e3c61f82a351 100644
--- a/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
+++ b/dev-java/junit-clptr/junit-clptr-1.2.2.ebuild
@@ -11,7 +11,7 @@ MAVEN_ID="org.bitstrings.test:junit-clptr:1.2.2"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\"."
+DESCRIPTION="ClassLoader per Test runner for JUnit 4.12+ based on myfaces-test \"TestPerClassLoaderRunner\""
 HOMEPAGE="http://nexus.sonatype.org/oss-repository-hosting.html/junit-clptr"
 SRC_URI="https://github.com/bitstrings/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}-sources.tar.gz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
index 6adabb372624..9a2b30aa4483 100644
--- a/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.13_p8.ebuild
@@ -211,6 +211,7 @@ src_compile() {
 		JOBS=$(makeopts_jobs)
 		LOG=debug
 		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images product-images)
 	)
diff --git a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
index 9491e94edeca..6472dfd14950 100644
--- a/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.1_p12.ebuild
@@ -205,6 +205,7 @@ src_compile() {
 		JOBS=$(makeopts_jobs)
 		LOG=debug
 		CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
+		NICE= # Use PORTAGE_NICENESS, don't adjust further down
 		$(usex doc docs '')
 		$(usex jbootstrap bootcycle-images product-images)
 	)
diff --git a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
index 638cef4a653e..599c16068738 100644
--- a/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
+++ b/dev-java/randomized-runner/randomized-runner-2.7.8.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness."
+DESCRIPTION="JUnit test runner and plugins for running JUnit tests with pseudo-randomness"
 HOMEPAGE="https://github.com/randomizedtesting/randomizedtesting/randomizedtesting-runner"
 SRC_URI="https://github.com/randomizedtesting/randomizedtesting/archive/refs/tags/release/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/rat/rat-0.13.ebuild b/dev-java/rat/rat-0.13.ebuild
index ad082bb240bc..2d6facdeddae 100644
--- a/dev-java/rat/rat-0.13.ebuild
+++ b/dev-java/rat/rat-0.13.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit java-pkg-2
 
-DESCRIPTION="Apache Rat is a release audit tool, focused on licenses."
+DESCRIPTION="Apache Rat is a release audit tool, focused on licenses"
 HOMEPAGE="https://creadur.apache.org/rat/"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/sbt/sbt-0.13.18.ebuild b/dev-java/sbt/sbt-0.13.18.ebuild
index c4f3a8c3e8bc..4262d767d5b3 100644
--- a/dev-java/sbt/sbt-0.13.18.ebuild
+++ b/dev-java/sbt/sbt-0.13.18.ebuild
@@ -97,12 +97,12 @@ src_prepare() {
 		cp -p "${DISTDIR}/${L_P}.jar" "${WORKDIR}/${L_P}/${L_PN}.jar" || die
 		cat <<- EOF > "${WORKDIR}/${L_P}/sbt"
 			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			SBT_OPTS="-Xms512M -Xmx3072M -Xss1M -XX:+CMSClassUnloadingEnabled"
 			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${WORKDIR}/${L_P}/sbt-launch.jar" "\$@"
 		EOF
 		cat <<- EOF > "${S}/${P}"
 			#!/bin/sh
-			SBT_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled"
+			SBT_OPTS="-Xms512M -Xmx3072M -Xss1M -XX:+CMSClassUnloadingEnabled"
 			java -Djavac.args="-encoding UTF-8" -Duser.home="${WORKDIR}" \${SBT_OPTS} -jar "${S}/launch/target/sbt-launch.jar" "\$@"
 		EOF
 		chmod u+x "${WORKDIR}/${L_P}/sbt" "${S}/${P}" || die
diff --git a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
index d4a4e473b091..73eff1ee42cf 100644
--- a/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
+++ b/dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="51b64c0"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library to describe the structure of data and functions."
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
index 5558df7e2a14..42a9a4dd23fd 100644
--- a/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
+++ b/dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ EGIT_REF="59af4cf"
 MY_PN=${PN//-/.}
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="A Clojure library to describe the structure of data and functions."
+DESCRIPTION="A Clojure library to describe the structure of data and functions"
 HOMEPAGE="https://clojure.org/ https://github.com/clojure/spec.alpha"
 SRC_URI="https://github.com/clojure/${MY_PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/typesafe-config/Manifest b/dev-java/typesafe-config/Manifest
index 28b28e579daa..95e6e9e954b7 100644
--- a/dev-java/typesafe-config/Manifest
+++ b/dev-java/typesafe-config/Manifest
@@ -1,2 +1,3 @@
 DIST typesafe-config-1.2.1.zip 287878 BLAKE2B bf4d1001bb84d0102b91b7ff383d9313302d95fd854928a40ecfbaae7a18309cf3f8509af0968fa21cedc485a1691c135395ccea5f9e6ba1c94856f2bb7ce81c SHA512 178f0df81f081b9355951debd3a5435c7d6aae25893f049917a25861015eba18a305d5370d914b89a7c46e55b5d9f3939ddd0656cfa9a4691bd16cf32c796502
+DIST typesafe-config-1.3.0.tar.gz 257311 BLAKE2B 6df016ef84f8e3f717ac22ea3a8a66ad54ab378645e853fbb5fbb3316dde56e4cf6ba7a256f38d8912514321060290a92c412ad9753c0244b35c20bb0a9e4950 SHA512 e8c0e3100b9e7c50ddd19285a3e33cc708711d0007719bb191012d88ddbd0286529172fce54a369c0dd86ced1c61807f40d5334a69b2c8bc6865a8b65740798e
 DIST typesafe-config-1.3.0.zip 363061 BLAKE2B 94c3f1f4eaaa831a15ef10619b672fb1882cfc472ab4d4ebb3494805f281152f7d01c56cee5f06a70319822d3e4254d540d4a5dde0f1c321b79fc4fbc18da6b8 SHA512 8b9821de442dc24b8b7be4c5ebc91d57214a32dceda8dc160cfaf801f70b34d2a2df6f8b2cbb744d18be3fbc887f1666f431b52882edcbde408d8adf3681fec4
diff --git a/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild b/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
new file mode 100644
index 000000000000..8437c8eaf023
--- /dev/null
+++ b/dev-java/typesafe-config/typesafe-config-1.3.0-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A library of arguably useful Java utilities"
+HOMEPAGE="https://lightbend.github.io/config/"
+SRC_URI="https://github.com/lightbend/config/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc source"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 8f22d0cafb1a..0a414c4fb11f 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Apache Velocity is a general purpose template engine."
+DESCRIPTION="Apache Velocity is a general purpose template engine"
 HOMEPAGE="https://velocity.apache.org"
 SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-java/xmpbox/xmpbox-2.0.24.ebuild b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
index c96dec5d9b60..428edda56d82 100644
--- a/dev-java/xmpbox/xmpbox-2.0.24.ebuild
+++ b/dev-java/xmpbox/xmpbox-2.0.24.ebuild
@@ -12,7 +12,7 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification."
+DESCRIPTION="An open source Java tool that implements Adobe's XMP(TM) specification"
 HOMEPAGE="https://pdfbox.apache.org"
 SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip"