Adding metadata

12 files changed, 500 insertions, 64 deletions

diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index a884ea898fb6..4562f0eea90e 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,2 +1,3 @@
 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
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 414df790328e..d09584b82304 100644
--- a/dev-java/javax-servlet-api/Manifest
+++ b/dev-java/javax-servlet-api/Manifest
@@ -1,3 +1,4 @@
 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
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/jaxen/Manifest b/dev-java/jaxen/Manifest
index b85b4cd1177a..251dffcfcdd0 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1 +1,2 @@
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
+DIST jaxen-2.0.0.tar.gz 348084 BLAKE2B 0dd90e040c865e0c2588f93ead9aadd64d49a8559a7c48255bdf89cca88967a60c8c0817ee4b234352fc0c8c3607e00e08c21df4580be7a889ca748073184f54 SHA512 897d8ee72b2ee3743118e363f66e1ccf5195863e4395dbdffa33b0bd7339663d85946f5e6eb37891e2ebb1572cab610a98a3690bdcc3993a2d2be4ae7920f174
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/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/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/xom/Manifest b/dev-java/xom/Manifest
index 8c6360068295..8623f92eb313 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1 +1,2 @@
 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
diff --git a/dev-java/xom/xom-1.3.8.ebuild b/dev-java/xom/xom-1.3.8.ebuild
new file mode 100644
index 000000000000..d8489ef1cab9
--- /dev/null
+++ b/dev-java/xom/xom-1.3.8.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"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+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:*"
+
+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"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	# 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
+}