Cleanup and fix paths per bug #172548 thanks to Sergij Borodych

(Portage version: 2.1.2.7)

12 files changed, 43 insertions, 486 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 5a9a2ad56518..03b186965e96 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.52 2007/04/15 19:43:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.53 2007/05/31 10:08:50 jokey Exp $
+
+*sysstat-7.0.4-r2 (31 May 2007)
+
+  31 May 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/sysstat-6.0.0-gcc4.diff, -files/sysstat-6.0.1-gcc4.diff,
+  +files/sysstat.init.d, -sysstat-5.0.2.ebuild, -sysstat-6.0.1.ebuild,
+  -sysstat-7.0.1.ebuild, -sysstat-7.0.4-r1.ebuild, +sysstat-7.0.4-r2.ebuild:
+  Cleanup and fix paths per bug #172548 thanks to Sergij Borodych
 
   15 Apr 2007; Markus Rothe <corsair@gentoo.org> sysstat-7.0.4-r1.ebuild:
   Stable on ppc64
diff --git a/app-admin/sysstat/files/digest-sysstat-5.0.2 b/app-admin/sysstat/files/digest-sysstat-5.0.2
deleted file mode 100644
index f63b2c1cca26..000000000000
--- a/app-admin/sysstat/files/digest-sysstat-5.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b4d1273ef7629a31af3e5161d14c60b2 sysstat-5.0.2.tar.gz 118740
-RMD160 bd36203c7de695440bda8f41ca6ae1e943926bcb sysstat-5.0.2.tar.gz 118740
-SHA256 152e1f4c2b0208bb96aa7a28cdfd4ee349123fa6494ec04a119f5968804c3e76 sysstat-5.0.2.tar.gz 118740
diff --git a/app-admin/sysstat/files/digest-sysstat-6.0.1 b/app-admin/sysstat/files/digest-sysstat-6.0.1
deleted file mode 100644
index 29c6978fbc42..000000000000
--- a/app-admin/sysstat/files/digest-sysstat-6.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98a19b8c9c4a8a299b859df143d2b2a8 sysstat-6.0.1.tar.gz 151168
-RMD160 3210e755e3f238f8e8c120453a8fbd5007f5a317 sysstat-6.0.1.tar.gz 151168
-SHA256 f1b629074dc03bad81537336a14334fca5fd37ec70e704db157d088c1617ba22 sysstat-6.0.1.tar.gz 151168
diff --git a/app-admin/sysstat/files/digest-sysstat-7.0.1 b/app-admin/sysstat/files/digest-sysstat-7.0.1
deleted file mode 100644
index 21f08853cd04..000000000000
--- a/app-admin/sysstat/files/digest-sysstat-7.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 574d79d8b7943b91f6e6040753308b72 sysstat-7.0.1.tar.gz 153372
-RMD160 1d5f6d6e6a8db0877e166ee9910424ef3c3d7ecd sysstat-7.0.1.tar.gz 153372
-SHA256 f3d97da29d00fbbc57580d4972ee76c3995892886090c53278b77511f4e96633 sysstat-7.0.1.tar.gz 153372
diff --git a/app-admin/sysstat/files/digest-sysstat-7.0.4-r1 b/app-admin/sysstat/files/digest-sysstat-7.0.4-r2
index c9aa6ebb9819..340589733815 100644
--- a/app-admin/sysstat/files/digest-sysstat-7.0.4-r1
+++ b/app-admin/sysstat/files/digest-sysstat-7.0.4-r2
@@ -1,3 +1,2 @@
-MD5 b51eb0931daa45b4df3fb59340db8379 sysstat-7.0.4.tar.gz 157567
 RMD160 c8f483e0b02176fa50a97a6608118540723fc498 sysstat-7.0.4.tar.gz 157567
 SHA256 b42e0d5fac381c24d0484708b0f992b39e267b4fcde2889b7c0c5f991bad604f sysstat-7.0.4.tar.gz 157567
