From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 82E3D13889F for ; Wed, 6 Feb 2013 05:14:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A23A8E0539; Wed, 6 Feb 2013 05:14:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0958BE0539 for ; Wed, 6 Feb 2013 05:14:16 +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 E746833DF57 for ; Wed, 6 Feb 2013 05:14:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 47C78E4073 for ; Wed, 6 Feb 2013 05:14:13 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1360126139.5abe8ce7d9b8f650032084d43a119ee2d398a9b1.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-text/yelp-tools/, app-text/yelp-tools/files/ X-VCS-Repository: proj/gnome X-VCS-Files: app-text/yelp-tools/files/yelp-tools-3.6.1-gawk.patch app-text/yelp-tools/yelp-tools-9999.ebuild X-VCS-Directories: app-text/yelp-tools/ app-text/yelp-tools/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 5abe8ce7d9b8f650032084d43a119ee2d398a9b1 X-VCS-Branch: master Date: Wed, 6 Feb 2013 05:14:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3f3535c-47ff-47a4-83ae-9317bbc2c630 X-Archives-Hash: 2019a1898ec6195ae5d22a279761866a commit: 5abe8ce7d9b8f650032084d43a119ee2d398a9b1 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Feb 6 04:48:59 2013 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Feb 6 04:48:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5abe8ce7 app-text/yelp-tools: virtual/awk is fine; only nawk is broken --- .../yelp-tools/files/yelp-tools-3.6.1-gawk.patch | 62 -------------------- app-text/yelp-tools/yelp-tools-9999.ebuild | 10 +--- 2 files changed, 2 insertions(+), 70 deletions(-) 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 322968e..0000000 --- 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 -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-9999.ebuild b/app-text/yelp-tools/yelp-tools-9999.ebuild index 445d692..cabd470 100644 --- a/app-text/yelp-tools/yelp-tools-9999.ebuild +++ b/app-text/yelp-tools/yelp-tools-9999.ebuild @@ -5,7 +5,7 @@ EAPI="5" GCONF_DEBUG="no" -inherit eutils gnome2 +inherit gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -22,16 +22,10 @@ else fi 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" + virtual/awk" DEPEND="${RDEPEND} virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch" - default -}