From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SizCr-0004U6-CY for garchives@archives.gentoo.org; Mon, 25 Jun 2012 02:39:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6F4AE0713; Mon, 25 Jun 2012 02:39:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7725FE0713 for ; Mon, 25 Jun 2012 02:39:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94D371B421F for ; Mon, 25 Jun 2012 02:39:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 443BAE5431 for ; Mon, 25 Jun 2012 02:39:03 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1340591847.4ef716471e4879833cc3804d81bebf1bfa5e24fb.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, doc/package/ebuild/eapi/ X-VCS-Repository: proj/portage X-VCS-Files: bin/dohtml.py doc/package/ebuild/eapi/4-python.docbook X-VCS-Directories: bin/ doc/package/ebuild/eapi/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 4ef716471e4879833cc3804d81bebf1bfa5e24fb X-VCS-Branch: master Date: Mon, 25 Jun 2012 02:39:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b957b746-6973-4a26-9f5f-4951bbcca7da X-Archives-Hash: 3f954b0dcaa8070f206fb0dcfd60ce23 commit: 4ef716471e4879833cc3804d81bebf1bfa5e24fb Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Jun 25 02:37:27 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail = com> CommitDate: Mon Jun 25 02:37:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4ef71647 dohtml: Add .ico, .svg, .xhtml and .xml extensions to default list in EAP= I=3D"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 =20 -# - will install the files in the list of files (space-separated list) = into=20 +# dohtml +# - 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, .h= tm, # .html, .jpeg, .jpg, .js or .png. # dohtml -r -# - will do as 'dohtml', but recurse into all directories, as long as t= he=20 +# - will do as 'dohtml', but recurse into all directories, as long as t= he # directory name is not CVS # dohtml -A jpe,java [-r] # - will do as 'dohtml' but add .jpe,.java (default filter list is # added to your list) # dohtml -a png,gif,html,htm [-r] -# - will do as 'dohtml' but filter on .png,.gif,.html,.htm (default fil= ter=20 +# - will do as 'dohtml' but filter on .png,.gif,.html,.htm (default fil= ter # list is ignored) # dohtml -x CVS,SCCS,RCS -r # - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS @@ -88,7 +88,7 @@ class OptionsClass: self.PF =3D "" self.ED =3D "" self.DOCDESTTREE =3D "" - =09 + if "PF" in os.environ: self.PF =3D os.environ["PF"] if "force-prefix" not in os.environ.get("FEATURES", "").split() and \ @@ -98,8 +98,10 @@ class OptionsClass: self.ED =3D os.environ.get("ED", "") if "_E_DOCDESTTREE_" in os.environ: self.DOCDESTTREE =3D os.environ["_E_DOCDESTTREE_"] - =09 + self.allowed_exts =3D ['css', 'gif', 'htm', 'html', 'jpeg', 'jpg', 'js= ', 'png'] + if os.environ.get("EAPI", "0") in ("4-python",): + self.allowed_exts +=3D ['ico', 'svg', 'xhtml', 'xml'] self.allowed_files =3D [] self.disallowed_dirs =3D ['CVS'] self.recurse =3D False @@ -126,7 +128,7 @@ def print_help(): def parse_args(): options =3D OptionsClass() args =3D [] -=09 + x =3D 1 while x < len(sys.argv): arg =3D sys.argv[x] @@ -158,7 +160,7 @@ def parse_args(): else: args.append(sys.argv[x]) x +=3D 1 -=09 + return (options, args) =20 def main(): @@ -171,7 +173,7 @@ def main(): print("Allowed files :", options.allowed_files) =20 success =3D False -=09 + for x in args: basename =3D os.path.basename(x) dirname =3D os.path.dirname(x) diff --git a/doc/package/ebuild/eapi/4-python.docbook b/doc/package/ebuil= d/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 @@
Helpers +
+ Extended default list of extensions in dohtml + + dohtml by default additionally installs files with .ico, .svg, .xhtm= l and .xml extensions. + +
Helpers Banned in Global Scope