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

(Portage version: 2.2_rc90/cvs/Linux i686)

3 files changed, 7 insertions, 75 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/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