gentoo resync : 12.05.2022

3 files changed, 2 insertions, 185 deletions

diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index 9c30acc23427..7c0703e76771 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,4 +1,3 @@
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
-EBUILD ant-ivy-2.5.0-r1.ebuild 8558 BLAKE2B 76dc5420f88510014df56e19f113f5daa7cf438fab150ec84a5bb55c29c051ee0dec5e4b94992f001d456842672c92acbe2330f28934a4a25e1a5002b42dd7d3 SHA512 ebe13d31a2f096c9f2c88cfff1c048cb2a9ce35f60664fb2093faf1b2477d819f4775ef2a6ffed0e12c79c048fec9f3cc05f7102191a362db80a2746a42781dc
-EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
+EBUILD ant-ivy-2.5.0-r1.ebuild 8555 BLAKE2B cf37b07fe2a32e39193130bda115e0bafbd268a6c62e3b63ee16717323d81a601af415fc7ad974539f36aa3c86460404b6880c58f64d47fabecf469de0a4bcbd SHA512 ccc5281d3da84393ce2a4e6fcbc5ac78e72fd384365d238900aca37d0b996e011aa022f6afd760195d3b7178728fa18bc2a5b4b67a457aa060a3859a1888820d
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
index cb8092656c67..fff42019b905 100644
--- a/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
+++ b/dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 PROPERTIES="test_network"
 RESTRICT="test"
diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
deleted file mode 100644
index 4e3633fe3296..000000000000
--- a/dev-java/ant-ivy/ant-ivy-2.5.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.ivy:ivy:2.5.0"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcpg:0
-	dev-java/bcprov:0
-	dev-java/commons-httpclient:4
-	dev-java/commons-vfs:2
-	dev-java/httpcore:0
-	dev-java/jakarta-oro:2.0
-	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/hamcrest-core:1.3
-		dev-java/hamcrest-library:1.3
-		dev-java/xmlunit:1
-	)"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DOCS=( LICENSE NOTICE README.adoc )
-
-S="${WORKDIR}/apache-ivy-${PV}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,bcpg,bcprov,commons-httpclient-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_SRC_DIR="test-src/java"
-JAVA_TEST_RESOURCE_DIRS="test"
-JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar"
-
-# according to 57,60 build-release.xml
-# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b
-JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true"
-
-# Several tests require a certain treatment to "generate-bundles":
-# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428
-# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/>
-#
-# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71
-# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'.
-# So the failing tests will be excluded, saved for a later attempt.
-#
-# Not excluding any test classes results in  "Tests run: 1109,  Failures: 98"
-# Excluding those test classes listed below leads to "OK (812 tests)"
-JAVA_TEST_EXCLUDES=(
-	# https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56
-	# test.class.pattern = *Test
-	"org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope
-	"org.apache.ivy.core.TestPerformance" # not in scope
-	"org.apache.ivy.util.TestXmlHelper" # not in scope
-	"org.apache.ivy.TestFixture" # not in scope
-	"org.apache.ivy.TestHelper" # not in scope
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420
-	# <exclude name="**/Abstract*Test.java"/>
-	"org.apache.ivy.util.url.AbstractURLHandlerTest"
-	"org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest"
-	"org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest"
-	# following excluded tests cause test failures
-	"org.apache.ivy.ant.BuildOBRTaskTest" #                                 Tests run: 3,  Failures: 2
-	"org.apache.ivy.core.deliver.DeliverTest" #                             Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.module.descriptor.IvyMakePomTest" #                Tests run: 1,  Failures: 1
-	"org.apache.ivy.core.settings.XmlSettingsParserTest" #                  Tests run: 29,  Failures: 1
-	"org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" #                 Tests run: 3,  Failures: 1
-	"org.apache.ivy.osgi.obr.OBRResolverTest" #                             Tests run: 16,  Failures: 16
-	"org.apache.ivy.osgi.repo.BundleRepoTest" #                             Tests run: 4,  Failures: 3
-	"org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" #      Tests run: 46,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" #     Tests run: 44,  Failures: 7
-	"org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" #     Tests run: 10,  Failures: 1
-	"org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" #              Tests run: 14,  Failures: 3
-	"org.apache.ivy.plugins.resolver.JarResolverTest" #                     Tests run: 3,  Failures: 3
-	# following excluded tests can pass if run individually
-	"org.apache.ivy.ant.IvyConfigureTest" #                                 OK (14 tests)
-	"org.apache.ivy.IvyTest" #                                              OK (1 test)
-	"org.apache.ivy.MainTest" #                                             OK (12 tests)
-	"org.apache.ivy.plugins.report.XmlReportWriterTest" #                   OK (3 tests)
-	"org.apache.ivy.plugins.resolver.BintrayResolverTest" #                 OK (12 tests)
-	"org.apache.ivy.plugins.resolver.ChainResolverTest" #                   OK (15 tests)
-	"org.apache.ivy.plugins.resolver.FileSystemResolverTest" #              OK (27 tests)
-	"org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test)
-	"org.apache.ivy.plugins.resolver.IvyRepResolverTest" #                  OK (3 tests)
-	"org.apache.ivy.plugins.resolver.Maven2LocalTest" #                     OK (2 tests)
-	"org.apache.ivy.plugins.resolver.PackagerResolverTest" #                OK (3 tests)
-	"org.apache.ivy.plugins.resolver.URLResolverTest" #                     OK (5 tests)
-	"org.apache.ivy.plugins.trigger.LogTriggerTest" #                       OK (3 tests)
-	# Without PROPERTIES="test_network", the following test cause additional failures.
-	"org.apache.ivy.core.settings.OnlineXmlSettingsParserTest"
-#	"org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest"
-	"org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest"
-#	"org.apache.ivy.plugins.resolver.IBiblioResolverTest"
-#	"org.apache.ivy.plugins.resolver.MirroredURLResolverTest"
-	"org.apache.ivy.util.url.ArtifactoryListingTest"
-#	"org.apache.ivy.util.url.BasicURLHandlerTest"
-#	"org.apache.ivy.util.url.HttpclientURLHandlerTest"
-)
-
-src_prepare() {
-	default
-
-	mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	pushd "${JAVA_RESOURCE_DIRS}"
-		cp "${S}"/{NOTICE,LICENSE} META-INF/ || die
-		cp -r "${S}"/src/java/* . || die
-
-		# DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead
-		# according to 210,221 build.xml and still in the upstream .jar file
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die
-		cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die
-
-		find . -type f -name '*.java' -exec rm -rf {} + || die
-	popd || die
-}
-
-src_test() {
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407
-	# name="build-custom-resolver-jar"
-	JAVA_SRC_DIR="test/custom-classpath"
-	JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar"
-	java-pkg-simple_src_compile
-
-	# Without "license.xml" the tests won't even start. "Tests run: 1109,  Failures: 318"
-	jar -cf test.jar \
-		-C test/java org/apache/ivy/plugins/parser/xml/license.xml \
-		-C test/java org/apache/ivy/plugins/parser/m2/license.xml || die
-
-	# Reduce number of failures to "Tests run: 1109,  Failures: 98"
-	jar -uf "test.jar" -C test/java . || die
-
-	# Separate *.java files from test resources
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393
-	mkdir test-src || die
-	cp -r test/java test-src/ || die
-	find test -type f -name '*.java' -exec rm -rf {} + || die
-
-	# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438
-	# name="prepare-test-jar-repositories"
-	mkdir test/jar-repos || die
-	jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die
-#	jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die
-
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-	java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy"
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc src/*
-}