public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2015-08-17 22:29 James Le Cuirot
  0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot @ 2015-08-17 22:29 UTC (permalink / raw
  To: gentoo-commits

commit:     6357034e4caf72d9b29c3666a94a31f57bbddb54
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 22:28:39 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 22:28:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6357034e

dev-java/htmlcleaner: Imported and bumped from java-overlay

Closes bug #369977.

Package-Manager: portage-2.2.20.1

 dev-java/htmlcleaner/Manifest                |  1 +
 dev-java/htmlcleaner/htmlcleaner-2.13.ebuild | 64 ++++++++++++++++++++++++++++
 dev-java/htmlcleaner/metadata.xml            |  6 +++
 3 files changed, 71 insertions(+)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
new file mode 100644
index 0000000..972d136
--- /dev/null
+++ b/dev-java/htmlcleaner/Manifest
@@ -0,0 +1 @@
+DIST htmlcleaner-2.13-src.zip 346998 SHA256 e51daa50eb65b5a92467bf794a6f82b667fe7ca1d1d58ba046ae234e45d9c3a0 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47 WHIRLPOOL 2b2792607e2c4f5f3dc8d2b7d7035c3f762ac1355724811b8a743ad2a0cd0f6fecf5392be8c58632b697a8529b55f60721dc63128c647aad7faa0e191c9056ce

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
new file mode 100644
index 0000000..fa953f2
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+CDEPEND="dev-java/jdom:2"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	app-arch/unzip
+	dev-java/ant-core:0
+	test? ( dev-java/junit:4 )"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-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_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/metadata.xml b/dev-java/htmlcleaner/metadata.xml
new file mode 100644
index 0000000..580cafc
--- /dev/null
+++ b/dev-java/htmlcleaner/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<longdescription>HtmlCleaner is an open source HTML parser written in Java. HTML found on the Web is usually dirty, ill-formed and unsuitable for further processing. For any serious consumption of such documents, it is necessary to first clean up the mess and bring some order to the tags, attributes and ordinary text. For any given HTML document, HtmlCleaner reorders individual elements and produces well-formed XML. By default, it follows similar rules that the most of web browsers use in order to create the Document Object Model. However, you can provide custom tag and rule sets for tag filtering and balancing.</longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2015-11-01 20:50 James Le Cuirot
  0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot @ 2015-11-01 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     b0312bc1612f4a7e49faedb6215abbfd90242d38
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 20:50:25 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 20:50:25 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0312bc1

dev-java/htmlcleaner: JAVA_CLASSPATH_EXTRA has been renamed

Package-Manager: portage-2.2.20.1

 dev-java/htmlcleaner/htmlcleaner-2.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index fa953f2..9d00dfd 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 }
 
 src_configure() {
-	JAVA_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
+	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core)
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2016-02-16 16:55 Patrice Clement
  0 siblings, 0 replies; 18+ messages in thread
From: Patrice Clement @ 2016-02-16 16:55 UTC (permalink / raw
  To: gentoo-commits

commit:     d8ed30827dce72ed16592383a58718f10056656b
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 15:43:51 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 16:48:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ed3082

dev-java/htmlcleaner: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy.

Package-Manager: portage-2.2.26

 dev-java/htmlcleaner/htmlcleaner-2.13.ebuild | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index 9d00dfd..0cf9f87 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,14 +19,16 @@ IUSE="test"
 
 CDEPEND="dev-java/jdom:2"
 
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.5"
+
+DEPEND="
+	${CDEPEND}
 	app-arch/unzip
 	dev-java/ant-core:0
-	test? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
+	test? ( dev-java/junit:4 )
+	>=virtual/jdk-1.5"
 
 JAVA_SRC_DIR="src/main/java"
 JAVA_GENTOO_CLASSPATH="jdom-2"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-04-30 13:51 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-04-30 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5c17f24ef68b457f3846d5511094768390d8c198
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 27 23:04:44 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=5c17f24e

dev-java/htmlcleaner: patched

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20560
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
index 60b40cac312..138bce85abb 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
@@ -40,6 +40,11 @@ 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
+
+	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] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-04-30 13:51 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-04-30 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4548cabf5329204aa4781eae935f6b7462bf60fa
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 27 16:11:41 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 13:50:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4548cabf

dev-java/htmlcleaner: remove old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 -
 dev-java/htmlcleaner/htmlcleaner-2.13.ebuild | 66 ----------------------------
 dev-java/htmlcleaner/htmlcleaner-2.24.ebuild |  1 -
 3 files changed, 68 deletions(-)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index ff37e647153..0e099073eb9 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
 DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
