Adding metadata

27 files changed, 526 insertions, 475 deletions

diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
index 96eda55d0e0b..a4b3175fa186 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.4-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/beanutils/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.7"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 8edb21e22425..45f9fac5a2c9 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -1,3 +1,2 @@
-DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
deleted file mode 100644
index c9ac95a3e677..000000000000
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit epatch java-pkg-2 java-ant-2
-
-MY_P="${P}-src"
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
-HOMEPAGE="https://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-CDEPEND="dev-java/commons-beanutils:1.7
-	>=dev-java/commons-collections-2.1:0
-	>=dev-java/commons-logging-1.0.2:0"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	test? (
-		dev-java/junit:0
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-# don't rewrite build.xml in examples
-JAVA_PKG_BSFIX_ALL="no"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-
-	dodoc RELEASE-NOTES.txt
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/org
-	use examples && java-pkg_doexamples src/examples
-}
diff --git a/dev-java/cortado/cortado-0.6.0-r2.ebuild b/dev-java/cortado/cortado-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..41a54f668ff8
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="https://www.theora.org/cortado/"
+SRC_URI="https://downloads.xiph.org/releases/cortado/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Package 'sun.audio' seems to have moved to 'javax.sound'.
+# More work would be needed.  Presently we restrict to jdk:1.8
+DEPEND="virtual/jdk:1.8"
+RDEPEND=">=virtual/jre-1.8:*"
+
+EANT_BUILD_TARGET="stripped"
+
+src_prepare() {
+	default
+	cat > scripts/get-revision <<-EOF || die
+		#!/bin/sh
+		echo ${PV}
+	EOF
+
+#	sed -e '/import/s/sun.audio/javax.sound/' \
+#		-i src/com/fluendo/plugin/AudioSinkSA.java || die
+}
+
+src_install() {
+	java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
+	dodoc ChangeLog HACKING NEWS README RELEASE TODO
+}
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
deleted file mode 100644
index d2517cd89f51..000000000000
--- a/dev-java/glazedlists/glazedlists-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://www.glazedlists.com/"
-SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-JAVA_SRC_DIR="source"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
index f71d3738a5de..57554793d894 100644
--- a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
+++ b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.glazedlists.com/"
 SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 8f38e2d53f8b..01da2eb2d5b9 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -2,4 +2,5 @@ DIST gradle-bin-6.8.3.zip 150631445 BLAKE2B 935a6631167481e289ac5a468b822ffeec20
 DIST gradle-bin-7.1.1.zip 154838841 BLAKE2B 0a0ad08101f0c5fa7c0cb2a4c9ad6e53320cc6214fe1a139f390b73d9aa656ebfaf90c21816d57964f37e9cad51faed21f82f55b7e24fcf0f5a3ffd861c990ad SHA512 95cc2de9b7c3d6019d7780b17238ff8f0db14c9a1e494b391c84d75619eb3064322bb2c56fa9127b0a5681c94b32283090a15b06fefeccdb95a1f8fb9e58c75c
 DIST gradle-bin-7.2.zip 157058280 BLAKE2B 918213df58ac2afbd075c74588f60676cd7dc99030834828138c621348ac1abd368e0b54c2f6937cbfc9533e55e310b46cf841c92dcb1039b898c6f456032d38 SHA512 6ccc79f08afdc20b3d5abf876c3cabb69114d1ab4285cdb77158cd8c5e09207589edefb6c79f2bcffe4629a38c6b9e2f473de42dab29a24310965bc5816b907d
 DIST gradle-bin-7.3.3.zip 158875257 BLAKE2B 94f86e06da3eae4a9522d35a28577d033d64ce1bc2f36d0f5c1992e9b92ec311d25bd98bbeaf4b8a9869f22d93e14c88952e12166e436a0a6c206541d1f967aa SHA512 03f2bdd77202788cd43bb3e3a6390340f4d083d69ade5a53e0163204fb85307f5bbbbf4e04077c6ae558bc36ab3c478674f941079bc14a8344f55631fbba1490
