gentoo resync : 25.10.2021

19 files changed, 149 insertions, 205 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8aee40352f78..5bfa6a6e311a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bnd-junit/Manifest b/dev-java/bnd-junit/Manifest
index 9cbb04805610..aa6ca7ff1fe9 100644
--- a/dev-java/bnd-junit/Manifest
+++ b/dev-java/bnd-junit/Manifest
@@ -1,5 +1,3 @@
 DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD bnd-junit-2.1.0-r1.ebuild 959 BLAKE2B 3ff80d51205a61a3ee5bb66dd2fa08643f8e5a41024937c8d83af1b0ed68f852d5006727b83ce2ecf0dfa12431738042cc10a501847e94d54f1da60260a5f39f SHA512 9f5ab4569b9a2801f59b7fbaa59e9951c88382ae4d1c1895dbc3024039abedfa46e4e4c2a897831b6a30a11a5fc5cfb854dfe1a85658d24cfa6a32d7e5c6c68a
 EBUILD bnd-junit-2.1.0-r2.ebuild 955 BLAKE2B af87f54f96f02dfa7f038a2f01fa49c98c221e7e543e6da62603a7f430815efaab02a33cd5fd9d54b3985909068e5df762d040409d4863ac19e3dbeb1223b4d0 SHA512 1887c9f82c01d5eda2b730bccbb860e3f40556cc5623c10250eb453e2700bf92a0e9d2e01daf9d9cbd34f070dbf800cde79c8699fe8096728d9089df9bac1a60
