Version bump. Redo LINGUAS patch. Add patch to respect LDFLAGS/CFLAGS.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux i686

10 files changed, 62 insertions, 421 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index f9af6aabaf59..edd894cecbc8 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,15 @@
 # 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.188 2010/12/27 18:31:00 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.189 2011/03/15 16:55:56 jer Exp $
+
+*sysstat-10.0.0 (15 Mar 2011)
+
+  15 Mar 2011; Jeroen Roovers <jer@gentoo.org> -files/sysstat-9.1.2-nls.patch,
+  -sysstat-9.1.3.ebuild, -sysstat-9.1.4.ebuild, -sysstat-9.1.5.ebuild,
+  -files/sysstat-9.1.5-nls.patch, -sysstat-9.1.6.ebuild, -sysstat-9.1.7.ebuild,
+  +sysstat-10.0.0.ebuild, +files/sysstat-10.0.0-flags.patch,
+  +files/sysstat-10.0.0-nls.patch:
+  Version bump. Redo LINGUAS patch. Add patch to respect LDFLAGS/CFLAGS.
 
 *sysstat-9.1.7 (27 Dec 2010)
 
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 6fdf6dab5b20..847866ef17d1 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,18 +1,10 @@
 AUX crontab 537 RMD160 1691874f9addabd7b234f792b112d45cb6e4de9a SHA1 7fdba83e02b333a37861c84d050876cc83daecff SHA256 0c2bcfb3b0c8df092a978c0e6d8ee960b3c10157271df1d4d14707a0d5788fa3
-AUX sysstat-9.1.2-nls.patch 3841 RMD160 a6111ffd2a99d8f6129a3f0dea4a3e3a7c6bd572 SHA1 d10281e1f76d71aaa1b8b0276098ca7500ed2dbd SHA256 9c3cfafa92b9be55009507fb3b5582d6845c1a2cd1435dc5d0acc5878fc5bf2b
-AUX sysstat-9.1.5-nls.patch 3966 RMD160 2e194c59bc4633e0954c9233ec9bc18eae2af5e9 SHA1 22a76bdb9cbf62b28cbb90b279e54c63852ea8c1 SHA256 d1c2385cb133f07e3d5e6a813c5e71573f3f546de7ef2f438ff64cf0e1c5d8cd
+AUX sysstat-10.0.0-flags.patch 956 RMD160 6b8000b9e13426ae66cd73f6e3dced87ffab1957 SHA1 5ae8eb0c4b54ea806e428a86b66f9ce23bad9bea SHA256 4aad7965b2cf404ead9403c92f24c6c67164081d15523873d0f947f9ed4ca70c
+AUX sysstat-10.0.0-nls.patch 4092 RMD160 e38b12f36646a9f82802887761c010e6a90a600f SHA1 d36f834eb445f8c356a0606325803295f353c927 SHA256 eab902993a0ed58c6dde0643d0c5c5339780327a12b119493e725a4df4fdaf69
 AUX sysstat.init.d 632 RMD160 24d5293358f223db305155e335bae30d53e447b0 SHA1 df019ff3f28c8e3c7a91d664490ea1ab2a766c9f SHA256 5fca53d7b274c21c495dd0af6459d7dd75bb8098018d7458d85416eb279119dd
+DIST sysstat-10.0.0.tar.bz2 261707 RMD160 f05799ddf0fcc0dfb745b79e89948b91a2135d9e SHA1 264810b9408589fd63afb973d515c7a724b97e6b SHA256 b3ea6c7457d02ebaef97861af0eef9db30a3f1f033bc0283f92a517f3f49d121
 DIST sysstat-9.0.6.1.tar.bz2 243939 RMD160 9433cacb5a4f4b4ca82e817bf7896de6f41c65d0 SHA1 1d2c47d1c236e9d33519015bc12b0bf816300ae3 SHA256 27cfac5384fd53b8929c0e5e91f81b75f357206798fb32f3948e03c64c303918
-DIST sysstat-9.1.3.tar.bz2 248832 RMD160 74d8f0f6514fbb8a0dc9221ed0ad2959f8c2f423 SHA1 4d232b4adb4394d8adf7e0e312da862b4c9bdfbb SHA256 69ca634210d8bd3c60e1fa911dadc00f54fabd9a739ad3d3862164718e74fd54
-DIST sysstat-9.1.4.tar.bz2 250877 RMD160 7f95cd4efb5589d4239f0de317afe499776e9669 SHA1 e41ca60ff53c1bd143bde57f43d8ab4de2610e5a SHA256 b8dc3f74a67776197f69589c519ccca8e654bbbcf14f9295fd05ccdbd5d42d47
-DIST sysstat-9.1.5.tar.bz2 253767 RMD160 82d498b025bbd0802a69b6cfd39e6f11ff81da63 SHA1 a9f99e70d54d90b2b34820d33762c14811866b75 SHA256 489d7dd20cc5e735b791370f55643a8d20ab1bf8d22be605827ff1386d0c4857
-DIST sysstat-9.1.6.tar.bz2 256751 RMD160 0076ec88ad832531e0ee2f2c4da7b0cd45782730 SHA1 112af09e0d423a1251f420a2317b01a5c2e1869d SHA256 0a0bc9724e9767dfafed091aeacabb7a6bcbdc389ebd74d78060953170e94489
-DIST sysstat-9.1.7.tar.bz2 258617 RMD160 10c521929cb09679ee83b5da542abae6fadc8590 SHA1 91897e09b73d9308c38fc8f59641b755612c6fec SHA256 3da3b08ee44298a053a3d1051c3d9269f2f1bbce9dc646adab0fa3ebaf4cdf45
+EBUILD sysstat-10.0.0.ebuild 2162 RMD160 7dfe2142bce2f0c43423c2c2dd96df745ddfa91b SHA1 639dc7e1d4200730e8c12f4339aec3b40993aa66 SHA256 ca59fd72445b2f4e3659222c8390096fb076534eb64a4009303da2e043d302c8
 EBUILD sysstat-9.0.6.1.ebuild 1389 RMD160 721ca5d33f736895819787df73d1a87ae8be6687 SHA1 81fb50612927353e9c83291dc4ff65c20e1d124a SHA256 a7830dbabb1223c4d1fe92ec41a2160775e261e472e0d8cdaf38d252a6914329
-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
-EBUILD sysstat-9.1.6.ebuild 2082 RMD160 b1ffccceed266f8818ce6fa3c2f6d1a08d626dcf SHA1 7e0b16662dde1d46a0e6b2baff43efee553139c7 SHA256 3eb08348f428fb70d616f6a2ddf897dfd4fbeb5d44abfb6dcf87506616766050
-EBUILD sysstat-9.1.7.ebuild 2082 RMD160 8fbc7bfdc8a75e0880aef989de2803f402993d88 SHA1 812ad8bde96822c7a59685cf2ea2422730fc3f33 SHA256 c6492a14c28a81237f4d3b6eae1c22c209b2aaf5901fb0b45ce0eed411e44906
-MISC ChangeLog 23491 RMD160 c9286f2dd16c05fede82bdc1fd32d55dbdbcd4ac SHA1 1cddee84cab3314ab66a0cb494c11ebb4aeae99a SHA256 9af976b70b1b5eb51ef36579f43a72bd49894311171303b9aa71e2b733fd55f9
+MISC ChangeLog 23922 RMD160 5565f1437b922d8bba2cd6007f80be9ce258e566 SHA1 1fb08fa6e632516d9bfb4d8f9f04d5a9134a1596 SHA256 703ed742c7adb67755db11e6c0be971bad162979d16bf8b426092c80a4999105
 MISC metadata.xml 416 RMD160 7f095f0f80e688c8817c2120707b5186b9950da4 SHA1 115f7b62bc505ed8176b3c2558556009856e9f00 SHA256 d93e7ab614ffb746fe5a8acd24c1906f5159bf0850e7a9bf5605be4f1ff6a731
diff --git a/app-admin/sysstat/files/sysstat-10.0.0-flags.patch b/app-admin/sysstat/files/sysstat-10.0.0-flags.patch
new file mode 100644
index 000000000000..faa69a25b918
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-10.0.0-flags.patch
@@ -0,0 +1,31 @@
+--- Makefile.in.orig	2011-03-15 17:43:16.000000000 +0100
++++ Makefile.in	2011-03-15 17:44:20.000000000 +0100
+@@ -69,9 +69,8 @@
+ SYSCONFIG_DIR = @SYSCONFIG_DIR@
+ 
+ # Compiler flags
+-CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
++CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes 
+ DFLAGS = @DFLAGS@
+-LFLAGS =  -s
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ DFLAGS += $(DFSENSORS)
+ 
+@@ -154,7 +153,7 @@
+ 	$(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
+ 
+ % : %.o
+-	$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
++	$(CC) -o $@ $(CFLAGS) $(LFLAGS) $^ $(LIBS)
+ 
+ all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
+ 
+@@ -196,7 +195,7 @@
+ 
+ sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
+ 
+-sadc: LFLAGS += $(LFSENSORS)
++sadc: LIBS = $(LFSENSORS)
+ sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
+ 
+ sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
diff --git a/app-admin/sysstat/files/sysstat-9.1.5-nls.patch b/app-admin/sysstat/files/sysstat-10.0.0-nls.patch
index 235786b45129..937fb26ab2d1 100644
--- a/app-admin/sysstat/files/sysstat-9.1.5-nls.patch
+++ b/app-admin/sysstat/files/sysstat-10.0.0-nls.patch
@@ -1,6 +1,6 @@
---- a/Makefile.in	2010-08-28 08:30:07.000000000 +0200
-+++ b/Makefile.in	2010-09-14 07:20:50.000000000 +0200
-@@ -270,60 +270,14 @@
+--- a/Makefile.in	2011-03-06 16:46:23.000000000 +0100
++++ b/Makefile.in	2011-03-15 17:19:36.000000000 +0100
+@@ -290,62 +290,14 @@
  
  install_nls: locales
  ifdef REQUIRE_NLS
@@ -28,6 +28,7 @@
 -	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)/uk/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
