gentoo resync : 09.06.2018

2 files changed, 0 insertions, 68 deletions

diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index ce3f9a756c03..00285e885c33 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,7 +2,6 @@ AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc94
 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
-EBUILD jdom-1.0-r2.ebuild 1636 BLAKE2B e416e898cb0b46320526cc0d452c34943421ff24ceb6b8c47cd0c6051267b8afeec955257553d1047380173f8a3876d8cabc1f2bfae9fa0a2b59ee7bdf822b1f SHA512 9513e4798ceffde02b8767e79d08a535ff35150a5a1971c04ef8cfee14eafef751404de9221dd4527d71fe97949046f2d08306c9d10109534dc80966b2e5f648
 EBUILD jdom-1.0-r4.ebuild 1365 BLAKE2B 362d41c64040b187d6245444f30e73e06b7a0f959fe5d9aaa6cf2a44bf443a3ea1a32a29b0d73e332dfdf924a551232d3bd587968d4c0166ba3f15fca5e407c9 SHA512 abcf550b34518e4c4873b4ef5a90682a7ecece474ffe5cdd02c14176169e27a913b43171eb606c9f25ceaf107e165d0987341664beca4da5443e40516ab68bc5
 EBUILD jdom-1.1.3.ebuild 1257 BLAKE2B 9d7d93ab036539abbe0d945e7b7f0767b0e7d0a3f39ec68f7bb20047ad5182bb283160e9fe3484d5cad853b17479947ae3e1edfb1113c76483b8c4da4d70fa84 SHA512 91cbb5345d46dcd100384da0f249749dc840aaddc90f4d525ae14dc22e2dcff06d8649713d343e81de1c5d9cb99c5559adcd23156a7be33e6be5ac428ab6be41
 EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
deleted file mode 100644
index 2e92729fbb79..000000000000
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ /dev/null
@@ -1,67 +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/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86"
-COMMON_DEP="dev-java/saxpath
-		>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v build/*.jar lib/*.jar || die
-	rm -rf build/{apidocs,samples} || die
-
-	cd "${S}/lib"
-	java-pkg_jar-from saxpath,xerces-2
-
-	if has_version '=dev-java/jaxen-1.1*'; then
-		elog "jaxen detected - building jaxen support."
-		elog "you can ignore the warnings below"
-		elog "one day there will be better solution"
-		JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
-	fi
-}
-
-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
-
-	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
-}
-
-pkg_postinst() {
-	if ! has_version '=dev-java/jaxen-1.1*'; then
-		elog ""
-		elog "If you want jaxen support for jdom then"
-		elog "please emerge =dev-java/jaxen-1.1* first and"
-		elog "re-emerge jdom.  Sorry for the"
-		elog "inconvenience, this is to break out of the"
-		elog "circular dependencies."
-		elog ""
-	fi
-}