-EBUILD bnd-junit-2.1.0.ebuild 1108 BLAKE2B e23ae80e3510e5858ae86cf1d08a029cc6f65a57516538496db22cc37c3c84d58df4d2563a8da1a08f3ba435a1e2b1ff02a71031fb9f277dbb6c276c76fdf553 SHA512 4ca41cd6424423e74da9251835c15ff946d9d9a157cf1760f30daf6e5ffe61b420c01fec4fc78bac46d946010925bced7534d88e2b9f6ea0c80f74a0ce02ae2f
 MISC metadata.xml 324 BLAKE2B 4abc17608a568a12af96dc0ddb7b82d55341ad891537e120633fd8517e09a339d805325988f3208050cde9b20aeb0a4dcab95e55ba13c66854a0d90b0e54551c SHA512 e9e23c794433024b0888c2d5859120c0ef39cd6b55df99035c3ea1761280bd4287fdeb4aaf8ff067bab1bea80dcdcc9060f74b43b1a6a004bad87eb69a9bd3c3
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0-r1.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0-r1.ebuild
deleted file mode 100644
index eaf475c67bf3..000000000000
--- a/dev-java/bnd-junit/bnd-junit-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/osgi-core-api:0
-	dev-java/bndlib:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.5"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit"
-
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-src_prepare() {
-	default
-	java-pkg_clean
-	cp ../cnf/build.xml . || die
-}
-
-src_install() {
-	java-pkg_newjar generated/biz.aQute.junit.jar
-}
diff --git a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild b/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
deleted file mode 100644
index e4de5405feee..000000000000
--- a/dev-java/bnd-junit/bnd-junit-2.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Junit plugin for bndlib, a swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="
-	dev-java/osgi-core-api:0
-	dev-java/bndlib:0"
-
-DEPEND=">=virtual/jdk-1.5
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}/bnd-${PV}.REL/biz.aQute.junit"
-
-EANT_BUILD_TARGET="build"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="bndlib,junit-4,osgi-core-api"
-
-# Tests appear broken and cause a circular dependency.
-RESTRICT="test"
-
-java_prepare() {
-	# Move the correct build.xml into place, needed for testing.
-	cp ../cnf/build.xml . || die
-
-	# Remove bundled jar files.
-	find . -name '*.jar' -delete > /dev/null
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar generated/biz.aQute.junit.jar
-}
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index a2cb3a17a5d2..f09bf275cdd4 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1,7 +1,8 @@
-AUX fec-1.0.4-build.patch 890 BLAKE2B 58dcca98815ecf53dfee025e1f11ca5a9a86adcfe672561a376c11d14d0635e9a858cb28a88b6f5187d03e1f5cf6412078caf1984ad58b1f46b28be0f1a9c0ea SHA512 d92960acd70d4f494e6875f1f5472d4da889c12a7bf8a232d291a557b0d17160a048290ab9dd9e90746a7954bd71681d36433d9dc422add7b9ea9ab956d8c90e
-AUX fec-1.0.4-libfec8path.patch 1087 BLAKE2B 085c732b1ebf4bd8a6e6d7ddd7f5995c29177e165972360f9cec74dc8bc13f331ec32bf31f531c9efb4f63e796fd91142d87b94695ecff31cf4997e63379f3f1 SHA512 7f46eedf2eb21eff04f0cee30a0e454d4796f29a22df4c33100255133c43cce07ac95e8e7eae5957412a2ce0da626cdbfffc57c5398f9f2c56660000805a60a0
-AUX fec-1.0.4-remove-concurrent-util-imports.patch 3142 BLAKE2B 028451e332afc9ec5d5afdacc9bc75364708dc5700d8691a428fde2e7c24595dba5d1e39901555095aa4577180e884000c21bf2f55a375616de59b82244a3a14 SHA512 195d2d5ec252d9e8c83762de318393b50d08fd50c900a13489e082e6d08bcc6f85b6425dd350fe1d24e2aab5ed8753ce25dc87f35aa8754721cdf5949ad49aa6
-AUX fec-1.0.4-soname.patch 786 BLAKE2B 0037363c6a8a8506f1981980296708cc202815ecb48b0357a71ff2f7a1cb9a6a438974d35b548f10688dffa6cef736f1c24b56ef27a3b6767b63c56b4698d088 SHA512 d75e6198f2f7193fbb65b686118f597c289576726d77ce3d65e122b4d6ca1f790fb8530e42e3e174c97a4b45083f95407478499f11b457d813d06e85b5d21c1d
+AUX fec-1.0.4-build.patch 894 BLAKE2B 753cee6cbca1a13ba83fba81466cee4651eafd987410295a22a75cfdc51dcfed3a5cea34cb46ebebf701896b2acdb3260a7dbd5f81f38dae8d23e6a1d266911a SHA512 7501680d8ec3aa709aa97afabae6a31f4a7797851d4954a41ba158922ee92fd84bffebc3ae5c74a1766f6e704ede146e8ff2d819ab32d39adb18eb1a7f6184ca
+AUX fec-1.0.4-libfec8path.patch 1091 BLAKE2B 4e19c8615b20694f26d3ee5bd83e33ec342f34797198f10cca1a3cad86ed51ee6a603c697e50e95ba62b5200b1f24beed04adbb620ee0c49a403e24841bb2faf SHA512 91147d4022b3d9a5fe4f81d425a961c7767924b2cf309c315e663f00c679c867210e175863a49cb79fe47e686eb29b876ac8ddec1ed17b678f6affae71a2817e
+AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030d12709c12d15adb2462c40da5ab896806e4dc8b572fc6d952b6b09c550f1ba4511a84b9a75306804b67526ee34fac33d2f3d4bf453c807f9 SHA512 592cfd6502a000cc1ac02e534e5436cb3d621855cc682a4588a5fd6f17c8d7f4811743fa9dbcd30851221ba55ab2adb188f6dc9e32f8735651edd28e032803a6
+AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
 EBUILD fec-1.0.4-r2.ebuild 1498 BLAKE2B b1d62acc07c2ca5eec3a397c871f22435238e53823a45718fd2bb0bc85403b1916944a0eac177c78207ccbd0286fa9df05d8641609ea40bbdab37d30c944941a SHA512 9248440a109bfa8245da3c114e42186fe625cee6da2d0122edf12db626609d9026ebb0dc543ab5cd5fcfa15f3a26b333f79c1af70dac67c8c1ca98bf45ccf9aa
