* [gentoo-commits] proj/gnome:master commit in: app-text/yelp-tools/, app-text/yelp-tools/files/
@ 2013-02-06 3:32 Alexandre Rostovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev @ 2013-02-06 3:32 UTC (permalink / raw
To: gentoo-commits
commit: e7adbfeec7feb92155532b90474c89608d1bd064
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 03:31:25 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> 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 <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-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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: app-text/yelp-tools/, app-text/yelp-tools/files/
@ 2013-02-06 5:14 Alexandre Rostovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev @ 2013-02-06 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 5abe8ce7d9b8f650032084d43a119ee2d398a9b1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 04:48:59 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> 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 <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-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-06 5:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-06 5:14 [gentoo-commits] proj/gnome:master commit in: app-text/yelp-tools/, app-text/yelp-tools/files/ Alexandre Rostovtsev
-- strict thread matches above, loose matches on Subject: below --
2013-02-06 3:32 Alexandre Rostovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox