gentoo auto-resync : 28:03:2023 - 09:49:10

28 files changed, 785 insertions, 74 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index af3aaba163fc..b822b59b8b01 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index 1e1b851a001b..bccdb62f6471 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,5 +1,7 @@
 AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4
 DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96
+DIST dom4j-2.1.4.tar.gz 566090 BLAKE2B 3078389c947d6915f001a6b59e1398c037d9b696186a9386a00f79b6aec33093e1786903eff35d4d9766345c3fa4f644dd756b431f4f9772b988038d8b48ce17 SHA512 bb735222c8b7dd3788bd8be3b265814d8f3133d42b750a2911464c92dacff1172067d3eedd6736014879ea9e54af32d46a45224522e6a6f2607d25c0fc9e6f38
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-2.1.3.ebuild 2250 BLAKE2B e49e599471e8bb71cdf607dcde2d8899a55f9a5ba3b1f7a3b2a51562c0379c77a31bea78e15f3d933b2a89a6044270ff0681606f0cd5ef6193460b3d8d28d874 SHA512 fd60f6eab2ce00a1b66a08ee3f20ddb1e490c1fd15bfe15b23eccd914eac01dc31916eaf81fa19854fb3fe116dbd57ec46cac1accd6ba908951bdc4c10bde19d
+EBUILD dom4j-2.1.4.ebuild 1421 BLAKE2B 1d2fb8c8c70c8a319c5b07df219b855fdab28196c280ddf9cea52e37f01cff58b0066fde9a9c0fe598adb9f95ae9a69e89ff2be114af64e12f514f2eb2da4ecf SHA512 6967ee2fdbe01b18d9788f949f4b275465ab79dca1af6b9517b73fe231bac7fc69557a9c08d8588411864a7217870e8f444c9ae50270c021313e77f0f81cb3eb
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild b/dev-java/dom4j/dom4j-2.1.4.ebuild
new file mode 100644
index 000000000000..433ef0be38f3
--- /dev/null
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.dom4j:dom4j:2.1.4"
+JAVA_TESTING_FRAMEWORKS="testng"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="flexible XML framework for Java"
+HOMEPAGE="https://dom4j.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar"
+S="${WORKDIR}/${PN}-version-${PV}"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="jaxen"
+
+CP_DEPEND="
+	dev-java/jaxb-api:2
+	dev-java/xpp2:0
+	dev-java/xpp3:0
+	dev-java/xsdlib:0
+"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	jaxen? ( dev-java/jaxen:1.2[dom4j] )
+	test? ( dev-java/xerces:2 )
+"
+
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*
+	jaxen? ( dev-java/jaxen:1.2[dom4j] )
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.dom4j"
+
+# dom4j has a cyclic dependency on jaxen[dom4j].
+# The downloaded jaxen-1.2.0.jar is provided for compilation only.
+# No prebuilt software is actually installed onto the system.
+JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/jaxen-1.2.0.jar"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng,xerces-2"
+JAVA_TEST_RESOURCE_DIRS="xml"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean ..
+
+	if use jaxen; then
+		JAVA_GENTOO_CLASSPATH+=" jaxen-1.2"
+	fi
+}
diff --git a/dev-java/javax-servlet-api/Manifest b/dev-java/javax-servlet-api/Manifest
index 6c694d5220e7..6e9b73184ad5 100644
--- a/dev-java/javax-servlet-api/Manifest
+++ b/dev-java/javax-servlet-api/Manifest
@@ -1,7 +1,9 @@
 DIST javax.servlet-api-3.0.1-sources.jar 212871 BLAKE2B aea63157c3c0af5a40b7245ed0cab312b6d21419087d269374446e1c5f13200fb726a4533bf8d843a7e30d26266e4d9ae6c5e0b05004165ffcef14a7d179cf7b SHA512 9a955e4c8973af31f421f5651b0ae0c00fe4966318ef1849af97aa525736e262fa88b312c0acad093f25d7fa2c0903549d3e53b0cbc45afa7a2436b2c2282e7d
 DIST javax.servlet-api-3.1.0-sources.jar 223386 BLAKE2B ca472d1312e3ebb86ac1f0d1971dbaa607143f856e56a5544cf30daa3c23745e0b338ca10f518300627a53adccf284da91c6f70a25001c5a030b3308b23cb89d SHA512 15c9e497a67c1702ff9f987713553ade10ddfc722ea69377e721b8b094491184efc5801aad420fdbbdffd1d23691328c6eb768d5ad580fc00f3a7eaa6411749c
+DIST servlet-api-2.2-sources.jar 124718 BLAKE2B e9b79dafd1e858935215bf53e70f6e7d6eca226659c50abf6922e895c037ca23c5592da557cb53e649024e59dc56392535ca174dc96130d95e4b8ee98bff790e SHA512 62335089d991e05ba463bc7d976dcc51861e03d0ff350c4de9b63a508e0a8adf043764a7935c7c5c4b64baa2853f8163a78ab8609ee9d5a6001a7e6acb81e16e
 DIST servlet-api-2.5-sources.jar 158114 BLAKE2B 84997b9cc2122f49a850ac32089eb484bc4f68c4e73c7541cf70f453f0a0eaa0c037d6f2b8c8270d4122502f224a6943011f6a964da406093d0ad4bb173dc71e SHA512 6590adea214ba7f59e033b8f450ca8fd3a0764ac6aaf2789d5824ddeecc4c520d004242e42e3a058517d5f556a41a970f782dfde35b2cf184874a77063dc0fef
+EBUILD javax-servlet-api-2.2.ebuild 915 BLAKE2B 3bab0c314c1373e4f55d1035c34eaa8bc02df316d19f23b0b2ecb7d8819a03ef8a65ac643cd71a5a210a70719da39e7fe0b44837e23bc2b14f7908c130555d4f SHA512 ca3ba15c530254f15fa201f134b85e3dcb0b2a89a8ae1080d59f7d38dad807d431fcb1190d8bc950082c7af35dc3b65f6f7ccd1681e65038d125656b8c8d44fb
 EBUILD javax-servlet-api-2.5.ebuild 827 BLAKE2B b8dfafdf2bc1537acfb941d323b7cf93dfb5987c90161ce1ca0283258b7d400e740ff80daacb271ecb5d23840b954a8c4e9e91d4abc4d67b90f2fa614e3a5ced SHA512 f48c0780a2d792890e1ba48c586c67af2da055771a2519f814dd91b6f1d486318a5adaf554da483c3607e2b90d900dfc3c95a96e6ffe386089ee2ccb697c922c
