Fix sed in Estonian locale, thanks to Priit Laes.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 26 insertions, 18 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 579132b9ee51..1e8e2f67f188 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.227 2012/04/15 04:45:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.228 2012/04/16 16:53:33 tetromino Exp $
+
+  16 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-utils-2.32.0-r2.ebuild, gnome-utils-3.2.1.ebuild:
+  Fix sed in Estonian locale, thanks to Priit Laes.
 
   15 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-utils-3.2.1.ebuild, +files/gnome-utils-3.2.1-gtk+-3.4-ft2.patch:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index 1b79fe838bec..051867b34d2d 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 RMD160 bd78aea0fd11c764e7816bbe4ff9ecf2aa008bc3 SHA1 60b5875f874fbb6da90db7ef6d99199e3f637514 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919
 AUX gnome-utils-2.32.0-new-icons.patch 5478 RMD160 157d0dbe228aa773e7ef6783ad940ca4737d1e25 SHA1 00b3b9cdba1e81bfc6ff044652a479bd2524d45b SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36
@@ -8,14 +8,18 @@ AUX gnome-utils-3.2.1-gtk+-3.4-ft2.patch 1503 RMD160 de3187dc98fb4068cd576dc5182
 DIST gnome-utils-2.32.0-icons.tar.xz 153632 RMD160 3e0f88fced7ab807a425de67ce90834894a41b70 SHA1 231f49f11233c1bf5f95763f12d1447fee2c222c SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e
 DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
 DIST gnome-utils-3.2.1.tar.xz 7273572 RMD160 a0e34b7057c0b77b58f7310ec8a8a3af238071bd SHA1 2f837a420ea73ad1a1cab56656b450e704f2faab SHA256 3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328
-EBUILD gnome-utils-2.32.0-r2.ebuild 2506 RMD160 4a37726ccabf34ff72c5bb91125715ef2c843e80 SHA1 be52fd196a51cde4a468ab009fec1626efd57a9e SHA256 b70690c47739af9d20b7347c8c43face655b069299775a1bba5ac485cb29c5cb
-EBUILD gnome-utils-3.2.1.ebuild 2143 RMD160 51f2b7e6e8667701a05489b2041de56bc02d2ecc SHA1 9f5dc601050aff77c3d81e24fe7c20870485bb35 SHA256 ba8ba7c102feadcb360e5ed47dc83033bb01e96f92b5f3ed4ee84afeca09eea9
-MISC ChangeLog 29251 RMD160 e43e439176c3ee32a77022008380b6af1bfd6ac0 SHA1 368248727fb37993501d474b63eeaf84a0f8e819 SHA256 5a0e2e1568adb811c2950387a40b433f326589c316862a9f644796aad66ae40d
+EBUILD gnome-utils-2.32.0-r2.ebuild 2524 RMD160 f6536e2f9ac540a55cd695e6f90155a452bd27b9 SHA1 9a32d69497e62148c8de1229af5026764deb0bfa SHA256 f00483817e5a415afb44e023a4b3b423aef6d6935142f61c928d85c8573dc08b
+EBUILD gnome-utils-3.2.1.ebuild 2161 RMD160 525e9f683a70d3fa5502d62f50d657a4223d9159 SHA1 79e66d12e3d2d7af1aa6d85ae4bc87779226cc50 SHA256 049a217b9d418201653ab14e297df64c209dea90045f5d3afd7f82475181e502
+MISC ChangeLog 29421 RMD160 28b365e7d9eb191b375f67f60816cca93aaaf078 SHA1 9a7977f65ae054cfb63c9b55956ff887022940d4 SHA256 df5ca680d4c525fac9291e958ab5574d34d4539a7a94cc7e80bb9bfacd7747c5
 MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+KUm8ACgkQdjK8w9WeBnDEOwD/XdyeLc7JHH7I4oIGl503vsF/
-l8+kuj7hj0gVS87I7c8A/3GI6273pQ1mOcyKp2qhPkqOsG+IjTJXdvxUzC+yflGf
-=zorj
+iQEcBAEBAgAGBQJPjE6TAAoJEJ0WA1zPCt1hOVEH/iOUXAD/uNnnAIcTKP4/r3os
+y3Ap2dhyORDL+wbe8NDNYnXzLexlSHYtX6ehBku8nY3dJeK1YSwp3ZK/tJW59pVB
+B7num+gJAlM4uyeND2mCoJ7wMgWDxu14clcmG1VvtG+Bys7/vm3xj7t083jwQ2/P
+xAl6oMHaWzju/MYmyycELM9WSDPRZv713dO9bvS6VKCeIXuihIdl/XyBs9BA5pZZ
+gbSRNJP9HxEQfgW7NM98aUNVrd+aD89cVAdpjoTJOySCeWkW5nH5+r1MWyjUwj0e
+EyZMKLKqXlh/C59Eh+NTJq+x2B7wLEpKAUKjc8MATzcxgvpe5Lw1TH5SD0H5BSg=
+=Z0FZ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
index d6644e13ee59..a29fff4f844f 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.7 2012/01/01 23:47:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.8 2012/04/16 16:53:33 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -64,14 +64,14 @@ src_prepare() {
 	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
 	# This method is kinda prone to breakage. Recheck carefully with next bump.
 	# bug 339074
-	find . -iname 'Makefile.am' -exec \
+	LC_ALL=C find . -iname 'Makefile.am' -exec \
 		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
 	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+	LC_ALL=C find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
 
 	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
+		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 3 failed"
 	fi
 
 	# Fix intltoolize broken file, see upstream #577133
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
index b6b642cff519..b018303be60e 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.3 2012/04/15 04:45:29 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-3.2.1.ebuild,v 1.4 2012/04/16 16:53:33 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -62,14 +62,14 @@ src_prepare() {
 	# Remove idiotic -D.*DISABLE_DEPRECATED cflags
 	# This method is kinda prone to breakage. Recheck carefully with next bump.
 	# bug 339074
-	find . -iname 'Makefile.am' -exec \
+	LC_ALL=C find . -iname 'Makefile.am' -exec \
 		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
 	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
-	find . -iname 'Makefile.in' -exec \
-		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+	LC_ALL=C find . -iname 'Makefile.in' -exec \
+		sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
 
 	if ! use test ; then
-		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed"
+		sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 3 failed"
 	fi
 
 	gnome2_src_prepare