Fix build error with et_EE locale (#318995)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 5bc34c4b71a24edcd90e34512aca919d0464250b..605e562b2985d228660bda253711f7845d464ef0 100644 (file)
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.38 2010/04/27 23:49:12 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.39 2010/05/09 22:02:04 truedfx Exp $
+
+  09 May 2010; Harald van Dijk <truedfx@gentoo.org> tmux-1.2.ebuild,
+  +files/tmux-1.2-locale.patch:
+  Fix build error with et_EE locale (#318995)
 
   27 Apr 2010; Tiago Cunha <tcunha@gentoo.org> tmux-1.2.ebuild:
   stable sparc, bug 317535

diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index a0186154c029f5c5a0bf41c253e4e57c5b17bc93..06103622b4b65bf4824cd9dc147455d4d5347cd9 100644 (file)
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tmux-1.2-locale.patch 628 RMD160 2f9902fdabd4349a3861e2d8f2e6fa43c363f271 SHA1 f7c6fe2e2e2fb18809a964be65d034d9bb60e944 SHA256 64ef3fadd3aef308c0ab0cac62ac1926d769651a7b6c30697f4c7a80db020404
 AUX tmux.vim 55 RMD160 1299eac25b3e01700dba4b295c33964a607b8ee4 SHA1 820863224eda185aba4da86ffbe876e287a70f30 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7
 DIST tmux-1.1.tar.gz 230955 RMD160 9f03922c0be46e9259202ed2fdc0834dcf01581c SHA1 8dc57a70605930bbe61664bd52ed2c8081ea5a1c SHA256 b3626ecb74185c5764be658fd359c3fe29ffbe5d1936de81d6628b686558436a
 DIST tmux-1.2.tar.gz 241779 RMD160 47ac2b3606841189c6b75412bb67d6625073b035 SHA1 57a784dc998710a719ee3e13dcd29541611c009e SHA256 af3f2678ae631ab3f7973b646aff2f8757e9e00935a5984c23058da4f723491d
 EBUILD tmux-1.1.ebuild 1715 RMD160 ba381d04e919f6d670b89d359f48d8ad74d558a9 SHA1 4d8f7c40ea608977d7a06290490b58816d54abb6 SHA256 1ad6f762da0ae1a186c76420a39d36e797b2ee7a551c61582a3be2be287ebf7b
-EBUILD tmux-1.2.ebuild 1680 RMD160 7a99f1628d102390a68e69892f9657c7f7705a83 SHA1 c93e2be5fdbea77b73fbea33920ecf331b6f1eeb SHA256 6f5c62f3e3642e01189b591dfff9c864eb81746b4554e07293caf81204941df3
-MISC ChangeLog 4293 RMD160 457305b3d474103ae76f6d74a6423c1d4748cd91 SHA1 bcbad843c3f486cfe0d723f082671294a2bb804b SHA256 d7fbe447b90718f384d8a652d6ecd494bbdd5127cc3682cc6cdcd335ba828b40
+EBUILD tmux-1.2.ebuild 1770 RMD160 7292485241061dfda0eae90bf176f7967060bcec SHA1 fa0799912a0c3d1b7fc167997cd025b7abab7d34 SHA256 8025defec5880c14a23db1929ada8c6d5136c9c33ffba78b16d42e65e3331482
+MISC ChangeLog 4442 RMD160 c5d17c2d917ee8cf1360d2f61d34f01b57c99b2c SHA1 5c3a80ddf9f6b13d49e0a39af1c968e46edd6879 SHA256 1bbb4a68adee4fbafbe12cc0f9d50bcd5e0dd5989153aab19aaeede00c54f24c
 MISC metadata.xml 524 RMD160 c7df711d771564757605e393c603e852fc119687 SHA1 52e7187a665801813a4b127244ec24a3ca186a53 SHA256 3aa4215fcc77d74449dda9fd8bbbdff50efa678510c8ac97948bd790d134a588
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvnMP8ACgkQwnQyISwouHw5GwCfSGu7NYp+DZPaM5W/vBoau1VS
+leYAn1tSbbBUUizXBpL/g7BhE8CB1X4k
+=/mi/
+-----END PGP SIGNATURE-----

diff --git a/app-misc/tmux/files/tmux-1.2-locale.patch b/app-misc/tmux/files/tmux-1.2-locale.patch
new file mode 100644 (file)
index 0000000..810b10c
--- /dev/null
+++ b/app-misc/tmux/files/tmux-1.2-locale.patch
@@ -0,0 +1,22 @@
+--- tmux-1.2/GNUmakefile
++++ tmux-1.2/GNUmakefile
+@@ -56,7 +56,7 @@
+ INSTALLBIN= install -g bin -o root -m 555
+ INSTALLMAN= install -g bin -o root -m 444
+ 
+-SRCS= $(shell echo *.c|sed 's|osdep-[a-z0-9]*.c||g')
++SRCS= $(shell echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g')
+ include config.mk
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+ 
+--- tmux-1.2/Makefile
++++ tmux-1.2/Makefile
+@@ -52,7 +52,7 @@
+ INSTALLBIN= install -g bin -o root -m 555
+ INSTALLMAN= install -g bin -o root -m 444
+ 
+-SRCS!= echo *.c|sed 's|osdep-[a-z0-9]*.c||g'
++SRCS!= echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g'
+ .include "config.mk"
+ OBJS= ${SRCS:S/.c/.o/}
+ 

diff --git a/app-misc/tmux/tmux-1.2.ebuild b/app-misc/tmux/tmux-1.2.ebuild
index b16742ca01884010a30ad18ffbddca97cbe597eb..ce5dc4f6aef3f85fef8f015ebbe7901ed7cc2750 100644 (file)
--- a/app-misc/tmux/tmux-1.2.ebuild
+++ b/app-misc/tmux/tmux-1.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.3 2010/04/27 23:49:12 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.4 2010/05/09 22:02:04 truedfx Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="http://tmux.sourceforge.net"
@@ -20,6 +20,12 @@ RDEPEND="${DEPEND}
                        app-editors/gvim
                        app-editors/vim ) )"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-locale.patch
+}
+
 src_compile() {
        # The configure script isn't created by GNU autotools.
        ./configure || die "configure failed"