-EBUILD javax-servlet-api-3.0.1.ebuild 942 BLAKE2B cd0f994af65398d0a6c96cbc51eeb2cb9b25a8dcb2bdfbfd35b9bbdc82ddec8006a7ea8781a7a3763bd7415ba7e93dc9810e07fbc321007c1c5936294ae67a10 SHA512 e231654d8d6c0884ed6c8f769585a226630a7d7b4dfbf39890677caa21f37cd41b41e337bb4c100b2dac6b16b25ebb874b8e624399e3338f9d552724455861c1
+EBUILD javax-servlet-api-3.0.1.ebuild 940 BLAKE2B fbec8f7bddfce3dadc7df788c8f65bb71760e2ddff6afffe155e12e984319d504078643ad1d5b139fcdfea23c476a776f96cc8a0ace230b7d6e4251fdec8cbf8 SHA512 3bce74b77a92102085eb6e5243af6aa17e6767fc8649542cf81f73e2c6406c55969e1dee5e1a63f27b12d412daf9ae67781f87dc0b88d6ec589fdc0d123035a8
 EBUILD javax-servlet-api-3.1.0.ebuild 946 BLAKE2B be00c47d8d6c922af92b1f9e65483f0959437180e88d3d0386a3d49742ed56fb4478f60dfa496d2aa635d39d879a7f225ccad7ef27679a996568ca1517a2d8c4 SHA512 1fff69bbd79ef7d4f08d6b971fdb8b28829507cf77c5b2f8d5222137d093bf529a0e4b0884f0cf16f1e1dd63b2ced819432f52953b7b1405f41736a4b7156d38
-MISC metadata.xml 716 BLAKE2B 9d83587a19d52fb72bcec32e1d6e0c096ce5dae07085163e7d193342fc81c82d19fd403297db4b2ad07924127397ebd90576ef3d8427dd1e103e83289445ea2a SHA512 e21915025ff8fb317902a55d3d91597b10747fcf5539b3ff277a34a63bcb59ea6238b891596d5478ef56cff515ee1c3d517ae39700e5eb15db274d21936d6da5
+MISC metadata.xml 805 BLAKE2B 1659a31c44ce401f65c117482a31b28da3e065f5b2f5ef9c0343e14e9151899b1c49838d1135ce5b0faab49082424d440c125f6a312d8c07366e0e54bd4d5386 SHA512 7b5386f0415198641ee8c4d93a1d0607f376f836297559cc361ab428be1ad02c02b700d465a69bd6ceb98f9e77118dc45d4542aa872018c7b2f910c2d7adc05a
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild
new file mode 100644
index 000000000000..ae2d0df2f7c8
--- /dev/null
+++ b/dev-java/javax-servlet-api/javax-servlet-api-2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="javax.servlet:servlet-api:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JavaServlet(TM) Specification"
+HOMEPAGE="https://javaee.github.io/servlet-spec/"
+SRC_URI="https://repo1.maven.org/maven2/javax/servlet/servlet-api/${PV}/servlet-api-${PV}-sources.jar"
+
+LICENSE="CDDL GPL-2"
+SLOT="2.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+JAVA_RESOURCE_DIRS="resources"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+	echo "Implementation-Version: 2.2" > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+	echo "Specification-Version: 2.2" >> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF"
+	find . -type f -name '*.properties' | xargs cp --parent -t resources || die
+}
diff --git a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
index 6361a7a227f3..c591b2849432 100644
--- a/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
+++ b/dev-java/javax-servlet-api/javax-servlet-api-3.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://repo1.maven.org/maven2/javax/servlet/javax.servlet-api/${PV}/ja
 
 LICENSE="CDDL GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=virtual/jre-1.8:*"
 DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/javax-servlet-api/metadata.xml b/dev-java/javax-servlet-api/metadata.xml
index e6e90687d73f..8b4338de30f3 100644
--- a/dev-java/javax-servlet-api/metadata.xml
+++ b/dev-java/javax-servlet-api/metadata.xml
@@ -8,6 +8,7 @@
 		Java Servlet is the foundation web specification in the Java Enterprise Platform. Developers can build web applications using the Servlet API to interact with the request/response workflow.
 	</longdescription>
 	<slots>
+		<slot name="2.2">https://jcp.org/aboutJava/communityprocess/maintenance/jsr903/</slot>
 		<slot name="2.5">https://jcp.org/aboutJava/communityprocess/final/jsr154/</slot>
 		<slot name="3.1">https://jcp.org/aboutJava/communityprocess/final/jsr340/</slot>
 		<slot name="3.0">https://jcp.org/aboutJava/communityprocess/final/jsr315/</slot>
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index a5b8079df996..3809345b5bc1 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,5 @@
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
+DIST jaxen-2.0.0.tar.gz 348084 BLAKE2B 0dd90e040c865e0c2588f93ead9aadd64d49a8559a7c48255bdf89cca88967a60c8c0817ee4b234352fc0c8c3607e00e08c21df4580be7a889ca748073184f54 SHA512 897d8ee72b2ee3743118e363f66e1ccf5195863e4395dbdffa33b0bd7339663d85946f5e6eb37891e2ebb1572cab610a98a3690bdcc3993a2d2be4ae7920f174
 EBUILD jaxen-1.2.0-r1.ebuild 1912 BLAKE2B b7c2b6d75ae49f3df6a46c20a23488f9084fc81d39cec91e3d5258c8ba26532bc03c7da45a4520c245a5b9132d40437cf93b0ab7eefa18459401fe6e091ce1e0 SHA512 f9a9252c02312941af0c08073956449834a5baaf19ff0ebe32fd279cda927e0e6b951c928270e3699d3fccf54b8867f5198aec24ddf8977339e78dbad6d3f3d8
