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 98B7C1388A2 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 89A60E0531; 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 D6175E0531 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 BB20C33DF16 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 70AAAE4083 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: <1360127640.e7914bd1b47b9dcb276b9c8efbaaab841764eea9.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/yelp-xsl/, gnome-extra/yelp-xsl/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild X-VCS-Directories: gnome-extra/yelp-xsl/ gnome-extra/yelp-xsl/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: e7914bd1b47b9dcb276b9c8efbaaab841764eea9 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: 10aaf9b2-be4a-47bc-9a13-b31fa9a24256 X-Archives-Hash: 8fc477a208de5e6bd702313d815744b6 commit: e7914bd1b47b9dcb276b9c8efbaaab841764eea9 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Feb 6 05:14:00 2013 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Feb 6 05:14:00 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e7914bd1 gnome-extra/yelp-xsl: virtual/awk is fine; only nawk is broken --- .../yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch | 59 -------------------- gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild | 11 +--- 2 files changed, 2 insertions(+), 68 deletions(-) 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 deleted file mode 100644 index 9f06c43..0000000 --- a/gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7dfe59cd3ed75a245804ea3081460988c4affdee Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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 --- -1.8.1.2 - diff --git a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild index 122d125..4b26000 100644 --- a/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild +++ b/gnome-extra/yelp-xsl/yelp-xsl-9999.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit eutils gnome.org +inherit gnome.org if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -23,16 +23,9 @@ fi 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/awk 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 -}