Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/ant-ivy/
Date: Mon, 04 Jun 2018 01:12:46
Message-Id: 1528074741.10358ecd6161e47679ea12ba4b9e990d543dd6f5.bman@gentoo
1 commit: 10358ecd6161e47679ea12ba4b9e990d543dd6f5
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 3 18:54:10 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 4 01:12:21 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10358ecd
7
8 dev-java/ant-ivy: drop old EAPI
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 dev-java/ant-ivy/Manifest | 1 -
13 dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild | 66 --------------------------------
14 2 files changed, 67 deletions(-)
15
16 diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
17 index bf62bf6af0b..ef80fa17ff6 100644
18 --- a/dev-java/ant-ivy/Manifest
19 +++ b/dev-java/ant-ivy/Manifest
20 @@ -1,3 +1,2 @@
21 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
22 -DIST ivy-1.3.1-src.zip 1302693 BLAKE2B fbf6da871fdb629810bfa15ec977da4e998a987bd509e80c462d6ebfc113f88ea0c609526795bc414cb0d17fb424c345e40d2fc1a6d17ac8a8bcd25cd9c9bcef SHA512 35c425ea8adc714496dbc2bc0d5a6037fe295967bea9014a16850e54ab3925192e42579ca1e23d68d776326e81e1e195ce85f1a7791a6b0b20ed179c09a22f82
23 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
24
25 diff --git a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild b/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
26 deleted file mode 100644
27 index 58853eef8a6..00000000000
28 --- a/dev-java/ant-ivy/ant-ivy-1.3.1-r1.ebuild
29 +++ /dev/null
30 @@ -1,66 +0,0 @@
31 -# Copyright 1999-2018 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=0
35 -
36 -JAVA_PKG_IUSE="doc source"
37 -
38 -inherit java-pkg-2 java-ant-2 eutils
39 -
40 -MY_PN=${PN##*-}
41 -MY_P=${MY_PN}-${PV}
42 -
43 -DESCRIPTION="Ivy is a free java based dependency manager"
44 -HOMEPAGE="https://ant.apache.org/ivy/"
45 -SRC_URI="http://jayasoft.org/downloads/ivy/1.3.1/${MY_P}-src.zip"
46 -
47 -LICENSE="BSD"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
50 -IUSE=""
51 -
52 -COMMON_DEP="
53 - dev-java/ant-core
54 - =dev-java/commons-cli-1*
55 - =dev-java/commons-httpclient-3*
56 - dev-java/commons-logging
57 - =dev-java/jakarta-oro-2.0*"
58 -DEPEND="
59 - >=virtual/jdk-1.4
60 - app-arch/unzip
61 - ${COMMON_DEP}"
62 -RDEPEND=">=virtual/jre-1.4
63 - ${COMMON_DEP}"
64 -
65 -S=${WORKDIR}/${MY_P}
66 -
67 -# Rewrites examples... bad
68 -JAVA_PKG_BSFIX="off"
69 -
70 -src_unpack() {
71 - unpack ${A}
72 -
73 - cd "${S}"
74 - epatch "${FILESDIR}/${MY_P}-noresolve.patch"
75 - epatch "${FILESDIR}/${MY_P}-tasks.patch"
76 -
77 - mkdir "${S}/lib"
78 - java-pkg_jar-from --into lib commons-cli-1,commons-httpclient-3,commons-logging,ant-core,jakarta-oro-2.0
79 -
80 - java-ant_bsfix_one build.xml
81 -}
82 -
83 -src_install() {
84 - java-pkg_dojar build/artifact/${MY_PN}.jar
85 - dodir /usr/share/ant-core/lib
86 - dosym /usr/share/${PN}/lib/${MY_PN}.jar /usr/share/ant-core/lib/${PN}.jar
87 - use doc && java-pkg_dojavadoc doc/build/api
88 - use source && java-pkg_dosrc src/java/*
89 -}
90 -
91 -RESTRICT="test" # fail because of a missing file
92 -
93 -src_test() {
94 - java-pkg_jar-from --into lib junit
95 - ANT_TASKS="ant-junit" eant test || die "Junit tests failed"
96 -}