public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/files/, dev-java/jtidy/
@ 2022-02-19 10:04 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-02-19 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     eeba2d806730a0edf4ba46f455169ad30c3b9cdc
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Feb 18 20:39:02 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 10:04:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeba2d80

dev-java/jtidy: EAPI 8, min java 1.8:*

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

 dev-java/jtidy/files/jtidy-1.0-build.xml.patch |  4 +-
 dev-java/jtidy/jtidy-1.0-r1.ebuild             | 54 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
index fea64813365d..ba5e04a7f976 100644
--- a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
+++ b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
@@ -1,5 +1,5 @@
---- build.xml.orig	2015-12-01 21:10:36.689000000 +0000
-+++ build.xml	2015-12-01 21:11:05.642000000 +0000
+--- 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"/>

diff --git a/dev-java/jtidy/jtidy-1.0-r1.ebuild b/dev-java/jtidy/jtidy-1.0-r1.ebuild
new file mode 100644
index 000000000000..e56159ea6020
--- /dev/null
+++ b/dev-java/jtidy/jtidy-1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/files/, dev-java/jtidy/
@ 2024-04-18  7:43 Miroslav Šulc
  0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2024-04-18  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b9a4552de1fb8b78ea67c569391b7d2deabb0601
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 18 04:22:42 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 07:42:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a4552d

dev-java/jtidy: drop 1.0-r1

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jtidy/files/jtidy-1.0-build.xml.patch | 31 ---------------
 dev-java/jtidy/jtidy-1.0-r1.ebuild             | 54 --------------------------
 2 files changed, 85 deletions(-)

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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/files/, dev-java/jtidy/
@ 2016-03-14 10:04 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-03-14 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     4e179a7330fb0ac0c6a204244a8b8390ac84d45e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 09:29:42 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 09:44:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e179a73

dev-java/jtidy: Clean up old.

Package-Manager: portage-2.2.26

 dev-java/jtidy/Manifest                      |  1 -
 dev-java/jtidy/files/jtidy-source-1.4.patch  | 10 --------
 dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild | 35 ----------------------------
 3 files changed, 46 deletions(-)

diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 9b3860f..8346118 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1,2 +1 @@
-DIST jtidy-04aug2000r7-dev.zip 718750 SHA256 18e9fc9bcf2d573a27a466ceee2b75772c6dd830af8e83cadb23df9d772583c6 SHA512 3e8baedd992797d7894b2b47f5e214b55189b34081d276563a152ef8603a22188c64d4a363279d1a400cafefdb24018467249bc67283c547f27da44c77cb261c WHIRLPOOL f90403fb86b9860e355710ce0b638a16979487f6aedb9cc1ee4f23d3d0bddc65689cdd989dcac2391f141bca15429f8aad24228a25dbf50df76802ec6118961c
 DIST jtidy-1.0.zip 240642 SHA256 50d7d93aeb9b53f4fe3e46a685c334482f2e15da7f81c93b53aec128f1fd7aa6 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a WHIRLPOOL 24cd2b55bb7713c7ebdee9bab7b1ad730a13f3bc825347a6fa6e7d137770891a985811102c494155b56c15726ccbb105a9421ce720699f9ba796ab4daf1c0f24

diff --git a/dev-java/jtidy/files/jtidy-source-1.4.patch b/dev-java/jtidy/files/jtidy-source-1.4.patch
deleted file mode 100644
index 6649fba..0000000
--- a/dev-java/jtidy/files/jtidy-source-1.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jtidy-04aug2000r7-dev/build.xml.jrockit	2005-08-24 23:03:45.000000000 -0400
-+++ jtidy-04aug2000r7-dev/build.xml	2005-08-24 23:04:09.000000000 -0400
-@@ -59,6 +59,7 @@
- 	 destdir="${build.dir}"
- 	 includes="**/*.java"
- 	 deprecation="on"
-+	 source="1.4"
- 	 optimize="${optimize}"
- 	 debug="${debug}"/>
-  </target>

diff --git a/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild b/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
deleted file mode 100644
index 44d6041..0000000
--- a/dev-java/jtidy/jtidy-0_pre20010801-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils base java-pkg-2 java-ant-2
-
-MY_PV="04aug2000r7"
-DESCRIPTION="Tidy is a Java port of HTML Tidy , a HTML syntax checker and pretty printer"
-HOMEPAGE="http://jtidy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-dev.zip"
-LICENSE="HTML-Tidy W3C"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/${PN}-${MY_PV}-dev
-
-PATCHES=( "${FILESDIR}"/${PN}-source-1.4.patch )
-
-src_compile() {
-	eant jar # Has javadoc premade
-}
-
-src_install() {
-	java-pkg_dojar build/Tidy.jar
-
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/org
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/files/, dev-java/jtidy/
@ 2015-12-01 21:20 Patrice Clement
  0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2015-12-01 21:20 UTC (permalink / raw
  To: gentoo-commits

commit:     693cbea1d2b23bc89f2c2048372bfa2b1b410d78
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 21:19:28 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 21:20:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693cbea1

dev-java/jtidy: EAPI 5 && Version bump.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/jtidy/Manifest                        |  1 +
 dev-java/jtidy/files/jtidy-1.0-build.xml.patch | 31 +++++++++++++++
 dev-java/jtidy/jtidy-1.0.ebuild                | 52 ++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/dev-java/jtidy/Manifest b/dev-java/jtidy/Manifest
index 5c5d3ce..9b3860f 100644
--- a/dev-java/jtidy/Manifest
+++ b/dev-java/jtidy/Manifest
@@ -1 +1,2 @@
 DIST jtidy-04aug2000r7-dev.zip 718750 SHA256 18e9fc9bcf2d573a27a466ceee2b75772c6dd830af8e83cadb23df9d772583c6 SHA512 3e8baedd992797d7894b2b47f5e214b55189b34081d276563a152ef8603a22188c64d4a363279d1a400cafefdb24018467249bc67283c547f27da44c77cb261c WHIRLPOOL f90403fb86b9860e355710ce0b638a16979487f6aedb9cc1ee4f23d3d0bddc65689cdd989dcac2391f141bca15429f8aad24228a25dbf50df76802ec6118961c
+DIST jtidy-1.0.zip 240642 SHA256 50d7d93aeb9b53f4fe3e46a685c334482f2e15da7f81c93b53aec128f1fd7aa6 SHA512 be73dfd2f65ec53a3c1a9b9014a62011f58f5f337bbd2b3939c5f8f54c225fa7718717bf84348bc07a37411c20b1e82f300ba4fc865d7019ada6b1f8d081440a WHIRLPOOL 24cd2b55bb7713c7ebdee9bab7b1ad730a13f3bc825347a6fa6e7d137770891a985811102c494155b56c15726ccbb105a9421ce720699f9ba796ab4daf1c0f24

diff --git a/dev-java/jtidy/files/jtidy-1.0-build.xml.patch b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
new file mode 100644
index 0000000..fea6481
--- /dev/null
+++ b/dev-java/jtidy/files/jtidy-1.0-build.xml.patch
@@ -0,0 +1,31 @@
+--- build.xml.orig	2015-12-01 21:10:36.689000000 +0000
++++ 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.ebuild b/dev-java/jtidy/jtidy-1.0.ebuild
new file mode 100644
index 0000000..089d46d
--- /dev/null
+++ b/dev-java/jtidy/jtidy-1.0.ebuild
@@ -0,0 +1,52 @@
+# 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-ant-2
+
+MY_PV="r938"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Tidy is a Java port of HTML Tidy , a HTML syntax checker and pretty printer"
+HOMEPAGE="http://jtidy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}-sources.zip -> ${P}.zip"
+LICENSE="HTML-Tidy W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="
+	${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_BUILD_TARGET="jar"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-build.xml.patch"
+)
+
+java_prepare() {
+	epatch "${PATCHES[@]}"
+}
+
+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
+}


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

end of thread, other threads:[~2024-04-18  7:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-19 10:04 [gentoo-commits] repo/gentoo:master commit in: dev-java/jtidy/files/, dev-java/jtidy/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2024-04-18  7:43 Miroslav Šulc
2016-03-14 10:04 Patrice Clement
2015-12-01 21:20 Patrice Clement

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