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

(Portage version: 2.2.0_alpha27/cvs/Linux i686)

9 files changed, 57 insertions, 408 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/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."
-}