+EBUILD jaxen-2.0.0.ebuild 1386 BLAKE2B 34dbb1b1163229237d8c19a142d58dcd22e56b9f634e3cc42780f8c125d6a5a9c6a16a41d96bf95beaa05b398c6efac67c3866e9f7b31a78b1b2bcc7a79d792f SHA512 0179ef6928c194ee699c9c45b1c66af4e61d7f83dd941f159da81223a871ad9194520cbc8263173c35d3a984ecf8402e672f76566778dcef4afaeca893d29622
 MISC metadata.xml 719 BLAKE2B 81b0a7991de9a06ca79c793dc619356856370488753d22fbfc77d92e5323ab6a5cd489fe9098a60d1de248fa481d906696a20032e7a27972f9630d72a8175906 SHA512 221fb2b9430c909ea27039513feb2c9395992cd67ec087e008cc284dcb3a8d19fd373405c52d59f0ad41cf481586ce58588c04b05e864cc7731d6c4162a3544d
diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild b/dev-java/jaxen/jaxen-2.0.0.ebuild
new file mode 100644
index 000000000000..c8ec4f551e2f
--- /dev/null
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:2.0.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java"
+HOMEPAGE="http://www.cafeconleche.org/jaxen/"
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dom4j jdom xom"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen
+REQUIRED_USE="test? ( dom4j jdom xom )"
+
+CDEPEND="
+	dom4j? ( dev-java/dom4j:1 )
+	jdom? ( dev-java/jdom:0 )
+	xom? ( dev-java/xom:0 )
+"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jaxen"
+JAVA_SRC_DIR="core/src/java/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="core/src/java/test"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	if use dom4j; then
+		JAVA_GENTOO_CLASSPATH+=" dom4j-1"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+	fi
+
+	if use jdom; then
+		JAVA_GENTOO_CLASSPATH+=" jdom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
+	fi
+
+	if use xom; then
+		JAVA_GENTOO_CLASSPATH+=" xom"
+	else
+		rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
+	fi
+}
diff --git a/dev-java/jcifs/Manifest b/dev-java/jcifs/Manifest
index ab124cf1a27d..7fbb0d4bb532 100644
--- a/dev-java/jcifs/Manifest
+++ b/dev-java/jcifs/Manifest
@@ -1,4 +1,3 @@
 DIST jcifs-1.3.19.tgz 883534 BLAKE2B ede24f43018a4bf304019aeddb6cf789e3a01622d840dc3f6bfa45104b97a39d256807f766f14b3e215e53519f3838aabeb73bdf7897323fb41ca5ef2b7c9372 SHA512 24ea656469ac7a5666d28dcdf122c80d254af5317a704718d8848858a21b38c6efe9b977854a33130cdb57d2fc8324ac3ee01fb5443360899f9572ec41788eef
-EBUILD jcifs-1.3.19-r1.ebuild 796 BLAKE2B 4f7851449f0618e9f4457ec4a4dbb0d620f5c546bf9054b44f3fc6dff601181f5f447be90d440ee5310071bfb2378632a1a423d1c1c968605222e919c9d3a59c SHA512 b9b0435c98c1c6e898ddc8b4812f2bdc11bde89b06cc517305e59dec22c23c8f82b7ac67dbc11204d0168c674f61657e89bd612810cedf818069080f7c35e7eb
-EBUILD jcifs-1.3.19-r2.ebuild 896 BLAKE2B 88f5dafefbf815e62085b79f7367a6c076014405915ce377b89db11a3dfbd8a51350dd98c6c3bfe754e6cc6658470614b63313279889b0097d42926b4fe3ba62 SHA512 0919366503ae171d9281341e55d558e66f858c3f92f9e0b0eda69e27027c62a7f409d246e0dbe856533a7d73ecaf6405978b62d0f77be805546dbac6da949d23
+EBUILD jcifs-1.3.19-r2.ebuild 893 BLAKE2B a9241017e8a8c2fc806db9249299fc5fea9274a37d48c045fbcda4e6bd94b760c944709c119244a41e9c02247cf6da9f6d8c3f2d8541f87fa79e4d3442950b42 SHA512 6d43472f0a8da96e2de16c9a3e278f9c38459b5b0d8c533f14464bb560513ca98f9a503598535400e9f4c9bbd2b68b5818a454a205b82c7621c6659b27588590
 MISC metadata.xml 548 BLAKE2B bc7c331f8d53556d450986b25180a144923c7a84dd0aeaff351c4603899d2664fd919f82ff6d9545331855889aa350b7b9d68e8963c2454a79dab7cf26904003 SHA512 339f5cabfc56e1c50cb6d2e1a55992bc593c31ed9b818cd1c071f4c5e07e46cf2c5699287ecf8e27e69ba3f48946856c31723fe9e26e37ef8a1a795f32b70a3d
