Version bump. Remove testing cruft.

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

5 files changed, 162 insertions, 5 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index a82325348dcc..4bb1fd1db70e 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,13 @@
 # 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.184 2010/08/02 16:17:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.185 2010/09/14 05:24:17 jer Exp $
+
+*sysstat-9.1.5 (14 Sep 2010)
+
+  14 Sep 2010; Jeroen Roovers <jer@gentoo.org> sysstat-9.1.3.ebuild,
+  sysstat-9.1.4.ebuild, +sysstat-9.1.5.ebuild,
+  +files/sysstat-9.1.5-nls.patch:
+  Version bump. Remove testing cruft.
 
   02 Aug 2010; Jeroen Roovers <jer@gentoo.org> files/sysstat.init.d:
   Describe more accurately what the init.d script is doing and not doing.
diff --git a/app-admin/sysstat/files/sysstat-9.1.5-nls.patch b/app-admin/sysstat/files/sysstat-9.1.5-nls.patch
new file mode 100644
index 000000000000..22eb01ac0b00
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-9.1.5-nls.patch
@@ -0,0 +1,71 @@
+--- Makefile.in.orig	2010-08-28 08:30:07.000000000 +0200
++++ Makefile.in	2010-09-14 07:20:50.000000000 +0200
+@@ -270,60 +270,14 @@
+ 
+ install_nls: locales
+ ifdef REQUIRE_NLS
+-	mkdir -p $(DESTDIR)$(NLS_DIR)/af/LC_MESSAGES
+-	mkdir -p $(DESTDIR)$(NLS_DIR)/cs/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/cs.gmo $(DESTDIR)$(NLS_DIR)/cs/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.3.ebuild b/app-admin/sysstat/sysstat-9.1.3.ebuild
index ef5887ffb66b..78849c80025f 100644
--- a/app-admin/sysstat/sysstat-9.1.3.ebuild
+++ b/app-admin/sysstat/sysstat-9.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2010/06/29 13:47:47 jer Exp $
+# $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"
 
@@ -34,7 +34,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	cp -av Makefile.in{,.orig}
 	epatch "${FILESDIR}/${PN}-9.1.2-nls.patch"
 
 	local lingua NLSDIR="${S}/nls"
diff --git a/app-admin/sysstat/sysstat-9.1.4.ebuild b/app-admin/sysstat/sysstat-9.1.4.ebuild
index 2f58f9210fa5..fe41dfdda340 100644
--- a/app-admin/sysstat/sysstat-9.1.4.ebuild
+++ b/app-admin/sysstat/sysstat-9.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2010/07/29 11:49:01 jer Exp $
+# $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"
 
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	cp -av Makefile.in{,.orig}
 	epatch "${FILESDIR}/${PN}-9.1.2-nls.patch"
 
 	local lingua NLSDIR="${S}/nls"
diff --git a/app-admin/sysstat/sysstat-9.1.5.ebuild b/app-admin/sysstat/sysstat-9.1.5.ebuild
new file mode 100644
index 000000000000..63e8f89a28bd
--- /dev/null
+++ b/app-admin/sysstat/sysstat-9.1.5.ebuild
@@ -0,0 +1,81 @@
+# 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
+}