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

[Michał Górny]

commit:     eb1fd1dbf5c543ac2d5836e413e21fa8656c371c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 12:12:05 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 12:15:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1fd1db

dev-java/jdom: Remove old masked version

Bug: https://bugs.gentoo.org/559994

 dev-java/jdom/Manifest           |  1 -
 dev-java/jdom/jdom-1.0-r4.ebuild | 54 ----------------------------------------
 profiles/package.mask            |  1 -
 3 files changed, 56 deletions(-)

diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 60967b0aad8..251072f6c98 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,2 @@
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
-DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278

diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
deleted file mode 100644
index 124849d18db..00000000000
--- a/dev-java/jdom/jdom-1.0-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-PDEPEND="~dev-java/jdom-jaxen-${PV}"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v build/*.jar lib/*.jar || die
-	rm -rf build/{apidocs,samples} || die
-
-	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
-		|| die "Unable to remove Jaxen Binding class."
-
-	cd "${S}"/lib
-	java-pkg_jar-from saxpath,xerces-2
-}
-
-src_compile() {
-	# to prevent a newer jdom from going into cp
-	# (EANT_ANT_TASKS doesn't work with none)
-	ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar build/*.jar
-
-	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
-
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
-	use doc && java-pkg_dojavadoc build/apidocs
-	use examples && java-pkg_doexamples samples
-	use source && java-pkg_dosrc src/java/org
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 60c767bb582..eddffc55f0e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -225,7 +225,6 @@ dev-java/sun-jacc-api
 # Obsolete package not needed for a long time, bug #559994. Removal in a
 # month.
 dev-java/jdom-jaxen
-=dev-java/jdom-1.0-r4
 
 # Pacho Ramos <pacho@g.o> (17 Jun 2018)
 # Dead since 2013, not compatible with latest profiles (#642568). Removal in