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

4 files changed, 117 insertions, 4 deletions

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
+}