deleted file mode 100644
index 0d2f1e08302..00000000000
--- 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
index f51d425b4e9..60b40cac312 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 BDEPEND="
 	app-arch/unzip"
 
-
 JAVA_SRC_DIR="src/main/java"
 JAVA_GENTOO_CLASSPATH="jdom-2"
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-04-30 13:51 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-04-30 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     af53793a9c726082856102682deedd6366b30c41
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Apr 27 16:10:39 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 13:50:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af53793a

dev-java/htmlcleaner: bump to 2.24

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 +
 dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 70 ++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index b705663e15d..ff37e647153 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1 +1,2 @@
 DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
+DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
new file mode 100644
index 00000000000..f51d425b4e9
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
@@ -0,0 +1,70 @@
+# 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"
+
+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}
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-10-05  7:25 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-10-05  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     2ed034fcf36aa1ed1f95455a18813b706970b694
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  5 07:24:52 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  5 07:25:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed034fc

dev-java/htmlcleaner: bump to 2.25

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 +
 dev-java/htmlcleaner/htmlcleaner-2.25.ebuild | 73 ++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 0e099073eb9..12fdeaafa87 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1 +1,2 @@
 DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
+DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
new file mode 100644
index 00000000000..e4d64cd88b0
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.25.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}/${PN}-2.24-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}
+}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-10-25 11:27 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2021-10-25 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     580152a6a25d9166585fbea71506bc8767794dc0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 25 11:27:25 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 25 11:27:39 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580152a6

dev-java/htmlcleaner: removed obsolete 2.24

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 -
 dev-java/htmlcleaner/htmlcleaner-2.24.ebuild | 73 ----------------------------
 2 files changed, 74 deletions(-)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 12fdeaafa87..bf12edd4b46 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
 DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
deleted file mode 100644
index 72bceb361e0..00000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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}
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-10-27  6:35 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2021-10-27  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     a44ef80861d6e8a2374ab83f1d5969d77dbbc626
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:35:41 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:35:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44ef808

dev-java/htmlcleaner: amd64 stable wrt bug #816375

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
index e4d64cd88b0..060d8b10fd5 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2021-10-27  6:37 Agostino Sarubbo
  0 siblings, 0 replies; 18+ messages in thread
From: Agostino Sarubbo @ 2021-10-27  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c3d074c25a3676278e4435b2f9a32463721f9981
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:37:02 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:37:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d074c2

dev-java/htmlcleaner: x86 stable wrt bug #816375

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.25.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
index 060d8b10fd5..bb8c0221c59 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/htmlcleaner/files/${P}-src.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2022-08-02 11:52 Florian Schmaus
  0 siblings, 0 replies; 18+ messages in thread
From: Florian Schmaus @ 2022-08-02 11:52 UTC (permalink / raw
  To: gentoo-commits

commit:     5ccc77bd20a8836b6ccd33124f192e202ac7e8ad
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Aug  1 16:46:50 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 11:52:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ccc77bd

dev-java/htmlcleaner: add 2.26

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26697
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 +
 dev-java/htmlcleaner/htmlcleaner-2.26.ebuild | 55 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index bf12edd4b46d..4352620f3de1 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1 +1,2 @@
 DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
+DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
new file mode 100644
index 000000000000..2bb65af8d069
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
@@ -0,0 +1,55 @@
+# 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] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2022-09-01  7:55 Jakov Smolić
  0 siblings, 0 replies; 18+ messages in thread
From: Jakov Smolić @ 2022-09-01  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     b4ef42c123c607b509402457a32d17fb85431643
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 07:54:52 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 07:54:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ef42c1

dev-java/htmlcleaner: Stabilize 2.26 amd64, #867805

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
index 2bb65af8d069..b21fdfee49c6 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 CP_DEPEND="dev-java/jdom:2"
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2022-09-01  7:55 Jakov Smolić
  0 siblings, 0 replies; 18+ messages in thread
From: Jakov Smolić @ 2022-09-01  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7bf05f6d78198d3c2491881cf4efecbacc974d78
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 07:55:02 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 07:55:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf05f6d

dev-java/htmlcleaner: Stabilize 2.26 x86, #867805

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
index b21fdfee49c6..11ae5880fbc2 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CP_DEPEND="dev-java/jdom:2"
 


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2022-09-02  4:22 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2022-09-02  4:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5dc08bd84e75cdb8983b35a2d1952312af38fb17
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Sep  1 19:48:15 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 04:22:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc08bd8

dev-java/htmlcleaner: drop 2.25

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/27108
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 -
 dev-java/htmlcleaner/htmlcleaner-2.25.ebuild | 73 ----------------------------
 2 files changed, 74 deletions(-)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 4352620f3de1..c055de4d6604 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,2 +1 @@
-DIST htmlcleaner-2.25-src.zip 414193 BLAKE2B e840b65665b23a6c55eda49a522994208b7178ddf924e60bdca9304c58df9bde343b31bbd4b7491db7bfd4fe0930283f9019d9213450618e0d50036563cced86 SHA512 fb49f0298b05008a727e7ba97a3444c6f8c31f65a9962e42bae63e1dab76fc7302f282daa45177daffcadbb73565685735f44b57107c62819bafa0db030c5ea3
 DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
deleted file mode 100644
index bb8c0221c59b..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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}/${PN}-2.24-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}
-}


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2023-11-25  8:46 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2023-11-25  8:46 UTC (permalink / raw
  To: gentoo-commits

commit:     44a9cd51b1edf23ac213406dc5616ad1f806bf46
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Nov 18 08:55:23 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 08:42:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a9cd51

dev-java/htmlcleaner: add 2.29 - CVE-2023-34624

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33883
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/htmlcleaner/Manifest                |  1 +
 dev-java/htmlcleaner/htmlcleaner-2.29.ebuild | 40 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index c055de4d6604..ee70232228bb 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1 +1,2 @@
 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/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
new file mode 100644
index 000000000000..39354c4424da
--- /dev/null
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 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.29"
+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="https://htmlcleaner.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-src-${PV}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/jdom:2"
+DEPEND="${CP_DEPEND}
+	dev-java/ant-core:0
+	>=virtual/jdk-1.8:*
+	test? ( dev-java/junit:4 )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+
+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] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2023-12-25 15:18 Sam James
  0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2023-12-25 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     540cb6697a1a96dad5184bde0731081b37eeea53
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:18:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 15:18:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540cb669

