fix patch, unix lf

Package-Manager: portage-2.1_pre9-r5

3 files changed, 29 insertions, 25 deletions

diff --git a/app-admin/gnome-system-tools/ChangeLog b/app-admin/gnome-system-tools/ChangeLog
index 6a7d5b506cc0..4fb1ea8d4512 100644
--- a/app-admin/gnome-system-tools/ChangeLog
+++ b/app-admin/gnome-system-tools/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for app-admin/gnome-system-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.60 2006/05/18 20:17:38 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/ChangeLog,v 1.61 2006/05/20 10:47:41 foser Exp $
 
-  18 May 2006; Patrick McLean <chutzpah@gentoo.org>
+  20 May 2006; Marinus Schraal <foser@gentoo.org>
   files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch:
+  Fix the patch (#133711)
+
+  18 May 2006; Patrick McLean <chutzpah@gentoo.org>
   Somehow a space got dropped from the patch, added back (bug #133711)
 
   18 May 2006; Patrick McLean <chutzpah@gentoo.org>
diff --git a/app-admin/gnome-system-tools/Manifest b/app-admin/gnome-system-tools/Manifest
index e7e03d554d75..f55f8dee103d 100644
--- a/app-admin/gnome-system-tools/Manifest
+++ b/app-admin/gnome-system-tools/Manifest
@@ -2,10 +2,10 @@ AUX gnome-system-tools-1.0.2-ntp.patch 11173 RMD160 cad5ce5345305fb1279b3c5cbe58
 MD5 d260438372974645549ff9e1490cc855 files/gnome-system-tools-1.0.2-ntp.patch 11173
 RMD160 cad5ce5345305fb1279b3c5cbe58f85f898f2c67 files/gnome-system-tools-1.0.2-ntp.patch 11173
 SHA256 fd7047326d334c550c5c70f03d9c21a28716f4c88eacfeae3d52a52cf682ca6a files/gnome-system-tools-1.0.2-ntp.patch 11173
-AUX gnome-system-tools-2.14.0-ALL_LINGUAS.patch 800 RMD160 cce30ef1985aff1538c247f3b0f03624814cfc29 SHA1 11de2e96d533b46ee1bf350333aa9fc28a2a831f SHA256 f26e90fe723b460e1ee8e0edc697a0e031e49b981a6894dab1c5119dd4ba6c3b size 800
-MD5 3a1e751b96bcd42a4b40213f367598e5 files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 800
-RMD160 cce30ef1985aff1538c247f3b0f03624814cfc29 files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 800
-SHA256 f26e90fe723b460e1ee8e0edc697a0e031e49b981a6894dab1c5119dd4ba6c3b files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 800
+AUX gnome-system-tools-2.14.0-ALL_LINGUAS.patch 879 RMD160 ddf92cd90f134cf04c4566af4854f089141c7a1f SHA1 30ed7945344ea778173054919f4326dbc7fbf0d4 SHA256 a08f85690387aba07c29c98e9d6fd12d05e5532ad08854e9a3ffcfaa0fd1d360 size 879
+MD5 80c15d4177b11e6931fd6ddacfe3f508 files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 879
+RMD160 ddf92cd90f134cf04c4566af4854f089141c7a1f files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 879
+SHA256 a08f85690387aba07c29c98e9d6fd12d05e5532ad08854e9a3ffcfaa0fd1d360 files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch 879
 AUX gnome-system-tools-2.14.0-as-needed.patch 651 RMD160 2034a8d2e1032433d46102ac276323d8146b201f SHA1 43a16f5efd5c96d942b95b0a3c96ce3a7672f614 SHA256 6d51c42496d1655af47ee59aca8f99eeed1f9bbfa68fe302746a269540e09368 size 651
 MD5 3d89d90489a5c72e3545e5a79ed72fc8 files/gnome-system-tools-2.14.0-as-needed.patch 651
 RMD160 2034a8d2e1032433d46102ac276323d8146b201f files/gnome-system-tools-2.14.0-as-needed.patch 651
@@ -35,10 +35,10 @@ EBUILD gnome-system-tools-2.14.0.ebuild 1339 RMD160 b598193f5390e42f3de6cc6fbb08
 MD5 43159d7a73ca42f0bff62b143fecae4d gnome-system-tools-2.14.0.ebuild 1339
 RMD160 b598193f5390e42f3de6cc6fbb08ea6b972eb4f1 gnome-system-tools-2.14.0.ebuild 1339
 SHA256 1416b313b2c3ec0286bc1d0b0f11b446ebc43b017d1ce14b9066b9506680465e gnome-system-tools-2.14.0.ebuild 1339
-MISC ChangeLog 8047 RMD160 d99eaa610bcb3a526cd3fb7a4275094da0b3b4fe SHA1 cbe4f81749d2e1abb3ce4769383a2afb4368112f SHA256 1e8e922709c34eb1e01ad75dca13dc541158394bbfd2c33fe7d287d1f82f5650 size 8047
-MD5 6c06a5332a22ce4ef1e258695fd0a513 ChangeLog 8047
-RMD160 d99eaa610bcb3a526cd3fb7a4275094da0b3b4fe ChangeLog 8047
-SHA256 1e8e922709c34eb1e01ad75dca13dc541158394bbfd2c33fe7d287d1f82f5650 ChangeLog 8047
+MISC ChangeLog 8121 RMD160 adc1e41eb71e8f97b3834aa9f1dc131d94899c40 SHA1 300e1735969963ea197dbc6781c473134654d758 SHA256 979f895d79377aaccb26bf71acd73a7e1414a2b1fab8b4015c98b2c37b9a75c0 size 8121
+MD5 71f5b208110d4d8c5f98e86f6a8c97b7 ChangeLog 8121
+RMD160 adc1e41eb71e8f97b3834aa9f1dc131d94899c40 ChangeLog 8121
+SHA256 979f895d79377aaccb26bf71acd73a7e1414a2b1fab8b4015c98b2c37b9a75c0 ChangeLog 8121
 MISC metadata.xml 487 RMD160 808b45701a4270c3f2069fba5910fda2d6e4d07a SHA1 b7b7a287bacc7cc792c3eb2f520779638fc6657e SHA256 352891db5cc03fcecb3c98007e2adad2deac78f3ae2148bacce678862cfdb23a size 487
 MD5 a92d776cde3686cca83f5e95e1fd1a6e metadata.xml 487
 RMD160 808b45701a4270c3f2069fba5910fda2d6e4d07a metadata.xml 487
diff --git a/app-admin/gnome-system-tools/files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch b/app-admin/gnome-system-tools/files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch
index 9ffcf0b65765..c9136922f5df 100644
--- a/app-admin/gnome-system-tools/files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch
+++ b/app-admin/gnome-system-tools/files/gnome-system-tools-2.14.0-ALL_LINGUAS.patch
@@ -1,15 +1,16 @@
---- gnome-system-tools-2.14.0/configure.in.orig 2006-05-17 16:25:04.000000000 -0400

-+++ gnome-system-tools-2.14.0/configure.in      2006-05-17 16:25:14.000000000 -0400

-@@ -173,9 +173,9 @@

- dnl Translations

- dnl ========================================================

- 

--ALL_LINGUAS="am ar az bg bn ca cs cy da de el en_CA en_GB es et eu fi fr

--ga gl gu he hi hr hu id it ja ko ku lt lv mk ml mn ms nb ne nl nn no pa

--pl pt pt_BR ro ru rw sk sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN

-+ALL_LINGUAS="am ar az bg bn ca cs cy da de el en_CA en_GB es et eu fi fr \

-+ga gl gu he hi hr hu id it ja ko ku lt lv mk ml mn ms nb ne nl nn no pa \

-+pl pt pt_BR ro ru rw sk sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN \

- zh_HK zh_TW"

- GETTEXT_PACKAGE=gnome-system-tools

- AC_SUBST(GETTEXT_PACKAGE)

+diff -uNr gnome-system-tools-2.14.0/configure.in gnome-system-tools-2.14.0.patched/configure.in
+--- gnome-system-tools-2.14.0/configure.in	2006-03-13 14:19:33.000000000 +0100
++++ gnome-system-tools-2.14.0.patched/configure.in	2006-05-20 13:42:41.000000000 +0200
+@@ -173,9 +173,9 @@
+ dnl Translations
+ dnl ========================================================
+ 
+-ALL_LINGUAS="am ar az bg bn ca cs cy da de el en_CA en_GB es et eu fi fr
+-ga gl gu he hi hr hu id it ja ko ku lt lv mk ml mn ms nb ne nl nn no pa
+-pl pt pt_BR ro ru rw sk sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN
++ALL_LINGUAS="am ar az bg bn ca cs cy da de el en_CA en_GB es et eu fi fr \
++ga gl gu he hi hr hu id it ja ko ku lt lv mk ml mn ms nb ne nl nn no pa \
++pl pt pt_BR ro ru rw sk sq sr sr@Latn sv ta th tr uk vi wa xh zh_CN \
+ zh_HK zh_TW"
+ GETTEXT_PACKAGE=gnome-system-tools
+ AC_SUBST(GETTEXT_PACKAGE)