Version bump. Clean up patches.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

7 files changed, 148 insertions, 14 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/Manifest b/app-admin/sysstat/Manifest
index bcd1e09dcf69..d56ad9f76488 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,20 +2,23 @@
 Hash: SHA1
 
 AUX crontab 537 RMD160 1691874f9addabd7b234f792b112d45cb6e4de9a SHA1 7fdba83e02b333a37861c84d050876cc83daecff SHA256 0c2bcfb3b0c8df092a978c0e6d8ee960b3c10157271df1d4d14707a0d5788fa3
-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-10.0.1-nls.patch 4218 RMD160 78887675af00aace62f93951d83016a6dbe4f75c SHA1 9efdb87b3c1dba7158221439a4aec17ad52c8b11 SHA256 e8e74b97d445b99e98d629f2b587a754f0abfdebf9df0c952a17b22d6a051469
+AUX sysstat-10.0.0-flags.patch 883 RMD160 5f4b24b957cfecf2df5cd1bc29870cde39f717ff SHA1 7c49f4473a33d3cd92407b6face3209ad90a3d09 SHA256 40f04c77754139940b9ce3eb5d06c036c724aadb3d88dc8699397a9c80d2cccf
+AUX sysstat-10.0.0-nls.patch 4020 RMD160 f48ddda1ecabb65f471a9bbf0867f520ad7c38d7 SHA1 0804e60ad7c1adaa30b7bf662479c104936adf64 SHA256 d8f64fd272a7b10c5ed730f62e89e31992756122a4fc2546a5cbdd3c3e0fc6f8
+AUX sysstat-10.0.1-nls.patch 4146 RMD160 96344a716358cf459b9010588562c4f6e2173ca8 SHA1 d3b69aae16031d71f0c333937025ebf21a5c2400 SHA256 77866225e542b1d4408818c5b0b856ce9a2feecd935f4d4dd8a0c331378ee970
+AUX sysstat-10.0.4-flags.patch 887 RMD160 21e9307ff8e62418b748701db8d5b4740b22a6c3 SHA1 92bedcd09fb96e0e946daa92bef1ef8771f9bfca SHA256 198660c418902107914afefbed1b07a0206ee05d673e99182f834f4ed98d1e8c
 AUX sysstat.init.d 489 RMD160 ad6022699c4bcfd0536e9210a4d50a27fc59a50e SHA1 bcf069710a8e1316e714af7b7a3568782eeb7165 SHA256 bfc3a588685964cf0f8c0dff5915f55a370be986e92fd4e7d8e751dbf367f5fe
 DIST sysstat-10.0.2.tar.bz2 268403 RMD160 307f9bdc9c014cd8380e1ef0c77fe0ddfb8382d6 SHA1 c356aa2a1338e7a70ddf359a00ecf7bfddd1790a SHA256 26570c18e0f2a80a30bcc94cb57cab09d99e84ea223a827f4f426a6246ad3eb5
 DIST sysstat-10.0.3.tar.bz2 271868 RMD160 ba59fa29eb17eebc6abe7ed2d8b570580668bbe1 SHA1 d85b261b01daf4d3fdcc69cc852fb8bb747b9f97 SHA256 22023d53f58d3d6f483b21b852d606d135e69984cf6631574633bd4e56c8ff7c
+DIST sysstat-10.0.4.tar.bz2 276962 RMD160 a76e84eab9ecfcb622be9d3437a6ab2b7d3179c4 SHA1 8ab30d2cecccb8dcfbb1cbd4e894139fc67fe0fd SHA256 55d6664bdfe72b3291100627a5e301189d29189e0432676a3678514962837fdb
 EBUILD sysstat-10.0.2.ebuild 2146 RMD160 577944adc8c40f7622e6250164d170d10cdfb65c SHA1 cc114584f7948d6c876296bc1df0ffebba738590 SHA256 597b144182887ce17f113ee3665b03c465e5901782b4f24a7c953c98513a1560
 EBUILD sysstat-10.0.3.ebuild 2149 RMD160 2a7f9b030eaef1351f14ad80a84159ca78301dae SHA1 e077ea60b406c799e722f4fa3c54f032dd85c0e5 SHA256 7b1898d329fa55d99356000d2a806392c864a441e952d3c3cbac6146dc9a1105
-MISC ChangeLog 26985 RMD160 4744b256ae2cf4f292c6d539a0913c21c69d5d4f SHA1 952a98361559ddd3ba0e05e4986d1089bc20ccbf SHA256 f1629b041251d58804e1c528c3a71d4fdc284a548a13f1f0f67f52bf46eb5592
+EBUILD sysstat-10.0.4.ebuild 2154 RMD160 ba7a949bd80bb361be16c9321d855e4c33df6d62 SHA1 d3c96e41af491211a9d05efe90c1e3ff0671b48f SHA256 75a32de8930da3ace7395bd449a829878cec78505572acf9d94bc2148043f2c0
+MISC ChangeLog 27261 RMD160 b63b78ef5ff82a5949f311b19b5fd37b759a60aa SHA1 fb67830d04a633598009ef940b56c56154746689 SHA256 0ff66879379112eb36789742e735170cc1d3163a04bf420e29ca0376ba557480
 MISC metadata.xml 395 RMD160 1ebcd91dcaa86debad0cb047dfa4483e3d550713 SHA1 5c7dcdfea634a13a16ad0fa74e347b4fe937339a SHA256 90a23fcc0a01b4de0db48afe58aa046e2478075af5bf1b0d9b1c17f016bf945f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9Wc8QACgkQVWmRsqeSphO+OQCfREBocZJs77zHkZzDSD9YCTyg
-KmEAn3x9DoecROKZDscGMI+XmFZipSpR
-=PArN
+iEYEARECAAYFAk9aJwsACgkQVWmRsqeSphOEOgCfaLRleXvlyCTett1S7ucDt76N
+uacAn1khgzEtFVfIgJWncymbcktpjaGI
+=JWt5
 -----END PGP SIGNATURE-----
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
+}