From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B9D55158043 for ; Mon, 15 Apr 2024 10:18:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02460E29E8; Mon, 15 Apr 2024 10:18:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0A1CE29E8 for ; Mon, 15 Apr 2024 10:18:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF3B5343380 for ; Mon, 15 Apr 2024 10:18:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3E3E1504 for ; Mon, 15 Apr 2024 10:17:58 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1713176123.5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild dev-java/ant-ivy/metadata.xml X-VCS-Directories: dev-java/ant-ivy/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90 X-VCS-Branch: master Date: Mon, 15 Apr 2024 10:17:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9fe48e77-77b6-463c-ab93-e262f22df285 X-Archives-Hash: 952463cdc62a4e04a8eecb74fd104ba2 commit: 5cc09eb3ba8239c94e5ab8cb93d81eb966f13e90 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Mar 12 20:40:18 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Apr 15 10:15:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc09eb3 dev-java/ant-ivy: switch to dev-java/ant Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723/commits/8d6551f1f1e71c422722e9353d8b5351772f8979 Signed-off-by: Miroslav Šulc gentoo.org> ...ivy-2.5.0-r1.ebuild => ant-ivy-2.5.0-r2.ebuild} | 31 +++++++++++++++------- dev-java/ant-ivy/metadata.xml | 4 +-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild similarity index 94% rename from dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild rename to dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild index fff42019b905..0158c70768f5 100644 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple java-osgi DESCRIPTION="Ivy is a free java based dependency manager" HOMEPAGE="https://ant.apache.org/ivy/" -SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" +SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2" @@ -21,7 +21,7 @@ PROPERTIES="test_network" RESTRICT="test" CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r3:0 dev-java/bcpg:0 dev-java/bcprov:0 dev-java/httpcomponents-client @@ -31,10 +31,7 @@ CDEPEND=" dev-java/jsch:0 dev-java/jsch-agent-proxy:0 test? ( - dev-java/ant-junit:0 - dev-java/ant-junit4:0 - dev-java/ant-junitlauncher:0 - dev-java/ant-testutil:0 + >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] dev-java/hamcrest-core:1.3 dev-java/hamcrest-library:1.3 dev-java/xmlunit:1 @@ -50,12 +47,28 @@ DOCS=( LICENSE NOTICE README.adoc ) S="${WORKDIR}/apache-ivy-${PV}" -JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,httpcomponents-client-4,commons-vfs-2,httpcore,jakarta-oro-2.0,jsch,jsch-agent-proxy" +JAVA_GENTOO_CLASSPATH=" + ant + bcpg + bcprov + httpcomponents-client-4 + commons-vfs-2 + httpcore + jakarta-oro-2.0 + jsch + jsch-agent-proxy +" JAVA_MAIN_CLASS="org.apache.ivy.Main" JAVA_SRC_DIR="src/java" JAVA_RESOURCE_DIRS="resources/java" -JAVA_TEST_GENTOO_CLASSPATH="ant-junit,ant-junit4,ant-junitlauncher,ant-testutil,hamcrest-core-1.3,hamcrest-library-1.3,junit-4,xmlunit-1" +JAVA_TEST_GENTOO_CLASSPATH=" + ant + hamcrest-core-1.3 + hamcrest-library-1.3 + junit-4 + xmlunit-1 +" JAVA_TEST_SRC_DIR="test-src/java" JAVA_TEST_RESOURCE_DIRS="test" JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar" diff --git a/dev-java/ant-ivy/metadata.xml b/dev-java/ant-ivy/metadata.xml index 91e2ba1cf10c..84db44eaed66 100644 --- a/dev-java/ant-ivy/metadata.xml +++ b/dev-java/ant-ivy/metadata.xml @@ -16,7 +16,7 @@ apache/ant-ivy - https://ant.apache.org/ivy/history/2.5.0 - https://issues.apache.org/jira/browse/IVY + https://ant.apache.org/ivy/history/2.5.0/ + https://issues.apache.org/jira/browse/IVY