diff --git a/dev-java/jcifs/jcifs-1.3.19-r1.ebuild b/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
deleted file mode 100644
index 2ccf1a0705d6..000000000000
--- a/dev-java/jcifs/jcifs-1.3.19-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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="Library that implements the CIFS/SMB networking protocol in Java"
-SRC_URI="https://jcifs.samba.org/src/${P}.tgz"
-HOMEPAGE="https://jcifs.samba.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.1"
-
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="java-virtuals/servlet-api:3.0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-JAVA_GENTOO_CLASSPATH="servlet-api-3.0"
-
-JAVA_SRC_DIR="src"
-
-DOCS=( README.txt )
-
-S="${WORKDIR}/${P/-/_}"
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples examples
-	einstalldocs
-}
diff --git a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild b/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
index 5544a2eeba75..1ae94af596dc 100644
--- a/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
+++ b/dev-java/jcifs/jcifs-1.3.19-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P/-/_}"
 LICENSE="LGPL-2.1"
 SLOT="1.1"
 
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 CP_DEPEND="dev-java/jakarta-servlet-api:4"
 
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index a6b8e25f5dfb..e62797c7c33a 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,5 +1,6 @@
+AUX jdom-2.0.6.1-skip-failing-tests.patch 8392 BLAKE2B b906e2854f51a534af29fa1d8191ecb53a1cb7f4b390820847f30213db9e58bd4526a20ac4c8763c49382f35fbe67caf12962a720f5edd5e004f9881ee29070f SHA512 bf753bb13b633bbf39d0f55f1a34e273876c2fb7841ab73baa9e03fb1945a61bf19c0aceb6891df6abe8b57cbc81f33773da4fd5e4e3f42b5ace51b666f4ece2
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3-r1.ebuild 1252 BLAKE2B 1f13d6f90843dd28a886d5b8158d33602239d6fe7540655166a7bf8aa6f3201cb9a3700a7a1ea669c04a7aa8a94432ed6b8e6c1df5a3b1ed36243ec1bb3d0f1d SHA512 bf245f0d9e759c1c0ebe8937d980e391480687eb53ba0234e5f7b02f124b4a55b61bf6001d391da7fbb58de4a82d7ec90b9bd63a101d869e1d96c14d43a792a6
-EBUILD jdom-2.0.6.1.ebuild 2142 BLAKE2B 1a2adb4054650e2f62173cf6843031da74429b76da6b6390c60e4a873561fd626e572da0e87eed65b9c3d78c6224603b0be8772313db151d55b2190dd9e1ad22 SHA512 8758a72cc650a113ebe7e18155315c183513363aaa1abff4d7ee0d55c181901701ca80625b7b8633ee97057ff111dd850eaf3461800983e972cb082c8caabe55
+EBUILD jdom-2.0.6.1.ebuild 2748 BLAKE2B 3e0e6123893a15827ed6202b16387e4403748a33c70132ac0c1edafe6b505046d6fa1896d4cec93dc01d0adb551f1b548e5c2af1c8998c541ff8ac7ef4aa292f SHA512 66ced362fd81ddd13989cac07f6093628ce6166fdfe8f7c6b41fe94376fff4ee5911f7637cf5a43375731674d6410efe0ecfe740e838a45558930293bedf4d46
 MISC metadata.xml 870 BLAKE2B 4f720a44e7f3d2c808e81aeebcdb11963cbdc590d61d9edd4ea5794913096b84ad463726071f66848a26d7a6209c466db4a00253793c08d7fc848fc780da1763 SHA512 516809ec60e2c6763949ddac1cd2cce46a52973c3be148a6153b0941787d4a798699206367ba26e707f1e671a5f851b00281b84b18592b3ece442bc4129aafaf
