gentoo auto-resync : 18:04:2024 - 12:04:39

4 files changed, 2 insertions, 89 deletions

diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 152a934ffa7b..c669ec759fca 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,5 +1,3 @@
-AUX jtidy-1.0-build.xml.patch 998 BLAKE2B 7bd86d87699a784a918e102195e097d3b88bed791af9fd5df929b06609831749a65fb9c7d79aa4aaa86d87c6796872ef1fbc077844a3ec7e431970bc3a094d65 SHA512 18b5679c538aee7821456acd44342a03e79dbb4d5b65ec7f7103a4d2b883f3726f346804d6362e7775b7e2826ea0e002663bfc32c0282a431254bf199791cd9d
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-EBUILD jtidy-1.0-r1.ebuild 1051 BLAKE2B d78ac8d23e34f8e0b3398d18517ad8cca15fb7a503f4ff3ba729d2f376356da9ba1404899d18b5149c4cf66d1c5500f73b8d91984f0b1586c6951f67804e6a5e SHA512 fbf988d06410e3215bede2e621c701170ab0566eefcda2071da8c913c962a22c7479e718e2f297380c108cff1bf486f5f1ef94aa01b13c5214858e8009ce9e4b
-EBUILD jtidy-1.0-r2.ebuild 802 BLAKE2B b68ff5a1b23e1e982a390f4845e879f0e176eaa061d3db1e4766900758be4b32185b9432a57dbc5c0ad68eca8bc6ae07cd21cdf5d356edecfb9609c950c73c92 SHA512 432fdeb4ad79684c1763e83be1360067a1ac0b87dedfc568bf3962b0ef70f75105b036032d946a15ca1780c10f13d38ee2043eab151ac85c27ffdc0fa13bc0be
+EBUILD jtidy-1.0-r2.ebuild 801 BLAKE2B dee738b3ece69e0827f35867e3acef0d57dbfff3f906dba670948ed58c83efd8a0dad39a508ebe9ab4d387370d9641af4f5ef02976939f3b361033d1618dd6bd SHA512 6786c92e5a0582bb62b8523a40a542c4f7b270d2ef11f76ad508ea40ddcc04309d0e2b7ee2030b22537031c304c276bd374c2c10fbacf81b24edb4891e2ba9f6
 MISC metadata.xml 312 BLAKE2B 0cefe0ab92f9a89c5728c2d7ceb5079e2942590955ebed76105c11ca6e25064fa5d74ad968bdb922be16ef01348ad9e015e68d501c7da3ee6a807cf3821e5380 SHA512 2f68badf7c7d98f60ca73b9fe7e5b5b12168aaec72605ca780e2478ba49f73f460dc3f8a7b4c6d28e334aac3e3e99d76573c4fb8eb40d92619ccbea845947bdd
diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
deleted file mode 100644
index ba5e04a7f976..000000000000
--- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/build.xml.orig	2015-12-01 21:10:36.689000000 +0000
-+++ b/build.xml	2015-12-01 21:11:05.642000000 +0000
-@@ -9,11 +9,7 @@
- 	<property name="srczip" value="jtidy-${version}-sources.zip"/>
- 	<property name="allzip" value="jtidy-${version}.zip"/>
- 	
--	<target name="clean">
--		<delete dir="${target}"/>
--	</target>
--	
--	<target name="jar" depends="clean">
-+  <target name="jar">
- 		<mkdir dir="${target}"/>
- 		<mkdir dir="${bin}"/>
- 		<javac srcdir="${src}" destdir="${bin}" source="1.4" target="1.4"/>
-@@ -30,13 +26,13 @@
- 		</jar>
- 	</target>
- 	
--	<target name="javadoc" depends="clean">
-+  <target name="javadoc">
- 		<javadoc sourcepath="${src}" destdir="${target}/${doc}" windowtitle=" JTidy ${version} " doctitle="JTidy ${version} API documentation">
- 			<tag name="todo" scope="all" description="To do:"/>
- 		</javadoc>
- 	</target>
- 	
--	<target name="src" depends="clean">
-+  <target name="src">
- 		<zip destfile="${target}/${srczip}">
- 			<fileset dir=".">
- 				<include name="${src}/**"/>
diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
deleted file mode 100644
index a8f58c01c6ed..000000000000
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PV="r938"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Java port of HTML Tidy, an HTML syntax checker and pretty printer"
-HOMEPAGE="http://jtidy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
-LICENSE="HTML-Tidy W3C"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="
-	app-arch/unzip"
-
-JAVA_ANT_ENCODING="UTF-8"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="ant-core"
-EANT_BUILD_TARGET="jar"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/"${P}-build.xml.patch"
-)
-
-src_prepare() {
-	default
-}
-
-src_install() {
-	java-pkg_newjar "target/${MY_P}.jar"
-	java-pkg_dolauncher "jtidy" --main org.w3c.tidy.Tidy
-
-	use doc && java-pkg_dojavadoc target/javadoc/
-	use source && java-pkg_dosrc src/main/java
-}
diff --git a/dev-java/jtidy/jtidy-1.0-r2.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
index 4323e2296f88..dc23cf930da6 100644
--- a/dev-java/jtidy/jtidy-1.0-r2.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-source
 
 LICENSE="HTML-Tidy W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"