+EBUILD fec-1.0.4-r3.ebuild 1485 BLAKE2B d6a62270e9ca9c9248276c49eaba860e6f64211b52e21771a87d8f64fa5ca02c612112150495b1ff0bc09c1eb131cdd84f7a51972b52a8064b5c855388b4ec2c SHA512 d3e1b69aa3e2e50f5e5114569abbf6db4b901b93a86ef3d18cf82d7f8d02752835860dcf67b5c22ba17a04ca59744c0166caa1e07955e8b7dfaaa2fb222d6702
 MISC metadata.xml 435 BLAKE2B f15bf1cf8797a940aef17b1a72884aad2859be1790129554172bbeec7ea0e2f68da81c0e5362cc7d94302bb9090bc1d0960d608335bc1a88168a3607ccb0d191 SHA512 13f1c5f833c69547926d60f4f9325624db5e82ea9b01900b00d48b38079e0cd8b1d038f6a69d784d78fa3cafa6f23e7ce57b78812b91154e0850466c2daf2ab9
diff --git a/dev-java/fec/fec-1.0.4-r3.ebuild b/dev-java/fec/fec-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..11b1f1df74fb
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="log4j"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+src_prepare() {
+	# Apply patches.
+	default
+
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so
+}
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
index c47eb5459045..bc776a23c825 100644
--- a/dev-java/fec/files/fec-1.0.4-build.patch
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -1,5 +1,5 @@
---- src/csrc/Makefile.orig	2015-10-18 14:31:56.752486000 +0000
-+++ src/csrc/Makefile	2015-10-18 14:33:11.502486000 +0000
+--- a/src/csrc/Makefile.orig	2015-10-18 14:31:56.752486000 +0000
++++ b/src/csrc/Makefile	2015-10-18 14:33:11.502486000 +0000
 @@ -28,11 +28,8 @@
  		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
  		-o fec8-jinterf.o
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
index 58eb89efb730..88333afd08fe 100644
--- a/dev-java/fec/files/fec-1.0.4-libfec8path.patch
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -1,5 +1,5 @@
---- src/com/onionnetworks/fec/Native8Code.java.orig	2015-10-18 14:27:06.160486000 +0000
-+++ src/com/onionnetworks/fec/Native8Code.java	2015-10-18 14:30:32.557486000 +0000
+--- a/src/com/onionnetworks/fec/Native8Code.java.orig	2015-10-18 14:27:06.160486000 +0000
++++ b/src/com/onionnetworks/fec/Native8Code.java	2015-10-18 14:30:32.557486000 +0000
 @@ -3,6 +3,7 @@
  //import java.security.AccessController;
  //import sun.security.action.*;
diff --git a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
index 87a9473ed937..ff4a583dfc7b 100644
--- a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
+++ b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
@@ -1,5 +1,5 @@
---- src/com/onionnetworks/fec/io/FECFile.java.orig	2015-10-18 15:38:26.000000000 +0000
-+++ src/com/onionnetworks/fec/io/FECFile.java	2015-10-18 16:06:51.159486000 +0000
+--- a/src/com/onionnetworks/fec/io/FECFile.java.orig	2015-10-18 15:38:26.000000000 +0000
++++ b/src/com/onionnetworks/fec/io/FECFile.java	2015-10-18 16:06:51.159486000 +0000
 @@ -10,7 +10,9 @@
  import com.onionnetworks.fec.FECCodeFactory;
  import com.onionnetworks.io.RAF;
