[gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/

[Miroslav Šulc]

commit:     0f9a4ef4760d05d8eddbe5ffea7f3b79758dd5f6
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun 22 13:41:58 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 03:56:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a4ef4

dev-java/jdom: drop 2.0.6-r5

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

 dev-java/jdom/Manifest                |  1 -
 dev-java/jdom/files/build-xml-2.patch | 36 --------------------
 dev-java/jdom/jdom-2.0.6-r5.ebuild    | 64 -----------------------------------
 3 files changed, 101 deletions(-)

diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index f1a5bdf79b25..ac1c82fc0e38 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,2 @@
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278

diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff1993..000000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml	2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- 		</javac>
- 	</target>
- 	
--	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+	<target name="compile" depends="compile.core, compile.contrib, compile.samples"
- 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />
- 
- 	<!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- 	<!-- =================================================================== -->
- 	<!-- Creates the jars                                           -->
- 	<!-- =================================================================== -->
--	<target name="jars" depends="compile, javadoc"
-+	<target name="jars" depends="compile"
- 	    description="Builds the Jars">
- 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- 			<fileset dir="${contrib.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- 		</jar>
-+<!--
- 		<jar jarfile="${package}/${jarbase}-junit.jar" >
- 			<fileset dir="${junit.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- 			<fileset dir="${contrib.src}" includes="**/*" />
- 		</jar>
- 	    	    
-+-->
- 	</target>
- 	
- 	<target name="androidtests" depends="jars">

diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de7..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/iso-relax:0
-	dev-java/jaxen:1.2
-	dev-java/xalan:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Remove Android stuff to avoid junit RDEPEND.
-	rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
-	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}