dev-java/htmlcleaner: Stabilize 2.29 amd64, #920688

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
index 39354c4424da..40eba0ef93f7 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jdom:2"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2023-12-25 19:17 Arthur Zamarin
  0 siblings, 0 replies; 18+ messages in thread
From: Arthur Zamarin @ 2023-12-25 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     41a11c5096466a2553c8e5a62bba34e0e044308f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 19:17:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 19:17:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a11c50

dev-java/htmlcleaner: Stabilize 2.29 x86, #920688

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/htmlcleaner/htmlcleaner-2.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
index 40eba0ef93f7..a3637d08cc40 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jdom:2"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-java/htmlcleaner/
@ 2024-03-13 11:09 Miroslav Šulc
  0 siblings, 0 replies; 18+ messages in thread
From: Miroslav Šulc @ 2024-03-13 11:09 UTC (permalink / raw
  To: gentoo-commits

commit:     7f1437fc96293a3261aa654a70f60ec62fca7a74
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 12 12:34:20 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 11:07:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1437fc

dev-java/htmlcleaner: switch to dev-java/ant

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35723/commits/3d2a3e632890240c092f67ad33077c6159b4a9ae
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../{htmlcleaner-2.29.ebuild => htmlcleaner-2.29-r1.ebuild}         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
similarity index 91%
rename from dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
rename to dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
index a3637d08cc40..ed7088f6cec6 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,13 +20,13 @@ KEYWORDS="amd64 x86"
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jdom:2"
 DEPEND="${CP_DEPEND}
-	dev-java/ant-core:0
+	dev-java/ant:0
 	>=virtual/jdk-1.8:*
 	test? ( dev-java/junit:4 )"
 RDEPEND="${CP_DEPEND}
 	>=virtual/jre-1.8:*"
 
-JAVA_CLASSPATH_EXTRA="ant-core"
+JAVA_CLASSPATH_EXTRA="ant"
 JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
 JAVA_SRC_DIR="src/main/java"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2024-03-13 11:09 UTC | newest]

Thread overview: 18+ 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/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2024-03-13 11:09 Miroslav Šulc
2023-12-25 19:17 Arthur Zamarin
2023-12-25 15:18 Sam James
2023-11-25  8:46 Miroslav Šulc
2022-09-02  4:22 Miroslav Šulc
2022-09-01  7:55 Jakov Smolić
2022-09-01  7:55 Jakov Smolić
2022-08-02 11:52 Florian Schmaus
2021-10-27  6:37 Agostino Sarubbo
2021-10-27  6:35 Agostino Sarubbo
2021-10-25 11:27 Miroslav Šulc
2021-10-05  7:25 Miroslav Šulc
2021-04-30 13:51 Miroslav Šulc
2021-04-30 13:51 Miroslav Šulc
2016-02-16 16:55 Patrice Clement
2015-11-01 20:50 James Le Cuirot
2015-08-17 22:29 James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox