[gentoo-commits] repo/gentoo:master commit in: dev-java/ant/

[Patrice Clement]

commit:     9ab2c9d51857615c76d7114786562366deae519e
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed May  2 10:15:33 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri May  4 20:49:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab2c9d5

dev-java/ant: remove old, use HTTPS.

 dev-java/ant/ant-1.9.2-r1.ebuild |  2 +-
 dev-java/ant/ant-1.9.2.ebuild    | 63 ----------------------------------------
 2 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/dev-java/ant/ant-1.9.2-r1.ebuild b/dev-java/ant/ant-1.9.2-r1.ebuild
index 6f0a35eeecd..b9f778d065f 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 c1ebdce94aa..00000000000
--- 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
-}