gentoo resync : 09.06.2018

14 files changed, 64 insertions, 328 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d05dda7e2525..ca3417f43fd0 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index dc1c3441096e..b3fba3b598b8 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -2,9 +2,7 @@ AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908
 AUX ivy-1.3.1-noresolve.patch 371 BLAKE2B aa9cead35ea3bf8b4dd9ad0009a5794dc16598f2a3428cc41e2a46c0b6a946be78263f56390f4da5e5dc2940abdaa217489271c6effb07de7d3ee7445f900f3f SHA512 fa520c8bf17813c3aa9c6b41b50bf844c86b959b2046b64241bddc16675a7a2583151813b6ad3dd7369ab1ee453909fe84a34d8e4c81ee5729e9c929d9690b02
 AUX ivy-1.3.1-tasks.patch 593 BLAKE2B 7d6b478ced62f35619490248b3f62a32869695fdef67c0a5fe19cb52de565c5c20f1a3e903406aef6835559d84ba668c0dfa5e2ce8d78c9b86c645b89fc9fcf4 SHA512 399f5fd76af888d4aacac83ce0a1311e26e49f3101dc1577615b576057197518348917a7670d916e502ac4caa2620d9824470e72acd9708a35463d044e733278
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
-DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
-EBUILD ant-ivy-1.3.1-r1.ebuild 1505 BLAKE2B 4b39326155e46486d72641665bd26ac75b4a102a9739c819845a2e6ae901e445034276df9a1d71f925f0ecd054597220cee9e2b78fb3d02be5dac187372f8530 SHA512 1494f051c1ff8cb7ed72b764b12bf0c519f6060947ee04b5fa0464e54487f2e03a7d5760ae1f319141a2218f5fbe94dd343d6111d9566d822279d1470286ab01
 EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
 EBUILD ant-ivy-2.3.0-r2.ebuild 2216 BLAKE2B dcc9f39656185a5a0e56c30bc75231e12a8fca7f50ca1b6687795855c774c8ce39177fd0128887f2c9b87d028e3321cd6577aba5036fb8576330ba370639fcbe SHA512 7c7f55b44592a7cf60e82202d4d882867758936304a93a11c3677c39c486b1c28a2df4891a87c7e8d408ebf4ad70926959e05a5d4a9ac6ac03ca7de6f40d3b87
 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d
diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
deleted file mode 100644
index 58853eef8a6c..000000000000
--- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN=${PN##*-}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/ant-core
-	=dev-java/commons-cli-1*
-	=dev-java/commons-httpclient-3*
-	dev-java/commons-logging
-	=dev-java/jakarta-oro-2.0*"
-DEPEND="
-	>=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_P}
-
-# Rewrites examples... bad
-JAVA_PKG_BSFIX="off"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${MY_P}-noresolve.patch"
-	epatch "${FILESDIR}/${MY_P}-tasks.patch"
-
-	mkdir "${S}/lib"
-	java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
-
-	java-ant_bsfix_one build.xml
-}
-
-src_install() {
-	java-pkg_dojar build/artifact/${MY_PN}.jar
-	dodir /usr/share/ant-core/lib
-	dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
-	use doc && java-pkg_dojavadoc doc/build/api
-	use source && java-pkg_dosrc src/java/*
-}
-
-RESTRICT="test" # fail because of a missing file
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
-}
diff --git a/dev-java/commons-jxpath/Manifest b/dev-java/commons-jxpath/Manifest
index ff621e0bf670..cccd22fbe07b 100644
--- a/dev-java/commons-jxpath/Manifest
+++ b/dev-java/commons-jxpath/Manifest
@@ -1,3 +1,4 @@
 DIST commons-jxpath-1.3.tar.gz 285339 BLAKE2B c0127ff90c51b7ba69c12072689cc7ca5b969fa29e4793839bef3200b0dc3fbb529c89e21877daa4def4386f94298e43054828d4b4b05be3671e38d9f728d3d0 SHA512 a0ad0b90c9aa4c732c47c8f38f036990438f526295b782fbdc00fd67e4c0e92643c7850429eb5263f9d322aff7cb7000b8ff2bffcdcfa88fa3ba5354dce7e152
 EBUILD commons-jxpath-1.3-r3.ebuild 1418 BLAKE2B c79ac6ce0e52a8e9d7742ff1dfb270a500ad79329c8cbbf64d7b6c8c4be773f8b64dcd36520fa1241c92e4151c8b9aa73bbe2853fa5260e73307e3be08824780 SHA512 ce9597f2e492e2d7d346d8ef74f50395c5a40bf0b143a06544f49c2aa3f40832aa5425925b864b425584df7070401ec6777ca05bce4409c94346d93c0960ce37
+EBUILD commons-jxpath-1.3-r4.ebuild 1427 BLAKE2B 080e1600ea5b3733a56b4b455b87892713a81fbf2b5a9d910526ee16cd275259ec81ebeb90bf4888c9033228c32fef719331d01b0977c8bfdb401969a1b6ba48 SHA512 ffc15c19ad39277d0f2d2977985762e4d77dfc92d210eb7fe2cd64215a5e4f3ef4986af21b001cabff21a4e4c97e8648f5a658a3eb12abf5b8514438185bb65a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
new file mode 100644
index 000000000000..bc77ab2d8ed2
--- /dev/null
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
+HOMEPAGE="https://commons.apache.org/jxpath/"
+SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+S="${WORKDIR}/${P}-src"
+
+CDEPEND="
+	dev-java/jdom:0
+	java-virtuals/servlet-api:3.0
+	dev-java/commons-beanutils:1.7"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/commons-logging:0
+		dev-java/commons-collections:0
+	)
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="jdom,servlet-api-3.0,commons-beanutils-1.7"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},commons-logging,commons-collections,ant-junit"
+ANT_TASKS="ant-junit"
+EANT_TEST_TARGET="test"
+
+src_prepare() {
+	default
+
+	# Don't automatically run tests.
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+
+	# This one needs mockrunner. See #259027.
+	rm -v src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
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
-}
diff --git a/dev-java/jgoodies-binding/Manifest b/dev-java/jgoodies-binding/Manifest
index e08583570715..5a927406145e 100644
--- a/dev-java/jgoodies-binding/Manifest
+++ b/dev-java/jgoodies-binding/Manifest
@@ -1,6 +1,3 @@
-DIST binding-1_1_2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
 DIST jgoodies-binding-1.1.2.zip 1265099 BLAKE2B 15cbb78e8289d7457d8c34112b18293b975046221226630542ffdee1950f8e0cf6120eb69daff57e601f75141b037e5ebc85248f396487e37f4435fbb9e77fe6 SHA512 2373a21f7866173a634adf34c089895ff69022ce24af3a0a9225dc312d659c910df387d26ccd94f3f9f2b79edf5a40a9c101e9040a36f08888cf96228cfcf5b7
-EBUILD jgoodies-binding-1.1.2-r1.ebuild 939 BLAKE2B fcbef0baeee3151064fcb88c194dd5e4f537992f9be5c135497e312077d358ac7282d79c89af3c17043471321fcc80795a70d10953ec1ca8547dd99e0c4b2231 SHA512 1dcf0acc99204a24da3979d2dc6cd5bd4d6127fc9ee976520a51d4ffb1ab58b70c079d81cd4036f510f46f0f5012afd92bd9d9d037f4804e13d881f67670dfd6
 EBUILD jgoodies-binding-1.1.2-r2.ebuild 727 BLAKE2B 7da37b4d1b8afcf534fc20d79aaf6da594da83eb48381f23157dc903d1640b9287b6f153d632428226c4e868360f85dfa8df2547e343ad7e6e8c2c277e9d0047 SHA512 d095b153caed39783f705f34a3e9d5729950e651704559d54850d67be6d080c1cea93fc265c05752548b2f5393ae430650a07571319172f0292066145c13e9a9
-EBUILD jgoodies-binding-1.1.2.ebuild 1303 BLAKE2B 85ff0957e054c36f97b90cc1a9456195808de692330cb267c5d59eeef4dbae0c9829083d3ecc03827234497ac0bed7ab4f9678028b039382994c785047f91659 SHA512 148d6a737eb859c12ca5a170cc9f4637d6453575eacaf8b7fdfee9847e9404b518d018df5d74eeb8e3c7516e55382ef0cd5e9243145cd3321042857ec68c7429
 MISC metadata.xml 341 BLAKE2B df75f028a7f38b32d21a20cd1cf3d17f298bf92e99187d95f525d30be00e7a02ca1d0f04dc4e6dcefd028be89b83069e6db326bdc4d1e8eefdd84aa523e4fb5e SHA512 ca7c045eb07e88e8cdb6c6639ec651b038159d824df55dcb5f0819dae264edb8873e4dadf94fd6bf71879ddd64a75e44820fe2b6cf485df18ca743b264c9f267
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
deleted file mode 100644
index eb59c57ac80c..000000000000
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_V=${PV//./_}
-DESCRIPTION="A Java library to bind object properties with UI components"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4.2
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4.2
-		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
-
-S=${WORKDIR}/binding-${PV}
-
-RESTRICT="test"
-
-EANT_FILTER_COMPILER="jikes"
-
-java_prepare() {
-	find -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar build/binding.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/com
-	use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild b/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
deleted file mode 100644
index 4b7c688b3f1c..000000000000
--- a/dev-java/jgoodies-binding/jgoodies-binding-1.1.2.ebuild
+++ /dev/null
@@ -1,60 +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
-
-MY_V=${PV//./_}
-DESCRIPTION="A Java library to bind object properties with UI components"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/binding-${MY_V}.zip"
-
-LICENSE="BSD"
-SLOT="1.0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4.2
-		app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4.2
-		examples? ( >=dev-java/jgoodies-looks-1.0.5 )"
-
-S=${WORKDIR}/binding-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Clean up the directory structure
-	rm -rvf *.jar lib
-
-	# Copy the Gentoo'ized build.xml
-	# cp ${FILESDIR}/build-${PV}.xml ${S}
-	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath
-	#	|| die "Failed to fix bootclasspath"
-	java-pkg_filter-compiler jikes
-}
-
-src_compile() {
-	eant jar # precompile javadocs
-}
-
-RESTRICT="test"
-# Needs X
-#src_test() {
-#	eant test -D\
-#		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
-#}
-
-src_install() {
-	java-pkg_dojar build/binding.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/*
-	use examples && java-pkg_doexamples src/tutorial
-}
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
index 45e1114c12d6..76e689ded088 100644
--- a/dev-java/spice-jndikit/Manifest
+++ b/dev-java/spice-jndikit/Manifest
@@ -1,5 +1,3 @@
-DIST spice-jndikit-1.2-src.tar.gz 23084 BLAKE2B 66a00c3c155a006193c87ab2271def35c50cf722c29b4acbf9c2af0aaf19dbfda8be0bfe0ae44dfdecb8a5383334e542833284cd9212436cb837adca049afefe SHA512 bdb508eac32c8dac05be45553a6877e214dce4135c9ae96b95764254df4c0e57f2a7be3905301b096f140014e04e4fe6b517b7757553de26d73a513f7ff06244
 DIST spice-jndikit-1.4.zip 55185 BLAKE2B 4d5068a3f2e12d287ecd657e2092a2e73e6637f2285dcea58b6d8c820508f21f1ceb508514813b34cf9c1a7536cbc530aba1edf0ca80603b3008e3afa240582a SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501
-EBUILD spice-jndikit-1.2.ebuild 1113 BLAKE2B 657d971ee55dc34cf34eac82de3ed5eeda20ded456e9369d9124f0adff797d36a72b8e119b5bffa63ad1ef5d87f689ab1361e02d3d51abd8864fdf0f4de91b9a SHA512 e377846b164b51263d71ba19d2e16864d11d3877a1c2e5313f20645dfcdee7f44c5c9445ff6dfb12137e5ded6a3dc746e1883fbffb55a33831cd913eb22c49d3
 EBUILD spice-jndikit-1.4.ebuild 868 BLAKE2B 2ba91fedd394e87c0fe49c7366a7759a4c1095b03fcb50765e99d03ab55aed61b9529ec299df4971d1045a68885dc04e6f73fd332e344c335ecae99ef7b137da SHA512 c42bbb64c7e51c2f34aaf7d09c3f9a958f75acb85364f6b5e3e9f316f2aa4c57ac7feb70388fd3a6992d362b112fc57c8f4d1d01c873997cb756329e89c9011a
 MISC metadata.xml 553 BLAKE2B d097fce9e744f8edd8d86284f5fc71cd4a987af0db70a475bca9db42c18127fe2bda1e04fb6bfb564483858e4aaf737d917a6deff7917643123996db89119f46 SHA512 53926ae768029abd0e9bc1a4bd55c641c0a6547e0db60e0538bef4f020ac018ab2617cd925f1c81852e1b92d6da5f97ee792f3f400329dc750da77e533517976
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
deleted file mode 100644
index 26737e6041ff..000000000000
--- a/dev-java/spice-jndikit/spice-jndikit-1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JNDI Kit is a toolkit designed to help with the construction of JNDI providers"
-HOMEPAGE="https://github.com/codehaus"
-SRC_URI="http://dist.codehaus.org/spice/distributions/${P}-src.tar.gz"
-LICENSE="Spice-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	java-ant_rewrite-classpath
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd target/classes
-	rmic org.codehaus.spice.jndikit.rmi.server.RMINamingProviderImpl \
-		|| die "rmic failed"
-}
-
-src_test() {
-	einfo "Tests need a network connection so they will fail without it"
-	ANT_TASKS="ant-junit" eant test -DJunit.present=true \
-		-Dgentoo.classpath="$(java-pkg_getjars --build-only junit)"
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/xml-commons-external/Manifest b/dev-java/xml-commons-external/Manifest
index c4f0cbe10543..12da6cef96c0 100644
--- a/dev-java/xml-commons-external/Manifest
+++ b/dev-java/xml-commons-external/Manifest
@@ -1,7 +1,5 @@
 DIST xml-commons-external-1.3.04.tar.bz2 659665 BLAKE2B b7f51fab7162b905142c5256f1d03d519b4ab387edf8b4c3d738ac138cf6ad71f29fd568c99423f840be6eb02bb50e89cfab3c729d2d5071d8a66e30836d8f5e SHA512 8bc71a0850e751ae4a5057833d57b2235734facbae43c733b0a9d86e5be99af016b737f12f5566c736f71374a709dee9954089db8fbeff4fb4cbb236a9fd6abb
 DIST xml-commons-external-1.4.01.jar 656529 BLAKE2B c51ca760c23759d4f4ad11fcb44caa1cb0bcb2785d9095ed56dba9b0d5fe57370a9d9aaeed5a8e0c1fa67918237ce693590bac791200add2e85155ab87ffe40b SHA512 f00773eec613453d0e1b7b0857b01c51d1926079f38e172953c4ef0350f063439acc8b5967f947c8d15a73e5d53e8887c3bf30122d5f7c553bcef349e5a8cb9a
-DIST xml-commons-external-1.4.01.tar.bz2 683486 BLAKE2B 4740516a09f64811a134b7de8309fe0ae803f7867b0cdf3391211297bb9d0dada6010f03f2cb5d0800f971bf1e47356ee163eeb300e49d5db1c6b7adc96f45fb SHA512 fe22afb25e17b69a5416025ea812348af83474c26dcf88613ebc7b5f1288af9a73428b3f70544907afae4ba9dacb2aa7b8e5e2375d0aa712fe9d4e672d2e02db
 EBUILD xml-commons-external-1.3.04.ebuild 1152 BLAKE2B 250f12e24a07b9de4d2f8df29d9542b6db382f1553695fa32c9256031f783a841441bfafbb375aa4118c6a9f94828ebed5aa8d8ca9e3bf7b7c2cf169ae9b7289 SHA512 95847f06f31c8b3647e4651b42f1a15d4f93c682b7febc4d3277fc70f2611556a0692a7160ff77edf40503e958b98971d786203c0f419185534ec654094e1c0a
 EBUILD xml-commons-external-1.4.01-r1.ebuild 764 BLAKE2B 0575c2815534cf378e89545687c78f2a7487b2d16b9cd991ff8e8f50a8166a8b7524b9b25dfa3d1dc649d501b0971798a62b1d085cb9a2ea57ade1150e7ea351 SHA512 3e355a0090ef8ee0206e423042674215678b5aa959d6018c1aa979cb5eb50dcc72218f45395c3502173ee1c1459f07920b1213af05ba1fd07b4994ecb3f54a68
-EBUILD xml-commons-external-1.4.01.ebuild 1178 BLAKE2B 08a88f7f4dbcf15923c6d60dd353d1d85b1de862f5bd76923c0aab2387005ce1df4c6ba0e59bd8f6e931c64329f6686c150419ca46974e7fe0bc9d41b24a638d SHA512 7bc375cb06aa265abdc1e41a7f66e0a027eef4d30c1b73e5aed8dcf6471e02f2c600c137251b05be63cd2eb80e2a384fd9bd9fd219d0d0fd86ca585bad99059a
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
deleted file mode 100644
index 9e500334ce00..000000000000
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
-HOMEPAGE="http://xml.apache.org/commons/"
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
-# upstream source tar.gz is missing build.xml and other stuff, so we get it like this
-# svn export
-# http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_4_01/java/external xml-commons-external-1.4.01
-# tar cjf xml-commons-external-1.4.01.tar.bz2 xml-commons-external-1.4.01
-
-LICENSE="Apache-2.0"
-SLOT="1.4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
-
-src_install() {
-	java-pkg_dojar build/xml-apis.jar build/xml-apis-ext.jar
-
-	dodoc NOTICE README.*
-
-	if use doc; then
-		java-pkg_dojavadoc build/docs/javadoc
-		java-pkg_dohtml -r build/docs/dom
-	fi
-	use source && java-pkg_dosrc src/javax src/org
-}