Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Wed, 31 Mar 2021 02:04:26
Message-Id: 1617156155.ab0730612d991bffc71d474510e463b2d89fe8cc.sam@gentoo
1 commit: ab0730612d991bffc71d474510e463b2d89fe8cc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 28 04:40:46 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 02:02:35 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab073061
7
8 ant-tasks.eclass: explicitly mark ANT_TASK_*VER as @PRE_INHERIT
9
10 They manage dependencies and the description clearly states
11 they should be used before inherit.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 eclass/ant-tasks.eclass | 6 +++++-
16 1 file changed, 5 insertions(+), 1 deletion(-)
17
18 diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
19 index 42f801a84d7..b03f3e4aa36 100644
20 --- a/eclass/ant-tasks.eclass
21 +++ b/eclass/ant-tasks.eclass
22 @@ -1,4 +1,4 @@
23 -# Copyright 2007-2020 Gentoo Authors
24 +# Copyright 2007-2021 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 # @ECLASS: ant-tasks.eclass
28 @@ -33,12 +33,14 @@ inherit java-pkg-2 java-ant-2
29 EXPORT_FUNCTIONS src_unpack src_compile src_install
30
31 # @ECLASS-VARIABLE: ANT_TASK_JDKVER
32 +# @PRE_INHERIT
33 # @DESCRIPTION:
34 # Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.8, can
35 # be overridden from ebuild BEFORE inheriting this eclass.
36 ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.8}
37
38 # @ECLASS-VARIABLE: ANT_TASK_JREVER
39 +# @PRE_INHERIT
40 # @DESCRIPTION:
41 # Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.8, can
42 # be overridden from ebuild BEFORE inheriting this eclass.
43 @@ -60,12 +62,14 @@ ANT_TASK_NAME="${PN#ant-}"
44 ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
45
46 # @ECLASS-VARIABLE: ANT_TASK_DISABLE_VM_DEPS
47 +# @PRE_INHERIT
48 # @DEFAULT_UNSET
49 # @DESCRIPTION:
50 # If set, no JDK/JRE deps are added.
51
52 # @VARIABLE: ANT_TASK_PV
53 # @INTERNAL
54 +# @DESCRIPTION:
55 # Version of ant-core this task is intended to register and thus load with.
56 ANT_TASK_PV="${PV}"