From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- dev-java/ant-contrib/Manifest | 2 +- .../ant-contrib-1.0_beta6_pre20201123-r2.ebuild | 70 ---------------------- .../ant-contrib-1.0_beta6_pre20201123-r3.ebuild | 70 ++++++++++++++++++++++ 3 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild create mode 100644 dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild (limited to 'dev-java/ant-contrib') diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest index 29522d86c154..e48aa0e65b64 100644 --- a/dev-java/ant-contrib/Manifest +++ b/dev-java/ant-contrib/Manifest @@ -1,3 +1,3 @@ DIST ant-contrib-1.0_beta6_pre20201123.tar.gz 473435 BLAKE2B f73f0a3cfbf92719143a806e1b4b753f7809aeef4976fd6f75aef85490daa0a44a90c03779aba0784e9e59dfe9b9abf7b19c405287fa20838b29e621fa5f7dac SHA512 0b4d05c90c16c5d076364aa140d3ce503b7b7abf187d7d4cccbf0170dd3afab879bb71b002b3c467f73d2632a57dfd70f74715e8b48f26376cb88e872ec1014e -EBUILD ant-contrib-1.0_beta6_pre20201123-r2.ebuild 1981 BLAKE2B 7a68e3b812ea888204ee5656e71675c0c42484a5b6ea07cceaaf4c557782f2ec594355841aab7146a88446d8662f676ae126b7e0ff88e13966b2000d1f667f80 SHA512 0a7889334bc4515981e6cfbd2206cc73e3c34dc12dcf90210dd9dea7c87542c422673c0443b111c65433496ebdbf49466b3f2182090ff4416f954de866c7cb30 +EBUILD ant-contrib-1.0_beta6_pre20201123-r3.ebuild 1979 BLAKE2B f0edc72d57d0865d09a9994dffd46f0c2384b3bbfefbe22b758da461b7c115da8b5354b197cb1d39187d9b0e67d3a3fe791641974958bba57c5435a6de7d9a84 SHA512 f99925614acf5db260529745891b23be7d2e4c4ef40f9c6411820a59adac470e6d72186ada6706954c8e5a4c4b90eafcac36050bf264afab8fee21694b2b21d1 MISC metadata.xml 376 BLAKE2B 9a2a0c2682879b564c70896325934cbc53ec1289781487f4d82b1d053b5e45ed16a3fb9ff228c29f29975e8a2cc3231e9f9a7694ed2e504025f5d909e0a2e89a SHA512 a54fd5353676f4c1cbe28d463e4d245dccc342dd79d5809f1b130a0b93f9eceb2a93aa4addb8de98cfe26b5999c1bc7cb65fd075117a2b0f14ed41d92c2c144c diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild deleted file mode 100644 index 172467ec6ed4..000000000000 --- a/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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="https://ant-contrib.sourceforge.net/" -SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" - -# Too many tests fail -RESTRICT="test" - -# 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-1.10.14-r3: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-1.10.14-r3:0[junit4] - )" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -# JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2" -JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,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" -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-r3.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild new file mode 100644 index 000000000000..120a631bc481 --- /dev/null +++ b/dev-java/ant-contrib/ant-contrib-1.0_beta6_pre20201123-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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="https://ant-contrib.sourceforge.net/" +SRC_URI="https://github.com/cniweb/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}/${PN}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ppc64 x86" + +# Too many tests fail +RESTRICT="test" + +# 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-1.10.14-r3:0 + dev-java/ant-ivy:0 + 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-1.10.14-r3:0[junit4] + )" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" + +# JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant-core,bcel,ant-ivy-2,!!!groupId-not-found!!!,xerces-2" +JAVA_GENTOO_CLASSPATH="commons-httpclient-3,ant,bcel,ant-ivy,xerces-2" +JAVA_SRC_DIR="src/main/java" +JAVA_RESOURCE_DIRS="src/main/resources" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4,ant" +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 +} -- cgit v1.2.3