diff options
Diffstat (limited to 'dev-java/ant-ivy')
| -rw-r--r-- | dev-java/ant-ivy/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild (renamed from dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild) | 18 | ||||
| -rw-r--r-- | dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild (renamed from dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild) | 10 |
3 files changed, 19 insertions, 13 deletions
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-r2.ebuild index 92df6ba8e8ba..62198fb29dc1 100644 --- a/dev-java/ant-ivy/ant-ivy-1.4.1-r1.ebuild +++ b/dev-java/ant-ivy/ant-ivy-1.4.1-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc examples source test" @@ -11,7 +11,7 @@ WANT_SPLIT_ANT="true" # Rewrites examples otherwise... bad. JAVA_PKG_BSFIX_ALL="no" -inherit java-pkg-2 java-ant-2 eutils +inherit java-pkg-2 java-ant-2 MY_PN="${PN##*-}" MY_P="${MY_PN}-${PV}" @@ -32,19 +32,23 @@ COMMON_DEP=" dev-java/jakarta-oro:2.0 dev-java/jsch:0" +BDEPEND="app-arch/unzip" DEPEND=" - >=virtual/jdk-1.4 - app-arch/unzip + >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) ${COMMON_DEP}" -RDEPEND=">=virtual/jre-1.4 +RDEPEND=">=virtual/jre-1.8:* ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" -java_prepare() { - epatch "${FILESDIR}/1.4.1-javadoc.patch" +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 \ diff --git a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild index d39bf4890818..ef8d904b79d8 100644 --- a/dev-java/ant-ivy/ant-ivy-2.3.0-r2.ebuild +++ b/dev-java/ant-ivy/ant-ivy-2.3.0-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc examples source test" @@ -40,18 +40,20 @@ CDEPEND="dev-java/jsch:0 dev-java/jakarta-oro:2.0 dev-java/commons-httpclient:3" -DEPEND=">=virtual/jdk-1.6 +DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 ) ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 +RDEPEND=">=virtual/jre-1.8:* ${CDEPEND}" S="${WORKDIR}/${MY_P}" -java_prepare() { +src_prepare() { + default + # This stuff needs removing. local CLEANUP=( doc/reports |