Version bump. Clean up patches.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

6 files changed, 138 insertions, 7 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 93af9fc167b6..da2864b8a7f0 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.217 2012/03/06 20:29:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.218 2012/03/09 15:51:33 jer Exp $
+
+*sysstat-10.0.4 (09 Mar 2012)
+
+  09 Mar 2012; Jeroen Roovers <jer@gentoo.org>
+  files/sysstat-10.0.0-flags.patch, files/sysstat-10.0.0-nls.patch,
+  files/sysstat-10.0.1-nls.patch, +sysstat-10.0.4.ebuild,
+  +files/sysstat-10.0.4-flags.patch:
+  Version bump. Clean up patches.
 
   06 Mar 2012; Jeroen Roovers <jer@gentoo.org> -sysstat-10.0.1.ebuild:
   Old.
diff --git a/app-admin/sysstat/files/sysstat-10.0.0-flags.patch b/app-admin/sysstat/files/sysstat-10.0.0-flags.patch
index faa69a25b918..16bdd61a7d34 100644
--- a/app-admin/sysstat/files/sysstat-10.0.0-flags.patch
+++ b/app-admin/sysstat/files/sysstat-10.0.0-flags.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2011-03-15 17:43:16.000000000 +0100
-+++ Makefile.in	2011-03-15 17:44:20.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -69,9 +69,8 @@
  SYSCONFIG_DIR = @SYSCONFIG_DIR@
  
diff --git a/app-admin/sysstat/files/sysstat-10.0.0-nls.patch b/app-admin/sysstat/files/sysstat-10.0.0-nls.patch
index 937fb26ab2d1..5fef3bbd7e0c 100644
--- a/app-admin/sysstat/files/sysstat-10.0.0-nls.patch
+++ b/app-admin/sysstat/files/sysstat-10.0.0-nls.patch
@@ -1,5 +1,5 @@
---- a/Makefile.in	2011-03-06 16:46:23.000000000 +0100
-+++ b/Makefile.in	2011-03-15 17:19:36.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -290,62 +290,14 @@
  
  install_nls: locales
diff --git a/app-admin/sysstat/files/sysstat-10.0.1-nls.patch b/app-admin/sysstat/files/sysstat-10.0.1-nls.patch
index 20bcc592a219..e44693bc4848 100644
--- a/app-admin/sysstat/files/sysstat-10.0.1-nls.patch
+++ b/app-admin/sysstat/files/sysstat-10.0.1-nls.patch
@@ -1,5 +1,5 @@
---- Makefile.in.old	2011-05-07 08:27:30.000000000 +0200
-+++ Makefile.in	2011-06-03 16:03:08.946659588 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -290,64 +290,14 @@
  
  install_nls: locales
diff --git a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
new file mode 100644
index 000000000000..402e7d604b1a
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
@@ -0,0 +1,31 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -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 = @STRIP@
+ 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/sysstat-10.0.4.ebuild b/app-admin/sysstat/sysstat-10.0.4.ebuild
new file mode 100644
index 000000000000..13bb186967db
--- /dev/null
+++ b/app-admin/sysstat/sysstat-10.0.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.0.4.ebuild,v 1.1 2012/03/09 15:51:33 jer Exp $
+
+EAPI="4"
+
+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 debug +doc isag nls lm_sensors"
+
+SYSSTAT_LINGUAS="
+	af cs da de eo es eu fi fr id it ja ky lv mt nb nl nn pl pt pt_BR ro ru sk
+	sr sv uk 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() {
+	local po_count li_count lingua NLSDIR="${S}/nls"
+
+	count() { echo ${#}; }
+	po_count=$(count ${NLSDIR}/*.po)
+	li_count=$(count ${SYSSTAT_LINGUAS})
+	[[ ${po_count} = ${li_count} ]] \
+		|| die "Number of LINGUAS does not match number of .po files"
+	unset count
+
+	einfo "Keeping these locales: ${LINGUAS}."
+	for lingua in ${SYSSTAT_LINGUAS}; do
+		if ! use linguas_${lingua}; then
+			rm -f "${NLSDIR}/${lingua}.po" || die
+		fi
+	done
+	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+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 debug debuginfo) \
+			$(use_enable isag install-isag) \
+			$(use_enable nls) \
+			$(use_enable lm_sensors sensors) \
+			conf_dir=/etc
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	use cron && dodir /etc/cron.{daily,hourly}
+
+	emake \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		install
+
+	dodoc contrib/sargraph/sargraph
+
+	newinitd "${FILESDIR}"/sysstat.init.d sysstat
+
+	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}