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 B2DE613889E for ; Wed, 6 Feb 2013 03:32:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CAD7E04C2; Wed, 6 Feb 2013 03:32:11 +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 71377E04C2 for ; Wed, 6 Feb 2013 03:32:10 +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 2FD8C33DDE0 for ; Wed, 6 Feb 2013 03:32:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id F0BF8E4083 for ; Wed, 6 Feb 2013 03:32:06 +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: <1360121485.e7adbfeec7feb92155532b90474c89608d1bd064.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: e7adbfeec7feb92155532b90474c89608d1bd064 X-VCS-Branch: master Date: Wed, 6 Feb 2013 03:32:06 +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: 8e9b6813-e240-4ee2-b2a3-8158e0b6741c X-Archives-Hash: f54e9392d383f301936c7776d7042caa commit: e7adbfeec7feb92155532b90474c89608d1bd064 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Feb 6 03:31:25 2013 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Feb 6 03:31:25 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e7adbfee app-text/yelp-tools: sync with gx86 Add gawk patch (bug #455656), metadata.xml. --- .../yelp-tools/files/yelp-tools-3.6.1-gawk.patch | 62 ++++++++++++++++++++ app-text/yelp-tools/yelp-tools-9999.ebuild | 12 +++- 2 files changed, 71 insertions(+), 3 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 new file mode 100644 index 0000000..322968e --- /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 +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 f9428d3..445d692 100644 --- a/app-text/yelp-tools/yelp-tools-9999.ebuild +++ b/app-text/yelp-tools/yelp-tools-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI="5" GCONF_DEBUG="no" -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -18,10 +18,11 @@ SLOT="0" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" 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 @@ -29,3 +30,8 @@ RDEPEND=">=dev-libs/libxml2-2.6.12 sys-apps/gawk" DEPEND="${RDEPEND} virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}/${PN}-3.6.1-gawk.patch" + default +}