gentoo resync : 29.05.2018

2 files changed, 0 insertions, 87 deletions

diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index fb9d7bfbbd00..dc1c3441096e 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,12 +1,10 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 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.0.0-src.tar.gz 2248438 BLAKE2B a06c6716ae72d744e335734da4ca414b1c8fe3c819a1d25edae00d758e0db18e9aecb307d95c9f522f24d29c7249cd52d5729e82ab5cdf97abf977005ace702c SHA512 eb932069c42b42c421afc5b49a94204d5359b8f6f23708d3cbd04fee260c2348eea540bddbee7950cd71c8a5290383f7f2d4044e03fc8b53013fb381e410f1f6
 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.0.0.ebuild 1992 BLAKE2B d2bb80357856974e08bc654b99258fd9467085c1d2604d02b26d047e541d08cadc5dbf35f3a1ff49475f31a3b4ab5dbe20f20262499b0d5ab030c78749fedaa1 SHA512 dd1c2849e60e06894fcf39e293e5356328f4a935db929e9af048e43193d9e2dc0bea462971a27a84ab18af33f8a8b4b35ce8ac1fbd3c9d2e8504addffe0b6ea8
 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-2.0.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
deleted file mode 100644
index 393bd5ad69f7..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.0.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="doc examples source test"
-# registers as split-ant task
-WANT_SPLIT_ANT="true"
-# rewrites examples otherwise... bad
-JAVA_PKG_BSFIX_ALL="no"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="apache-ivy"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Ivy is a free java based dependency manager"
-HOMEPAGE="https://ant.apache.org/ivy/"
-SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-RESTRICT="test" # We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet
-
-# There may be additional optional dependencies (commons-logging, commons-lang...)
-
-COMMON_DEP="
-	dev-java/ant-core:0
-	dev-java/jakarta-oro:2.0
-	dev-java/jsch:0
-	dev-java/commons-httpclient:3
-	dev-java/commons-vfs:0"
-
-DEPEND="
-	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )
-	${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -rf test/repositories
-	rm -rf test/triggers
-	rm -rf src/example/chained-resolvers/settings/repository/test-1.0.jar
-	rm -rf test/java/org/apache/ivy/core/settings/custom-resolver.jar
-
-	# Removing obsolete documentation
-
-	rm -rf doc/reports
-	rm -rf doc/configuration
-
-	java-ant_rewrite-classpath
-	mkdir lib
-}
-
-EANT_GENTOO_CLASSPATH="ant-core,commons-vfs,jakarta-oro-2.0,jsch
-	commons-httpclient-3"
-
-EANT_BUILD_TARGET="/offline jar"
-
-EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}"
-
-src_test() {
-	java-pkg_jar-from --into lib junit
-	ANT_TASKS="ant-junit" eant "/offline test"
-}
-
-src_install() {
-	java-pkg_dojar "build/artifact/jars/ivy.jar"
-
-	use doc && java-pkg_dojavadoc "build/doc/reports/api"
-	use doc && dohtml -r "doc"
-	use examples && java-pkg_doexamples "src/example"
-	use source && java-pkg_dosrc src/java/*
-
-	java-pkg_register-ant-task
-}