Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 20 Mar 2019 17:28:10
Message-Id: 1553102864.d3bb014cc872f4b9ff6d116e7655c9a668ee8447.fordfrog@gentoo
1 commit: d3bb014cc872f4b9ff6d116e7655c9a668ee8447
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 20 17:24:37 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 20 17:27:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3bb014c
7
8 eclass/ant-tasks.eclass: cleanup
9
10 1) removed support for eapi 5 (was used in ant tasks v 1.9.2 and those are already gone)
11 2) removed support for ant tasks 1.9.2 (those are already gone)
12
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 eclass/ant-tasks.eclass | 23 ++++++-----------------
16 1 file changed, 6 insertions(+), 17 deletions(-)
17
18 diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
19 index f889a92aa36..84e65765795 100644
20 --- a/eclass/ant-tasks.eclass
21 +++ b/eclass/ant-tasks.eclass
22 @@ -12,10 +12,10 @@
23 # dev-java/ant-* packages easily.
24
25 case "${EAPI:-0}" in
26 - 0|1|2|3|4)
27 + 0|1|2|3|4|5)
28 die "ant-tasks.eclass: EAPI ${EAPI} is too old."
29 ;;
30 - 5|6|7)
31 + 6|7)
32 ;;
33 *)
34 die "ant-tasks.eclass: EAPI ${EAPI} is not supported yet."
35 @@ -27,7 +27,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true
36 # rewriting build.xml for are the testcases has no reason atm
37 JAVA_PKG_BSFIX_ALL=no
38 inherit java-pkg-2 java-ant-2
39 -[[ ${EAPI:-0} == [56] ]] && inherit eapi7-ver
40 +[[ ${EAPI:-0} -eq 6 ]] && inherit eapi7-ver
41
42 EXPORT_FUNCTIONS src_unpack src_compile src_install
43
44 @@ -68,16 +68,9 @@ ANT_TASK_PV="${PV}"
45
46 # default for final releases
47 MY_PV=${PV}
48 -case ${PV} in
49 -1.9.2)
50 - UPSTREAM_PREFIX="https://archive.apache.org/dist/ant/source"
51 - GENTOO_PREFIX="https://dev.gentoo.org/~tomwij/files/dist"
52 - ;;
53 -*)
54 - UPSTREAM_PREFIX="mirror://apache/ant/source"
55 - GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles"
56 - ;;
57 -esac
58 +
59 +UPSTREAM_PREFIX="mirror://apache/ant/source"
60 +GENTOO_PREFIX="https://dev.gentoo.org/~fordfrog/distfiles"
61
62 # source/workdir name
63 MY_P="apache-ant-${MY_PV}"
64 @@ -123,10 +116,6 @@ ant-tasks_src_unpack() {
65
66 # replace build.xml with our modified for split building
67 if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then
68 - if [ ${EAPI:-0} -eq 5 ]; then
69 - die "ant-tasks.eclass: build.xml patching not supported for EAPI 5 ebuilds"
70 - fi
71 -
72 eapply "${WORKDIR}"/${PV}-build.patch
73 else
74 mv -f "${WORKDIR}"/build.xml .