diff --git a/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch
new file mode 100644
index 000000000000..cb8675153b8a
--- /dev/null
+++ b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch
@@ -0,0 +1,248 @@
+In order to enable tests we skip ( @Ignore ) several of them which
+would otherwise fail, see bug #901743.
+--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
++++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
+@@ -86,6 +86,7 @@ import java.util.List;
+ 
+ import org.junit.Ignore;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.DTDHandler;
+ import org.xml.sax.EntityResolver;
+@@ -696,6 +697,7 @@ public final class TestSAXBuilder {
+      * are added to the DocType
+      */
+     @Test
++    @Ignore
+     public void test_TCM__void_setExpandEntities_boolean() throws JDOMException, IOException {
+         //test entity exansion on internal entity
+     	
+--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java
+@@ -6,6 +6,7 @@ import java.util.ArrayList;
+ import java.util.List;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import org.jdom2.Attribute;
+ import org.jdom2.CDATA;
+@@ -483,6 +484,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 	
+ 	@Test
++	@Ignore
+ 	public void testDocTypeSimpleISS() {
+ 		DocType content = new DocType("root");
+ 		content.setInternalSubset("<!ENTITY name \"value\">");
+@@ -518,6 +520,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 	
+ 	@Test
++	@Ignore
+ 	public void testDocTypeSystemIDISS() {
+ 		DocType content = new DocType("root", "sysid");
+ 		content.setInternalSubset("internal");
+@@ -553,6 +556,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 	
+ 	@Test
++	@Ignore
+ 	public void testDocTypePublicSystemIDISS() {
+ 		DocType content = new DocType("root", "pubid", "sysid");
+ 		content.setInternalSubset("internal");
+@@ -768,6 +772,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testOutputElementAttributeNotSpecifiedB() {
+ 		String txt = "<root atta=\"val\" attb=\"attb\" />";
+ 		final Element root = new Element("root");
+@@ -1111,6 +1116,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testOutputDocTypeInternalSubset() {
+ 		String dec = "<!DOCTYPE root [\ninternal]>";
+ 		DocType dt = new DocType("root");
+@@ -1151,6 +1157,7 @@ public abstract class AbstractTestOutputter {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testOutputDocumentOmitEncoding() {
+ 		Document doc = new Document();
+ 		doc.addContent(new Element("root"));
+--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java
++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java
+@@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue;
+ import java.io.IOException;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ import org.jdom2.Document;
+ import org.jdom2.Element;
+@@ -63,6 +64,7 @@ public abstract class AbstractTestRoundTrip {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testNamespaces() throws JDOMException, IOException {
+ 		final SAXBuilder sb = new SAXBuilder();
+ 		
+@@ -72,6 +74,7 @@ public abstract class AbstractTestRoundTrip {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testComplex() throws JDOMException, IOException {
+ 		final SAXBuilder sb = new SAXBuilder();
+ 		
+--- a/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
+@@ -237,6 +237,7 @@ public final class TestDOMOutputter extends AbstractTestOutputter {
+     }
+     
+     @Test
++    @Ignore
+     public void testWithDocType() {
+     	DocType dt = new DocType("root");
+     	dt.setInternalSubset("<!ELEMENT root (#PCDATA)>");
+--- a/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java
+@@ -347,6 +347,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ 	}
+ 
+ 	@Test
++	@Ignore
+     public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -362,6 +363,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -376,6 +378,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -390,6 +393,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -405,6 +409,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ 
+     // Construct a raw surrogate pair character and confirm it outputs hex escaped
+     @Test
++    @Ignore
+     public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+--- a/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java
+@@ -321,6 +321,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ 	}
+ 
+ 	@Test
++	@Ignore
+     public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -337,6 +338,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -352,6 +354,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -367,6 +370,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+     }
+ 
+     @Test
++    @Ignore
+     public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+@@ -383,6 +387,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ 
+     // Construct a raw surrogate pair character and confirm it outputs hex escaped
+     @Test
++    @Ignore
+     public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException {
+       SAXBuilder builder = new SAXBuilder();
+       builder.setExpandEntities(true);
+--- a/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java
++++ b/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java
+@@ -13,6 +13,7 @@ import org.jdom2.output.XMLOutputter;
+ import org.jdom2.test.util.FidoFetch;
+ 
+ import org.junit.Test;
++import org.junit.Ignore;
+ 
+ @SuppressWarnings("javadoc")
+ public class TestIssue008ExpandEntity {
+@@ -53,16 +54,19 @@ public class TestIssue008ExpandEntity {
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testFalse() {
+ 		roundTrip(false, false, null, "<doc>&minus;</doc>");
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testFalseUSASCII() {
+ 		roundTrip(false, false, "US-ASCII", "<doc>&minus;</doc>");
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testFalseUTF8() {
+ 		roundTrip(false, false, "UTF-8", "<doc>&minus;</doc>");
+ 	}
+@@ -85,16 +89,19 @@ public class TestIssue008ExpandEntity {
+ 
+ 
+ 	@Test
++	@Ignore
+ 	public void testValidFalse() {
+ 		roundTrip(false, true, null, "<doc>&minus;</doc>");
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testValidFalseUSASCII() {
+ 		roundTrip(false, true, "US-ASCII", "<doc>&minus;</doc>");
+ 	}
+ 
+ 	@Test
++	@Ignore
+ 	public void testValidFalseUTF8() {
+ 		roundTrip(false, true, "UTF-8", "<doc>&minus;</doc>");
+ 	}
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index 5cbdaa66520d..774430ba8820 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,15 +12,12 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data"
 HOMEPAGE="http://www.jdom.org"
 SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
+S="${WORKDIR}/jdom-JDOM-${PV}"
 
 LICENSE="Apache-1.1"
 SLOT="2"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# FAILURES!!!
-# Tests run: 1887,  Failures: 23
-RESTRICT="test"
-
 CP_DEPEND="
 	dev-java/iso-relax:0
 	dev-java/jaxen:1.2
@@ -40,35 +37,51 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-S="${WORKDIR}/jdom-JDOM-${PV}"
+PATCHES=( "${FILESDIR}/jdom-2.0.6.1-skip-failing-tests.patch" )
 
-JAVA_TEST_SRC_DIR="test/src/java"
-JAVA_TEST_RESOURCE_DIRS="test/src/resources"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_SRC_DIR="test/src/java"
 
 src_prepare() {
-	default
+	java-pkg-2_src_prepare
+	default # bug #780585
 	java-pkg_clean
 
+	mkdir core/resources || die
+	cp -r core/{package,resources}/META-INF || die
+
 	# Remove Android stuff to avoid junit RDEPEND.
 	rm -vr contrib/src/java/org/jdom2/contrib/android || die
 
-	# There are resources in JAVA_TEST_SRC_DIR
-	cp -r test/src/{java,resources}/org || die
-	# Remove .java files from JAVA_TEST_RESOURCE_DIRS
-	find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+	cd test/src/java || die
+	# java-pkg-simple.eclass expects test resources in JAVA_TEST_RESOURCE_DIRS
+	find . -type f ! -name '*.java' \
+		| xargs cp --parent -t ../resources || die
+
+	# We skip testDocTypeDocument() from 3 test classes due to test failures,
+	# see bug #901743. This requires changing also the line endings which would
+	# lead to huge patches. Hence we do this with sed ( 's/\r$//g' ).
+	sed \
+		-e 's/\r$//g' \
+		-e '/import org.junit.Test/a import org.junit.Ignore;' \
+		-e '/testDocTypeDocument()/i @Ignore' \
+		-i org/jdom2/test/cases/input/TestDOMBuilder.java \
+		-i org/jdom2/test/cases/input/TestStAXEventBuilder.java \
+		-i org/jdom2/test/cases/input/TestStAXStreamBuilder.java || die
 }
 
 src_compile() {
-	JAVA_SRC_DIR="core/src/java"
 	JAVA_JAR_FILENAME="jdom.jar"
+	JAVA_RESOURCE_DIRS="core/resources"
+	JAVA_SRC_DIR="core/src/java"
 	java-pkg-simple_src_compile
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar"
 	rm -rf target || die
 
-	JAVA_SRC_DIR="contrib/src/java"
-	JAVA_RESOURCE_DIRS="contrib/src/resources"
 	JAVA_JAR_FILENAME="jdom-contrib.jar"
+	JAVA_RESOURCE_DIRS="contrib/src/resources"
+	JAVA_SRC_DIR="contrib/src/java"
 	java-pkg-simple_src_compile
 	JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
 	rm -rf target || die
@@ -85,7 +98,7 @@ src_compile() {
 }
 
 src_install() {
-	default # https://bugs.gentoo.org/789582
+	default # install README
 	java-pkg_dojar "jdom.jar"
 	java-pkg_dojar "jdom-contrib.jar"
 	if use doc; then
diff --git a/dev-java/xmlunit-assertj/Manifest b/dev-java/xmlunit-assertj/Manifest
new file mode 100644
index 000000000000..6efb5f2bee05
--- /dev/null
+++ b/dev-java/xmlunit-assertj/Manifest
@@ -0,0 +1,3 @@
+DIST xmlunit-2.9.1-src.tar.gz 681721 BLAKE2B 8e8d40e79890d9bec2a3a72a9931cba1c832438e713eb290867a2d95d3ca5a8092327611998075cf1e0117b747563f178b52f3c6435fc0f57c08a94d7240d104 SHA512 147c3868098b526895059b12a1cb692d774f4734fac94069e72a8c61109f8a3bfd7846d7f2596bf7c10dfb1a379185f73a4a0066076fc64a8577b90da8623acf
+EBUILD xmlunit-assertj-2.9.1.ebuild 1358 BLAKE2B 8f1c96c4dd1caae8c833caff0c07855ac545f8e6444ec087dfb81771137f5994116679cca290366f339ee223ab5ac13400ea6acd301a68e6777ffc9c28b48ef5 SHA512 780fe8596f351c08412e160f994c464866b0decc0b646a3993f70937bb70bfb1684b1dcbb676cc45db000f324b524d06643e7eb20d21a63e0ccee826c8369a59
+MISC metadata.xml 297 BLAKE2B 1c474aad9d99cf02cdea059ef071a80a0f4c61b30f8dba1ae878161ca3e569e2617450d01aec4186ae24a7741d65da013ad9e37809e60f25d99d29a9cd9dbd4d SHA512 5f4f2916d77c7551c8f674971c595dbf217aba7a0b83f8cfa92c38afa50536c7690356efaaed799a4eee5c3f024dbbdc645d809918aa1ebaeac5d58200a97a08
diff --git a/dev-java/xmlunit-assertj/metadata.xml b/dev-java/xmlunit-assertj/metadata.xml
new file mode 100644
index 000000000000..a707e0e60cc6
--- /dev/null
+++ b/dev-java/xmlunit-assertj/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xmlunit/xmlunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild b/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
new file mode 100644
index 000000000000..aff998df433d
--- /dev/null
+++ b/dev-java/xmlunit-assertj/xmlunit-assertj-2.9.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xmlunit:xmlunit-assertj:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMLUnit with AssertJ fluent API"
+HOMEPAGE="https://www.xmlunit.org/"
+SRC_URI="https://github.com/xmlunit/xmlunit/releases/download/v${PV}/xmlunit-${PV}-src.tar.gz"
+S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-assertj"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/assertj-core:3
+	dev-java/byte-buddy:0
+	~dev-java/xmlunit-core-${PV}:2
+	test? (
+		dev-java/hamcrest:0
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( ../{CONTRIBUTING,HELP_WANTED,README,RELEASE_NOTES}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.xmlunit.assertj"
+JAVA_CLASSPATH_EXTRA="
+	assertj-core-3
+	byte-buddy
+	xmlunit-core-2
+"
+JAVA_SRC_DIR="src/main/java"
+
+# org.junit.runners.model.InvalidTestClassError: Invalid test class '
+JAVA_TEST_EXCLUDES="org.xmlunit.TestResources"
+JAVA_TEST_GENTOO_CLASSPATH="
+	junit-4
+	mockito-4
+	xmlunit-core-2
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	cp {../xmlunit-core/,}src/test/java/org/xmlunit/TestResources.java || die
+}
diff --git a/dev-java/xmlunit-core/Manifest b/dev-java/xmlunit-core/Manifest
new file mode 100644
index 000000000000..79f63f3586c2
--- /dev/null
+++ b/dev-java/xmlunit-core/Manifest
@@ -0,0 +1,3 @@
+DIST xmlunit-2.9.1-src.tar.gz 681721 BLAKE2B 8e8d40e79890d9bec2a3a72a9931cba1c832438e713eb290867a2d95d3ca5a8092327611998075cf1e0117b747563f178b52f3c6435fc0f57c08a94d7240d104 SHA512 147c3868098b526895059b12a1cb692d774f4734fac94069e72a8c61109f8a3bfd7846d7f2596bf7c10dfb1a379185f73a4a0066076fc64a8577b90da8623acf
+EBUILD xmlunit-core-2.9.1.ebuild 1176 BLAKE2B 8247f41deaf405b93ecb6b8a04d010e960008f1b41bd7c413ec62ee9eb6ad74ebdb901603681d8fb355fa82c5d0d4932ced9571bc347c7367cd32d79083ad3c0 SHA512 005888760a8655493136a7f1500e4673b13c5253e30d3b4fee037a38f535dc19503eb50c613636a6ea10c123ab30774f1f40bd8d2120bf3c029eec44f494161b
+MISC metadata.xml 297 BLAKE2B 1c474aad9d99cf02cdea059ef071a80a0f4c61b30f8dba1ae878161ca3e569e2617450d01aec4186ae24a7741d65da013ad9e37809e60f25d99d29a9cd9dbd4d SHA512 5f4f2916d77c7551c8f674971c595dbf217aba7a0b83f8cfa92c38afa50536c7690356efaaed799a4eee5c3f024dbbdc645d809918aa1ebaeac5d58200a97a08
diff --git a/dev-java/xmlunit-core/metadata.xml b/dev-java/xmlunit-core/metadata.xml
new file mode 100644
index 000000000000..a707e0e60cc6
--- /dev/null
+++ b/dev-java/xmlunit-core/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xmlunit/xmlunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild b/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
new file mode 100644
index 000000000000..0ce19e461751
--- /dev/null
+++ b/dev-java/xmlunit-core/xmlunit-core-2.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xmlunit:xmlunit-core:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMLUnit for Java"
+HOMEPAGE="https://www.xmlunit.org/"
+SRC_URI="https://github.com/xmlunit/xmlunit/releases/download/v${PV}/xmlunit-${PV}-src.tar.gz"
+S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-core"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+CP_DEPEND="
+	dev-java/jaxb-api:2
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	dev-java/jaxb-runtime:2
+	${CP_DEPEND}
+	test? (
+		dev-java/hamcrest:0
+		dev-java/istack-commons-runtime:3
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( ../{CONTRIBUTING,HELP_WANTED,README,RELEASE_NOTES}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.xmlunit"
+JAVA_CLASSPATH_EXTRA="jaxb-runtime-2"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES=(
+	# org.junit.runners.model.InvalidTestClassError: Invalid test class
+	org.xmlunit.TestResources
+)
+JAVA_TEST_GENTOO_CLASSPATH="
+	hamcrest
+	istack-commons-runtime-3
+	junit-4
+	mockito-4
+"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/xmlunit-matchers/Manifest b/dev-java/xmlunit-matchers/Manifest
new file mode 100644
index 000000000000..2181467645db
--- /dev/null
+++ b/dev-java/xmlunit-matchers/Manifest
@@ -0,0 +1,3 @@
+DIST xmlunit-2.9.1-src.tar.gz 681721 BLAKE2B 8e8d40e79890d9bec2a3a72a9931cba1c832438e713eb290867a2d95d3ca5a8092327611998075cf1e0117b747563f178b52f3c6435fc0f57c08a94d7240d104 SHA512 147c3868098b526895059b12a1cb692d774f4734fac94069e72a8c61109f8a3bfd7846d7f2596bf7c10dfb1a379185f73a4a0066076fc64a8577b90da8623acf
+EBUILD xmlunit-matchers-2.9.1.ebuild 1297 BLAKE2B 2c47dd2076a488cffb0b90c50794cd7d80b105f801cb9612925272915ab92c5385cc9eb32feb6f0489b8aa456390229a188b8b3255003e1efeaef4fc205c9a74 SHA512 aa749242506b3454438783535c9aa28dc3e2e683a1f754109d4cc94c7e4505a1167bb2f7a0c92b54fe34e837f33e8939c44341700b2b18efdf8a22f238564e38
+MISC metadata.xml 297 BLAKE2B 1c474aad9d99cf02cdea059ef071a80a0f4c61b30f8dba1ae878161ca3e569e2617450d01aec4186ae24a7741d65da013ad9e37809e60f25d99d29a9cd9dbd4d SHA512 5f4f2916d77c7551c8f674971c595dbf217aba7a0b83f8cfa92c38afa50536c7690356efaaed799a4eee5c3f024dbbdc645d809918aa1ebaeac5d58200a97a08
diff --git a/dev-java/xmlunit-matchers/metadata.xml b/dev-java/xmlunit-matchers/metadata.xml
new file mode 100644
index 000000000000..a707e0e60cc6
--- /dev/null
+++ b/dev-java/xmlunit-matchers/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xmlunit/xmlunit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild b/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
new file mode 100644
index 000000000000..20f507d2b058
--- /dev/null
+++ b/dev-java/xmlunit-matchers/xmlunit-matchers-2.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.xmlunit:xmlunit-matchers:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XMLUnit for Java Hamcrest Matchers"
+HOMEPAGE="https://www.xmlunit.org/"
+SRC_URI="https://github.com/xmlunit/xmlunit/releases/download/v${PV}/xmlunit-${PV}-src.tar.gz"
+S="${WORKDIR}/xmlunit-${PV}-src/xmlunit-matchers"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+	dev-java/hamcrest-core:1.3
+	~dev-java/xmlunit-core-${PV}:2
+	test? (
+		dev-java/hamcrest-library:1.3
+		dev-java/mockito:4
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+DOCS=( ../{CONTRIBUTING,HELP_WANTED,README,RELEASE_NOTES}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.xmlunit.matchers"
+JAVA_CLASSPATH_EXTRA="
+	hamcrest-core-1.3
+	xmlunit-core-2
+"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_EXCLUDES="org.xmlunit.TestResources"
+JAVA_TEST_GENTOO_CLASSPATH="
+	hamcrest-library-1.3
+	junit-4
+	mockito-4
+	xmlunit-core-2
+"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	cp {../xmlunit-core/,}src/test/java/org/xmlunit/TestResources.java || die
+}
diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 8f80e726d9e0..da51f88a8aba 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,4 +1,6 @@
-AUX xom-1.3.7-disable-invalid-test.patch 672 BLAKE2B a58012a6152e0b9d8b064c32b5dfa0de3c5c008c44001963c6d4f81a7230c9d4b0aacedf99936ccb8ceb84ef5926eaee228e488846c15b47ee1caeaa47ce6279 SHA512 bd6bc466b36f5095b8b74109ea5b5e740317b81d1a844571c7dd6212536d8abaaf576e4c57b66eb997efa2b24fffcbf8c79a2c28361785e710ba6736c9b8491d
+AUX xom-1.3.7-disable-invalid-test.patch 1303 BLAKE2B 5a15e175bc32c6fde77675f4e737e4df2a9a91d99cbb9b954f13a740b2de3435efeb12f03a02eb7aa57e48d45ea90a7ceb998ec68f919ea5478941223dc6a334 SHA512 de929d1e81def5b0bd390ff1498a08e88c06714149ad4cb719be28c110d79b1deb1327239c32d471b0a9f146a9f9231889e4727790b7a15ed55df930d1f07b3e
 DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
+DIST xom-1.3.8-src.tar.gz 5898196 BLAKE2B 59d2af50b1f662419cf9e860c9946b250b3a803b3e3190483bef5d9b77a51272f1f2b11b10da1d72daff5f9a38dfdd3c3c13d15de7b1d9e19372895316df0033 SHA512 4a9b328a51fc24a447271e52b2c084178e2a5091b6e37a6dcb05cfa7c1aeacc426bae896a84dd9a7adc425f77785c12f0ee23805863f096232ad6ca4a2335b44
 EBUILD xom-1.3.7.ebuild 1670 BLAKE2B 7be5543510ceaf1a9a97110417493b51c2481fdff6f985392456063fdd035175cc5dd58bcf475eb6b9345573f14d2d7bdd20dd2d93ea5fc910fc5bc6ef1e18ec SHA512 3b25b044d20351d9eb5d51e1b497cdb731c70e6b25e313e7a0d5bbd2248fe00d09ba0d6013db98811965186b8ac5610d9d1a0387b9ad2a1f93fa49b641c3b889
-MISC metadata.xml 408 BLAKE2B c33f5584ef28efe62e2a913254be05b4f830de92f98bb8c9d7f9d42200e6cdd51ac9258bbbb3f0724a2780ddde9f9bd4c5be08817253b240272f137d811c445f SHA512 c51f83f61d4fdd83f2a308a2e6fe03ff25639ee689490e30f9547a75435691b339b530e44359a89090022556d88cd5fe878c3848f1a9a8ec28e9d21b49592145
+EBUILD xom-1.3.8-r1.ebuild 2707 BLAKE2B 784ebf42a247aa394f76192d978f36249964f79af4b56196ea5e0e634d510fd29113f65f3c068cce29191121e74b613b7f0f19a23d112ebfeaf66a3fbc0f732c SHA512 fbd26255a17b2655ea06bbfb16609365e43abb5c90a39467a21568751d0b8f0d84ff6735152b989ce31f1137029082f6a1178d4113a503a8b2e92a80614603c4
+MISC metadata.xml 483 BLAKE2B f0994332615be07a760e59ac8a996bddfafda98afbac6cc412b670edd0fbcba142200d760d01cf04e2cb33852765974240497c349b382a8e09117ad09bcb52d1 SHA512 2da8b77a95753572e7d9f89bacc92ecf0f9a4e1324df33731f32f00c6ba8a73a128126b1164947698223b56bb61f24a2f6b831636dc2ad9d5c6ade4a81372476
diff --git a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
index ef897ae004c9..6ee097470edc 100644
--- a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
+++ b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
@@ -1,5 +1,14 @@
-diff --git a/XOM/src/nu/xom/tests/XSLTransformTest.java b/XOM/src/nu/xom/tests/XSLTransformTest.java
-index 443c058..56f7b6e 100644
+1) testIllegalTransform(nu.xom.tests.XSLTransformTest)
+nu.xom.xslt.XSLException: Syntax error in stylesheet
+        at nu.xom.xslt.XSLTransform.<init>(XSLTransform.java:181)
+        at nu.xom.xslt.XSLTransform.<init>(XSLTransform.java:226)
+        at nu.xom.xslt.XSLTransform.<init>(XSLTransform.java:201)
+        at nu.xom.tests.XSLTransformTest.testIllegalTransform(XSLTransformTest.java:775)
+        ... 25 trimmed
+Caused by: javax.xml.transform.TransformerConfigurationException: Cannot find external method 'www.example.com.fn' (must be public).
+        at com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl.newTemplates(TransformerFactoryImpl.java:990)
+        at nu.xom.xslt.XSLTransform.<init>(XSLTransform.java:173)
+        ... 29 more
 --- a/XOM/src/nu/xom/tests/XSLTransformTest.java
 +++ b/XOM/src/nu/xom/tests/XSLTransformTest.java
 @@ -765,7 +765,7 @@ public class XSLTransformTest extends XOMTestCase {
diff --git a/dev-java/xom/metadata.xml b/dev-java/xom/metadata.xml
index 511ed7c60117..08ce1d1a6403 100644
--- a/dev-java/xom/metadata.xml
+++ b/dev-java/xom/metadata.xml
@@ -9,4 +9,7 @@
 		XOM is a new XML object model. It is a tree-based API for processing
 		XML with Java that strives for correctness and simplicity.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">elharo/xom</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-java/xom/xom-1.3.8-r1.ebuild b/dev-java/xom/xom-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..f3124d0ca351
--- /dev/null
+++ b/dev-java/xom/xom-1.3.8-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+MAVEN_ID="xom:xom:${PV}"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XML Object Model"
+HOMEPAGE="https://xom.nu"
+SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+CP_DEPEND="
+	dev-java/jaxen:1.2
+	dev-java/xerces:2"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CP_DEPEND}
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*"
+
+PATCHES=( "${FILESDIR}/xom-1.3.7-disable-invalid-test.patch" )
+
+JAVA_AUTOMATIC_MODULE_NAME="nu.xom"
+JAVA_MAIN_CLASS="nu.xom.Info"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	java-pkg_clean
+	default
+
+	# removing directories based on build.xml
+	rm -rv XOM/src/nu/xom/benchmarks/ || die
+	rm -rv XOM/src/nu/xom/integrationtests/ || die
+	rm -rv XOM/src/nu/xom/samples/ || die
+	rm -rv XOM/src/nu/xom/tools/ || die
+
+	# reorganize the code and resources so that it goes well with java-pkg-simple
+	mkdir -pv ${JAVA_SRC_DIR} ${JAVA_RESOURCE_DIRS} ${JAVA_TEST_SRC_DIR}/nu/xom || die
+	mv -v {XOM/src,${JAVA_TEST_SRC_DIR}}/nu/xom/tests || die
+	mv -v XOM/data . || die
+	pushd XOM/src || die
+	for file in $(find -type f -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_SRC_DIR}" || die
+	done
+	for file in $(find -type f ! -name "*.java"); do
+		cp --parents -R ${file} "${WORKDIR}/${JAVA_RESOURCE_DIRS}" || die
+	done
+	popd
+}
+
+src_test() {
+	# These tests need to run separately, otherwise fail
+	# Should pass with "OK (126 tests)"
+	JAVA_TEST_RUN_ONLY=(
+		nu.xom.tests.AttributesTest
+		nu.xom.tests.DocumentTest
+		nu.xom.tests.ElementTest
+		nu.xom.tests.NodesTest
+		nu.xom.tests.ParentNodeTest
+	)
+	java-pkg-simple_src_test
+
+	JAVA_TEST_RUN_ONLY=()
+	pushd src/test/java > /dev/null || die
+		# Exclude EBCDICTest.java
+		# https://github.com/elharo/xom/blob/v1.3.8/src/nu/xom/tests/EBCDICTest.java#L71-L73
+		# And exclude those tests already run before
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-type f \
+			-name "*Test.java" \
+			! -name 'EBCDICTest.java' \
+			! -name 'AttributesTest.java' \
+			! -name 'DocumentTest.java' \
+			! -name 'ElementTest.java' \
+			! -name 'NodesTest.java' \
+			! -name 'ParentNodeTest.java' \
+			)
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+		JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	popd > /dev/null || die
+	java-pkg-simple_src_test
+}