diff --git a/dev-java/fec/files/fec-1.0.4-soname.patch b/dev-java/fec/files/fec-1.0.4-soname.patch
index ae00449ced40..7309aa03b086 100644
--- a/dev-java/fec/files/fec-1.0.4-soname.patch
+++ b/dev-java/fec/files/fec-1.0.4-soname.patch
@@ -1,5 +1,5 @@
---- src/csrc/Makefile.bak	2010-02-27 00:51:38.000000000 +1300
-+++ src/csrc/Makefile	2010-02-27 00:56:06.000000000 +1300
+--- a/src/csrc/Makefile.bak	2010-02-27 00:51:38.000000000 +1300
++++ b/src/csrc/Makefile	2010-02-27 00:56:06.000000000 +1300
 @@ -21,7 +21,8 @@
  	$(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c
  
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 7d608340d2da..1a276decf8ea 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,6 +1,4 @@
 AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
-DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
 DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
-EBUILD htmlcleaner-2.24.ebuild 1671 BLAKE2B 150e6f7606158b72df11ab119df62d4760bb291807360df18bef0c5314d75262fb5c213a961f6d1e0b18e12e39d12a03657ffd1370c00165b316b0781777cfff SHA512 56aec335f34b873113c5c5547eb551b376bdce7b6d12100692980f74b59b0ef0dde6099453ec7523ab0e43c722cc702dc6559551ddc599bd26e26236323268bf
 EBUILD htmlcleaner-2.25.ebuild 1677 BLAKE2B 5d60d3be5fe87752064d2b846004b02f153206f98359ef56441fd8b3abb6243dd4eea9804dcb3666a720b10ca9757e3b9fba46c8673412187412f46670a9ecc2 SHA512 0ac5c9349bedf40ef5b03757bfd782a87172ccc595c1cf1ac922b22b1efec72e2236ce7ce777b465e25b817ad41a2745c4a789b3bd95fb42b0eaf1e52493efec
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
deleted file mode 100644
index 72bceb361e04..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
-HOMEPAGE="http://htmlcleaner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-java/jdom:2"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	dev-java/ant-core:0
-	test? ( dev-java/junit:4 )
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="
-	app-arch/unzip"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_GENTOO_CLASSPATH="jdom-2"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-tests.patch"
-)
-
-src_prepare() {
-	default
-	# Don't require default.xml to be in the current directory.
-	sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \
-		src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die
-}
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-ant-task
-	java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine
-
-	insinto "${JAVA_PKG_SHAREPATH}"
-	newins example.xml default.xml
-}
-
-src_test() {
-	local DIR="src/test/java"
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
-	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/lzma/Manifest b/dev-java/lzma/Manifest
index d634de41a404..1e545deb75d8 100644
--- a/dev-java/lzma/Manifest
+++ b/dev-java/lzma/Manifest
@@ -1,3 +1,5 @@
+DIST lzma1900.7z 1082692 BLAKE2B 88aca3f3225d589c9b1b0fbf4c196db8e6e8df362f926736a45e1f80d302c132b25537203b0a903da9de5f3b0398b10901f126cf6905fcbdf0a57ee894e74b6d SHA512 60532483249d86960d5c481dc88ebeafabb7e435afb6188bc26f38177b8534ef3da83317d6920d99103d4f10a8dcdb624489ea5ddad8e0c8732bab1bb4ebd7eb
 DIST lzma918.tar.bz2 533322 BLAKE2B ed79541be70e127ead9f7683ed098fe6c69cca90574377a4abf0d130434624b05e67448e65e5f88602640b1784a7d613527fafd237d0a94c01ddd91a8f698dd4 SHA512 fa32920d5c45e80c6d029fa1244154e7ae2a2db676e9b115359e955bec829f4cffa6cd8297cae388aca540fc2974dfced4ce284fb351992d7b4a337292da3803
+EBUILD lzma-19.00.ebuild 520 BLAKE2B deb1311e0321dd50a79323aaaba6af05f379e1f5cbd0f2fe3d25338ceac49c286d10eca9d248962bcd1e2dc2121f635c57c922ab934a4b88ce5a54ec8c3834e8 SHA512 e719d88757a10190d5175bac07bb4c77550ac3a2f8a2757baaed3c3c362ddf71118fe11b544b6cee499a6a61527ef7d7b59040e2952dcf1bb0d59e723b836109
 EBUILD lzma-9.18.ebuild 503 BLAKE2B 68df02e7b664be7c59467f27b051684120929b5007a781f4f6eb205b0dee35bea374bbcd3a710cd778dc3975fd815e23bc94f8403db114dc901d9a0bc4d0df4d SHA512 d451bd866b6c4f486cf4707a953b267bcb6f3cf1cc15b85863e0511eadec0990072adcc8a8068a0a62645abc281d046bb087a6861cfc99c6ba140f4090fa4ea0
 MISC metadata.xml 432 BLAKE2B 998874250825748d38aff4d525a9aaceab9cf55299f8fc3960fb0bfedeafc82fee0a9c2570d262678e5fb7949400673fe10b4d9f43a5a02aa1d02907f2d7a57a SHA512 0bfa574b8bea1f0e6f0f29331fdc6caa379729ff27e603af6bf20a895dcdfd233830dd35d2a14c032abd5c5d8feae101747aa344a9e2d08ec1eb3d98daa36939
diff --git a/dev-java/lzma/lzma-19.00.ebuild b/dev-java/lzma/lzma-19.00.ebuild
new file mode 100644
index 000000000000..88e381330a05
--- /dev/null
+++ b/dev-java/lzma/lzma-19.00.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java code for LZMA compression and decompression"
+HOMEPAGE="https://www.7-zip.org/"
+SRC_URI="https://www.7-zip.org/a/${PN}${PV/./}.7z"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/p7zip"
+
+S="${WORKDIR}/Java"
+
+JAVA_SRC_DIR="SevenZip"
diff --git a/dev-java/lzmajio/Manifest b/dev-java/lzmajio/Manifest
index 6ff393cca5b5..a8f543b658ca 100644
--- a/dev-java/lzmajio/Manifest
+++ b/dev-java/lzmajio/Manifest
@@ -1,4 +1,4 @@
 DIST lzmajio-0.95.tar.gz 20790 BLAKE2B e24a5f4778bb135ce3ab519dfc8357cf3abc04d564b8d365f7cbad579be7ff86b4d24156720954bab882d7ade8e5145e533fd477c1925f6a9353c90dd5a2e511 SHA512 65736a66ec8f5eb63688edda912718f4e9b0518c68b0b1eed3df26e7b6bb15728024c637b4cf40f6ab52168c913cce91bd7cafefca7515e0f3e386738cedc6e5
-EBUILD lzmajio-0.95-r1.ebuild 680 BLAKE2B d1761a2317f81216c37f4c40d2b59d70727caece1a6af0e74127aeb5b70da986894cb8fe865c25843882ed629e992433210836f64d5df1f7c69cacce31b44fbb SHA512 05d34b13fbf5e52975ddfbd54ec11fea10c022c7395a6326d0afcacc6f882e765a40433e6a040722e7dcc657c729654454c7bd67060d94dd7bb4df47689a4830
-EBUILD lzmajio-0.95-r2.ebuild 679 BLAKE2B 3f4de611f88fd898c4b29e15ffa685772c69598b76d664dfbfa338e6d9d742071567b956f4958bdfb3c256514729d7d9b9359f0c3adecfc0e1690d4d5fb53ed3 SHA512 2add22580d5f3ff97016f509db4a7c7e81534e7003592e694df3dd8b722e069f533b3d1724492de1762c11babb6c45afb33ee5b63bcca0b300e2bbee7199f3b0
+EBUILD lzmajio-0.95-r2.ebuild 674 BLAKE2B 5b7549e81b29c6e1322a2fe388a0cb6036df92f5ce65f3b3da9d10f8c379f65911b2a362346275237a802ea600feb41648eac688e5c0e42d2ce25a6636b0dd32 SHA512 e73d54235883122f78bb01384eaed2f738d7a220d9a46c1596e33ce5cf7a4b2b0843a0482704e9d8ff413c82c9ff2c62cd01f7825c9eda9b1630ac72249fea08
+EBUILD lzmajio-0.95-r3.ebuild 680 BLAKE2B 8fdce1a93e9e05120bc10d932d8cba50a4781a8ea6a4795b34fd6ee1d13c08defcc684ae5678ef6f5c2ae11767f270e13d1dafcdd732d09ac909abe3648159f9 SHA512 07d050b84237914dad32e8d52bd2e791b1ec97363d03c4a59e08b924492d7ac4553bce9b982ead7f26edbfb9783942810c90aeb64c0acc649d524bee3e975821
 MISC metadata.xml 355 BLAKE2B 45e5688e8e9af78304f1e5b5c499e6416551c805c67f009bd4cfaa2d3bdfaa76da736176e1508d0b91549bf9b402dd5c4b87daa94853eea4d473ee086af3fa0a SHA512 5e5c0b1b6841cd69152cca661eaa68c5ea91bd5954d5a3e831fe82470acd63acaa2ac43ed7797c0af4b2932a2dd1e78b633de4e24ab02c744c2c33f4b920f16d
diff --git a/dev-java/lzmajio/lzmajio-0.95-r2.ebuild b/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
index d0cfe223c5d6..ece3a6b37a67 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r2.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r2.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=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/lzma:0"
 
diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
index 614275aea27e..e4b47cccb1e9 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
@@ -9,21 +10,23 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
 HOMEPAGE="https://contrapunctus.net/league/haques/lzmajio/
 	https://github.com/league/lzmajio"
-SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/league/${P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="dev-java/lzma:0"
 
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
+
 JAVA_GENTOO_CLASSPATH="lzma"
 JAVA_SRC_DIR="net"
diff --git a/dev-java/mersennetwister/Manifest b/dev-java/mersennetwister/Manifest
index 504e4640e85a..e420f3d9690a 100644
--- a/dev-java/mersennetwister/Manifest
+++ b/dev-java/mersennetwister/Manifest
@@ -1,3 +1,4 @@
 DIST mersennetwister-0_pre23765.tar.bz2 4974 BLAKE2B 3a609f7319f365234ebac8ae7b9accd447b9a506cf7cbf45c59bb2c44099e3ee780ea7754db91f96ff6f33fa84f65f20acda58d058aba30345114808ca90e65d SHA512 3c3b970da3ddc3a0b7fda299916781551867b6ce3c8ecb1f89670783d4d51e2681b07c6b2dfc15e11a03c8b949f4880b0bf1511dde2cb4ad0600688809d38e46
 EBUILD mersennetwister-0_pre23765-r1.ebuild 485 BLAKE2B c72a4625e3e19505172f71e403ce8ae928c6561e9b47e6b4cdb15087f84fa199de27cd3cfdd8d41f549210f788ad7415e4aaff620905dbc942c602112a478dce SHA512 8793bfbed4be02fda5edc8455e544ba4eafec8ab3a6af29e1cf39672271b92db4a3520f6833a278100e05ebe9a13de2bc484717a240db5deae85f061345925f3
+EBUILD mersennetwister-0_pre23765-r2.ebuild 488 BLAKE2B 6e245c8c7c0a3147c632c1da1dfe0e01d3bc573cc0a4301a13c4ccf19b1f4163ae5c11a8da429013c8ea44a92e6d09e226af3874a0549fc06f402e6340018a75 SHA512 4a7b390a2c8726ad698c9a86c1357ba1ec7ee8ae173749b3ddddb63cbd5e0518aec5a4ec0a57ee88a8e6ee538289ee948bc3c6238ec57aa534345de8fa952c64
 MISC metadata.xml 353 BLAKE2B c417f3c4e9fb900fe5c4874caf3bc7c0a4e816fd8064ac8eba8c624c4864bee28c9160478ec688e4e447fef35dd8a2f2ed971ea6717cbed73ce85e35facbfdd3 SHA512 4baca3ed7dd47cb5a78222c3d35b0f66439d937fd3629a8784f20bae379539bc01436e5ec2e26fe0b568472faee3d545e9a06089b062ea34e79ea58cecdd86ec
diff --git a/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
new file mode 100644
index 000000000000..8fe643d64cd1
--- /dev/null
+++ b/dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Modified MersenneTwister java port for Freenet"
+HOMEPAGE="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND="
+	source? ( app-arch/zip )
+	>=virtual/jdk-1.8:*"