diff --git a/app-admin/sysstat/files/sysstat-6.0.0-gcc4.diff b/app-admin/sysstat/files/sysstat-6.0.0-gcc4.diff
deleted file mode 100644
index 6a9f570a55dd..000000000000
--- a/app-admin/sysstat/files/sysstat-6.0.0-gcc4.diff
+++ /dev/null
@@ -1,169 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/iostat.c sysstat-6.0.0/iostat.c
---- sysstat-6.0.0.orig/iostat.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/iostat.c	2005-05-16 16:48:06.000000000 -0400
-@@ -958,7 +958,7 @@
- 
-    /* Print time stamp */
-    if (DISPLAY_TIMESTAMP(flags)) {
--      strftime(timestamp, sizeof(timestamp), "%X", loc_time);
-+      strftime((char *)timestamp, sizeof(timestamp), "%X", loc_time);
-       printf(_("Time: %s\n"), timestamp);
-    }
- 
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sa_common.c sysstat-6.0.0/sa_common.c
---- sysstat-6.0.0.orig/sa_common.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sa_common.c	2005-05-16 16:42:31.000000000 -0400
-@@ -380,7 +380,7 @@
-       mktime(loc_time);
-    }
-    else
--      loc_time = localtime(&(file_hdr->sa_ust_time));
-+      loc_time = localtime((time_t *)(&(file_hdr->sa_ust_time)));
- 
-    if (!format)
-       /* No output format (we are not using sadf) */
-@@ -406,7 +406,7 @@
- 
-    while (index < file_hdr->sa_iface) {
-       st_net_dev_j = st_net_dev[ref] + index;
--      if (!strcmp(st_net_dev_i->interface, st_net_dev_j->interface)) {
-+      if (!strcmp((char *)st_net_dev_i->interface, (char *)st_net_dev_j->interface)) {
- 	 /*
- 	  * Network interface found.
- 	  * If a counter has decreased, then we may assume that the
-@@ -465,7 +465,7 @@
- 	    if (!ovfw) {
- 	       /* OK: assume here that the device was actually unregistered */
- 	       memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--	       strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+	       strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 	    }
- 	 }
- 	 return index;
-@@ -476,9 +476,9 @@
-    /* Network interface not found: Look for the first free structure */
-    for (index = 0; index < file_hdr->sa_iface; index++) {
-       st_net_dev_j = st_net_dev[ref] + index;
--      if (!strcmp(st_net_dev_j->interface, "?")) {
-+      if (!strcmp((char *)st_net_dev_j->interface, "?")) {
- 	 memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--	 strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+	 strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 	 break;
-       }
-    }
-@@ -489,7 +489,7 @@
-    st_net_dev_j = st_net_dev[ref] + index;
-    /* Since the name is not the same, reset all the structure */
-    memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--   strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+   strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 
-    return  index;
- }
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadc.c sysstat-6.0.0/sadc.c
---- sysstat-6.0.0.orig/sadc.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sadc.c	2005-05-16 16:33:19.000000000 -0400
-@@ -1419,7 +1419,7 @@
- 	  * old file with more interfaces than are actually available now.
- 	  */
- 	 st_net_dev_i = st_net_dev + dev++;
--	 strcpy(st_net_dev_i->interface, "?");
-+	 strcpy((char *)(st_net_dev_i->interface), "?");
-       }
-    }
- }
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadf.c sysstat-6.0.0/sadf.c
---- sysstat-6.0.0.orig/sadf.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sadf.c	2005-05-16 16:47:18.000000000 -0400
-@@ -136,10 +136,10 @@
-    if (PRINT_TRUE_TIME(flags) &&
-        ((format == S_O_DB_OPTION) || (format == S_O_XML_OPTION)))
-       /* '-d -t' or '-x -t' */
--      ltm = localtime(&file_stats[curr].ust_time);
-+      ltm = localtime((time_t *)(&file_stats[curr].ust_time));
-    else
-       /* '-p' or '-p -t' or '-d' or '-x' */
--      ltm = gmtime(&file_stats[curr].ust_time);
-+      ltm = gmtime((time_t *)(&file_stats[curr].ust_time));
- 
-    loc_time = *ltm;
- }
-@@ -675,7 +675,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- 
--	 if (!strcmp((ifc = sndi->interface), "?"))
-+	 if (!strcmp((ifc = (char *)sndi->interface), "?"))
- 	    continue;
- 
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
-@@ -722,7 +722,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- 
--	 if (!strcmp((ifc = sndi->interface), "?"))
-+	 if (!strcmp((ifc = (char *)sndi->interface), "?"))
- 	    continue;
- 
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
-@@ -1231,7 +1231,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 	
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
- 	 sndj = st_net_dev[!curr] + j;
-@@ -1411,7 +1411,7 @@
- {
-    printf("File: %s (%#x)\n", dfile, file_hdr->sa_magic);
- 
--   print_gal_header(localtime(&(file_hdr->sa_ust_time)), file_hdr->sa_sysname,
-+   print_gal_header(localtime((time_t *)(&(file_hdr->sa_ust_time))), file_hdr->sa_sysname,
- 		    file_hdr->sa_release, file_hdr->sa_nodename);
- 
-    printf("Activity flag: %#x\n", file_hdr->sa_actflag);
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sa.h sysstat-6.0.0/sa.h
---- sysstat-6.0.0.orig/sa.h	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sa.h	2005-05-16 16:38:10.000000000 -0400
-@@ -489,7 +489,7 @@
- 					 struct stats_one_cpu *);
- extern char	   *get_devname(unsigned int, unsigned int, int);
- extern void	    init_bitmap(unsigned char [], unsigned char, unsigned int);
--extern void	    init_stats(struct file_stats [], unsigned int [][]);
-+extern void	    init_stats(struct file_stats [], unsigned int [DIM][NR_IRQS]);
- extern int	    next_slice(unsigned long long, unsigned long long,
- 			       struct file_hdr *, int, long);
- extern int	    parse_sar_opt(char * [], int, unsigned int *,
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sar.c sysstat-6.0.0/sar.c
---- sysstat-6.0.0.orig/sar.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sar.c	2005-05-16 16:43:19.000000000 -0400
-@@ -213,7 +213,7 @@
-       loc_time.tm_sec  = file_stats[curr].second;
-    }
-    else {
--      ltm = localtime(&file_stats[curr].ust_time);
-+      ltm = localtime((time_t *)(&file_stats[curr].ust_time));
-       loc_time = *ltm;
-    }
- }
-@@ -577,7 +577,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
- 	 sndj = st_net_dev[prev] + j;
-@@ -608,7 +608,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
- 	 sndj = st_net_dev[prev] + j;
diff --git a/app-admin/sysstat/files/sysstat-6.0.1-gcc4.diff b/app-admin/sysstat/files/sysstat-6.0.1-gcc4.diff
deleted file mode 100644
index 739cde163bba..000000000000
--- a/app-admin/sysstat/files/sysstat-6.0.1-gcc4.diff
+++ /dev/null
@@ -1,157 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/iostat.c sysstat-6.0.0/iostat.c
---- sysstat-6.0.0.orig/iostat.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/iostat.c	2005-05-16 16:48:06.000000000 -0400
-@@ -958,7 +958,7 @@
- 
-    /* Print time stamp */
-    if (DISPLAY_TIMESTAMP(flags)) {
--      strftime(timestamp, sizeof(timestamp), "%X", loc_time);
-+      strftime((char *)timestamp, sizeof(timestamp), "%X", loc_time);
-       printf(_("Time: %s\n"), timestamp);
-    }
- 
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sa_common.c sysstat-6.0.0/sa_common.c
---- sysstat-6.0.0.orig/sa_common.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sa_common.c	2005-05-16 16:42:31.000000000 -0400
-@@ -380,7 +380,7 @@
-       mktime(loc_time);
-    }
-    else
--      loc_time = localtime(&(file_hdr->sa_ust_time));
-+      loc_time = localtime((time_t *)(&(file_hdr->sa_ust_time)));
- 
-    if (!format)
-       /* No output format (we are not using sadf) */
-@@ -406,7 +406,7 @@
- 
-    while (index < file_hdr->sa_iface) {
-       st_net_dev_j = st_net_dev[ref] + index;
--      if (!strcmp(st_net_dev_i->interface, st_net_dev_j->interface)) {
-+      if (!strcmp((char *)st_net_dev_i->interface, (char *)st_net_dev_j->interface)) {
- 	 /*
- 	  * Network interface found.
- 	  * If a counter has decreased, then we may assume that the
-@@ -465,7 +465,7 @@
- 	    if (!ovfw) {
- 	       /* OK: assume here that the device was actually unregistered */
- 	       memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--	       strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+	       strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 	    }
- 	 }
- 	 return index;
-@@ -476,9 +476,9 @@
-    /* Network interface not found: Look for the first free structure */
-    for (index = 0; index < file_hdr->sa_iface; index++) {
-       st_net_dev_j = st_net_dev[ref] + index;
--      if (!strcmp(st_net_dev_j->interface, "?")) {
-+      if (!strcmp((char *)st_net_dev_j->interface, "?")) {
- 	 memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--	 strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+	 strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 	 break;
-       }
-    }
-@@ -489,7 +489,7 @@
-    st_net_dev_j = st_net_dev[ref] + index;
-    /* Since the name is not the same, reset all the structure */
-    memset(st_net_dev_j, 0, STATS_NET_DEV_SIZE);
--   strcpy(st_net_dev_j->interface, st_net_dev_i->interface);
-+   strcpy((char *)st_net_dev_j->interface, (char *)st_net_dev_i->interface);
- 
-    return  index;
- }
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadc.c sysstat-6.0.0/sadc.c
---- sysstat-6.0.0.orig/sadc.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sadc.c	2005-05-16 16:33:19.000000000 -0400
-@@ -1419,7 +1419,7 @@
- 	  * old file with more interfaces than are actually available now.
- 	  */
- 	 st_net_dev_i = st_net_dev + dev++;
--	 strcpy(st_net_dev_i->interface, "?");
-+	 strcpy((char *)(st_net_dev_i->interface), "?");
-       }
-    }
- }
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sadf.c sysstat-6.0.0/sadf.c
---- sysstat-6.0.0.orig/sadf.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sadf.c	2005-05-16 16:47:18.000000000 -0400
-@@ -136,10 +136,10 @@
-    if (PRINT_TRUE_TIME(flags) &&
-        ((format == S_O_DB_OPTION) || (format == S_O_XML_OPTION)))
-       /* '-d -t' or '-x -t' */
--      ltm = localtime(&file_stats[curr].ust_time);
-+      ltm = localtime((time_t *)(&file_stats[curr].ust_time));
-    else
-       /* '-p' or '-p -t' or '-d' or '-x' */
--      ltm = gmtime(&file_stats[curr].ust_time);
-+      ltm = gmtime((time_t *)(&file_stats[curr].ust_time));
- 
-    loc_time = *ltm;
- }
-@@ -675,7 +675,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- 
--	 if (!strcmp((ifc = sndi->interface), "?"))
-+	 if (!strcmp((ifc = (char *)sndi->interface), "?"))
- 	    continue;
- 
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
-@@ -722,7 +722,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, ++sndi) {
- 
--	 if (!strcmp((ifc = sndi->interface), "?"))
-+	 if (!strcmp((ifc = (char *)sndi->interface), "?"))
- 	    continue;
- 
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
-@@ -1231,7 +1231,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 	
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, !curr, i);
- 	 sndj = st_net_dev[!curr] + j;
-@@ -1411,7 +1411,7 @@
- {
-    printf("File: %s (%#x)\n", dfile, file_hdr->sa_magic);
- 
--   print_gal_header(localtime(&(file_hdr->sa_ust_time)), file_hdr->sa_sysname,
-+   print_gal_header(localtime((time_t *)(&(file_hdr->sa_ust_time))), file_hdr->sa_sysname,
- 		    file_hdr->sa_release, file_hdr->sa_nodename);
- 
-    printf("Activity flag: %#x\n", file_hdr->sa_actflag);
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sysstat-6.0.0.orig/sar.c sysstat-6.0.0/sar.c
---- sysstat-6.0.0.orig/sar.c	2005-05-16 16:20:24.000000000 -0400
-+++ sysstat-6.0.0/sar.c	2005-05-16 16:43:19.000000000 -0400
-@@ -213,7 +213,7 @@
-       loc_time.tm_sec  = file_stats[curr].second;
-    }
-    else {
--      ltm = localtime(&file_stats[curr].ust_time);
-+      ltm = localtime((time_t *)(&file_stats[curr].ust_time));
-       loc_time = *ltm;
-    }
- }
-@@ -577,7 +577,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
- 	 sndj = st_net_dev[prev] + j;
-@@ -608,7 +608,7 @@
- 
-       for (i = 0; i < file_hdr.sa_iface; i++, sndi++) {
- 
--	 if (!strcmp(sndi->interface, "?"))
-+	 if (!strcmp((char *)sndi->interface, "?"))
- 	    continue;
- 	 j = check_iface_reg(&file_hdr, st_net_dev, curr, prev, i);
- 	 sndj = st_net_dev[prev] + j;
diff --git a/app-admin/sysstat/files/sysstat.init.d b/app-admin/sysstat/files/sysstat.init.d
new file mode 100644
index 000000000000..78fd28b5d144
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat.init.d
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/files/sysstat.init.d,v 1.1 2007/05/31 10:08:50 jokey Exp $
+
+depend() {
+    use hostname
+}
+
+start() {
+    ebegin "Calling the system activity data collector (sadc)..."
+    /usr/lib/sa/sadc -F -L -
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping..."
+    eend $?
+}
+
+# restart emulation
+# svc_start svc_stop
+restart() {
+    ebegin "Restart..."
+    eend $?
+}
diff --git a/app-admin/sysstat/sysstat-5.0.2.ebuild b/app-admin/sysstat/sysstat-5.0.2.ebuild
deleted file mode 100644
index 311470c9a73f..000000000000
--- a/app-admin/sysstat/sysstat-5.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-5.0.2.ebuild,v 1.10 2006/02/25 01:31:44 ka0ttic Exp $
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/"
-SRC_URI="http://perso.wanadoo.fr/sebastien.godard/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 mips hppa"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	yes "" | make config
-	use nls || sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG
-	make PREFIX=/usr || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man{1,8}
-	dodir /var/log/sa
-	keepdir /var/log/sa
-
-	make \
-		DESTDIR=${D} \
-		PREFIX=/usr \
-		MAN_DIR=/usr/share/man \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install || die
-}
diff --git a/app-admin/sysstat/sysstat-6.0.1.ebuild b/app-admin/sysstat/sysstat-6.0.1.ebuild
deleted file mode 100644
index 7cd6c55bbfbb..000000000000
--- a/app-admin/sysstat/sysstat-6.0.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-6.0.1.ebuild,v 1.5 2006/02/25 01:31:44 ka0ttic Exp $
-
-inherit eutils
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/"
-SRC_URI="http://perso.wanadoo.fr/sebastien.godard/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
-	epatch ${FILESDIR}/${P}-gcc4.diff
-}
-
-src_compile() {
-	# ick. interactive makefile rule
-	yes '' | make config
-
-	if ! use nls ; then
-		sed -i 's/\(ENABLE_NLS\ =\ \)y/\1n/g' build/CONFIG || \
-			die "sed CONFIG failed"
-	fi
-
-	make PREFIX=/usr SA_LIB_DIR=/usr/lib/sa || die "make failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-	newdoc ${FILESDIR}/crontab crontab.example
-
-	make \
-		DESTDIR=${D} \
-		PREFIX=/usr \
-		MAN_DIR=/usr/share/man \
-		DOC_DIR=/usr/share/doc/${PF} \
-		SA_LIB_DIR=/usr/lib/sa \
-		install || die "make install failed"
-}
diff --git a/app-admin/sysstat/sysstat-7.0.1.ebuild b/app-admin/sysstat/sysstat-7.0.1.ebuild
deleted file mode 100644
index ed62619294c8..000000000000
--- a/app-admin/sysstat/sysstat-7.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-7.0.1.ebuild,v 1.1 2006/11/13 23:21:11 jokey Exp $
-
-inherit multilib
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/"
-SRC_URI="http://perso.orange.fr/sebastien.godard/sysstat-7.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-CONFIGVARS="PREFIX=\"${ROOT}usr\"
-		SA_LIB_DIR=\"${ROOT}usr/$(get_libdir)/sa\"
-		SA_DIR=\"${ROOT}var/log/sa\"
-		DOC_DIR=\"${ROOT}usr/share/doc/${PF}\""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	if ! use nls ; then
-		sed -i '19s:\(REQUIRE_NLS = \)[^\n]*:\1:' build/CONFIG || \
-			die "sed CONFIG failed"
-	fi
-
-	emake LFLAGS=" " \
-		${CONFIGVARS} \
-		|| die "make failed"
-}
-
-src_install() {
-	keepdir /var/log/sa
-	newdoc "${FILESDIR}/crontab" crontab.example
-
-	emake \
-		DESTDIR="${D}" \
-		${CONFIGVARS} \
-		install || die "make install failed"
-
-	rm "${D}/usr/share/doc/${PF}/COPYING"
-	gzip "${D}/usr/share/doc/${PF}/"*[^mz]
-}
diff --git a/app-admin/sysstat/sysstat-7.0.4-r1.ebuild b/app-admin/sysstat/sysstat-7.0.4-r2.ebuild
index 5967942923c8..0e420d9c9ff1 100644
--- a/app-admin/sysstat/sysstat-7.0.4-r1.ebuild
+++ b/app-admin/sysstat/sysstat-7.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-7.0.4-r1.ebuild,v 1.3 2007/04/15 19:43:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-7.0.4-r2.ebuild,v 1.1 2007/05/31 10:08:50 jokey Exp $
 
 inherit multilib
 
