| 1 |
betelgeuse 10/01/28 22:00:13 |
| 2 |
|
| 3 |
Modified: eutils.eclass |
| 4 |
Log: |
| 5 |
Only define epause and ebeep in EAPIs 0 1 2. Mark built_with_use as deprecated. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.329 eclass/eutils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.329&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?rev=1.329&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/eutils.eclass?r1=1.328&r2=1.329 |
| 13 |
|
| 14 |
Index: eutils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
| 17 |
retrieving revision 1.328 |
| 18 |
retrieving revision 1.329 |
| 19 |
diff -u -r1.328 -r1.329 |
| 20 |
--- eutils.eclass 10 Jan 2010 15:58:58 -0000 1.328 |
| 21 |
+++ eutils.eclass 28 Jan 2010 22:00:12 -0000 1.329 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2009 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.328 2010/01/10 15:58:58 scarabeus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.329 2010/01/28 22:00:12 betelgeuse Exp $ |
| 27 |
|
| 28 |
# @ECLASS: eutils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -19,13 +19,15 @@ |
| 31 |
|
| 32 |
DESCRIPTION="Based on the ${ECLASS} eclass" |
| 33 |
|
| 34 |
+if has "${EAPI:-0}" 0 1 2; then |
| 35 |
+ |
| 36 |
# @FUNCTION: epause |
| 37 |
# @USAGE: [seconds] |
| 38 |
# @DESCRIPTION: |
| 39 |
# Sleep for the specified number of seconds (default of 5 seconds). Useful when |
| 40 |
# printing a message the user should probably be reading and often used in |
| 41 |
# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set, |
| 42 |
-# don't wait at all. |
| 43 |
+# don't wait at all. Defined in EAPIs 0 1 and 2. |
| 44 |
epause() { |
| 45 |
[[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} |
| 46 |
} |
| 47 |
@@ -36,7 +38,7 @@ |
| 48 |
# Issue the specified number of beeps (default of 5 beeps). Useful when |
| 49 |
# printing a message the user should probably be reading and often used in |
| 50 |
# conjunction with the epause function. If the EBEEP_IGNORE env var is set, |
| 51 |
-# don't beep at all. |
| 52 |
+# don't beep at all. Defined in EAPIs 0 1 and 2. |
| 53 |
ebeep() { |
| 54 |
local n |
| 55 |
if [[ -z ${EBEEP_IGNORE} ]] ; then |
| 56 |
@@ -49,6 +51,8 @@ |
| 57 |
fi |
| 58 |
} |
| 59 |
|
| 60 |
+fi |
| 61 |
+ |
| 62 |
# @FUNCTION: ecvs_clean |
| 63 |
# @USAGE: [list of dirs] |
| 64 |
# @DESCRIPTION: |
| 65 |
@@ -1745,6 +1749,9 @@ |
| 66 |
# @FUNCTION: built_with_use |
| 67 |
# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags> |
| 68 |
# @DESCRIPTION: |
| 69 |
+# |
| 70 |
+# Deprecated: Use EAPI 2 use deps in DEPEND|RDEPEND and with has_version calls. |
| 71 |
+# |
| 72 |
# A temporary hack until portage properly supports DEPENDing on USE |
| 73 |
# flags being enabled in packages. This will check to see if the specified |
| 74 |
# DEPEND atom was built with the specified list of USE flags. The |
Archives