[gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp-xsl/files/

[gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp-xsl/files/

[Alexandre Rostovtsev]

commit:     9d428bd0b8ef0915ea8e3f68666a9ff1b39b4eb2
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 03:49:53 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 03:51:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9d428bd0

gnome-extra/yelp-xsl: sync with gx86

Require gawk, not virtual/awk (bug #455730).

---
 .../yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch       |   59 ++++++++++++++++++++
 gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild          |   13 +++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch b/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
new file mode 100644
index 0000000..9f06c43
--- /dev/null
+++ b/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
@@ -0,0 +1,59 @@
+From 7dfe59cd3ed75a245804ea3081460988c4affdee Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 5 Feb 2013 22:41:14 -0500
+Subject: [PATCH] Use gawk, not awk
+
+Despite all attempts to be compatible with other awks, using some (e.g.
+nawk) still results in syntax errors:
+
+nawk: syntax error at source line 3 source file
+doc/yelp-xsl/xsldoc-scan.awk
+ context is
+        # -*- indent-tabs-mode: nil -*- >>>
+ <<<
+        2 extra }'s
+---
+ doc/yelp-xsl/mal2cache       | 2 +-
+ doc/yelp-xsl/xsldoc-scan     | 2 +-
+ doc/yelp-xsl/xsldoc-scan.awk | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/doc/yelp-xsl/mal2cache b/doc/yelp-xsl/mal2cache
+index a7a23ee..6beaa64 100755
+--- a/doc/yelp-xsl/mal2cache
++++ b/doc/yelp-xsl/mal2cache
+@@ -2,7 +2,7 @@
+ # -*- indent-tabs-mode: nil -*-
+ export LANG=C
+ urlencode() {
+-    echo "$1" | awk --posix '
++    echo "$1" | gawk --posix '
+ BEGIN {
+   for (i = 1; i <= 256; i++) {
+     bytes[sprintf("%c", i)] = i;
+diff --git a/doc/yelp-xsl/xsldoc-scan b/doc/yelp-xsl/xsldoc-scan
+index 63e713b..892bb3a 100755
+--- a/doc/yelp-xsl/xsldoc-scan
++++ b/doc/yelp-xsl/xsldoc-scan
+@@ -9,7 +9,7 @@ while [ "$#" != "0" ]; do
+     else
+         fullfile=$(cd $(dirname "$1") && pwd)/$(basename "$1")
+         outfile=$(basename "$1" .xsl)
+-        awk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
++        gawk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
+             xsltproc -o "$outdir/$outfile".page \
+             --stringparam xsldoc.id "$outfile" \
+             --stringparam xsldoc.xslt_file "$fullfile" \
+diff --git a/doc/yelp-xsl/xsldoc-scan.awk b/doc/yelp-xsl/xsldoc-scan.awk
+index a8859df..83e976a 100644
+--- a/doc/yelp-xsl/xsldoc-scan.awk
++++ b/doc/yelp-xsl/xsldoc-scan.awk
+@@ -1,4 +1,4 @@
+-#!/bin/awk
++#!/usr/bin/env gawk
+ # -*- indent-tabs-mode: nil -*-
+ # xsldoc.awk - Convert inline documentation to XML suitable for xsldoc.xsl
+ # Copyright (C) 2006 Shaun McCance <shaunm@gnome.org>
+-- 
+1.8.1.2
+

diff --git a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
index 2d52218..122d125 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
-inherit gnome.org
+inherit eutils gnome.org
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -18,14 +18,21 @@ IUSE=""
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8"
+# Requires gawk, not virtual/awk: nawk fails with syntax errors
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/itstool
 	sys-apps/gawk
 	sys-devel/gettext
 	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
+	sed -e 's/$(YELP_XSL_AWK)/gawk/' -i doc/yelp-xsl/Makefile.{am,in} || die
+	default
+}

[gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp-xsl/files/

[Alexandre Rostovtsev]

commit:     e7914bd1b47b9dcb276b9c8efbaaab841764eea9
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  6 05:14:00 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Feb  6 05:14:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e7914bd1

gnome-extra/yelp-xsl: virtual/awk is fine; only nawk is broken

---
 .../yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch       |   59 --------------------
 gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild          |   11 +---
 2 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch b/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
deleted file mode 100644
index 9f06c43..0000000
--- a/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7dfe59cd3ed75a245804ea3081460988c4affdee Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 5 Feb 2013 22:41:14 -0500
-Subject: [PATCH] Use gawk, not awk
-
-Despite all attempts to be compatible with other awks, using some (e.g.
-nawk) still results in syntax errors:
-
-nawk: syntax error at source line 3 source file
-doc/yelp-xsl/xsldoc-scan.awk
- context is
-        # -*- indent-tabs-mode: nil -*- >>>
- <<<
-        2 extra }'s
----
- doc/yelp-xsl/mal2cache       | 2 +-
- doc/yelp-xsl/xsldoc-scan     | 2 +-
- doc/yelp-xsl/xsldoc-scan.awk | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/yelp-xsl/mal2cache b/doc/yelp-xsl/mal2cache
-index a7a23ee..6beaa64 100755
---- a/doc/yelp-xsl/mal2cache
-+++ b/doc/yelp-xsl/mal2cache
-@@ -2,7 +2,7 @@
- # -*- indent-tabs-mode: nil -*-
- export LANG=C
- urlencode() {
--    echo "$1" | awk --posix '
-+    echo "$1" | gawk --posix '
- BEGIN {
-   for (i = 1; i <= 256; i++) {
-     bytes[sprintf("%c", i)] = i;
-diff --git a/doc/yelp-xsl/xsldoc-scan b/doc/yelp-xsl/xsldoc-scan
-index 63e713b..892bb3a 100755
---- a/doc/yelp-xsl/xsldoc-scan
-+++ b/doc/yelp-xsl/xsldoc-scan
-@@ -9,7 +9,7 @@ while [ "$#" != "0" ]; do
-     else
-         fullfile=$(cd $(dirname "$1") && pwd)/$(basename "$1")
-         outfile=$(basename "$1" .xsl)
--        awk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
-+        gawk -f $(dirname "$0")/xsldoc-scan.awk "$1" | \
-             xsltproc -o "$outdir/$outfile".page \
-             --stringparam xsldoc.id "$outfile" \
-             --stringparam xsldoc.xslt_file "$fullfile" \
-diff --git a/doc/yelp-xsl/xsldoc-scan.awk b/doc/yelp-xsl/xsldoc-scan.awk
-index a8859df..83e976a 100644
---- a/doc/yelp-xsl/xsldoc-scan.awk
-+++ b/doc/yelp-xsl/xsldoc-scan.awk
-@@ -1,4 +1,4 @@
--#!/bin/awk
-+#!/usr/bin/env gawk
- # -*- indent-tabs-mode: nil -*-
- # xsldoc.awk - Convert inline documentation to XML suitable for xsldoc.xsl
- # Copyright (C) 2006 Shaun McCance <shaunm@gnome.org>
--- 
-1.8.1.2
-

diff --git a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
index 122d125..4b26000 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils gnome.org
+inherit gnome.org
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -23,16 +23,9 @@ fi
 
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8"
-# Requires gawk, not virtual/awk: nawk fails with syntax errors
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	dev-util/itstool
-	sys-apps/gawk
 	sys-devel/gettext
+	virtual/awk
 	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
-	sed -e 's/$(YELP_XSL_AWK)/gawk/' -i doc/yelp-xsl/Makefile.{am,in} || die
-	default
-}