@@ -20,12 +20,13 @@ DEPEND="${RDEPEND}
 CONFIGVARS="PREFIX=\"${ROOT}usr\"
 		SA_LIB_DIR=\"${ROOT}usr/$(get_libdir)/sa\"
 		SA_DIR=\"${ROOT}var/log/sa\"
+		CRON_OWNER=\"root\"
 		DOC_DIR=\"${ROOT}usr/share/doc/${PF}\"
 		MAN_DIR=\"${ROOT}usr/share/man/\""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
 }
 
@@ -42,7 +43,6 @@ src_compile() {
 
 src_install() {
 	keepdir /var/log/sa
-	newdoc "${FILESDIR}/crontab" crontab.example
 
 	emake \
 		LFLAGS="${LDFLAGS}" \
@@ -51,5 +51,9 @@ src_install() {
 		install || die "make install failed"
 
 	rm "${D}/usr/share/doc/${PF}/COPYING"
-	gzip "${D}/usr/share/doc/${PF}/"*[^mz]
+	ecompress "${D}/usr/share/doc/${PF}/"*[^mz]
+	newdoc sysstat.crond.sample crontab.example
+	insinto /etc/cron.d
+	newins sysstat.crond sysstat
+	newinitd "${FILESDIR}"/sysstat.init.d sysstat
 }