gentoo resync : 28.04.2021

3 files changed, 79 insertions, 1 deletions

diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index a291de3af722..0d50c08a829f 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,4 +1,6 @@
 AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
+DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
 EBUILD ant-contrib-1.0_beta3-r2.ebuild 1814 BLAKE2B a2bb1cab559d3e71813493337aa09865010665855ea4321e8cbd4132105d09c169da9fc1a4dccee2931d586fc63f225a39d95151f4d23e8a86bd4d5d9b556c17 SHA512 e46e91963aa9f9fb1fcfa61e4689fa9fa06b2c880ee4c21bfb70bc1f55725d0e59153b8a978856bad417afcb7ea07b30035e64fee2b5ee84fdfb91fa86185d85
-MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
+EBUILD ant-contrib-1.0_beta6_pre20201123.ebuild 2269 BLAKE2B 3eed3cd16b0b73c5991f421cb854528c5c7a81619d05c015236508835e571bcfa9ea83a6ea74f2901122041b29cc2065faf3f8dab4293d10ad360604921ace93 SHA512 0e492df4e615af11202b2df13c7808a3c1c5df107680bf124b2558fbb939a60fe34643e7da553e1abb3c25e8ea2014cf9ef555b48621f8e4e847e384f82bd0d9
+MISC metadata.xml 375 BLAKE2B 507699a997e9885647997143d7cecb35ac673924dc6aec0de9f1f09dad8ebf1a9d000b1c46562ddb07655df9d281788f0b7834d00072b8f675cd559455f5e9f9 SHA512 953b2ed99fb34280fb21995385e76d568fb24ce14eef6adfca7552ceea16b9a6ad82a6381b8cb2ba52c90a949b07f5d2e84bb79b5abdd6975b7cfbc8638037b9
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
new file mode 100644
index 000000000000..f652e7eadd71
--- /dev/null
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/cniweb/ant-contrib/archive/0228412be2ef648cfabc1d74416d3188755aff9b.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild ant-contrib-1.0_beta6_pre20201123.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="ant-contrib:ant-contrib:1.0b6"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_COMMIT="0228412be2ef648cfabc1d74416d3188755aff9b"
+DESCRIPTION="Ant-contrib tasks for Apache Ant"
+HOMEPAGE="http://ant-contrib.sourceforge.net:80"
+SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-httpclient:commons-httpclient:3.1 -> >=dev-java/commons-httpclient-3.1:3
+# org.apache.ant:ant:1.9.15 -> >=dev-java/ant-core-1.10.9:0
+# org.apache.bcel:bcel:5.1 -> >=dev-java/bcel-6.5.0:0
+# org.apache.ivy:ivy:2.5.0 -> >=dev-java/ant-ivy-2.5.0:2
+# org.jvnet.hudson:ivy:1.4.1 -> !!!groupId-not-found!!!
+# xerces:xercesImpl:2.12.0 -> >=dev-java/xerces-2.12.0:2
+
+CDEPEND="
+	>=dev-java/ant-core-1.10.9:0
+	>=dev-java/ant-ivy-2.3.0:2
+	>=dev-java/bcel-6.5.0:0
+	>=dev-java/commons-httpclient-3.1:3
+	>=dev-java/xerces-2.12.0:2
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.12:4
+# test? org.apache.ant:ant-launcher:1.9.5 -> >=dev-java/ant-core-1.10.9:0
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		>=dev-java/ant-core-1.10.9:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}
+"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}"
+
+#	JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2"
+JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,xerces-2"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant-core"
+JAVA_TEST_SRC_DIR="test/src"
+JAVA_TEST_RESOURCE_DIRS="test/resources"
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^import/s/fr.jayasoft.ivy.ant/org.apache.ivy.ant/' \
+		src/main/java/net/sf/antcontrib/net/Ivy14Adapter.java || die
+}
diff --git a/dev-java/ant-contrib/metadata.xml b/dev-java/ant-contrib/metadata.xml
index 5c1224a74c63..b0770934cd36 100644
--- a/dev-java/ant-contrib/metadata.xml
+++ b/dev-java/ant-contrib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ant-contrib</remote-id>
+		<remote-id type="github">cniweb/ant-contrib</remote-id>
 	</upstream>
 </pkgmetadata>