Gentoo Archives: gentoo-dev

From: James Le Cuirot <chewi@g.o>
To: gentoo-dev <gentoo-dev@l.g.o>
Cc: James Le Cuirot <chewi@g.o>
Subject: [gentoo-dev] [PATCH 2/2] java-utils-2.eclass: Drop sys-apps/portage build dependency
Date: Thu, 22 Mar 2018 21:23:54
Message-Id: 20180322212254.20519-2-chewi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/2] java-ant-2.eclass: Drop sys-apps/portage build dependency by James Le Cuirot
1 It originates from 2006 and should arguably have never been added.
2 ---
3 eclass/java-utils-2.eclass | 12 ++----------
4 1 file changed, 2 insertions(+), 10 deletions(-)
5
6 diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
7 index 25e35c33dd21..967050925245 100644
8 --- a/eclass/java-utils-2.eclass
9 +++ b/eclass/java-utils-2.eclass
10 @@ -1,4 +1,4 @@
11 -# Copyright 2004-2017 Gentoo Foundation
12 +# Copyright 2004-2018 Gentoo Foundation
13 # Distributed under the terms of the GNU General Public License v2
14
15 # @ECLASS: java-utils-2.eclass
16 @@ -25,21 +25,13 @@ export WANT_JAVA_CONFIG="2"
17 # Prefix variables are only available for EAPI>=3
18 has "${EAPI:-0}" 0 1 2 && ED="${D}" EPREFIX= EROOT="${ROOT}"
19
20 -# @VARIABLE: JAVA_PKG_PORTAGE_DEP
21 -# @INTERNAL
22 -# @DESCRIPTION:
23 -# The version of portage we need to function properly. Previously it was
24 -# portage with phase hooks support but now we use a version with proper env
25 -# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
26 -has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
27 -
28 # @VARIABLE: JAVA_PKG_E_DEPEND
29 # @INTERNAL
30 # @DESCRIPTION:
31 # This is a convience variable to be used from the other java eclasses. This is
32 # the version of java-config we want to use. Usually the latest stable version
33 # so that ebuilds can use new features without depending on specific versions.
34 -JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3 ${JAVA_PKG_PORTAGE_DEP}"
35 +JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3"
36 has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
37
38 # @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
39 --
40 2.16.1

Replies