From 2d3399a25152d9e798000e154751460cf64a94e8 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Tue, 12 Mar 2024 12:55:47 +0100 Subject: [PATCH] dev-java/commons-vfs: switch dependency to dev-java/ant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/35723/commits/15bf12d0be79fe70dc88307803f56ec6e9229825 Signed-off-by: Miroslav Šulc --- ...-vfs-2.0-r2.ebuild => commons-vfs-2.0-r3.ebuild} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename dev-java/commons-vfs/{commons-vfs-2.0-r2.ebuild => commons-vfs-2.0-r3.ebuild} (91%) diff --git a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild similarity index 91% rename from dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild rename to dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild index 6a24d0bb811ea..418ad23cc41f6 100644 --- a/dev-java/commons-vfs/commons-vfs-2.0-r2.ebuild +++ b/dev-java/commons-vfs/commons-vfs-2.0-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="source" @@ -9,14 +9,15 @@ inherit java-pkg-2 java-ant-2 DESCRIPTION="A single API for accessing various different file systems" HOMEPAGE="https://commons.apache.org/vfs/" -SRC_URI="mirror://apache/commons/vfs/source/${P}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/commons/vfs/source/${P}-src.tar.gz" +S="${WORKDIR}/${P}/core" LICENSE="Apache-2.0" SLOT="2" KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" CDEPEND=" - dev-java/ant-core:0 + dev-java/ant:0 dev-java/commons-collections:0 dev-java/commons-logging:0 dev-java/commons-net:0 @@ -34,10 +35,8 @@ PATCHES=( "${FILESDIR}"/${P}-incompatibility.patch ) -S="${WORKDIR}/${P}/core" - EANT_GENTOO_CLASSPATH=" - ant-core + ant commons-collections commons-logging commons-net