Undo previous commit: yelp-tools works with all virtual/awk implementations except for nawk, which is buggy (see bug #455786). However, the ebuild cannot switch to virtual/awk until it's keyworded on amd64-fbsd.

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

6 files changed, 20 insertions, 109 deletions

diff --git a/app-text/yelp-tools/ChangeLog b/app-text/yelp-tools/ChangeLog
index cbc372be9269..597b873424ce 100644
--- a/app-text/yelp-tools/ChangeLog
+++ b/app-text/yelp-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2013/02/06 03:29:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/ChangeLog,v 1.21 2013/02/06 04:53:23 tetromino Exp $
+
+  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:
+  Undo previous commit: yelp-tools works with all virtual/awk implementations
+  except for nawk, which is buggy (see bug #455786). However, the ebuild
+  cannot switch to virtual/awk until it's keyworded on amd64-fbsd.
 
 *yelp-tools-3.6.1-r1 (06 Feb 2013)
 
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 732767c8f14e..30abb50705c9 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX yelp-tools-3.6.1-gawk.patch 1454 SHA256 6886051f8b29d6bfddac78179ffb741535045bf0ec3cf59f1435495b14b32ef9 SHA512 aec9ec342f7558177693cc526b59e0afc74f854f839829a459e043f0c83cd575f4c58dd3e7cee8e25c9476516a85731ca749542cc242d4e3248f6bdf93df5c4f WHIRLPOOL 8faf9309200ef25e5ede2022d927dc7260e2ba968da17f8d2d41d34387120ab72c901a39f661cc0ba3555cfc33571a62ab939529427f1e8e7774fb7a5db87f6a
 DIST yelp-tools-3.4.1.tar.xz 196204 SHA256 21f72c853020f71c526e79245ffabb15258b5f6030c64d41a3911740bd95b9c5 SHA512 8191f6a094e5ae3eb7f160a90198b741c01bd422c79d70f800209035f17a3c2a03ce03fa4ba076d508db2ecd770662f1e432f097add4ebce6b748ad47e38dd94 WHIRLPOOL 8710739cf704801ed3ca5dc8db8986695156658f6972f49f9aa7f6ec60e28a837aa70d29361fb3b2f3504b9404a42ed249e7cbe26a5f3917ed65c45c527acb48
 DIST yelp-tools-3.6.1.tar.xz 196812 SHA256 5226e8245bb87f10e485aa65f5bf18d9e4fb5ef82f2e3c3734dd91bdf6f5c19a SHA512 10d23fcc6e3b27ce98956a173de7b9cf5aab7b3dbae7f3d50ad29ca8d1aa56446c588f4237094b1da47f5bc98a7d0f5ddb225ad98a312aa6d0eab45982526c65 WHIRLPOOL 46fff0ca6031eb56f9f70205e49390eb39f0b69348545bb90a2e81d0322dac4341c7700c3fa65ec71218269f3ad349fbed29b814b8ddc8b8e96539b604afc283
-EBUILD yelp-tools-3.4.1.ebuild 782 SHA256 884abebbf7d499e8067f95bdc7fea6eb0a98c1efc22b36bc6ec481025737999f SHA512 e68d035bbeca8bea99d4ba7c08f5a9f598a43e6c113cf0190221c67f8c0b242e278fdf85895cf6f611bee471e17e85e685a61e1259006ef12d6713cd1d68844c WHIRLPOOL cdc25be5585b6fffa086145fcfdaede9cd214e369f827e05e6c3bcaaa2f563557a799b4d4a4049defadd34b6b7ebe8d1202c413548952e77db6cf3e8d7b91e9b
-EBUILD yelp-tools-3.6.1-r1.ebuild 876 SHA256 ea46b1a092db733cdaf639cba4080658198841657151da494343769a3cc6fea3 SHA512 6a129f1758fed11749bc27b1ad4f0268fbfad93bf2b3b14a72cc3baa77407c0bc528f2ed53623f9bfaedff2819d5451da88e5ee6da5fcdac4183db55d7756a16 WHIRLPOOL 67b95068ade95fac78338e7ff8d679a05c7abebbd037239ec8e7a52f09748985984f18708790295a105f84d13a4b572e00a4a35d5de17248935ecfe036fb74d7
-EBUILD yelp-tools-3.6.1.ebuild 794 SHA256 c52b227d106ad1839c59a9eff7d6a1c567b34f657fd66af5d30b0f0446434358 SHA512 20788ce3584a1121ddfcfa927fb6dba29ce79de25dcbf35e984b9ac99bb1979c2087fb20af9f049b6b7132944fbef4a556955adce10d972f247568ca5b8ac57d WHIRLPOOL a8ba0057718d24d7fe58013b8dd71810a7a60166292c50544393d056411645728642a9b3fd6c55b02c4589a6710f0d0a69d62810fab60977595519be26fcdd56
-MISC ChangeLog 2996 SHA256 f6e37811d2484276379010ecb51677245b356a756bb1a34b8849f219d8e8f4d8 SHA512 ce23909549d97f7654fd24673ba3c4da7f04eaa58e909aabbc9bafeec5bace0467260d9f74c2fb8ff5ca8f680f3263196f3e31e1e8174e24e65228b848f251eb WHIRLPOOL 1627b6a6b71cde9e7d1e3ae264ac4b830b1fa09bcd13ddfd150ad1a61eaed92ca314335fc0aa1d26c7fe2df04e55ca5997c76f284dc474e347f1769c02725fee
+EBUILD yelp-tools-3.4.1.ebuild 705 SHA256 b687f326586b603589b49fe0d6065227e6e7b0060f1634cab1de08efb6fcedd8 SHA512 c671fc2e39374d1d61dda82239216a012f07b7644de33d6ba2f22a06459cb0c0d740cff06c23c2a7e073b816bbbff57c8996ac6b715d7644ccfb6363f5379886 WHIRLPOOL 08effc42bb1d5bc7bb099bb0ccac3a75282858b585a718740b25b676f1df8e00070b399bd29dbdfcf4ee0579819309a45aecb79ac6806577f82e11f93944daf6
+EBUILD yelp-tools-3.6.1.ebuild 717 SHA256 79fea2f3161cc2170337ae4b8c36ab2e62e099221d5f7ed13ee840c60a32dc3a SHA512 10db37a795f6b480ea2d2de9989b55f222b4b8c0024b9c73078391c92ed7c808db5e7f93cd8cd71249ea97a75748387db0250bbc9edd4390b53ebb2348b2241b WHIRLPOOL 67a6b8abf5c6244826693f2b95d1afb061daf594f36e79b1aa38d21ed161947b687fbc31796aa01d0e704637331e0ae36a3a56f0e8bc7eecbd71715147965555
+MISC ChangeLog 3393 SHA256 22171f751ebab9c12fee07d750837af2f9cd3578127b807dbeddd9a85414f4f5 SHA512 06bf21796c4e240653faf84e543888ef6cc4843898884c2aca50737bc822aaadbf2e18d026554c2f482b34ea958b87ea790e233123b8e0e9784b8bf4dfc0f0ee WHIRLPOOL 376d1398223d75cf9df56f57da4e3899f9c075327a63e056a11a79d2759e94a0a9db81f869677efa818c155987ef095ef8ef59b07da8e17394eac6e9ab7b3005
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREc4LAAoJEJ0WA1zPCt1hpmEH/R6DFc6sljBJPcDh8P0TVBQK
-+Nusfa7YzHDVhjCuFNdsNMGSO9wknffFoipR5Cq+Bq8FxUJ21v8LqfUyhLPjjgNb
-33Rn8H2mIXb4o+elS63qsVUcV2m0aSAL73WaSvU1JC7qYmHY/cfmkIM30+zow+Nq
-riraS6bGaXZTFBmw+Q25+zUQVcUh1p16vazo9mk2MzuTM/RSPhca1+i1BraE0OtW
-0ShNXWVz7k6VjJjsZ4mSB/a3niLD7ud71GzZ0T3TyJomDklKK3nlr+0YiixqxKne
-dLPFFlKIwwNzznklsjRntkX6AwcYTFCr9o4E9Tbu6A/t33qqI0AaIKpL2+2xH7E=
-=8Ccr
+iQEcBAEBCAAGBQJREeHEAAoJEJ0WA1zPCt1hS90H/3z9ZpT2kPrebwraDHWrs1MB
+rlX2ATfIQbgVjDckOAsyyZ86O9uRF/jVMJW8L88q/b1HYkM4wWp8LoCOs+GfO7+H
+i2XiXyUslRIx+E4R44B3wOaGxHeVUbwJ0uivmyQjMbCr8AYbiSkhAhbEMVORDWAU
+GPMNKNbPrRvHhFBYLBU7h2clOkPrl9JuoGoLSLdZLbo8QhNMs/u8IF/lFX7bEPPY
+9yZGf1uDKdXmh19vbiP+GvG4YvqhA5yW3288arlsxHk6MMiDvUSGutQ3c/MsHvdv
+Cis0SojJSy7rUc8mrnXW6npn9P11JHbWwLY0RdarEhvEVyc62OFKy1ex5w6M8SU=
+=hJrO
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 322968ebccf8..000000000000
--- a/app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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 4013876aa52f..fdb2dd273f19 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-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.8 2013/02/06 03:29:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.4.1.ebuild,v 1.9 2013/02/06 04:53:23 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,6 @@ 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
deleted file mode 100644
index b8655fd54f16..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 c72cb0fcabe2..029cfad70d5a 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.10 2013/02/06 03:29:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/yelp-tools/yelp-tools-3.6.1.ebuild,v 1.11 2013/02/06 04:53:23 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,6 @@ 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