| 1 |
ulm 12/09/28 15:18:04 |
| 2 |
|
| 3 |
Modified: eutils.eclass ChangeLog |
| 4 |
Log: |
| 5 |
Test for the EAPI explicitly, because it isn't required that package managers implement usex as a shell function. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.405 eclass/eutils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.405&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.405&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.404&r2=1.405 |
| 13 |
|
| 14 |
Index: eutils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
| 17 |
retrieving revision 1.404 |
| 18 |
retrieving revision 1.405 |
| 19 |
diff -u -r1.404 -r1.405 |
| 20 |
--- eutils.eclass 27 Sep 2012 17:12:34 -0000 1.404 |
| 21 |
+++ eutils.eclass 28 Sep 2012 15:18:04 -0000 1.405 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.404 2012/09/27 17:12:34 axs Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.405 2012/09/28 15:18:04 ulm Exp $ |
| 27 |
|
| 28 |
# @ECLASS: eutils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -1375,7 +1375,7 @@ |
| 31 |
# and use the package manager implementation when available (i.e. EAPI >= 5). |
| 32 |
# If USE flag is set, echo [true output][true suffix] (defaults to "yes"), |
| 33 |
# otherwise echo [false output][false suffix] (defaults to "no"). |
| 34 |
-if ! declare -F usex >/dev/null ; then |
| 35 |
+if has "${EAPI:-0}" 0 1 2 3 4; then |
| 36 |
usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963 |
| 37 |
fi |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.420 eclass/ChangeLog |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.420&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.420&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.419&r2=1.420 |
| 47 |
|
| 48 |
Index: ChangeLog |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 51 |
retrieving revision 1.419 |
| 52 |
retrieving revision 1.420 |
| 53 |
diff -u -r1.419 -r1.420 |
| 54 |
--- ChangeLog 28 Sep 2012 15:08:17 -0000 1.419 |
| 55 |
+++ ChangeLog 28 Sep 2012 15:18:04 -0000 1.420 |
| 56 |
@@ -1,6 +1,10 @@ |
| 57 |
# ChangeLog for eclass directory |
| 58 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.419 2012/09/28 15:08:17 axs Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.420 2012/09/28 15:18:04 ulm Exp $ |
| 61 |
+ |
| 62 |
+ 28 Sep 2012; Ulrich Müller <ulm@g.o> eutils.eclass: |
| 63 |
+ Test for the EAPI explicitly, because it isn't guaranteed that package |
| 64 |
+ managers implement usex as a shell function. |
| 65 |
|
| 66 |
28 Sep 2012; Ian Stakenvicius <axs@g.o> toolchain-funcs.eclass: |
| 67 |
reverted fatal error from unset KV and made it a warning only shown when |
Archives