* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/files/, dev-java/htmlcleaner/
@ 2021-04-30 13:51 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-04-30 13:51 UTC (permalink / raw
To: gentoo-commits
commit: e4fe58906834d266d47526044e24f43e3b1c3966
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 13:50:43 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 13:50:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4fe5890
dev-java/htmcleaner: fixed tests
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/htmlcleaner-2.24-fix-tests.patch | 26 ++++++++++++++++++++++
dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 9 ++++----
2 files changed, 30 insertions(+), 5 deletions(-)
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 00000000000..0e10ccee481
--- /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 {
+ + "</html>";
+
+ final String expectedOutput =
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ + "<html>\n" +
+ " <head/>\n" +
+ " <body>\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 {
+ + "</html>";
+
+ final String expectedOutput =
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ + "<html>\n" +
+ " <head/>\n" +
+ " <body>\n" +
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
index 138bce85abb..72bceb361e0 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
@@ -35,16 +35,15 @@ BDEPEND="
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
-
- sed -i \
- -e '/encoding=/s: standalone.*?>:?><html>:' \
- -e '/\+ \"<html>/d' \
- src/test/java/org/htmlcleaner/{Traversal,}DomSerializerTest.java || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/files/, dev-java/htmlcleaner/
@ 2023-12-25 20:06 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2023-12-25 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 237006a0a55ce0144bd2b9f1ef2c7df76f55ad80
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Dec 25 19:26:08 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 20:05:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=237006a0
dev-java/htmlcleaner: drop 2.26
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34473
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/htmlcleaner/Manifest | 1 -
.../files/htmlcleaner-2.24-fix-tests.patch | 26 ----------
dev-java/htmlcleaner/htmlcleaner-2.26.ebuild | 55 ----------------------
3 files changed, 82 deletions(-)
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index ee70232228bb..e19159c540f6 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f
diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
deleted file mode 100644
index 0e10ccee4816..000000000000
--- a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 {
- + "</html>";
-
- final String expectedOutput =
-- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<html>\n" +
- " <head/>\n" +
- " <body>\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 {
- + "</html>";
-
- final String expectedOutput =
-- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<html>\n" +
- " <head/>\n" +
- " <body>\n" +
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
deleted file mode 100644
index 11ae5880fbc2..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.sourceforge.htmlcleaner:htmlcleaner:2.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-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/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jdom:2"
-
-RDEPEND="
- ${CP_DEPEND}
- >=virtual/jre-1.8:*
-"
-
-DEPEND="
- ${CP_DEPEND}
- dev-java/ant-core:0
- >=virtual/jdk-1.8:*
- test? ( dev-java/junit:4 )
-"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.24-fix-tests.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="ant-core"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
- default # https://bugs.gentoo.org/780585
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_register-ant-task
-
- insinto "${JAVA_PKG_SHAREPATH}"
- newins example.xml default.xml
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-12-25 20:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30 13:51 [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/files/, dev-java/htmlcleaner/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2023-12-25 20:06 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox