Clean up patch. Remove unused patch by jalan (bug #340088).

Package-Manager: portage-2.2_rc90/cvs/Linux i686

4 files changed, 9 insertions, 78 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 4bb1fd1db70e..f896e4f732d5 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.185 2010/09/14 05:24:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.186 2010/10/11 19:53:41 jer Exp $
+
+  11 Oct 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/sysstat-9.1.1-nls.patch, files/sysstat-9.1.2-nls.patch:
+  Clean up patch. Remove unused patch by jalan (bug #340088).
 
 *sysstat-9.1.5 (14 Sep 2010)
 
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index d5d7eb9e0a67..de74e906e186 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,6 +1,5 @@
 AUX crontab 537 RMD160 1691874f9addabd7b234f792b112d45cb6e4de9a SHA1 7fdba83e02b333a37861c84d050876cc83daecff SHA256 0c2bcfb3b0c8df092a978c0e6d8ee960b3c10157271df1d4d14707a0d5788fa3
-AUX sysstat-9.1.1-nls.patch 3736 RMD160 618138c0a416afe9fe36fe11d06edbe1f7862368 SHA1 5a9469e7289762a86aad8db06b541204ae41f613 SHA256 3242dc42f7f7d1c63c73189da4c11c5b13c64cfe90edf97bb0fd078e90b81d6a
-AUX sysstat-9.1.2-nls.patch 3842 RMD160 f6987512105110be7178f0bb39c9dd1096d25315 SHA1 72e18180bba999bf24e68617ad86718a3b1b6091 SHA256 6b4249e431fcb16e879f45aece10f5b36cf04b04b37f82b25e57557ad50aa0be
+AUX sysstat-9.1.2-nls.patch 3841 RMD160 a6111ffd2a99d8f6129a3f0dea4a3e3a7c6bd572 SHA1 d10281e1f76d71aaa1b8b0276098ca7500ed2dbd SHA256 9c3cfafa92b9be55009507fb3b5582d6845c1a2cd1435dc5d0acc5878fc5bf2b
 AUX sysstat-9.1.5-nls.patch 3967 RMD160 b0f69035b91b659b02e93464328abd08c9c811b1 SHA1 ee21ca986c1a33d6796482a6d2b8150c4b3b7966 SHA256 0ac4dee89ef10373e311e1ef04c8a5153bb83fff537e583cdb895de6420be76c
 AUX sysstat.init.d 632 RMD160 24d5293358f223db305155e335bae30d53e447b0 SHA1 df019ff3f28c8e3c7a91d664490ea1ab2a766c9f SHA256 5fca53d7b274c21c495dd0af6459d7dd75bb8098018d7458d85416eb279119dd
 DIST sysstat-9.0.6.1.tar.bz2 243939 RMD160 9433cacb5a4f4b4ca82e817bf7896de6f41c65d0 SHA1 1d2c47d1c236e9d33519015bc12b0bf816300ae3 SHA256 27cfac5384fd53b8929c0e5e91f81b75f357206798fb32f3948e03c64c303918
@@ -11,5 +10,5 @@ EBUILD sysstat-9.0.6.1.ebuild 1389 RMD160 721ca5d33f736895819787df73d1a87ae8be66
 EBUILD sysstat-9.1.3.ebuild 1847 RMD160 78aa210b222c77197e6e8fa8c52675347b37218d SHA1 73f2ddf6f892398d4a934c7531c64906e46e11dc SHA256 69c0806bf06a5e062c23c9825a1f5837d5ab42d9ed33aff42e08010bb2718da5
 EBUILD sysstat-9.1.4.ebuild 1933 RMD160 aec3b62a72701c50c79bac539c260ef4e6a93696 SHA1 d83feb4d177faf914f911835da160e56444f356e SHA256 1dd9219bc0b2f8c9a91259d46d2d78e234b98d5e8fd4397ac665723a92609c84
 EBUILD sysstat-9.1.5.ebuild 1926 RMD160 206a09a5693521cf64c4c743ac43578f99fdb703 SHA1 12c7194265a7e991d2c2be7a4d2d2fd77aa9be31 SHA256 0ee60dc9ce7aa1ec5a03c3907b2f4fd2734821f08937ad252fd6f3cf24c770ed
-MISC ChangeLog 23033 RMD160 e055300a97b37e93f113b85d88a92377f4b40294 SHA1 7a15c00cd7abce0e0bd43e3b7ec6fbf3b1ff8110 SHA256 3ec3fedf73f29211080e5ff81720cc85033984acf277e6744f104cefc30f388b
+MISC ChangeLog 23208 RMD160 652f6fabb877db1534fa9372c90be56c9279aae2 SHA1 7b31138963fa68c7b5eaa98b8fe23a797fd47166 SHA256 efc4ba618ec8c43ceb96d3a85430d8ffbe46f13830d3135af5fc730cfb332726
 MISC metadata.xml 416 RMD160 7f095f0f80e688c8817c2120707b5186b9950da4 SHA1 115f7b62bc505ed8176b3c2558556009856e9f00 SHA256 d93e7ab614ffb746fe5a8acd24c1906f5159bf0850e7a9bf5605be4f1ff6a731
diff --git a/app-admin/sysstat/files/sysstat-9.1.1-nls.patch b/app-admin/sysstat/files/sysstat-9.1.1-nls.patch
deleted file mode 100644
index abe926cf2cb2..000000000000
--- a/app-admin/sysstat/files/sysstat-9.1.1-nls.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Generate a list of locales instead of hardcoding individual ones
-
---
-	Jeroen Roovers <jer@gentoo.org>
-
-
---- Makefile.in
-+++ Makefile.in
-@@ -257,56 +257,13 @@
- 
- install_nls: locales
- ifdef REQUIRE_NLS
--	mkdir -p $(DESTDIR)$(NLS_DIR)/af/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/da/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/de/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/es/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/fi/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/id/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/ky/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/lv/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/mt/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/nl/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/pt_BR/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/ru/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/sk/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/sv/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/vi/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/zh_CN/LC_MESSAGES
--	mkdir -p $(DESTDIR)$(NLS_DIR)/zh_TW/LC_MESSAGES
--	$(INSTALL_DATA) nls/af.gmo $(DESTDIR)$(NLS_DIR)/af/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/da.gmo $(DESTDIR)$(NLS_DIR)/da/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/de.gmo $(DESTDIR)$(NLS_DIR)/de/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/es.gmo $(DESTDIR)$(NLS_DIR)/es/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/fi.gmo $(DESTDIR)$(NLS_DIR)/fi/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/fr.gmo $(DESTDIR)$(NLS_DIR)/fr/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/id.gmo $(DESTDIR)$(NLS_DIR)/id/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/it.gmo $(DESTDIR)$(NLS_DIR)/it/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/ja.gmo $(DESTDIR)$(NLS_DIR)/ja/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/ky.gmo $(DESTDIR)$(NLS_DIR)/ky/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/lv.gmo $(DESTDIR)$(NLS_DIR)/lv/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/mt.gmo $(DESTDIR)$(NLS_DIR)/mt/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/nb.gmo $(DESTDIR)$(NLS_DIR)/nb/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/nl.gmo $(DESTDIR)$(NLS_DIR)/nl/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/nn.gmo $(DESTDIR)$(NLS_DIR)/nn/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/pl.gmo $(DESTDIR)$(NLS_DIR)/pl/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/pt.gmo $(DESTDIR)$(NLS_DIR)/pt/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/pt_BR.gmo $(DESTDIR)$(NLS_DIR)/pt_BR/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/ro.gmo $(DESTDIR)$(NLS_DIR)/ro/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/ru.gmo $(DESTDIR)$(NLS_DIR)/ru/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/sk.gmo $(DESTDIR)$(NLS_DIR)/sk/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/sv.gmo $(DESTDIR)$(NLS_DIR)/sv/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/vi.gmo $(DESTDIR)$(NLS_DIR)/vi/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/zh_CN.gmo $(DESTDIR)$(NLS_DIR)/zh_CN/LC_MESSAGES/$(PACKAGE).mo
--	$(INSTALL_DATA) nls/zh_TW.gmo $(DESTDIR)$(NLS_DIR)/zh_TW/LC_MESSAGES/$(PACKAGE).mo
-+	catalogs='$(NLSGMO)'; \
-+	for cat in $$catalogs; do \
-+		cat=`basename $$cat`; \
-+		lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+		mkdir -p $(DESTDIR)$(NLS_DIR)/$$lang/LC_MESSAGES; \
-+		$(INSTALL_DATA) nls/$$cat $(DESTDIR)$(NLS_DIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-+	done
- endif
- 
- install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
diff --git a/app-admin/sysstat/files/sysstat-9.1.2-nls.patch b/app-admin/sysstat/files/sysstat-9.1.2-nls.patch
index b23d859942b8..4b6b6db9646f 100644
--- a/app-admin/sysstat/files/sysstat-9.1.2-nls.patch
+++ b/app-admin/sysstat/files/sysstat-9.1.2-nls.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2010-03-14 09:12:01.000000000 +0100
-+++ Makefile.in	2010-05-24 20:52:19.000000000 +0200
+--- a/Makefile.in	2010-03-14 09:12:01.000000000 +0100
++++ b/Makefile.in	2010-05-24 20:52:19.000000000 +0200
 @@ -257,58 +257,14 @@
  
  install_nls: locales