Ensure gawk, not virtual/awk is used; nawk fails on build scripts with syntax errors (bug #455730, thanks to Christoph Junghans). Drop old.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 96 insertions, 38 deletions

diff --git a/gnome-extra/yelp-xsl/ChangeLog b/gnome-extra/yelp-xsl/ChangeLog
index ccf2950ffd35..49449f60c561 100644
--- a/gnome-extra/yelp-xsl/ChangeLog
+++ b/gnome-extra/yelp-xsl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp-xsl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/ChangeLog,v 1.20 2013/01/28 13:48:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/ChangeLog,v 1.21 2013/02/06 03:52:06 tetromino Exp $
+
+  06 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -yelp-xsl-3.2.1.ebuild, yelp-xsl-3.4.2.ebuild, yelp-xsl-3.6.1.ebuild,
+  +files/yelp-xsl-3.6.1-gawk.patch:
+  Ensure gawk, not virtual/awk is used; nawk fails on build scripts with syntax
+  errors (bug #455730, thanks to Christoph Junghans). Drop old.
 
   28 Jan 2013; Alexis Ballier <aballier@gentoo.org> yelp-xsl-3.6.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index a3d638bacb82..7c8187209275 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST yelp-xsl-3.2.1.tar.xz 556512 SHA256 76159759ccff4003c13a9fd14de82f334978165f88dd3716efa98382285a06a6 SHA512 08f94c8e5668aaa1f2e9c01d699aeccf644631d238574b0de295d0813368e05434abeef126e8dca3a01029beb5f09947a56c3b6402e31f90ca2ad4441910bc66 WHIRLPOOL 9982d8b389b711ce49a57918336cca6bfe983293dd868cdb37b5005d71782de7c21fd9eeef80d710d5ad437409eb5be61401003354cd47b4fa0f0b8a6d56361a
+AUX yelp-xsl-3.6.1-gawk.patch 1980 SHA256 3b536c2dd2813e625ff65e4a5188b7b95379d70f7362975204b47cfe63c46ea7 SHA512 61527bbaef787a6d76b3b23d8991ae71ad9f671debe78b59681b5ca4a484a5f7db9fde1f14fd17e5736576217878d4e29db0f8b5ad45ff32aaf7a6aaa74e7e09 WHIRLPOOL f4a1d177d4a8af6792d054d7a23f2e51d630ab95d4ce208c883f97efd64a1ffd9299bb87fb5cfc578ee9090e0dcb53e60f6d973dd97254e4769a15b72628f3f4
 DIST yelp-xsl-3.4.2.tar.xz 585248 SHA256 421b622da421f310add15c9d0cf23f3d66c3e0847292f45341e2f6b2db326325 SHA512 31a662ba0ba20871f89a26c254c3f13030541f592901913f76d1c0010148ad84a809cbd0c7335fa1ba534c5d6da64bca49ea1b79775c927107c21425a7fb77b9 WHIRLPOOL 388515bfbd9dc6910c57452e92b28d747278ad0e47a4356aef6821e4fab0c46fc510a98b03ad5a7c885cf53ebf76f5006b188a306cd000b6c286158d81f8db3e
 DIST yelp-xsl-3.6.1.tar.xz 589500 SHA256 9cac9770d6ace354f3e56a2e60933bb0cd894a4263a3bf1db6e8900f86f8cdd6 SHA512 8c097361d1f238b02d750e702f4eb72d56630e71b168634f4cabbfa9724719fced9b582c6c2e693b94f9045ec00313478b04e8d7a1f3fc87fd7ad140f7e5847a WHIRLPOOL 15e90968cf321ae8ca5f9acc6e1407f6b15a3d17b779ffdbe0380c4b5905870b3e3917f46e4a87ac19c07eccd105f1513e3f0041932af25d68abc9abc6c53475
-EBUILD yelp-xsl-3.2.1.ebuild 618 SHA256 ea61ed794b30b58baddb6ce9b2569d87ad265f46dafbcb3da406abebc5d89265 SHA512 1287d59a24258c52dfef53bd5dd291d78dfe0d4df2bbde3b06c8e7bcd15c1a22b2258d565c1ca8ed5cff0ce88352659314cb6464e6b0917227cd5e792de7647d WHIRLPOOL 0976e589cd6da1ff4d742af5a04433cd095742746dd595c29f70471442a3a01b560ab40699c122d3553d7aecda6d1af176a1fdb916c9de15480455743141d12d
-EBUILD yelp-xsl-3.4.2.ebuild 630 SHA256 b7ba14840614a18d8cae7db14201dfb3b133bddc0c460659ed520dfff6165412 SHA512 1b20e9719d8fab6185e7428ccb4da5392a8cc1ff60f47ebf91e91bbb3923b75f74c907563ad370284c2c6edcad006c80de99f6b28ebb1e97ab75ffc28e6c2db6 WHIRLPOOL ddbb5cde9dcd129dab74343702c1d38481f9e74e5f41a1c572ba04c7dc729bdc8a5964ead965319e6329b9f6555ca1b715c64570ba41bb84060b2c16e7dc06f9
-EBUILD yelp-xsl-3.6.1.ebuild 674 SHA256 30e46e59f34a2fb336b7818533e36797bc79eb4dfa662ae2e0129fcb6c6bca8e SHA512 cc2f7cbcf5155246d11b0babbd24ee6bb527f4cc48b5ec5072ee4815a257a5ec123898348df38b417c7230e9689c478235a7d0163b84141443f6a9ce32aca7f4 WHIRLPOOL 0862ae1a28c41a97a439fca57b5608ed1d8710cacd9ff353ff8144592fb3555ef0bdfe2a0600e4294fadd98f1cfafe07b65d1739fba007d8a422e4f9b76cd9df
-MISC ChangeLog 2879 SHA256 6f939ad5c3aa31b9e8c54a83e84487a8479fc81d88c9ae674893fc8fa2cbe49c SHA512 b3af1362470825e423e9c8296e9d7992512b8ab3285e94360db2ad0bdc76d317cd43382d94e043f2f9cad58678f9018e4c42f771c9b12938d98b5fd8f6b90507 WHIRLPOOL 5107d87d0f7f1d6c4f68287b7254fabf8ea4b6b9e664222b2d2f98ebd60a9a05936ee14be3f9622711bcc5d66079bd051f558307c7741fd62d1ba263ca47aed8
+EBUILD yelp-xsl-3.4.2.ebuild 854 SHA256 8dc9f9e204fed74af8d66fbf6e007392ae0b6d4fd4c60530357ae3d3baf55224 SHA512 6e228131504b1177fc87f04426cab7e44739f0bc5ce110c324bce9b0be961e8c644ab52d006f4cc1cee2ce2d0521d6c51e9c792ff0dc94e35bce1d1a560dec2e WHIRLPOOL 523d496d3008df7f0751ecbe4de19f967a0a6d4803427099bdc63b534f18961e158bae2acb3326f80215e24fa494885953769ea799603ba20562a54d2294904d
+EBUILD yelp-xsl-3.6.1.ebuild 894 SHA256 f8a024ed169d5a96e3fc5f69334f41383611a3cbcfd6b9f8982b396941f6697f SHA512 5e8983b794be471d30e4a45a27dc66c65560b14c68012c8b973c453746c4b64299f7e3b235b06cde9731a850b382a7baebcc31e8624034896759cb2f5c46e54c WHIRLPOOL 9d7984cda9289d5988ae2f0969272dd5b8785067ee50d904d65f307ecfb542bf5095e1376735db165ba8387f0a7900ebfdc9deeb6e76c266094decea4a963dd5
+MISC ChangeLog 3192 SHA256 52e9d8a51829504d982c507c4289de3275544ad08de6385f0650563f331a23f7 SHA512 033fae4b7b2849b3e0a7b80c5cd2e1d4cce164712adf1f2fbd159d3b1769b3d04b534cd1119c5ce557d035609a4d29028311cd82cc5c25c9fa1940aefec7afc5 WHIRLPOOL f86f8da76895745aa1dbce1b31819f9c0fbc45bbb601f8cde3b45a5eef28e1c47eac37cc586e74bf71c31e660d9bf628a4f6b15a27cf40c5f13073335177d74f
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEGgaYACgkQvFcC4BYPU0o2bQCgnQu4o/ygl4TGLKOSWscLD+48
-4/EAni96vWbnrrHzBqckI6jRlmp6U/Dp
-=4bIR
+iQEcBAEBCAAGBQJREdNnAAoJEJ0WA1zPCt1hZGkH+wf8hgWEPrXRb67kiFqdaNAm
+YtPkOieAjiWpJqCtwhU2rT/5sRcyPWvvlMX85n1qotxiGf9sdTkomwoh2PZffjyp
+kCEzjtJtGH+EqSwLWv6KbBy37KxeliL0J0EhBlFyqYh/byJQZ+dcWbnieV0kGcHP
+45aWlJDRvHk4+BbVHe3ey8Rn5fEKVUeqTzRR5JPkgZKdm4Hjpz9/r2poUpByGqEp
+2VRCOtyE7mk6H0ISfPk4eePcKTaH6tQEGS9vZR9im0lzTSuo07yXNhDl9HMY+wz5
+YdRA5qvRFTNd2uDW3t9hGGkdKkg66p1kLiJSSv4BwB6dJnO8c0Qr5rjselrh5Sg=
+=axLk
 -----END PGP SIGNATURE-----
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 000000000000..9f06c436050c
--- /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-3.2.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
deleted file mode 100644
index fc6418d8e32b..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.2.1.ebuild,v 1.5 2012/12/16 10:12:24 tetromino Exp $
-
-EAPI="4"
-
-inherit gnome.org
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8"
-DEPEND="${RDEPEND}
-	sys-apps/gawk
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	dev-util/itstool
-	virtual/pkgconfig"
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
index d082126057ad..c902e6f650b9 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.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: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.7 2012/12/19 15:54:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.8 2013/02/06 03:52:06 tetromino Exp $
 
 EAPI="4"
 
-inherit gnome.org
+inherit eutils gnome.org
 
 DESCRIPTION="XSL stylesheets for yelp"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,9 +16,16 @@ IUSE=""
 
 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
+}
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
index 3c73079579b5..4c8b6a275d80 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.9 2013/01/28 13:48:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.10 2013/02/06 03:52:06 tetromino Exp $
 
 EAPI="5"
 
-inherit gnome.org
+inherit eutils gnome.org
 
 DESCRIPTION="XSL stylesheets for yelp"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,9 +16,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fb
 
 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
+}