summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-03-06 05:22:50 +0000
committerTim Harder <radhermit@gentoo.org>2013-03-06 05:22:50 +0000
commit2bf022edc2ac6c68747f4de439d11f1dcfc995bb (patch)
treebb7b05f7eb57a2267912ec6a5011725b9c58e0f3 /sys-apps
parentAdd slot operator dep for protobuf. (diff)
downloadgentoo-2-2bf022edc2ac6c68747f4de439d11f1dcfc995bb.tar.gz
gentoo-2-2bf022edc2ac6c68747f4de439d11f1dcfc995bb.tar.bz2
gentoo-2-2bf022edc2ac6c68747f4de439d11f1dcfc995bb.zip
Fix doc build with LC_ALL=C (bug #454854).
(Portage version: 2.2.0_alpha165/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/moreutils/ChangeLog8
-rw-r--r--sys-apps/moreutils/files/moreutils-doc-build.patch11
-rw-r--r--sys-apps/moreutils/moreutils-0.47.ebuild7
3 files changed, 22 insertions, 4 deletions
diff --git a/sys-apps/moreutils/ChangeLog b/sys-apps/moreutils/ChangeLog
index b1245566f68b..7645b2cccc8c 100644
--- a/sys-apps/moreutils/ChangeLog
+++ b/sys-apps/moreutils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/moreutils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.52 2012/12/13 21:38:15 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/ChangeLog,v 1.53 2013/03/06 05:22:49 radhermit Exp $
+
+ 06 Mar 2013; Tim Harder <radhermit@gentoo.org> moreutils-0.47.ebuild,
+ +files/moreutils-doc-build.patch:
+ Fix doc build with LC_ALL=C (bug #454854).
13 Dec 2012; Tim Harder <radhermit@gentoo.org> -moreutils-0.45-r1.ebuild,
-files/moreutils-0.45-dtd-path.patch, -moreutils-0.46.ebuild:
diff --git a/sys-apps/moreutils/files/moreutils-doc-build.patch b/sys-apps/moreutils/files/moreutils-doc-build.patch
new file mode 100644
index 000000000000..d4ffe1df0e31
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-doc-build.patch
@@ -0,0 +1,11 @@
+--- moreutils/ts
++++ moreutils/ts
+@@ -21,7 +21,7 @@
+ If the -r switch is passed, it instead converts existing timestamps in
+ the input to relative times, such as "15m5s ago". Many common timestamp
+ formats are supported. Note that the Time::Duration and Date::Parse perl
+-modules are required for this mode to work. Currently, converting localized
++modules are required for this mode to work. Currently, converting localized
+ dates is not supported.
+
+ If both -r and a format is passed, the existing timestamps are
diff --git a/sys-apps/moreutils/moreutils-0.47.ebuild b/sys-apps/moreutils/moreutils-0.47.ebuild
index ef1322055546..e07637545ab0 100644
--- a/sys-apps/moreutils/moreutils-0.47.ebuild
+++ b/sys-apps/moreutils/moreutils-0.47.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.47.ebuild,v 1.6 2012/09/12 15:27:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/moreutils/moreutils-0.47.ebuild,v 1.7 2013/03/06 05:22:49 radhermit Exp $
EAPI=4
inherit eutils toolchain-funcs prefix
@@ -31,6 +31,9 @@ DEPEND="
S=${WORKDIR}/${PN}
src_prepare() {
+ # bug 454854, applied upstream
+ epatch "${FILESDIR}"/${PN}-doc-build.patch
+
epatch "${FILESDIR}"/${PN}-0.47-dtd-path.patch
eprefixify *.docbook