From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- dev-java/htmlcleaner/Manifest | 5 +- .../files/htmlcleaner-2.24-fix-tests.patch | 26 ++++++++ dev-java/htmlcleaner/htmlcleaner-2.13.ebuild | 66 ------------------- dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 73 ++++++++++++++++++++++ 4 files changed, 102 insertions(+), 68 deletions(-) create mode 100644 dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch delete mode 100644 dev-java/htmlcleaner/htmlcleaner-2.13.ebuild create mode 100644 dev-java/htmlcleaner/htmlcleaner-2.24.ebuild (limited to 'dev-java/htmlcleaner') diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest index 5c4aafb80ecc..ceb64022ab16 100644 --- a/dev-java/htmlcleaner/Manifest +++ b/dev-java/htmlcleaner/Manifest @@ -1,3 +1,4 @@ -DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47 -EBUILD htmlcleaner-2.13.ebuild 1597 BLAKE2B 0f63cbc475912060956ad1dfbebbc639be55caf89a0cf59424c4ba86b25b798e3efd675fe2ac71fcb6b518461f10e530bb0d1e3a2531954abaf4694545357af0 SHA512 c6a686dde0292fe2a2eff15c11a51f6d11dae268af0e5a5e75b0e53668fff3dfc53c924862220753d6acf588203cf4516d7d2eb2c74f40631b02fa44d5b543ef +AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0 +DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff +EBUILD htmlcleaner-2.24.ebuild 1671 BLAKE2B 150e6f7606158b72df11ab119df62d4760bb291807360df18bef0c5314d75262fb5c213a961f6d1e0b18e12e39d12a03657ffd1370c00165b316b0781777cfff SHA512 56aec335f34b873113c5c5547eb551b376bdce7b6d12100692980f74b59b0ef0dde6099453ec7523ab0e43c722cc702dc6559551ddc599bd26e26236323268bf MISC metadata.xml 956 BLAKE2B e9aac65fc4b7ea06f1151cf3f09d1d9363770332ee2d3c711099591edb6d4ee09bd385fadefdd95512ef84f3a870407fae0e2e69bbabd16b24980341095ff7cc SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0 diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch new file mode 100644 index 000000000000..0e10ccee4816 --- /dev/null +++ b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java +index b09c6d6..f4e83f0 100644 +--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java +@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest { + + ""; + + final String expectedOutput = +- "\n" ++ "" + + "\n" + + " \n" + + " \n" + +diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +index 3e1d1e9..d406c40 100644 +--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest { + + ""; + + final String expectedOutput = +- "\n" ++ "" + + "\n" + + " \n" + + " \n" + diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild deleted file mode 100644 index 0d2f1e083023..000000000000 --- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task" -HOMEPAGE="http://htmlcleaner.sourceforge.net/" -SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND="dev-java/jdom:2" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.5" - -DEPEND=" - ${CDEPEND} - app-arch/unzip - dev-java/ant-core:0 - test? ( dev-java/junit:4 ) - >=virtual/jdk-1.5" - -JAVA_SRC_DIR="src/main/java" -JAVA_GENTOO_CLASSPATH="jdom-2" - -src_prepare() { - # Don't require default.xml to be in the current directory. - sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \ - src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die -} - -src_configure() { - JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core) -} - -src_install() { - java-pkg-simple_src_install - java-pkg_register-ant-task - java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine - - insinto "${JAVA_PKG_SHAREPATH}" - newins example.xml default.xml -} - -src_test() { - local DIR="src/test/java" - local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" - - local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*") - TESTS="${TESTS//src\/test\/java\/}" - TESTS="${TESTS//.java}" - TESTS="${TESTS//\//.}" - - ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java") - ejunit4 -classpath "${CP}" ${TESTS} -} diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild new file mode 100644 index 000000000000..72bceb361e04 --- /dev/null +++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task" +HOMEPAGE="http://htmlcleaner.sourceforge.net/" +SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +CDEPEND="dev-java/jdom:2" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.8:*" + +DEPEND=" + ${CDEPEND} + dev-java/ant-core:0 + test? ( dev-java/junit:4 ) + >=virtual/jdk-1.8:*" + +BDEPEND=" + app-arch/unzip" + +JAVA_SRC_DIR="src/main/java" +JAVA_GENTOO_CLASSPATH="jdom-2" + +PATCHES=( + "${FILESDIR}/${P}-fix-tests.patch" +) + +src_prepare() { + default + # Don't require default.xml to be in the current directory. + sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \ + src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die +} + +src_configure() { + JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core) +} + +src_install() { + java-pkg-simple_src_install + java-pkg_register-ant-task + java-pkg_dolauncher ${PN} --main org.${PN}.CommandLine + + insinto "${JAVA_PKG_SHAREPATH}" + newins example.xml default.xml +} + +src_test() { + local DIR="src/test/java" + local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" + + local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*") + TESTS="${TESTS//src\/test\/java\/}" + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} -- cgit v1.2.3