1 |
W dniu pon, 21.05.2018 o godzinie 17∶03 -0500, użytkownik Marty E. |
2 |
Plummer napisał: |
3 |
> Actually I just noticed that eapi7-ver can now be used for EAPI 0-6, so |
4 |
> just unconditionally use it if EAPI != 7 |
5 |
> |
6 |
> Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
7 |
> --- |
8 |
> eclass/ant-tasks.eclass | 11 ++++++----- |
9 |
> 1 file changed, 6 insertions(+), 5 deletions(-) |
10 |
> |
11 |
> diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass |
12 |
> index e008e6eaea8..110344f712d 100644 |
13 |
> --- a/eclass/ant-tasks.eclass |
14 |
> +++ b/eclass/ant-tasks.eclass |
15 |
> @@ -16,7 +16,8 @@ |
16 |
> JAVA_ANT_DISABLE_ANT_CORE_DEP=true |
17 |
> # rewriting build.xml for are the testcases has no reason atm |
18 |
> JAVA_PKG_BSFIX_ALL=no |
19 |
> -inherit versionator java-pkg-2 java-ant-2 |
20 |
> +inherit java-pkg-2 java-ant-2 |
21 |
> +[[ ${EAPI} == 7 ]] || inherit eapi7-ver |
22 |
|
23 |
Always check for old EAPIs, instead of expecting people to keep updating |
24 |
this forever. |
25 |
|
26 |
> |
27 |
> EXPORT_FUNCTIONS src_unpack src_compile src_install |
28 |
> |
29 |
> @@ -60,12 +61,12 @@ if [[ ${PV} == *beta2* ]]; then |
30 |
> MY_PV=${PV/_beta2/beta} |
31 |
> UPSTREAM_PREFIX="http://people.apache.org/dist/ant/v1.7.1beta2/src" |
32 |
> GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
33 |
> - ANT_TASK_PV=$(get_version_component_range 1-3) |
34 |
> + ANT_TASK_PV=$(ver_cut 1-3) |
35 |
> elif [[ ${PV} == *_rc* ]]; then |
36 |
> MY_PV=${PV/_rc/RC} |
37 |
> UPSTREAM_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
38 |
> GENTOO_PREFIX="https://dev.gentoo.org/~caster/distfiles" |
39 |
> - ANT_TASK_PV=$(get_version_component_range 1-3) |
40 |
> + ANT_TASK_PV=$(ver_cut 1-3) |
41 |
> else |
42 |
> # default for final releases |
43 |
> MY_PV=${PV} |
44 |
> @@ -101,7 +102,7 @@ if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then |
45 |
> fi |
46 |
> |
47 |
> # we need direct blockers with old ant-tasks for file collisions - bug #252324 |
48 |
> -if version_is_at_least 1.7.1 ; then |
49 |
> +if ver_test -ge 1.7.1; then |
50 |
> DEPEND+=" !dev-java/ant-tasks" |
51 |
> fi |
52 |
> |
53 |
> @@ -167,7 +168,7 @@ ant-tasks_src_install() { |
54 |
> java-pkg_register-ant-task --version "${ANT_TASK_PV}" |
55 |
> |
56 |
> # create the compatibility symlink |
57 |
> - if version_is_at_least 1.7.1_beta2; then |
58 |
> + if ver_test -ge 1.7.1_beta2; then |
59 |
> dodir /usr/share/ant/lib |
60 |
> dosym /usr/share/${PN}/lib/${PN}.jar /usr/share/ant/lib/${PN}.jar |
61 |
> fi |
62 |
|
63 |
-- |
64 |
Best regards, |
65 |
Michał Górny |