Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
Date: Thu, 01 Apr 2010 22:29:31
Message-Id: E1NxStE-0006kY-U2@stork.gentoo.org
1 caster 10/04/01 22:29:28
2
3 Modified: java-utils-2.eclass
4 Log:
5 Allow JAVA_PKG_NV_DEPEND override in java-pkg_needs-vm()
6
7 Revision Changes Path
8 1.134 eclass/java-utils-2.eclass
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.134&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.134&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.133&r2=1.134
13
14 Index: java-utils-2.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
17 retrieving revision 1.133
18 retrieving revision 1.134
19 diff -u -r1.133 -r1.134
20 --- java-utils-2.eclass 24 Mar 2010 12:11:05 -0000 1.133
21 +++ java-utils-2.eclass 1 Apr 2010 22:29:28 -0000 1.134
22 @@ -6,7 +6,7 @@
23 #
24 # Licensed under the GNU General Public License, v2
25 #
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.133 2010/03/24 12:11:05 betelgeuse Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 2010/04/01 22:29:28 caster Exp $
28
29 # -----------------------------------------------------------------------------
30 # @eclass-begin
31 @@ -2484,7 +2484,7 @@
32 java-pkg_needs-vm() {
33 debug-print-function ${FUNCNAME} $*
34
35 - if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then
36 + if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
37 return 0
38 fi