* [gentoo-commits] proj/portage:master commit in: bin/, doc/package/ebuild/eapi/
@ 2012-05-05 16:03 Arfrever Frehtes Taifersar Arahesis
0 siblings, 0 replies; 3+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2012-05-05 16:03 UTC (permalink / raw
To: gentoo-commits
commit: e3d3ff4f22f5e41f12b2518d23ebea354a006b7b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat May 5 16:00:57 2012 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Sat May 5 16:00:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e3d3ff4f
Enable globstar shell option by default in EAPI="4-python".
---
bin/ebuild.sh | 4 ++++
doc/package/ebuild/eapi/4-python.docbook | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 173865c..32dc64f 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -512,6 +512,10 @@ if ! has "$EBUILD_PHASE" clean cleanrm depend && \
[[ -n $EAPI ]] || EAPI=0
fi
+if has "${EAPI:-0}" 4-python; then
+ shopt -s globstar
+fi
+
if ! has "$EBUILD_PHASE" clean cleanrm ; then
if [[ $EBUILD_PHASE = depend || ! -f $T/environment || \
-f $PORTAGE_BUILDDIR/.ebuild_changed ]] || \
diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuild/eapi/4-python.docbook
index b4cbc1a..99ad197 100644
--- a/doc/package/ebuild/eapi/4-python.docbook
+++ b/doc/package/ebuild/eapi/4-python.docbook
@@ -31,6 +31,12 @@ official EAPI 4-python Specification</ulink>.
The "." character is allowed in USE flags.
</para>
</section>
+<section id='package-ebuild-eapi-4-python-globstar'>
+<title>globstar shell option enabled by default</title>
+<para>
+globstar shell option is enabled by default, which enables recursive expansion of ** pattern in pathname expansion context.
+</para>
+</section>
<section id='package-ebuild-eapi-4-python-repository-variable'>
<title>REPOSITORY Variable</title>
<para>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/portage:master commit in: bin/, doc/package/ebuild/eapi/
@ 2012-06-25 2:39 Arfrever Frehtes Taifersar Arahesis
0 siblings, 0 replies; 3+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2012-06-25 2:39 UTC (permalink / raw
To: gentoo-commits
commit: 4ef716471e4879833cc3804d81bebf1bfa5e24fb
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jun 25 02:37:27 2012 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Mon Jun 25 02:37:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4ef71647
dohtml: Add .ico, .svg, .xhtml and .xml extensions to default list in EAPI="4-python".
---
bin/dohtml.py | 20 +++++++++++---------
doc/package/ebuild/eapi/4-python.docbook | 6 ++++++
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/bin/dohtml.py b/bin/dohtml.py
index 96e78ef..ba16b46 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -11,18 +11,18 @@
#
#
# Detailed usage:
-# dohtml <list-of-files>
-# - will install the files in the list of files (space-separated list) into
+# dohtml <list-of-files>
+# - will install the files in the list of files (space-separated list) into
# /usr/share/doc/${PF}/html, provided the file ends in .css, .gif, .htm,
# .html, .jpeg, .jpg, .js or .png.
# dohtml -r <list-of-files-and-directories>
-# - will do as 'dohtml', but recurse into all directories, as long as the
+# - will do as 'dohtml', but recurse into all directories, as long as the
# directory name is not CVS
# dohtml -A jpe,java [-r] <list-of-files[-and-directories]>
# - will do as 'dohtml' but add .jpe,.java (default filter list is
# added to your list)
# dohtml -a png,gif,html,htm [-r] <list-of-files[-and-directories]>
-# - will do as 'dohtml' but filter on .png,.gif,.html,.htm (default filter
+# - will do as 'dohtml' but filter on .png,.gif,.html,.htm (default filter
# list is ignored)
# dohtml -x CVS,SCCS,RCS -r <list-of-files-and-directories>
# - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS
@@ -88,7 +88,7 @@ class OptionsClass:
self.PF = ""
self.ED = ""
self.DOCDESTTREE = ""
-
+
if "PF" in os.environ:
self.PF = os.environ["PF"]
if "force-prefix" not in os.environ.get("FEATURES", "").split() and \
@@ -98,8 +98,10 @@ class OptionsClass:
self.ED = os.environ.get("ED", "")
if "_E_DOCDESTTREE_" in os.environ:
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",):
+ self.allowed_exts += ['ico', 'svg', 'xhtml', 'xml']
self.allowed_files = []
self.disallowed_dirs = ['CVS']
self.recurse = False
@@ -126,7 +128,7 @@ def print_help():
def parse_args():
options = OptionsClass()
args = []
-
+
x = 1
while x < len(sys.argv):
arg = sys.argv[x]
@@ -158,7 +160,7 @@ def parse_args():
else:
args.append(sys.argv[x])
x += 1
-
+
return (options, args)
def main():
@@ -171,7 +173,7 @@ def main():
print("Allowed files :", options.allowed_files)
success = False
-
+
for x in args:
basename = os.path.basename(x)
dirname = os.path.dirname(x)
diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuild/eapi/4-python.docbook
index 8420abb..ec5fd83 100644
--- a/doc/package/ebuild/eapi/4-python.docbook
+++ b/doc/package/ebuild/eapi/4-python.docbook
@@ -5,6 +5,12 @@
</para>
<section id='package-ebuild-eapi-4-python-helpers'>
<title>Helpers</title>
+ <section id='package-ebuild-eapi-4-python-helpers-dohtml-extended-default-list-of-extensions'>
+ <title>Extended default list of extensions in dohtml</title>
+ <para>
+ dohtml by default additionally installs files with .ico, .svg, .xhtml and .xml extensions.
+ </para>
+ </section>
<section id='package-ebuild-eapi-4-python-helpers-banned-in-global-scope'>
<title>Helpers Banned in Global Scope</title>
<para>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/portage:master commit in: bin/, doc/package/ebuild/eapi/
@ 2013-09-11 21:23 Arfrever Frehtes Taifersar Arahesis
0 siblings, 0 replies; 3+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis @ 2013-09-11 21:23 UTC (permalink / raw
To: gentoo-commits
commit: ad71b3444750599b88cf145af83a1edd16226976
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Sep 11 21:22:18 2013 +0000
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Wed Sep 11 21:22:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ad71b344
EAPI="5-progress": Support case-insensitive matching of extensions in unpack().
---
bin/eapi.sh | 2 +-
doc/package/ebuild/eapi/5-progress.docbook | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/bin/eapi.sh b/bin/eapi.sh
index 5d5b36d..623b89f 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -135,7 +135,7 @@ ___eapi_disallows_helpers_in_global_scope() {
}
___eapi_unpack_is_case_sensitive() {
- true
+ [[ ${1-${EAPI}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend)$ ]]
}
# OTHERS
diff --git a/doc/package/ebuild/eapi/5-progress.docbook b/doc/package/ebuild/eapi/5-progress.docbook
index 5fd623b..6493d7e 100644
--- a/doc/package/ebuild/eapi/5-progress.docbook
+++ b/doc/package/ebuild/eapi/5-progress.docbook
@@ -53,6 +53,12 @@
dohtml by default additionally installs files with .ico, .svg, .xhtml and .xml extensions.
</para>
</section>
+ <section id='package-ebuild-eapi-5-progress-helpers-unpack-case-insensitive'>
+ <title>Case-insensitive matching of extensions in unpack</title>
+ <para>
+ unpack matches extensions case-insensitively.
+ </para>
+ </section>
<section id='package-ebuild-eapi-5-progress-helpers-banned-in-global-scope'>
<title>Helpers Banned in Global Scope</title>
<para>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-11 21:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-11 21:23 [gentoo-commits] proj/portage:master commit in: bin/, doc/package/ebuild/eapi/ Arfrever Frehtes Taifersar Arahesis
-- strict thread matches above, loose matches on Subject: below --
2012-06-25 2:39 Arfrever Frehtes Taifersar Arahesis
2012-05-05 16:03 Arfrever Frehtes Taifersar Arahesis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox