Require gawk, not generic awk; e.g. nawk reports syntax errors in yelp-tools awk scripts (bug #455656, thanks to Christoph Junghans).

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 106 insertions, 4 deletions

diff --git a/app-text/yelp-tools/ChangeLog b/app-text/yelp-tools/ChangeLog
index 1c0798c90fb0..cbc372be9269 100644
--- a/app-text/yelp-tools/ChangeLog
+++ b/app-text/yelp-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/yelp-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/ChangeLog,v 1.19 2013/01/28 13:49:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/ChangeLog,v 1.20 2013/02/06 03:29:14 tetromino Exp $
+
+*yelp-tools-3.6.1-r1 (06 Feb 2013)
+
+  06 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-tools-3.4.1.ebuild, yelp-tools-3.6.1.ebuild,
+  +yelp-tools-3.6.1-r1.ebuild, +files/yelp-tools-3.6.1-gawk.patch:
+  Require gawk, not generic awk; e.g. nawk reports syntax errors in yelp-tools
+  awk scripts (bug #455656, thanks to Christoph Junghans).
 
   28 Jan 2013; Alexis Ballier <aballier@gentoo.org> yelp-tools-3.6.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch b/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch
new file mode 100644
index 000000000000..322968ebccf8
--- /dev/null
+++ b/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch
@@ -0,0 +1,62 @@
+From 5321959587ee0597703328213eb46716a3c0bb09 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 5 Feb 2013 22:18:01 -0500
+Subject: [PATCH] Use gawk, not awk
+
+Some other awk implementations (e.g. nawk) fail with a syntax error:
+
+awk: syntax error at source line 2
+ context is
+     >>> BEGIN <<<  {
+---
+ tools/yelp-build.in | 4 ++--
+ tools/yelp-check.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/yelp-build.in b/tools/yelp-build.in
+index 1d70145..5058d6e 100755
+--- a/tools/yelp-build.in
++++ b/tools/yelp-build.in
+@@ -35,7 +35,7 @@ mkdir_p () {
+ }
+ 
+ urlencode () {
+-    LANG=C awk '
++    LANG=C gawk '
+ BEGIN {
+   for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
+ }
+@@ -53,7 +53,7 @@ BEGIN {
+ }
+ 
+ urldecode () {
+-    LANG=C awk '
++    LANG=C gawk '
+ BEGIN {
+   for(i = 0; i < 10; i++) hex[i] = i;
+   hex["A"] = hex["a"] = 10;
+diff --git a/tools/yelp-check.in b/tools/yelp-check.in
+index a258290..4961d67 100755
+--- a/tools/yelp-check.in
++++ b/tools/yelp-check.in
+@@ -30,7 +30,7 @@ urlencode () {
+     else
+         urlencode_slash='\/'
+     fi
+-    echo "$1" | LANG=C awk '
++    echo "$1" | LANG=C gawk '
+ BEGIN {
+   for (i = 1; i <= 255; i++) chars[sprintf("%c", i)] = i;
+ }
+@@ -48,7 +48,7 @@ BEGIN {
+ }
+ 
+ urldecode () {
+-    echo "$1" | LANG=C awk '
++    echo "$1" | LANG=C gawk '
+ BEGIN {
+   for(i = 0; i < 10; i++) hex[i] = i;
+   hex["A"] = hex["a"] = 10;
+-- 
+1.8.1.2
+
diff --git a/app-text/yelp-tools/yelp-tools-3.4.1.ebuild b/app-text/yelp-tools/yelp-tools-3.4.1.ebuild
index 735ef588112f..4013876aa52f 100644
--- a/app-text/yelp-tools/yelp-tools-3.4.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.7 2012/12/19 15:54:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.8 2013/02/06 03:29:14 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
 IUSE=""
 
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8
 	dev-util/itstool
diff --git a/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild b/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..b8655fd54f16
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild,v 1.1 2013/02/06 03:29:14 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
+RDEPEND=">=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	gnome-extra/yelp-xsl
+	sys-apps/gawk"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch"
+	default
+}
diff --git a/app-text/yelp-tools/yelp-tools-3.6.1.ebuild b/app-text/yelp-tools/yelp-tools-3.6.1.ebuild
index c6253bdc1427..c72cb0fcabe2 100644
--- a/app-text/yelp-tools/yelp-tools-3.6.1.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.9 2013/01/28 13:49:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.10 2013/02/06 03:29:14 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,6 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
+# Requires gawk, not virtual/awk; using nawk as awk results in syntax errors
 RDEPEND=">=dev-libs/libxml2-2.6.12
 	>=dev-libs/libxslt-1.1.8
 	dev-util/itstool