summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-03-13 08:47:33 +0000
committerMike Frysinger <vapier@gentoo.org>2005-03-13 08:47:33 +0000
commit36e0b0b984b5dcc6b86b57facbddc2d9598ec2a8 (patch)
tree29d6ec735d6785601b7630d754555fcff6e2ce70 /sys-apps/sed
parentPatch fixes #84030 (missing type declarations) (diff)
downloadhistorical-36e0b0b984b5dcc6b86b57facbddc2d9598ec2a8.tar.gz
historical-36e0b0b984b5dcc6b86b57facbddc2d9598ec2a8.tar.bz2
historical-36e0b0b984b5dcc6b86b57facbddc2d9598ec2a8.zip
make sure we run makeinfo in the C locale #83984 by Stanley
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'sys-apps/sed')
-rw-r--r--sys-apps/sed/Manifest3
-rw-r--r--sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch18
-rw-r--r--sys-apps/sed/sed-4.1.4.ebuild8
3 files changed, 27 insertions, 2 deletions
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 947e8cee0ca8..e7ba2a6a1b2d 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,8 +1,9 @@
MD5 3e2102e6f71017db9d4caf5ac506429b ChangeLog 8298
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 748d3e7e3a5a8a38727e6a3ed7eb2ff7 sed-4.1.4.ebuild 1773
+MD5 315541a0514d6546f6d30d720ce93561 sed-4.1.4.ebuild 1866
MD5 ceac4c4a3a356201f7540e95ab08408e sed-4.0.9.ebuild 1788
MD5 ef7b5747c59d83996a62825c915805cb files/digest-sed-4.1.4 61
MD5 1f789b81b2d7992345e1490c68ad5477 files/dos2unix 59
MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
MD5 a244109e1adcbd40a02446fb23df33c1 files/digest-sed-4.0.9 61
+MD5 3ea67fdbcfe6288bb7e03a47b5801a04 files/sed-4.1.4-makeinfo-c-locale.patch 617
diff --git a/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch b/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
new file mode 100644
index 000000000000..ede6dc8e30bf
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.1.4-makeinfo-c-locale.patch
@@ -0,0 +1,18 @@
+Running makeinfo on sed.texi in some locales can cause
+problems (probably due to range matching not being the
+same). So we force the C locale and just take the lazy
+way out.
+
+http://bugs.gentoo.org/show_bug.cgi?id=83984
+
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -615,7 +615,7 @@
+
+ @MAKEINFO_HTML_TRUE@sed.html: sed.texi sed.info
+ @MAKEINFO_HTML_TRUE@ builddir=`pwd` && cd $(srcdir) && \
+-@MAKEINFO_HTML_TRUE@ $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
++@MAKEINFO_HTML_TRUE@ LC_ALL="C" $(MAKEINFO) --html --no-split -o $$builddir/sed.html sed.texi
+
+ @MAKEINFO_HTML_TRUE@html: sed.html
+
diff --git a/sys-apps/sed/sed-4.1.4.ebuild b/sys-apps/sed/sed-4.1.4.ebuild
index 1cf4fca8202c..a785ef1c7eb6 100644
--- a/sys-apps/sed/sed-4.1.4.ebuild
+++ b/sys-apps/sed/sed-4.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.4.ebuild,v 1.1 2005/02/19 18:26:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.4.ebuild,v 1.2 2005/03/13 08:47:33 vapier Exp $
inherit flag-o-matic
@@ -35,6 +35,12 @@ src_bootstrap_cleanup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-makeinfo-c-locale.patch
+}
+
src_compile() {
src_bootstrap_sed