+DIST gradle-bin-7.4.1.zip 159312495 BLAKE2B 591ab6af118d8fac7d0ead1a040ed4e69b8f84d18807fc4fb88778a58917a31d2111f2c140f7d723523a2411b6e57e7682ba94bd9043c948bafb1de7c2c066ff SHA512 bd2bc3570537e0878186a81eecee2c8578b2f7ea76a23b1f49de9cd0e70529a591f42c2d1433f29eddfab87f25d986a6c48b52e66396653153f20785f39aa977
 DIST gradle-bin-7.4.zip 159248291 BLAKE2B db9dde35d0c285afb8b30d08ee1a509660d7bf169530d734b1bffd0dbf22fec0360b12a78588e5f8b6180669678868f86e73950bf9bfd110ac1f24a73b3d2549 SHA512 9742efccd6539325f6cb3929f794afaf8f55763b9a09cccea8d6a84c55b8e0bf350ddf10d59e9a5271b9320719ade57e2e4c0b9bac5faf0afcb0304c75728cc9
diff --git a/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
new file mode 100644
index 000000000000..bec8bc49d5c4
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-7.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/"
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-eselect/eselect-gradle"
+BDEPEND="app-arch/unzip"
+RDEPEND="
+	${DEPEND}
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local gradle_dir="/usr/share/${PN}-${SLOT}"
+
+	if use source; then
+		java-pkg_dosrc src
+	fi
+
+	docinto html
+	dodoc -r docs/release-notes.html
+	if use doc; then
+		dodoc -r docs/{dsl,userguide}
+		java-pkg_dojavadoc docs/javadoc
+	fi
+
+	insinto "${gradle_dir}"
+	doins -r bin/ lib/
+	fperms 755 "${gradle_dir}/bin/gradle"
+	dosym "${gradle_dir}/bin/gradle" "/usr/bin/${PN}-${SLOT}"
+}
+
+pkg_postinst() {
+	eselect gradle update ifunset
+}
+
+pkg_postrm() {
+	eselect gradle update ifunset
+}
diff --git a/dev-java/jacl/jacl-1.4.1-r2.ebuild b/dev-java/jacl/jacl-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..b09fdb0f9cf4
--- /dev/null
+++ b/dev-java/jacl/jacl-1.4.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 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="Jacl is an implementation of Tcl written in Java"
+HOMEPAGE="http://tcljava.sourceforge.net"
+SRC_URI="mirror://sourceforge/project/tcljava/jacl/${PV}/jacl${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc"
+
+CDEPEND=">=dev-lang/tcl-8.4.5:*"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CRDEPEND}
+	>=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}${PV}"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	rm -rf src/{Test.java,empty,tests,janino} || die
+	java-pkg-simple_src_compile
+	mv src/jacl/tcl src/ || die
+	java-pkg_addres "${PN}.jar" src/ -name "*.tcl"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
+	dodoc README ChangeLog known_issues.txt
+}
diff --git a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
index be18da1baffd..c0de4b6cfb3e 100644
--- a/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
+++ b/dev-java/jcalendar/jcalendar-1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.toedter.com/download/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/jgoodies-looks:2.6"
 
diff --git a/dev-java/jcalendar/jcalendar-1.4.ebuild b/dev-java/jcalendar/jcalendar-1.4.ebuild
deleted file mode 100644
index 1833038cc4a9..000000000000
--- a/dev-java/jcalendar/jcalendar-1.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java date chooser bean for graphically picking a date"
-HOMEPAGE="http://www.toedter.com/en/jcalendar/"
-SRC_URI="http://www.toedter.com/download/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/jgoodies-looks:2.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jgoodies-looks-2.6"
-EANT_BUILD_XML="src/build.xml"
-EANT_BUILD_TARGET="jar"
-EANT_DOC_TARGET=""
-
-java_prepare() {
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg_newjar lib/${P}.jar
-
-	dodoc readme.txt
-
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/com
-}
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
index 6dec2f805f29..92301470bd7f 100644
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
+++ b/dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
 
 LICENSE="BSD"
 SLOT="1.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild b/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
deleted file mode 100644
index 0c830c5581e9..000000000000
--- a/dev-java/jgoodies-common/jgoodies-common-1.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_PN="common"
-MY_PV=${PV//./_}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="JGoodies Common Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/${MY_PN}/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="1.8"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND="
-	app-arch/unzip
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}"/${P}
-
-JAVA_SRC_DIR="src"
-
-java_prepare() {
-	mkdir src || die
-	unzip ${P}-sources.jar -d src || die
-	rm "${S}"/pom.xml "${S}"/*.jar || die
-}
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index b91637637531..32bc29febef6 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,2 +1 @@
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..762e6681fc1e
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-java/javacc:0"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+	${CDEPEND}
+	virtual/jdk:1.8
+	test? (
+		dev-java/junit:0
+		dev-java/ant-core:0
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+src_prepare() {
+	default
+	java-pkg_clean
+	sed -i -e '/-Xmax/ d' common-build.xml || die
+
+	# Portage marks shese files as bogus for some reason.
+	find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-core javacc" \
+		eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \
+		javacc
+	ANT_TASKS="none" \
+		eant \
+		-Dversion=${PV} \
+		jar-core \
+		jar-demo \
+		$(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" \
+		ANT_TASKS="ant-junit" \
+		eant \
+		test-core
+}
+
+src_install() {
+	einstalldocs
+	java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
+	java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
+
+	if use doc; then
+		dodoc -r docs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
deleted file mode 100644
index 091821750c1b..000000000000
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
-	dev-java/ant-ivy:2
-	dev-java/ant-junit:0
-	dev-java/ant-core:0
-	dev-java/hamcrest-core:0
-	contrib? (
-	          dev-java/jakarta-regexp:1.4
-			  dev-java/commons-compress:0
-	          dev-java/commons-collections:0
-	          dev-java/commons-digester:0
-	          dev-java/commons-logging:0
-			  dev-java/commons-beanutils:1.7
-	)"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/junit:4
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DOCS=(
-	CHANGES.txt README.txt
-	NOTICE.txt CHANGES.txt
-	JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		common-build.xml || die
-
-	# FIXME: contrib builds do not work if junit not included
-	#java-pkg_jar-from --build-only --into lib \
-	#	junit-4 junit.jar junit-4.7.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
-	if use contrib; then
-	  cd contrib/ || die
-	  java-pkg_jar-from --build-only --into queries/lib \
-	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-compress commons-compress.jar commons-compress-1.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-collections commons-collections.jar commons-collections-3.1.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-digester commons-digester.jar commons-digester-1.7.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	  java-pkg_jar-from --build-only --into benchmark/lib \
-	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-	fi
-}
-
-src_prepare() {
-	default
-	java-pkg_clean
-	sed -i \
-		-e '/-Xmax/ d' \
-		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
-		-e '/<ivy:retrieve/d' \
-		common-build.xml || die
-	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-ivy:2
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	# Always needed anyway
-	cd "${S}"/test-framework/ || die
-	java-pkg_jar-from --build-only --into lib \
-		ant-core ant.jar ant-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		ant-junit ant-junit.jar ant-junit-1.7.1.jar
-	java-pkg_jar-from --build-only --into lib \
-		junit-4 junit.jar junit-4.10.jar
-	java-pkg_jar-from --build-only --into lib \
-		hamcrest-core
-
-	if use contrib; then
-	    cd "${S}"/contrib/ || die
-		# queries
-	    java-pkg_jar-from --build-only --into queries/lib \
-	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
-		# benchmark
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-compress commons-compress.jar commons-compress-1.1.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-collections commons-collections.jar commons-collections-3.1.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-digester commons-digester.jar commons-digester-1.7.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
-	    java-pkg_jar-from --build-only --into benchmark/lib \
-	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
-		# analyzers/phonetic
-	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
-	    	commons-codec commons-codec.jar commons-codec-1.6.jar
-	fi
-}
-
-src_compile() {
-	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
-	java-ant_xml-rewrite -f common-build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	ANT_TASKS="none" \
-		eant -Dversion=${PV} \
-		-Dfailonjavadocwarning=false \
-		jar-core \
-		$(use_doc javadocs-core)
-
-	if use contrib; then
-		ANT_TASKS="none" \
-			eant -Dversion=${PV} \
-			-Dfailonjavadocwarning=false \
-			build-contrib \
-			$(use_doc javadocs-all)
-	fi
-}
-
-src_test() {
-	# FIXME: test does not get run, even when selected
-	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
-		ANT_TASKS="ant-junit" \
-		eant test-core
-}
-
-src_install() {
-	einstalldocs
-	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use contrib; then
-		local i j
-		for i in $(find build/contrib -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
-	if use doc; then
-		dodoc -r docs
-		java-pkg_dohtml -r build/docs/api
-	fi
-	if use source; then
-	     java-pkg_dosrc core/src/java/org
-	  	 use contrib && java-pkg_dosrc contrib
-	fi
-}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index 659501846532..e25b5c52aab3 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -6,8 +6,5 @@
   <name>Java</name>
  </maintainer>
  
- <use>
-  <flag name="contrib">Include extra functionality from contrib/</flag>
- </use>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index 14f2223992a4..63bc1df756bd 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,3 +1,4 @@
 DIST 0.9.10-assembly 63268137 BLAKE2B a87553608f9269e529227b4bb13bfca32cf82f3feb7b947dd849d66e86721f390d1862df897184306d84251b635ecd089e1e817244ee6e241a7ebab6c60fe1fc SHA512 dd551aac47b99d7a33f7900f80ac16eba60d1a93f68c87329f3faee8d219102424e19de899b78619568e55f09f2b081948bd21356179d608847c722157a55208
 DIST 0.9.11-assembly 63268510 BLAKE2B 2594800c42d23d3a91ec5b676e968200bb0a5f8e26a4163f05e6badd1377b593fa3b091f63bfca2b7cf3263fefa9d9bace5882b9a1061631f71ba647b65edeeb SHA512 3d6e67e1a301761209a83f3a12fbd692f5589af919ef4e30fe9017ef49a3ba5ff66a00ee372c184ab1d35932f014513c7fd4c7221463ecbc878efea0323c2920
 DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
+DIST mill-bin-0.10.1 67217004 BLAKE2B 4df576762b86e909b2fdbab49e5f8025d73ea0f6b60e25c6d1ec0b55acd91af44c5fbeb5088ea7e0138c4e418e36e60eaf2248b6867a7936aa6612749101f46f SHA512 0fd727aa0bd2f67536ef7155a5f57166bcd13b2fccf0d9b03c3081b8ce9ab1e7290b5705b52aad7e993a4bc0421ea6d57f94d76c0f240ce41df9e05e61dce940
diff --git a/dev-java/mill-bin/metadata.xml b/dev-java/mill-bin/metadata.xml
index 1c5a9d8dd3ed..26da33800c49 100644
--- a/dev-java/mill-bin/metadata.xml
+++ b/dev-java/mill-bin/metadata.xml
@@ -5,6 +5,9 @@
   <email>flow@gentoo.org</email>
   <name>Florian Schmaus</name>
  </maintainer>
- 
+ <upstream>
+  <changelog>https://github.com/paul-j-lucas/cdecl/releases</changelog>
+  <bugs-to>https://github.com/com-lihaoyi/mill/issues</bugs-to>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/mill-bin/mill-bin-0.10.1.ebuild b/dev-java/mill-bin/mill-bin-0.10.1.ebuild
new file mode 100644
index 000000000000..e8485c57dfd6
--- /dev/null
+++ b/dev-java/mill-bin/mill-bin-0.10.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN%-bin}
+
+DESCRIPTION="A Java/Scala build tool"
+HOMEPAGE="https://com-lihaoyi.github.io/mill/"
+SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	newbin "${DISTDIR}"/${P} ${MY_PN}
+}
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest
index c66f7621da10..569bb6a5f328 100644
--- a/dev-java/rhino/Manifest
+++ b/dev-java/rhino/Manifest
@@ -1 +1,2 @@
 DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e
+DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1
diff --git a/dev-java/rhino/metadata.xml b/dev-java/rhino/metadata.xml
index 9fa6d14023cf..abf33dd1fbb6 100644
--- a/dev-java/rhino/metadata.xml
+++ b/dev-java/rhino/metadata.xml
@@ -10,6 +10,9 @@
 		It is typically embedded into Java applications to provide scripting
 		to end users.
 	</longdescription>
- 
+ <upstream>
+  <changelog>https://github.com/mozilla/rhino/blob/master/RELEASE-NOTES.md</changelog>
+  <bugs-to>https://github.com/mozilla/rhino/issues</bugs-to>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-java/rhino/rhino-1.7.14.ebuild b/dev-java/rhino/rhino-1.7.14.ebuild
new file mode 100644
index 000000000000..e2d55459ce0f
--- /dev/null
+++ b/dev-java/rhino/rhino-1.7.14.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.mozilla:rhino:1.7.14"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="An open-source implementation of JavaScript written in Java"
+HOMEPAGE="https://github.com/mozilla/rhino"
+SRC_URI="https://github.com/mozilla/rhino/archive/Rhino${PV//./_}_Release.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="1.6"
+
+# There are too many test failures:
+# FAILURES!!!
+# Tests run: 10504,  Failures: 613
+# With openjdk-11 tests even fail to compile:
+# ./testsrc/tests/src/com/netscape/javascript/qa/liveconnect/LiveConnectTest.java:104: error: cannot find symbol
+#         global  = JSObject.getWindow( this );
+#                           ^
+#   symbol:   method getWindow(LiveConnectTest)
+#   location: class JSObject
+RESTRICT="test"
+
+DEPEND=">=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/emma:0
+		dev-java/jakarta-xml-soap-api:1
+		dev-java/jmh-core:0
+		dev-java/hamcrest-core:1.3
+		dev-java/snakeyaml:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DOCS=( {CODE_OF_CONDUCT,README,RELEASE-NOTES,RELEASE-STEPS}.md {NOTICE-tools,NOTICE}.txt )
+
+S="${WORKDIR}/rhino-Rhino${PV//./_}_Release"
+
+JAVA_SRC_DIR=( "src" "toolsrc" "xmlimplsrc" )
+JAVA_RESOURCE_DIRS="res"
+JAVA_MAIN_CLASS="org.mozilla.javascript.tools.shell.Main"
+
+JAVA_TEST_GENTOO_CLASSPATH="ant-junit,emma,hamcrest-core-1.3,jakarta-xml-soap-api-1,jmh-core,junit-4,snakeyaml"
+JAVA_TEST_SRC_DIRS="testsrc"
+JAVA_TEST_RESOURCE_DIRS="testres"
+
+# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L81-L87
+JAVA_TEST_EXTRA_ARGS=(
+	-Djava.awt.headless=true
+	-Dmozilla.js.tests=testsrc/tests
+	-Dmozilla.js.tests.timeout=60000
+	-Duser.language=en
+	-Duser.country=US
+	-Duser.timezone=America/Los_Angeles
+	-Dfile.encoding=UTF-8
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+
+	mkdir -p res/org/mozilla/javascript/tools/{resources,debugger} || die
+
+	cp -r "src/org" "res" || die
+	find "res" -type f -name '*.java' -exec rm -rf {} + || die
+
+	cp {toolsrc,res}/org/mozilla/javascript/tools/resources/Messages.properties || die
+	cp {toolsrc,res}/org/mozilla/javascript/tools/debugger/test.js || die
+
+	mv {src,testsrc}/org/mozilla/javascript/engine || die
+	cp -r "testsrc" "testres" || die
+	find "testres" -type f -name '*.java' -exec rm -rf {} + || die
+
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveConnectEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/LiveNavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/MacRefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/NavEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/ObservedTask.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RefEnv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoDrv.java || die
+	rm testsrc/tests/src/com/netscape/javascript/qa/drivers/RhinoEnv.java || die
+}
+
+src_test() {
+	# https://github.com/mozilla/rhino/blob/Rhino1_7_14_Release/build.gradle#L71-L77
+	rm -r testsrc/benchmarks || die
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+	if ver_test "${vm_version}" -gt "1.8" ; then
+		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/javax.swing.table=ALL-UNNAMED )
+	fi
+
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
deleted file mode 100644
index 250fe5e92412..000000000000
--- a/dev-java/rxtx/rxtx-2.2_pre2-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit toolchain-funcs versionator autotools java-pkg-2
-
-MY_PV="$(delete_version_separator 2)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Native lib providing serial and parallel communication for Java"
-HOMEPAGE="http://rxtx.qbang.org/"
-SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="lfd"
-
-RDEPEND=">=virtual/jre-1.6
-	lfd? ( sys-apps/xinetd )"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i -e "s:\(\$(JAVADOC)\):\1 -d api:g" Makefile.am || die
-	sed -i \
-		-e "s:UTS_RELEASE::g" \
-		-e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
-		-e "s:-source ... -target ...:$(java-pkg_javac-args):g" \
-		configure.in || die
-
-	epatch \
-		"${FILESDIR}/${PN}-2.1-7r2-lfd.diff" \
-		"${FILESDIR}/${PN}-2.1-7r2-nouts.diff" \
-		"${FILESDIR}/${P}-add-ttyACM.patch" \
-		"${FILESDIR}/${P}-limits.patch"
-
-	rm acinclude.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable lfd lockfile_server)
-}
-
-src_compile() {
-	emake
-
-	if use lfd ; then
-		# see INSTALL in src/ldf
-		$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/lfd/lockdaemon.c -o src/lfd/in.lfd || die
-	fi
-
-	if use doc ; then
-		emake docs
-	fi
-
-	# Fix for src zip creation
-	if use source ; then
-		mkdir -p src_with_pkg/gnu || die
-		ln -s ../../src src_with_pkg/gnu/io || die
-	fi
-}
-
-src_install() {
-	java-pkg_dojar RXTXcomm.jar
-	java-pkg_doso ${CHOST}/.libs/*.so
-
-	dodoc AUTHORS ChangeLog INSTALL PORTING TODO SerialPortInstructions.txt
-	docinto html
-	dodoc RMISecurityManager.html
-
-	if use lfd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/lockfiled.xinetd" lfd
-		dosbin src/lfd/in.lfd
-		dodoc src/lfd/LockFileServer.rfc
-	fi
-
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc src_with_pkg/gnu
-}
-
-pkg_postinst() {
-	if use lfd ; then
-		elog "Don't forget to enable the LockFileServer"
-		elog "daemon (lfd) in /etc/xinetd.d/lfd"
-	else
-		elog "RXTX uses UUCP style device-locks. You should"
-		elog "add every user who needs to access serial ports"
-		elog "to the 'uucp' group:"
-		elog
-		elog "    usermod -aG uucp <user>"
-	fi
-}
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index aa62594117f2..16874cfaeefa 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://rxtx.qbang.org/"
 SRC_URI="ftp://ftp.qbang.org/pub/rxtx/${MY_P}.zip"
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="lfd"
 
 RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/saxon/saxon-6.5.5-r3.ebuild b/dev-java/saxon/saxon-6.5.5-r3.ebuild
new file mode 100644
index 000000000000..49603d408175
--- /dev/null
+++ b/dev-java/saxon/saxon-6.5.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Set of tools for processing XML documents"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/saxon/saxon6/${PV}/saxon${PV//./-}.zip"
+
+LICENSE="MPL-1.1"
+SLOT="6.5"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="dev-java/jdom:0"
+
+# Restricting to jdk:1.8 for following reason:
+# src/org/w3c/dom/UserDataHandler.java:1: error: package exists in another module: java.xml
+# package org.w3c.dom;
+DEPEND="${CP_DEPEND}
+	virtual/jdk:1.8"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+JAVA_ENCODING="ISO-8859-1"
+JAVA_SRC_DIR="src"
+
+src_unpack() {
+	unpack ${A}
+	unzip -qq source.zip -d src || die "failed to unpack"
+}
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+	use examples && java-pkg_doexamples samples
+}
diff --git a/dev-java/saxon/saxon-9.2.0.6-r3.ebuild b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
new file mode 100644
index 000000000000..df8fd42a18eb
--- /dev/null
+++ b/dev-java/saxon/saxon-9.2.0.6-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 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-ant-2
+
+DESCRIPTION="A XSLT and XQuery Processor"
+HOMEPAGE="http://saxon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/saxon/Saxon-HE/$(ver_cut 1-2)/saxonhe${PV//./-}source.zip"
+
+LICENSE="MPL-1.0"
+SLOT="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+	dev-java/xom:0
+	dev-java/jdom:0
+	dev-java/dom4j:1
+	dev-java/ant-core"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+# prepare eclass variables
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
+
+src_prepare() {
+	default
+
+	# Fedora-inspired removal.
+
+	# deadNET.
+	rm -rv net/sf/saxon/dotnet || die
+
+	# Depends on XQJ (javax.xml.xquery).
+	rm -rv net/sf/saxon/xqj || die
+
+	# This requires a EE edition feature (com.saxonica.xsltextn).
+	rm -v net/sf/saxon/option/sql/SQLElementFactory.java || die
+
+	# <major>.<minor> version
+	local version="$(ver_cut 1-2)"
+
+	# generate build.xml with external javadoc links
+	sed -e "s:@JDK@:1.6:" \
+		-e "s:@JDOM@:1:" \
+		< "${FILESDIR}/${version}-build.xml" \
+		> "${S}/build.xml" \
+		|| die "build.xml generation failed!"
+
+	# prepare creates the dir for properties
+	eant prepare
+
+	# properties
+	cp -v \
+		"${FILESDIR}/${version}-edition.properties" \
+		"${S}/build/classes/edition.properties" || die
+}
+
+src_compile() {
+	local gcp="$(java-pkg_getjars dom4j-1,jdom,xom)"
+	gcp="${gcp}:$(java-pkg_getjars --build-only ant-core)"
+	eant -Dgentoo.classpath="${gcp}" jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	java-pkg_dolauncher ${PN}${SLOT}-transform --main net.sf.saxon.Transform
+	java-pkg_dolauncher ${PN}${SLOT}-query --main net.sf.saxon.Query
+
+	java-pkg_register-ant-task
+
+	use doc && java-pkg_dojavadoc build/api
+
+	use source && java-pkg_dosrc src
+}