[gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     c6cddc152740b7c9917ad60d46edd32dba2dc493
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Mar 11 14:16:24 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 10:21:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6cddc15

dev-java/jtidy: move 938 to 1.0-r2 switching to dev-java/ant

Version 938 was the same as 1.0-r1 and gets moved to 1.0-r2
Now depends on ant in JAVA_CLASSPATH_EXTRA.

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

 dev-java/jtidy/Manifest                                |  1 -
 dev-java/jtidy/jtidy-1.0-r1.ebuild                     |  2 +-
 .../jtidy/{jtidy-938.ebuild => jtidy-1.0-r2.ebuild}    | 18 ++++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index bd28d25f9377..e09ee53ded98 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,2 +1 @@
 DIST jtidy-1.0.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a
-DIST jtidy-r938-sources.zip 240642 BLAKE2B 96e312f2b938f75124a966ad6ecbae39a6822a0d362e98265226409b6c407cfbd1cf1eac2adac522cb02174159392c25bab3abb18c6dce591a0d398cef367306 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a

diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
index 7c227fdf5e9e..a8f58c01c6ed 100644
--- a/dev-java/jtidy/jtidy-1.0-r1.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

diff --git a/dev-java/jtidy/jtidy-938.ebuild b/dev-java/jtidy/jtidy-1.0-r2.ebuild
similarity index 63%
rename from dev-java/jtidy/jtidy-938.ebuild
rename to dev-java/jtidy/jtidy-1.0-r2.ebuild
index 63fdea8d2708..1e0c92a7ec53 100644
--- a/dev-java/jtidy/jtidy-938.ebuild
+++ b/dev-java/jtidy/jtidy-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,21 +8,23 @@ MAVEN_ID="net.sf.jtidy:jtidy:r${PV}"
 
 inherit java-pkg-2 java-pkg-simple
 
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="a Java port of HTML Tidy, a HTML syntax checker and pretty printer"
 HOMEPAGE="https://sourceforge.net/projects/jtidy/"
-SRC_URI="https://master.dl.sourceforge.net/project/jtidy/JTidy/r${PV}/jtidy-r${PV}-sources.zip"
+SRC_URI="mirror://sourceforge/project/${PN}/JTidy/${MY_PV}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
 
 LICENSE="HTML-Tidy W3C"
-SLOT="9"
-KEYWORDS="amd64"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND="app-arch/unzip"
-CP_DEPEND="dev-java/ant-core:0"
-
+CP_DEPEND=">=dev-java/ant-1.10.14-r3:0"
 DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8 "
+	>=virtual/jdk-1.8:*"
 RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8"
+	>=virtual/jre-1.8:*"
 
 JAVA_MAIN_CLASS="org.w3c.tidy.Tidy"
 JAVA_RESOURCE_DIRS="src/main/resources"