commit: e49d21d2d19324fb521d3572c89a9dfbcc7fef2b Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Thu May 22 13:13:55 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat May 24 20:08:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49d21d2
dev-java/xom: drop 1.3.8-r1 Closes: https://bugs.gentoo.org/951494 Closes: https://bugs.gentoo.org/790608 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/42206 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/xom/Manifest | 1 - .../xom/files/xom-1.3.7-disable-invalid-test.patch | 31 ------- dev-java/xom/xom-1.3.8-r1.ebuild | 103 --------------------- 3 files changed, 135 deletions(-) diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest index 660cd4b6a69b..bdedae17ab62 100644 --- a/dev-java/xom/Manifest +++ b/dev-java/xom/Manifest @@ -1,2 +1 @@ -DIST xom-1.3.8-src.tar.gz 5898196 BLAKE2B 59d2af50b1f662419cf9e860c9946b250b3a803b3e3190483bef5d9b77a51272f1f2b11b10da1d72daff5f9a38dfdd3c3c13d15de7b1d9e19372895316df0033 SHA512 4a9b328a51fc24a447271e52b2c084178e2a5091b6e37a6dcb05cfa7c1aeacc426bae896a84dd9a7adc425f77785c12f0ee23805863f096232ad6ca4a2335b44 DIST xom-1.3.9-src.tar.gz 3660062 BLAKE2B 9e9b6e297ba47bb5e106b903800d0591744ad8f9b5f6ecca769c4bbe42489b9d045ad84e4c9d3f75282337395503662ecc7b759b04b75bcf8d13869b4103db9f SHA512 73d085d91b29f548261804d684896ec457edeb13af9ea395e84fdb1f8259678733276d7240ef8b29f7233d82c1ca568785139871d9448986134ff97ff271946f 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 deleted file mode 100644 index 6ee097470edc..000000000000 --- a/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 { - - } - -- -+ /* - public void testIllegalTransform() - throws XSLException, ParsingException, IOException { - -@@ -784,7 +784,7 @@ public class XSLTransformTest extends XOMTestCase { - } - - } -- -+ */ - - public void testRemapPrefixToSameURI() - throws IOException, ParsingException, XSLException { diff --git a/dev-java/xom/xom-1.3.8-r1.ebuild b/dev-java/xom/xom-1.3.8-r1.ebuild deleted file mode 100644 index 38151f3a2175..000000000000 --- a/dev-java/xom/xom-1.3.8-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 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 arm64 ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -# Bug #905215 -PROPERTIES="test_network" -RESTRICT="test" - -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 -}