@@ -55,6 +56,7 @@
 -	$(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/uk.gmo $(DESTDIR)$(NLS_DIR)/uk/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
diff --git a/app-admin/sysstat/files/sysstat-9.1.2-nls.patch b/app-admin/sysstat/files/sysstat-9.1.2-nls.patch
deleted file mode 100644
index 4b6b6db9646f..000000000000
--- a/app-admin/sysstat/files/sysstat-9.1.2-nls.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- 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
- 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)/eu/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/eu.gmo $(DESTDIR)$(NLS_DIR)/eu/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`; \
-+		cat=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-+		mkdir -p $(DESTDIR)$(NLS_DIR)/$$cat/LC_MESSAGES; \
-+		$(INSTALL_DATA) nls/$$cat.gmo \
-+			$(DESTDIR)$(NLS_DIR)/$$cat/LC_MESSAGES/$(PACKAGE).mo; \
-+	done
- endif
- 
- install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \
diff --git a/app-admin/sysstat/sysstat-9.1.6.ebuild b/app-admin/sysstat/sysstat-10.0.0.ebuild
index 5bc4e00a484f..54e05f708bb2 100644
--- a/app-admin/sysstat/sysstat-9.1.6.ebuild
+++ b/app-admin/sysstat/sysstat-10.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.6.ebuild,v 1.1 2010/11/12 18:18:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.0.ebuild,v 1.1 2011/03/15 16:55:56 jer Exp $
 
 EAPI="2"
 
@@ -8,14 +8,15 @@ inherit eutils multilib
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron +doc isag nls lm_sensors"
+IUSE="cron debug +doc isag nls lm_sensors"
 
-SYSSTAT_LINGUAS="af da de es eu fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
+SYSSTAT_LINGUAS="af cs da de es eu fi fr id it ja ky lv mt nb nl nn pl pt pt_BR
+	ro ru sk sv uk vi zh_CN zh_TW"
 
 for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
 	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
@@ -35,8 +36,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-9.1.5-nls.patch"
-
+	epatch "${FILESDIR}/${P}-nls.patch"
 	local lingua NLSDIR="${S}/nls"
 	einfo "Keeping these locales: ${LINGUAS}."
 	for lingua in ${SYSSTAT_LINGUAS}; do
@@ -44,6 +44,8 @@ src_prepare() {
 			rm -f "${NLSDIR}/${lingua}.po"
 		fi
 	done
+
+	epatch "${FILESDIR}"/${P}-flags.patch
 }
 
 src_configure() {
@@ -53,6 +55,7 @@ src_configure() {
 		econf ${myconf} \
 			rcdir="Gentoo-does-not-use-rc.d" \
 			$(use_enable cron install-cron) \
+			$(use_enable debug debuginfo) \
 			$(use_enable isag install-isag) \
 			$(use_enable nls) \
 			$(use_enable lm_sensors sensors) \
diff --git a/app-admin/sysstat/sysstat-9.1.3.ebuild b/app-admin/sysstat/sysstat-9.1.3.ebuild
deleted file mode 100644
index 78849c80025f..000000000000
--- a/app-admin/sysstat/sysstat-9.1.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.3.ebuild,v 1.2 2010/09/14 05:24:17 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron +doc isag nls"
-
-SYSSTAT_LINGUAS="af da de es eu fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
-
-for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
-	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
-done
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-9.1.2-nls.patch"
-
-	local lingua NLSDIR="${S}/nls"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for lingua in ${SYSSTAT_LINGUAS}; do
-		if ! use linguas_${lingua}; then
-			rm -f "${NLSDIR}/${lingua}.po"
-		fi
-	done
-}
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-documentation"
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		econf ${myconf} \
-			rcdir="Gentoo-does-not-use-rc.d" \
-			$(use_enable cron install-cron) \
-			$(use_enable isag install-isag) \
-			$(use_enable nls) \
-			conf_dir=/etc || die "econf failed"
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install || die "make install failed"
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-9.1.4.ebuild b/app-admin/sysstat/sysstat-9.1.4.ebuild
deleted file mode 100644
index fe41dfdda340..000000000000
--- a/app-admin/sysstat/sysstat-9.1.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.4.ebuild,v 1.2 2010/09/14 05:24:17 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron +doc isag nls lm_sensors"
-
-SYSSTAT_LINGUAS="af da de es eu fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
-
-for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
-	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
-done
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-9.1.2-nls.patch"
-
-	local lingua NLSDIR="${S}/nls"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for lingua in ${SYSSTAT_LINGUAS}; do
-		if ! use linguas_${lingua}; then
-			rm -f "${NLSDIR}/${lingua}.po"
-		fi
-	done
-}
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-documentation"
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		econf ${myconf} \
-			rcdir="Gentoo-does-not-use-rc.d" \
-			$(use_enable cron install-cron) \
-			$(use_enable isag install-isag) \
-			$(use_enable nls) \
-			$(use_enable lm_sensors sensors) \
-			conf_dir=/etc || die "econf failed"
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install || die "make install failed"
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-9.1.5.ebuild b/app-admin/sysstat/sysstat-9.1.5.ebuild
deleted file mode 100644
index 63e8f89a28bd..000000000000
--- a/app-admin/sysstat/sysstat-9.1.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.5.ebuild,v 1.1 2010/09/14 05:24:17 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron +doc isag nls lm_sensors"
-
-SYSSTAT_LINGUAS="af da de es eu fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
-
-for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
-	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
-done
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-nls.patch"
-
-	local lingua NLSDIR="${S}/nls"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for lingua in ${SYSSTAT_LINGUAS}; do
-		if ! use linguas_${lingua}; then
-			rm -f "${NLSDIR}/${lingua}.po"
-		fi
-	done
-}
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-documentation"
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		econf ${myconf} \
-			rcdir="Gentoo-does-not-use-rc.d" \
-			$(use_enable cron install-cron) \
-			$(use_enable isag install-isag) \
-			$(use_enable nls) \
-			$(use_enable lm_sensors sensors) \
-			conf_dir=/etc || die "econf failed"
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install || die "make install failed"
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-9.1.7.ebuild b/app-admin/sysstat/sysstat-9.1.7.ebuild
deleted file mode 100644
index 5fcd1c2f53da..000000000000
--- a/app-admin/sysstat/sysstat-9.1.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-9.1.7.ebuild,v 1.1 2010/12/27 18:31:00 jer Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="cron +doc isag nls lm_sensors"
-
-SYSSTAT_LINGUAS="af da de es eu fi fr id it ja ky lv mt nb nl nn pl pt_BR pt ro ru sk sv vi zh_CN zh_TW"
-
-for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
-	IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
-done
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-9.1.5-nls.patch"
-
-	local lingua NLSDIR="${S}/nls"
-	einfo "Keeping these locales: ${LINGUAS}."
-	for lingua in ${SYSSTAT_LINGUAS}; do
-		if ! use linguas_${lingua}; then
-			rm -f "${NLSDIR}/${lingua}.po"
-		fi
-	done
-}
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-documentation"
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		econf ${myconf} \
-			rcdir="Gentoo-does-not-use-rc.d" \
-			$(use_enable cron install-cron) \
-			$(use_enable isag install-isag) \
-			$(use_enable nls) \
-			$(use_enable lm_sensors sensors) \
-			conf_dir=/etc || die "econf failed"
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install || die "make install failed"
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
-
-pkg_postinst() {
-	ewarn "This version breaks the format of sar daily data files"
-	ewarn "to enable the recording of average CPU clock frequency."
-}