From 7218e1b46bceac05841e90472501742d905fb3fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 12 Mar 2021 21:55:15 +0000 Subject: gentoo resync : 12.03.2021 --- dev-java/ant-ivy/Manifest | 4 +- dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild | 78 ----------------------- dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild | 82 ++++++++++++++++++++++++ dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild | 104 ------------------------------ dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild | 106 +++++++++++++++++++++++++++++++ 5 files changed, 190 insertions(+), 184 deletions(-) delete mode 100644 dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild create mode 100644 dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild delete mode 100644 dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild create mode 100644 dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild (limited to 'dev-java/ant-ivy') diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index 1012874719e9..07942b1fb5d0 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,6 +1,6 @@ AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d -EBUILD ant-ivy-1.4.1-r1.ebuild 1742 BLAKE2B 3e2afbb8620bb69395b7869790b7e65866784b94835e59779e24817f1e5b3c44c62eba0e6dfe586362cfcbe55f26434f60dcc101e992f1c451b3ee7020c7ba76 SHA512 fc9c5b8b9da85c510af2540b074d511460302d538dbde9bbcc805aa6cada0e69d0c2b516cd85cebc72a08d5e3e935eb1bdd3a858bdacb9def22fd5dd581cd0ea -EBUILD ant-ivy-2.3.0-r2.ebuild 2202 BLAKE2B 92b2dfcb3e3cf3bcf5879d649062770ba2f72c08a52d9ba686858de31f315031921da9baedabd01efe3406950c1633464b1fab466b8843f2c3595d7c3ecf321f SHA512 5057ecea8ae376b67e1b415899ea959336370bba4dea50198380e9d392d1a7c4847d84c6b33cb60484567c6968c61ea44deb17f19cc90279b49f6a5564c18185 +EBUILD ant-ivy-1.4.1-r2.ebuild 1760 BLAKE2B 042c11aee2720ffaf77877ab6f903026833db5600c98ea4fc70f0534fe33d478ab01d337b4dfcbfb2218a916ee06bbab42a3afffc29b8b60d663e4e51dec8bed SHA512 926b90f406b1be28920cf56b1463765b676fa00c01ddb4fa7d8a7f3b60b99ea009cad9591015fe65dae636827717390a3d4c5c00118c141f65e4e842f7599e2f +EBUILD ant-ivy-2.3.0-r3.ebuild 2213 BLAKE2B c47655fedaf297eef86e78ef1e28966d98fd6f93ec4c97ec0d36fbd4612837bce74727f66f6108f7fb692e0bdcf86907d0e0fe2444a38bd1182f14daba347d08 SHA512 122f6c157a461bed828bd8ee0a545ca6f178130ebb5d5b0069540ecffce35947abb26a9d54572db429d61ee0a8bd26677bf9a1e67e4ac3d3e7996723b3c83216 MISC metadata.xml 655 BLAKE2B ae710cffd6d182e1f67df6734f0bb1e3b61daa87629b8259f8d75f7476fa732904cd73d2ef02d496448191e33c069d3d284a79aeedb87323e28c029e8ceaa40f SHA512 81eb7f4ce41f17a43b32ac6e4ade9677397696cab06ae94964d1756d6745aadc9d61df9ef3b0749eb547b62fdc5bb19a98484268fbce9d56773be09a03671c0d diff --git a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild deleted file mode 100644 index 92df6ba8e8ba..000000000000 --- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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 eutils - -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" - -DEPEND=" - >=virtual/jdk-1.4 - app-arch/unzip - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEP}" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" - -S="${WORKDIR}/${MY_P}" - -java_prepare() { - epatch "${FILESDIR}/1.4.1-javadoc.patch" - - # 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-1.4.1-r2.ebuild b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild new file mode 100644 index 000000000000..62198fb29dc1 --- /dev/null +++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild @@ -0,0 +1,82 @@ +# 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-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild deleted file mode 100644 index d39bf4890818..000000000000 --- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -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 eutils - -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.6 - test? ( - dev-java/ant-junit:0 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -java_prepare() { - # 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/* -} 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 new file mode 100644 index 000000000000..ef8d904b79d8 --- /dev/null +++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild @@ -0,0 +1,106 @@ +# 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 eutils + +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/* +} -- cgit v1.2.3