From 15bb7733ddb1f16a0e3936969282ecc42419829a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 26 Dec 2023 01:33:45 +0000
Subject: gentoo auto-resync : 26:12:2023 - 01:33:45

---
 dev-java/Manifest.gz                               | Bin 60171 -> 60179 bytes
 dev-java/htmlcleaner/Manifest                      |   5 +-
 .../files/htmlcleaner-2.24-fix-tests.patch         |  26 ----------
 dev-java/htmlcleaner/htmlcleaner-2.26.ebuild       |  55 ---------------------
 dev-java/htmlcleaner/htmlcleaner-2.29.ebuild       |   2 +-
 5 files changed, 2 insertions(+), 86 deletions(-)
 delete mode 100644 dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
 delete mode 100644 dev-java/htmlcleaner/htmlcleaner-2.26.ebuild

(limited to 'dev-java')

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index dbce03dd45b1..1f0408113386 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 03a35e40d077..e4667dcb274b 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,6 +1,3 @@
-AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
-DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
 DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f
-EBUILD htmlcleaner-2.26.ebuild 1166 BLAKE2B 3a47cb454c26c29ba25b8e03d698f0e19cc381ec6609d30275aa9146416ba2dc5edd7cf77b64ffc7c2c3c07dd4ebaa229af07603ae0c6ec76236bbebdca24be5 SHA512 a473317d619edb39df2b19bb9cd653c0252d5de110855dd481630271777763c91cf67dd5aabe0a2869d1d0b8b50ca8b9976597b4af1f42321db18f34fef8fb48
-EBUILD htmlcleaner-2.29.ebuild 1043 BLAKE2B a7f3ca9f8cc9ea3e05b38e21dfca41bbfefbe70f852301e2d0ccd43fbb065c81e8951c6c9d36b57c06eb35826bda42b970257e1848bb8002f9ff430f037e307d SHA512 389dcd5d5a421572bec6c02bb262645b352260d87ddfc200c73633a2564ec09b11aa398a8191ed6e1d369444c4ce6c5f605028751ea856e326781fbc834b2906
+EBUILD htmlcleaner-2.29.ebuild 1042 BLAKE2B 255983940abdba15b969450efbd26ccfe6bdb0713fb21aa8d74118fd44529b2a8e9a8c5298f68e5d114e8aa22076eb51a37b2d7e75024f4c93a47770513474e5 SHA512 eca94d241a1e918e9f420a9f39fb28957c756c2b096fd19c7548208e378c9b407be48baaa9366de70379044d1c45f269434f126dffade0dfaf3c94e0824be65b
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
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
-}
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"
-- 
cgit v1.2.3