diff options
author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-09-21 21:03:05 +0200 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-09-21 21:03:05 +0200 |
commit | 6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7 (patch) | |
tree | bd88f1bbac16d9ffe78341f896a9dafd94306a87 /bin | |
parent | Add _DEPCLEAN_LIB_CHECK_DEFAULT constant. (diff) | |
download | portage-6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7.tar.gz portage-6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7.tar.bz2 portage-6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7.zip |
Support EAPI="5-progress".
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/dohtml.py | 2 | ||||
-rwxr-xr-x | bin/ebuild.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/dohtml.py b/bin/dohtml.py index 3e80ef5f6..3af270509 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -106,7 +106,7 @@ class OptionsClass: self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"] self.allowed_exts = ['css', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'js', 'png'] - if os.environ.get("EAPI", "0") in ("4-python",): + if os.environ.get("EAPI", "0") in ("4-python", "5-progress"): self.allowed_exts += ['ico', 'svg', 'xhtml', 'xml'] self.allowed_files = [] self.disallowed_dirs = ['CVS'] diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a6ff45301..79da2b518 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -26,7 +26,7 @@ else __strip_duplicate_slashes \ use_with use_enable ; do eval "${x}() { - if has \"\${EAPI:-0}\" 4-python; then + if has \"\${EAPI:-0}\" 4-python 5-progress; then die \"\${FUNCNAME}() calls are not allowed in global scope\" fi }" @@ -35,7 +35,7 @@ else # `use multislot` is false for the "depend" phase. for x in use useq usev usex ; do eval "${x}() { - if has \"\${EAPI:-0}\" 4-python; then + if has \"\${EAPI:-0}\" 4-python 5-progress; then die \"\${FUNCNAME}() calls are not allowed in global scope\" else return 1 @@ -506,7 +506,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm depend && \ [[ -n $EAPI ]] || EAPI=0 fi -if has "${EAPI:-0}" 4-python; then +if has "${EAPI:-0}" 4-python 5-progress; then shopt -s globstar fi |