commit: 8f0c7f0c9203b557853fdb8310fd1310bfc412d3 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Jan 3 10:36:42 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Wed Jan 5 20:49:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f0c7f0c
dev-java/ant-ivy: Drop old versions Closes: https://bugs.gentoo.org/804531 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/ant-ivy/Manifest | 2 - dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild | 82 ------------------------ dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild | 106 ------------------------------- 3 files changed, 190 deletions(-) diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index adb78cab36a9..0d8fb7a2c918 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,3 +1 @@ -DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268 -DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild deleted file mode 100644 index 62198fb29dc1..000000000000 --- a/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source test" - -# Registers as split-ant task. -WANT_SPLIT_ANT="true" - -# Rewrites examples otherwise... bad. -JAVA_PKG_BSFIX_ALL="no" - -inherit java-pkg-2 java-ant-2 - -MY_PN="${PN##*-}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Ivy is a free java based dependency manager" -HOMEPAGE="https://ant.apache.org/ivy/"; -SRC_URI="http://www.jaya.free.fr/downloads/ivy/${PV}/${MY_P}-src.zip"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" - -COMMON_DEP=" - dev-java/ant-core:0 - dev-java/commons-cli:1 - dev-java/commons-httpclient:3 - dev-java/commons-vfs:0 - dev-java/jakarta-oro:2.0 - dev-java/jsch:0" - -BDEPEND="app-arch/unzip" -DEPEND=" - >=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEP}" - -RDEPEND=">=virtual/jre-1.8:* - ${COMMON_DEP}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/1.4.1-javadoc.patch" -) - -src_prepare() { - default - - # init-ivy expects existing ivy.jar, but we don't need actually it - sed -i -e 's/depends="init-ivy, prepare"/depends="prepare"/' build.xml \ - || die - - rm -v src/java/fr/jayasoft/ivy/repository/vfs/IvyWebdav* || die - java-ant_rewrite-classpath - mkdir lib -} - -EANT_GENTOO_CLASSPATH=" - ant-core,commons-cli-1,commons-httpclient-3 - commons-vfs,jakarta-oro-2.0,jsch" - -EANT_BUILD_TARGET="offline jar" - -src_test() { - # TODO: find out why a couple of these fail - java-pkg_jar-from --into lib junit - ANT_TASKS="ant-junit" eant offline test -} - -src_install() { - java-pkg_dojar build/artifact/${MY_PN}.jar - - use doc && java-pkg_dojavadoc doc/ivy/api - use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/java/* - - java-pkg_register-ant-task -} diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild deleted file mode 100644 index 17350b9fc443..000000000000 --- a/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc examples source test" - -# Register this as a split-ant task. -WANT_SPLIT_ANT="true" - -# Don't rewrite examples, that's bad. -JAVA_PKG_BSFIX_ALL="no" - -inherit java-pkg-2 java-ant-2 - -MY_PN="apache-ivy" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Ivy is a free java based dependency manager" -HOMEPAGE="https://ant.apache.org/ivy/"; -SRC_URI="mirror://apache/ant/ivy/${PV}/${MY_P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" - -# We cannot build tests yet as there is no org.apache.tools.ant.BuildFileTest packaged anywhere yet. -RESTRICT="test" - -# SLOT to use for all bc dependencies. -BC_SLOT="1.50" - -# There may be additional optional dependencies (commons-logging, commons-lang...) -CDEPEND="dev-java/jsch:0 - dev-java/bcpg:${BC_SLOT} - dev-java/ant-core:0 - dev-java/bcpkix:${BC_SLOT} - dev-java/bcprov:${BC_SLOT} - dev-java/commons-vfs:0 - dev-java/jakarta-oro:2.0 - dev-java/commons-httpclient:3" - -DEPEND=">=virtual/jdk-1.8:* - test? ( - dev-java/ant-junit:0 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.8:* - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - # This stuff needs removing. - local CLEANUP=( - doc/reports - test/triggers - doc/configuration - test/repositories - test/java/org/apache/ivy/core/settings/custom-resolver.jar - src/example/chained-resolvers/settings/repository/test-1.0.jar - ) - - rm -rf "${CLEANUP[@]}" || die - - java-ant_rewrite-classpath - mkdir lib || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_GENTOO_CLASSPATH=" - jsch - bcpkix-${BC_SLOT} - ant-core - bcpg-${BC_SLOT} - commons-vfs - bcprov-${BC_SLOT} - jakarta-oro-2.0 - commons-httpclient-3 -" - -EANT_BUILD_TARGET="/offline jar" - -EANT_EXTRA_ARGS="-Dbuild.version=${PV} -Dbundle.version=${PV}" - -src_test() { - java-pkg_jar-from --into lib junit - ANT_TASKS="ant-junit" eant "/offline test" -} - -src_install() { - java-pkg_dojar build/artifact/jars/ivy.jar - java-pkg_register-ant-task - - if use doc; then - java-pkg_dojavadoc build/doc/reports/api - java-pkg_dohtml -r doc - fi - - use examples && java-pkg_doexamples src/example - use source && java-pkg_dosrc src/java/* -}
