gentoo resync : 05.04.2019

2 files changed, 0 insertions, 119 deletions

diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 33a3cbf3a9ff..ee5b34a16df8 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,10 +1,7 @@
 DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
 DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
-DIST ant-1.9.2-gentoo.tar.bz2 14884 BLAKE2B d67b14350ed135c656313a018c25dbd915838bb2f34c666d05347f9127ccee7c1552d319d195af24c748cc36aa1ec1c8dcc2a826da4cffcf05ddb08b2f6c5021 SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f
 DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
 DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-DIST apache-ant-1.9.2-src.tar.bz2 3402876 BLAKE2B c695fdfed67672716619db459f6644aad70876fa546523114500fa4007998b6b7b0856143365edf58b843fba35f0a46827e7a07b8cc730eebe4b9f7d8e87bf25 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629
 EBUILD ant-core-1.10.5-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
 EBUILD ant-core-1.9.13-r1.ebuild 3193 BLAKE2B 99479481bd22c6c1b74491949e629703ea09169def00e305449f263ea65f47df066b9f390cdd6d3f5aeacbf6915f7144b17753db7a063e964a08b2026c66914f SHA512 1fc307ec691ea85b49d27f9c2aafd7658988fd269df4eddd934c6e6739e133eaadfc833ea33c3d3e4c5ecc633ceb754cbd13ad162697c2ac8da5cc1ba169a482
-EBUILD ant-core-1.9.2.ebuild 3216 BLAKE2B fdd1e40be093d25a40afd4e6009539ee1be4877a5e281596fb246d64c913da5c0877b05b7b8f024132ecdff31dc48bf9df691b1a6d07cc6580d1176b16027600 SHA512 fa3f6f9120f3ba469aad57c73317ea37adde68d39451d773172fd2c0c6c5e2b537f2c3ab1334733481740ec74021bc73756e8c502de861aae0057a87c36237a1
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
deleted file mode 100644
index 1f5fc1092c46..000000000000
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 prefix versionator
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
-	https://dev.gentoo.org/~tomwij/files/dist/ant-${PV}-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="|| ( >=virtual/jdk-1.5 dev-java/gcj-jdk )
-	!dev-java/ant-tasks
-	!dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches/"
-	eprefixify "${WORKDIR}/ant"
-
-	# use our split-ant build.xml.
-	mv -f "${WORKDIR}/build.xml" . || die
-
-	# Fixes bug 556008.
-	java-ant_xml-rewrite -f build.xml \
-		-c -e javadoc \
-		-a failonerror \
-		-v "false"
-
-	# See bug #196080 for more details.
-	java-ant_bsfix_one build.xml
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	export ANT_HOME=""
-
-	local bsyscp
-
-	# This ensures that when building ant with bootstrapped ant,
-	# only the source is used for resolving references, and not
-	# the classes in bootstrapped ant but jikes in kaffe has issues with this...
-	if ! java-pkg_current-vm-matches kaffe; then
-		bsyscp="-Dbuild.sysclasspath=ignore"
-	fi
-
-	CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars internal_dist \
-		$(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
-	dodir /usr/share/ant/lib
-
-	for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
-		java-pkg_dojar build/lib/${jar}
-		dosym /usr/share/${PN}/lib/${jar} /usr/share/ant/lib/${jar}
-	done
-
-	dobin "${WORKDIR}/ant"
-
-	dodir /usr/share/${PN}/bin
-	for each in antRun antRun.pl runant.pl runant.py complete-ant-cmd.pl ; do
-		dobin "${S}/src/script/${each}"
-		dosym /usr/bin/${each} /usr/share/${PN}/bin/${each}
-	done
-	dosym /usr/share/${PN}/bin /usr/share/ant/bin
-
-	insinto /usr/share/${PN}
-	doins -r dist/etc
-	dosym /usr/share/${PN}/etc /usr/share/ant/etc
-
-	echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
-	doenvd "${T}/20ant"
-
-	dodoc NOTICE README WHATSNEW KEYS
-
-	if use doc; then
-		dohtml -r manual/*
-		java-pkg_dojavadoc --symlink manual/api build/javadocs
-	fi
-
-	use source && java-pkg_dosrc src/main/*
-}
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		if ! version_is_at_least 1.7.0 ${REPLACING_VERSIONS}; then
-			elog "The way of packaging ant in Gentoo has changed significantly since"
-			elog "the 1.7.0 version, For more information, please see:"
-			elog "https://www.gentoo.org/proj/en/java/ant-guide.xml"
-		fi
-
-		if ! version_is_at_least 1.7.1 ${REPLACING_VERSIONS}; then
-			elog "Since 1.7.1, the ant-tasks meta-ebuild has been removed and its USE"
-			elog "flags have been moved to dev-java/ant."
-		fi
-	fi
-}