summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2013-02-06 05:08:43 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2013-02-06 05:08:43 +0000
commit371011d233e4e42cd2bc2322bcb0cf1c83301d5d (patch)
treeff1ea17781934872abb79b73c4a9f35706c2ec32 /gnome-extra
parentBump, add .ini and logrotate files, use yenc by default, fix rar dep (#455190... (diff)
downloadgentoo-2-371011d233e4e42cd2bc2322bcb0cf1c83301d5d.tar.gz
gentoo-2-371011d233e4e42cd2bc2322bcb0cf1c83301d5d.tar.bz2
gentoo-2-371011d233e4e42cd2bc2322bcb0cf1c83301d5d.zip
Undo previous commit: yelp-xsl works with all virtual/awk implementations except for nawk, which is buggy (see bug #455786). However, the 3.6.1 ebuild cannot switch to virtual/awk until it's keyworded on amd64-fbsd.
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/yelp-xsl/ChangeLog9
-rw-r--r--gnome-extra/yelp-xsl/files/yelp-xsl-3.6.1-gawk.patch59
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild13
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild11
4 files changed, 13 insertions, 79 deletions
diff --git a/gnome-extra/yelp-xsl/ChangeLog b/gnome-extra/yelp-xsl/ChangeLog
index 49449f60c561..b959156dadd8 100644
--- a/gnome-extra/yelp-xsl/ChangeLog
+++ b/gnome-extra/yelp-xsl/ChangeLog
@@ -1,6 +1,13 @@
# 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.21 2013/02/06 03:52:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/ChangeLog,v 1.22 2013/02/06 05:08:43 tetromino Exp $
+
+ 06 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+ yelp-xsl-3.4.2.ebuild, yelp-xsl-3.6.1.ebuild,
+ -files/yelp-xsl-3.6.1-gawk.patch:
+ Undo previous commit: yelp-xsl works with all virtual/awk implementations
+ except for nawk, which is buggy (see bug #455786). However, the 3.6.1 ebuild
+ cannot switch to virtual/awk until it's keyworded on amd64-fbsd.
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,
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 9f06c436050c..000000000000
--- 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 <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.4.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild
index c902e6f650b9..21b5abe0b863 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-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.8 2013/02/06 03:52:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.4.2.ebuild,v 1.9 2013/02/06 05:08:43 tetromino Exp $
EAPI="4"
-inherit eutils gnome.org
+inherit gnome.org
DESCRIPTION="XSL stylesheets for yelp"
HOMEPAGE="http://www.gnome.org/"
@@ -16,16 +16,9 @@ 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/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
-}
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 4c8b6a275d80..f881a9326381 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.10 2013/02/06 03:52:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp-xsl/yelp-xsl-3.6.1.ebuild,v 1.11 2013/02/06 05:08:43 tetromino Exp $
EAPI="5"
-inherit eutils gnome.org
+inherit gnome.org
DESCRIPTION="XSL stylesheets for yelp"
HOMEPAGE="http://www.gnome.org/"
@@ -16,16 +16,9 @@ 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
-}