Fix building in some locales (like EE) #119847 by J.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 34 insertions, 4 deletions

diff --git a/sys-process/psmisc/ChangeLog b/sys-process/psmisc/ChangeLog
index 5687e485b810..4b5b7339101d 100644
--- a/sys-process/psmisc/ChangeLog
+++ b/sys-process/psmisc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-process/psmisc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.27 2006/01/15 13:58:16 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/ChangeLog,v 1.28 2006/01/24 23:50:38 vapier Exp $
+
+  24 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/psmisc-22.1-force-locale.patch, psmisc-22.1.ebuild:
+  Fix building in some locales (like EE) #119847 by J.
 
   15 Jan 2006; Jose Luis Rivero <yoswink@gentoo.org> psmisc-21.9.ebuild:
   alpha stable, bug #118757
diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 4ef37caae01e..1123c1ab0957 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,7 @@
-MD5 da09ddb41bc89ccb6a3eef14cc99e703 ChangeLog 9307
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2428d912aa781657894a31fb554d2512 ChangeLog 9473
 MD5 6f859fa9957d5cbc362d55aa098dfd0b files/digest-psmisc-21.6 63
 MD5 6fa1579d289a6c34d485651937fc1cc0 files/digest-psmisc-21.8 63
 MD5 3ab218bf6bd06a64d5de56a84f9f5dc0 files/digest-psmisc-21.9 63
@@ -7,8 +10,16 @@ MD5 70563076a6e89ee1471085d19884f8c5 files/psmisc-21.6-nonls.patch 388
 MD5 c02f21e37725ecf3815688b08fb8606a files/psmisc-21.6-scanf.patch 1860
 MD5 b82b550c4133bb8a25ab43316ca04fc4 files/psmisc-21.6-selinux.diff.bz2 7709
 MD5 2dbf220a6cff3180162434cb4ad6a4b1 files/psmisc-21.8-ipv6.patch 13017
+MD5 fbd6d2d8f9aca96690539b33ccce8ff8 files/psmisc-22.1-force-locale.patch 334
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 1166d8aabd3561f467db2ee4d10fe2f8 psmisc-21.6.ebuild 1274
 MD5 f3ef3a517b7b6b72a1922cede2ac0e9a psmisc-21.8.ebuild 1169
 MD5 08afad8cc7e0ba268cbcc4b4e4f95bcd psmisc-21.9.ebuild 1089
-MD5 eec9527d80130ba231584b2a1006ac4a psmisc-22.1.ebuild 1101
+MD5 b59183b314955aa6512ae3af9876bc23 psmisc-22.1.ebuild 1147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD1r3r2+ySkm8kpY0RAmJuAKCJqpdbmyezzFaZDujihDzf/AGJVQCfSQmX
+w7MAMM5ix+voczfyosHXgiA=
+=ZAzQ
+-----END PGP SIGNATURE-----
diff --git a/sys-process/psmisc/files/psmisc-22.1-force-locale.patch b/sys-process/psmisc/files/psmisc-22.1-force-locale.patch
new file mode 100644
index 000000000000..3879274d90e0
--- /dev/null
+++ b/sys-process/psmisc/files/psmisc-22.1-force-locale.patch
@@ -0,0 +1,14 @@
+Make sure we use [a-z] in a C locale
+
+http://bugs.gentoo.org/119847
+
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -455,6 +455,7 @@
+ 
+ 
+ signames.h: signames.c Makefile
++		export LC_ALL=C ; \
+ 		@CPP@ -dM $< |\
+ 		tr -s '\t ' ' ' | sort -n -k 3 | sed \
+ 	's:#define SIG\([A-Z]\+[0-9]*\) \([0-9]\+\) *\(\|/\*.*\)$$:{\ \2,"\1" },:p;d' | \
diff --git a/sys-process/psmisc/psmisc-22.1.ebuild b/sys-process/psmisc/psmisc-22.1.ebuild
index c6ef4d9e4ebb..88dc93518cbb 100644
--- a/sys-process/psmisc/psmisc-22.1.ebuild
+++ b/sys-process/psmisc/psmisc-22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.1.ebuild,v 1.1 2006/01/12 11:33:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/psmisc/psmisc-22.1.ebuild,v 1.2 2006/01/24 23:50:38 vapier Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-force-locale.patch
 	epunt_cxx #73632
 }