gentoo resync : 28.04.2021

3 files changed, 91 insertions, 0 deletions

diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest
index 79ed4cf15093..7bfd89cf10cf 100644
--- a/dev-java/xom/Manifest
+++ b/dev-java/xom/Manifest
@@ -1,8 +1,11 @@
 AUX xom-1.2.6.patch 2096 BLAKE2B 041c55199398e37fcb4a481d7deb1c8c3fb8d980fa6ebc207236cf1e85e91c7b28f2c5e551153ac52b17272b8f02324dce7ae2b9948f9c0880a900eed84d9f62 SHA512 7d864f9178a5fd846572a17eb345a74510e7a3880c203054d7156849c10c678421ed688965d821daafcff91888be9a485c5409937055a56139066aaa6d32aca0
+AUX xom-1.3.7-disable-invalid-test.patch 672 BLAKE2B a58012a6152e0b9d8b064c32b5dfa0de3c5c008c44001963c6d4f81a7230c9d4b0aacedf99936ccb8ceb84ef5926eaee228e488846c15b47ee1caeaa47ce6279 SHA512 bd6bc466b36f5095b8b74109ea5b5e740317b81d1a844571c7dd6212536d8abaaf576e4c57b66eb997efa2b24fffcbf8c79a2c28361785e710ba6736c9b8491d
 AUX xom-strip-fallback-parser.patch 690 BLAKE2B c8135a026905fc16560be949598a48e02000aa29b3d1ddc6b40bd16ceb7ae60983ce703715f01e550fa2b643bcb1febb032387ab5431367d9dbc54079ed5f551 SHA512 e61defbc5c8da65561709be6431b0b15069759ec94de2f1f356d518b8b9d90a7ab1ccfd6db6148a3dbcc999b19c9607cd7586ef4c30f70e627968e726e953830
 DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309
 DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680
 DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4
+DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262
 EBUILD xom-1.2.10.ebuild 2166 BLAKE2B 65380004dc447dd45c034599259b11e28ebc3988be9528782de0568b73b6e31632101d024b941b2acec78a8736dff7ad2b4a01d1303b9ba96c7c1b5c6c0e02ac SHA512 0858697d6ff1fc61930e42162d4e67b67e662b29e166d2e15da0fa51cf8563e06599359e6b04bd470902363988d6d61730a78a94244ff7b0ffca778afdeebeab
 EBUILD xom-1.3.2.ebuild 819 BLAKE2B 95c1a0236273676e598936b570f6304ed86b51b03b7368c6e1d112c6234bb92f3c0d1e5d36bb271e264fcf869d8d990124ffedaee7dcf0067a959a66d6374326 SHA512 92cfc4188b4b1d59d169481ec95c63bf6534f42df3f98c680beb8a69b3ecb7dd26b9ffaf0386e8536191008dd8789bc4312a750decbc867eab5c3e0639c959a3
+EBUILD xom-1.3.7.ebuild 1671 BLAKE2B 5b7516cf4626f3213a2105b6cf17b0223f948948ef7336db09e7c3dd1727d7417ffe12b8b55a63e752474cd594ee63d5fef09451537fdf9de2fe75599dac188f SHA512 f2fea9d1218bdb5672b6789f7f722aa8a2066261e107659f809d7f76890676e99af1fe32178808116f74b48d1d744db0969e141f6752f4d2e619319787b4f3b2
 MISC metadata.xml 407 BLAKE2B 2486554418b17502be636181d1dc619a50143016a72e05d5bef8a42c631b9f09913040bc868cefae0759075f26853c605e6a11179b20f3ca3081dd091536b56e SHA512 4ec08597d54cbea6121f240565ff7b7ee614c370357b551bebd18d31749c1863e30bc8b7935caa00051f9946cc927cd34c1bad02be07eca40c89d2c6e0e7b2f6
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
new file mode 100644
index 000000000000..ef897ae004c9
--- /dev/null
+++ b/dev-java/xom/files/xom-1.3.7-disable-invalid-test.patch
@@ -0,0 +1,22 @@
+diff --git a/XOM/src/nu/xom/tests/XSLTransformTest.java b/XOM/src/nu/xom/tests/XSLTransformTest.java
+index 443c058..56f7b6e 100644
+--- 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.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild
new file mode 100644
index 000000000000..87dbb6c9df9b
--- /dev/null
+++ b/dev-java/xom/xom-1.3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+CDEPEND="
+	dev-java/jaxen:1.2
+	dev-java/xerces:2"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	dev-java/junit:0
+	>=virtual/jdk-1.8:*"
+
+JAVA_GENTOO_CLASSPATH="jaxen-1.2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-invalid-test.patch"
+)
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+
+	# 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/nu/xom/tests ${JAVA_TEST_SRC_DIR}/nu/xom/ || 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
+}