gentoo resync : 06.05.2018

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index a33b9c825658..37970fd4f453 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,3 +1,2 @@
-EBUILD ant-1.9.2-r1.ebuild 2026 BLAKE2B 3dec8cbf5fca57f24f3e001a97a36167ca3df2e767cee501aff84406398fe952126b8e106dc8531e6df57804677c1ca1e8641e5fa5bdc23214786aa605544ff7 SHA512 e77efd2309dd0acec5334fecbc8b40240b647d7758abccd6b736877968cc2baaea910f6c5d9fb4e306e4b6b64279adc24b9c67e297d0aec9927ca9b9c1e7dc33
-EBUILD ant-1.9.2.ebuild 2102 BLAKE2B e024fddb5059511959821e2a1b56e5da26ac1a9d07708cc70ffb0425118294c7418d59d362ed56ebfb61166c8315f8f81006148a99beb2d5611e9e5f95dddab2 SHA512 e384f395421d69568246bdb370d7b3e40a06f4d96c727a090ce64997b20fec585680e36176507c132b74b44716d72559a781d8acb71c86dc749deafe48785bb9
+EBUILD ant-1.9.2-r1.ebuild 2027 BLAKE2B eee331a9cffd99f179cd2df829299f95e100d132cf7055dffa63463d42655febd55a3e7643af993f236a6ba5bc12efe5c332fcd73e7cebb4540bf45d4a7a7018 SHA512 092edc2dc1c0b2e2b607db39dab7632814bb124ef3c20c1787fc84760b4192e8690cdc575f21efc2b4146b1efea97e2317829f5c99b4f3b96cbb1c002951d605
 MISC metadata.xml 1159 BLAKE2B 393c61676e20af2acd08d2ecee954ea68ddb794f3aaf52bb576f72049b8807b25b8122919254d41cc249c88b375283d459193fe2c05dda46ae344e6774674ca2 SHA512 daa64360ccca2ae691a7d47b980cc35eb0c4577fd99493b235c4931861edc60a0bce1c7da5d360fd58c3c426421a7bbf41a8d9b463783e212dbae91f32a06a49
diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
index 6f0a35eeecd3..b9f778d065f9 100644
--- a/dev-java/ant/ant-1.9.2-r1.ebuild
+++ b/dev-java/ant/ant-1.9.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit versionator
 
 DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
+HOMEPAGE="https://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/ant/ant-1.9.2.ebuild b/dev-java/ant/ant-1.9.2.ebuild
deleted file mode 100644
index c1ebdce94aa0..000000000000
--- a/dev-java/ant/ant-1.9.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="http://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="~dev-java/ant-core-${PV}"
-RDEPEND="${DEPEND}"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
-	+jsch +log4j +oro +regexp +resolver testutil"
-
-RDEPEND="~dev-java/ant-core-${PV}
-	~dev-java/ant-nodeps-${PV}
-	~dev-java/ant-junit-${PV}
-	!dev-java/ant-optional
-	!dev-java/ant-tasks
-	~dev-java/ant-trax-${PV}
-	~dev-java/ant-apache-xalan2-${PV}
-	antlr? ( ~dev-java/ant-antlr-${PV} )
-	bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-	bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-	log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-	oro? ( ~dev-java/ant-apache-oro-${PV} )
-	regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-	resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-	commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-	commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-	jai? ( ~dev-java/ant-jai-${PV} )
-	javamail? ( ~dev-java/ant-javamail-${PV} )
-	jdepend? ( ~dev-java/ant-jdepend-${PV} )
-	jmf? ( ~dev-java/ant-jmf-${PV} )
-	jsch? ( ~dev-java/ant-jsch-${PV} )
-	testutil? ( ~dev-java/ant-testutil-${PV} )
-	X? ( ~dev-java/ant-swing-${PV} )"
-
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-pkg_postinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		# if we update from a version below 1.7.1
-		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."
-			elog
-			elog "You may now freely set the USE flags of this package without breaking"
-			elog "building of Java packages, which depend on the exact ant tasks they need."
-			elog "The USE flags default to enabled (except X, jai and jmf) for convenience."
-		fi
-	fi
-}