From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- dev-java/ant-contrib/Manifest | 5 +- .../ant-contrib/ant-contrib-1.0_beta3-r2.ebuild | 80 ---------------------- .../ant-contrib-1.0_beta6_pre20201123-r1.ebuild | 74 ++++++++++++++++++++ .../ant-contrib-1.0_beta6_pre20201123.ebuild | 75 -------------------- dev-java/ant-contrib/files/tests-visibility.patch | 12 ---- 5 files changed, 75 insertions(+), 171 deletions(-) delete mode 100644 dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild create mode 100644 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r1.ebuild delete mode 100644 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild delete mode 100644 dev-java/ant-contrib/files/tests-visibility.patch (limited to 'dev-java/ant-contrib') diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest index 81f3f0d35ebc..5a73c18df826 100644 --- a/dev-java/ant-contrib/Manifest +++ b/dev-java/ant-contrib/Manifest @@ -1,6 +1,3 @@ -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 -EBUILD ant-contrib-1.0_beta6_pre20201123.ebuild 2269 BLAKE2B 3eed3cd16b0b73c5991f421cb854528c5c7a81619d05c015236508835e571bcfa9ea83a6ea74f2901122041b29cc2065faf3f8dab4293d10ad360604921ace93 SHA512 0e492df4e615af11202b2df13c7808a3c1c5df107680bf124b2558fbb939a60fe34643e7da553e1abb3c25e8ea2014cf9ef555b48621f8e4e847e384f82bd0d9 +EBUILD ant-contrib-1.0_beta6_pre20201123-r1.ebuild 2247 BLAKE2B 07506ad4330f5273f2a7a1ccfe8c1e4bcc2ea27a6ecfbfc0ed279dbf13b1df82c7cfb153cccd528cfcac2e2394612f4b2c1d73449972e509dd488d42078f9006 SHA512 084e1dffb72fd0a13b34506c7f154aeb833a351b07ae1db9dc681e0207a727184355e0d261f688d0cd2fa8a74b50cf6b1aa460d4c9a58ef61334c54278fd112b MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild deleted file mode 100644 index 68d5f869ed7b..000000000000 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta3-r2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" -WANT_ANT_TASKS="ant-ivy" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="A collection of tasks for Apache Ant" -HOMEPAGE="http://ant-contrib.sourceforge.net/" -SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" - -# test? ( dev-java/ant-junit dev-java/ant-testutil ) -CP_DEPEND=" - >=dev-java/ant-core-1.7.0:0 - dev-java/ant-ivy:0 - >=dev-java/bcel-5.1:0 - dev-java/commons-httpclient:3 - dev-java/xerces:2 -" - -RDEPEND="${CP_DEPEND} - >=virtual/jre-1.4" - -# javatoolkit for cElementTree -DEPEND="${CP_DEPEND} - >=virtual/jdk-1.4 - >=dev-java/javatoolkit-0.3.0-r2" - -S="${WORKDIR}/${PN}" -PATCHES=( "${FILESDIR}"/tests-visibility.patch ) - -rewrite_build_xml() { - python < >=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:0 + dev-java/ant-ivy:2 + dev-java/bcel:0 + dev-java/commons-httpclient:3 + dev-java/xerces: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="${CDEPEND} + >=virtual/jdk-1.8:* + test? ( + dev-java/ant-core:0 + )" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +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/ant-contrib-1.0_beta6_pre20201123.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild deleted file mode 100644 index f652e7eadd71..000000000000 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# 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/files/tests-visibility.patch b/dev-java/ant-contrib/files/tests-visibility.patch deleted file mode 100644 index 182a17f054e0..000000000000 --- a/dev-java/ant-contrib/files/tests-visibility.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java ---- ant-contrib.old/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:16.000000000 +0200 -+++ ant-contrib/test/src/net/sf/antcontrib/BuildFileTestBase.java 2008-03-05 23:56:55.000000000 +0200 -@@ -76,7 +76,7 @@ - * @param filename name of project file to run - * @exception BuildException Description of the Exception - */ -- protected void configureProject( String filename ) throws BuildException { -+ public void configureProject( String filename ) throws BuildException { - // find the build file - File f = new File( filename ); - if ( !f.exists() ) { -- cgit v1.2.3