removing old version, marking 0.3.3 x86 stable

(Portage version: 2.0.51.19)

8 files changed, 10 insertions, 419 deletions

diff --git a/net-analyzer/slurm/ChangeLog b/net-analyzer/slurm/ChangeLog
index e8a01d2e16e5..2e38e02c4778 100644
--- a/net-analyzer/slurm/ChangeLog
+++ b/net-analyzer/slurm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/slurm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.10 2005/04/25 02:50:45 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.11 2005/05/07 21:48:05 vanquirius Exp $
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/slurm-0.2.2-altcolors-gentoo.patch,
+  -files/slurm-0.2.2-fix-gentoo.patch, -files/slurm-0.2.3-theme.patch,
+  -slurm-0.2.3.ebuild, slurm-0.3.3.ebuild:
+  Removing old ebuild, marking 0.3.3 x86 stable.
 
   24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -slurm-0.2.2.ebuild,
   slurm-0.3.2.ebuild:
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 51a6f93b64c6..ff5cdcc6b9ef 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1,11 +1,6 @@
-MD5 cecce935876d9ee07fdd25f5199c864f slurm-0.3.3.ebuild 764
+MD5 21455819381df05b8a0015c60e55d64a slurm-0.3.3.ebuild 763
 MD5 daf022e8a7a5ab2bf86b824fd9ae6848 slurm-0.3.2.ebuild 761
 MD5 9d66e8b7b6b3b820c8c64a686d34c9ad ChangeLog 1912
 MD5 a96a9c0d4be659091bc997c67c36d781 metadata.xml 258
-MD5 cd33ca61f17417a1605b9649b4d3e2db slurm-0.2.3.ebuild 1078
-MD5 42f81938478bb63828b98c7367b49949 files/slurm-0.2.2-fix-gentoo.patch 2209
-MD5 2dc5e67b0c6424cc560be57e7dcf099a files/slurm-0.2.2-altcolors-gentoo.patch 808
-MD5 24dbad68e154494dfc342ba0a06ed75f files/digest-slurm-0.2.3 62
 MD5 962d85efe2f7632aeb0ab2485d9ceed4 files/digest-slurm-0.3.2 63
 MD5 8a743905ff4f988e739f163cfed42e89 files/digest-slurm-0.3.3 63
-MD5 7c9bf01cf4427645967c290fdf77d0a1 files/slurm-0.2.3-theme.patch 10051
diff --git a/net-analyzer/slurm/files/digest-slurm-0.2.3 b/net-analyzer/slurm/files/digest-slurm-0.2.3
deleted file mode 100644
index 82d18090ff45..000000000000
--- a/net-analyzer/slurm/files/digest-slurm-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26c8fa23f40db3ecf641ce2e48c8857e slurm-0.2.3.tar.gz 50776
diff --git a/net-analyzer/slurm/files/slurm-0.2.2-altcolors-gentoo.patch b/net-analyzer/slurm/files/slurm-0.2.2-altcolors-gentoo.patch
deleted file mode 100644
index df9cd7a58404..000000000000
--- a/net-analyzer/slurm/files/slurm-0.2.2-altcolors-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru slurm-0.2.2/slurm.c slurm-0.2.2-hack/slurm.c
---- slurm-0.2.2/slurm.c	2003-04-02 00:46:36.000000000 +0300
-+++ slurm-0.2.2-hack/slurm.c	2003-04-26 11:18:23.000000000 +0300
-@@ -1410,11 +1410,11 @@
-     ifdata.if_amount = 0;
- 
-     sprintf(data_type, "mbytes");
--    colors.ingoing[0] = 2; colors.ingoing[1] = 1;
--    colors.outgoing[0] = 3; colors.outgoing[1] = 1;
-+    colors.ingoing[0] = 7; colors.ingoing[1] = 1;
-+    colors.outgoing[0] = -1; colors.outgoing[1] = 0;
-     colors.intersection[0] = 2; colors.intersection[1] = 1;
-     colors.background = 0;
--    colors.data[0] = 6; colors.data[1] = 1;
-+    colors.data[0] = 1; colors.data[1] = 1;
-     colors.border[0] = 7; colors.border[1] = 1;
-     colors.labels[0] = 7; colors.labels[1] = 1;
-     colors.power_led[0] = 2; colors.power_led[1] = 1;
diff --git a/net-analyzer/slurm/files/slurm-0.2.2-fix-gentoo.patch b/net-analyzer/slurm/files/slurm-0.2.2-fix-gentoo.patch
deleted file mode 100644
index 5cfada55797f..000000000000
--- a/net-analyzer/slurm/files/slurm-0.2.2-fix-gentoo.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ru slurm-0.2.2/slurm.c slurm-0.2.2-hack/slurm.c
---- slurm-0.2.2/slurm.c	2003-04-02 00:46:36.000000000 +0300
-+++ slurm-0.2.2-hack/slurm.c	2003-04-26 11:18:23.000000000 +0300
-@@ -682,7 +682,7 @@
-             /* TX graph */
-             if (tx_graph[x][y] == 1)
-             {
--                chcolor(COLOR_YELLOW, colors.ingoing[1]);
-+                chcolor(colors.outgoing[0], colors.outgoing[1]);
-                 mvprintw(10+y, x+1, "x");
-             }
-             else
-@@ -988,7 +988,7 @@
-             /* TX graph */
-             if (tx_graph[x][y] == 1)
-             {
--                chcolor(COLOR_YELLOW, colors.ingoing[1]);
-+                chcolor(colors.outgoing[0], colors.outgoing[1]);
-                 mvprintw(6+y, x+1, "x");
-             }
-             else
-@@ -1303,28 +1303,28 @@
-     if (displaymode != MODE_LARGE)
-     {
-         mvprintw(20, 9, "Received Packets:");
--        mvprintw(22, 6, "Errors on Receiving:");
--        mvprintw(20, 45,"Transmited Packets:");
-+        mvprintw(22, 16, "RX Errors:");
-+        mvprintw(20, 44, "Transmitted Packets:");
-         switch(data_type[0])
-         {
-             case 'b' :
--                mvprintw(21,11, "Bytes Received:");
--                mvprintw(21,47, "Bytes Transmited:");
-+                mvprintw(21, 11, "Bytes Received:");
-+                mvprintw(21, 46, "Bytes Transmitted:");
-                 break;
-             case 'k' :
--                mvprintw(21,10, "KBytes Received:");
--                mvprintw(21,46, "KBytes Transmited:");
-+                mvprintw(21, 10, "KBytes Received:");
-+                mvprintw(21, 45, "KBytes Transmitted:");
-                 break;
-             case 'm' :
--                mvprintw(21,10, "MBytes Received:");
--                mvprintw(21,46, "MBytes Transmited:");
-+                mvprintw(21, 10, "MBytes Received:");
-+                mvprintw(21, 45, "MBytes Transmitted:");
-                 break;
-         }
-     }
- 
-     if (displaymode == MODE_SPLIT)
-     {
--        mvprintw(22, 41, "Errors on Transmission:");
-+        mvprintw(22, 54, "TX Errors:");
-         mvprintw(14, 37, "RX");
-         mvprintw(14, 41, "TX");
-         mvprintw(17,  9, "Current RX Speed:");
diff --git a/net-analyzer/slurm/files/slurm-0.2.3-theme.patch b/net-analyzer/slurm/files/slurm-0.2.3-theme.patch
deleted file mode 100644
index 0db48ceb407d..000000000000
--- a/net-analyzer/slurm/files/slurm-0.2.3-theme.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -uNr slurm-0.2.3/slurm.c slurm-0.2.3-theme/slurm.c
---- slurm-0.2.3/slurm.c	2003-04-27 19:11:55.000000000 +0300
-+++ slurm-0.2.3-theme/slurm.c	2003-05-26 18:22:08.000000000 +0300
-@@ -217,6 +217,10 @@
- #include "src/if_media.h"
- #include "src/if_media.c"
- 
-+/* theme support */
-+#include "src/theme.h"
-+#include "src/theme.c"
-+
- #ifdef __HPUX__
- #include "src/hpux.h"
- #include "src/hpux.c"
-@@ -673,7 +677,7 @@
-             /* TX graph */
-             if (tx_graph[x][y] == 1)
-             {
--                chcolor(COLOR_YELLOW, colors.ingoing[1]);
-+                chcolor(colors.outgoing[0], colors.outgoing[1]);
-                 mvprintw(10+y, x+1, "x");
-             }
-             else
-@@ -979,7 +983,7 @@
-             /* TX graph */
-             if (tx_graph[x][y] == 1)
-             {
--                chcolor(COLOR_YELLOW, colors.ingoing[1]);
-+                chcolor(colors.outgoing[0], colors.outgoing[1]);
-                 mvprintw(6+y, x+1, "x");
-             }
-             else
-@@ -1234,7 +1238,8 @@
-                     "    -c            old classic/combined view\n"
-                     "    -s            split window mode with stats\n"
-                     "    -l            large split window mode\n"
--                    "    -i interface  select network interface\n\n",
-+                    "    -i interface  select network interface\n"
-+                    "    -t themefile  use colors from themefile\n\n",
- 					REFRESH_MIN, REFRESH_MAX);
-     _exit(code);
- }
-@@ -1295,16 +1300,16 @@
-     {
-         mvprintw(20, 9, "Received Packets:");
-         mvprintw(22, 6, "Errors on Receiving:");
--        mvprintw(20, 45,"Transmited Packets:");
-+        mvprintw(20, 44,"Transmitted Packets:");
-         switch(data_type)
-         {
- 			case TYPE_MEGA:
-                 mvprintw(21,10, "MBytes Received:");
--                mvprintw(21,46, "MBytes Transmited:");
-+                mvprintw(21,45, "MBytes Transmitted:");
-                 break;
- 			case TYPE_GIGA:
- 				mvprintw(21,10, "GBytes Received:");
--                mvprintw(21,46, "GBytes Transmited:");
-+                mvprintw(21,45, "GBytes Transmitted:");
-                 break;
-         }
-     }
-@@ -1385,30 +1390,21 @@
-     unsigned short int first = 1;
-     unsigned short int disconnected = 0;
- 	char hostname[MAXHOSTNAMELEN+1];
-+    char themefile[MAX_PATH_LEN+1];
- 	long refreshdelay = REFRESH_DEFAULT;
- 	float tmpdelay;
-     int op;
- 	int z_option = FALSE;
- 	hostname[0] = '\0';
-+    themefile[0] = '\0';
- 
-     /* HP-UX related as of now but could become standard */
-     ifdata.if_valid = 0;
-     ifdata.if_id = 0;
-     ifdata.if_amount = 0;
- 
--    colors.ingoing[0] = 2; colors.ingoing[1] = 1;
--    colors.outgoing[0] = 3; colors.outgoing[1] = 1;
--    colors.intersection[0] = 2; colors.intersection[1] = 1;
--    colors.background = 0;
--    colors.data[0] = 6; colors.data[1] = 1;
--    colors.border[0] = 7; colors.border[1] = 1;
--    colors.labels[0] = 7; colors.labels[1] = 1;
--    colors.power_led[0] = 2; colors.power_led[1] = 1;
--    colors.power_led[2] = 1; colors.power_led[3] = 1;
--    colors.version[0] = 7; colors.version[1] = 1;
--
-     /* handle command line options */
--    while ((op = getopt(argc, argv, "Hhzd:clsi:")) != EOF)
-+    while ((op = getopt(argc, argv, "Hhzd:clsi:t:")) != EOF)
-     {
-         switch (op)
-         {
-@@ -1462,12 +1458,17 @@
-                 /* use default split window mode */
-                 displaymode = MODE_SPLIT;
-                 break;
-+            case 't':
-+                /* theme file to read */
-+                strncpy(themefile, optarg, MAX_PATH_LEN);
-+                themefile[MAX_PATH_LEN] = '\0';
-+                break;
-             default:
-                 usage(1, argv);
-                 break;
-         }
-     }
--
-+    
-     if (!validinterface)
-     {
-         fprintf(stderr, "specified device does not exist or cannot "
-@@ -1476,6 +1477,9 @@
-         usage(1, argv);
-     }
- 
-+    /* read theme file or use defaults */
-+    read_theme(themefile);
-+
-     /* Initialize some info variables */
-     stats.tx_packets = 0; stats.tx_bytes = 0; stats.tx_errors = 0;
-     stats.rx_packets = 0; stats.rx_bytes = 0; stats.rx_errors = 0;
-diff -uNr slurm-0.2.3/src/theme.c slurm-0.2.3-theme/src/theme.c
---- slurm-0.2.3/src/theme.c	1970-01-01 02:00:00.000000000 +0200
-+++ slurm-0.2.3-theme/src/theme.c	2003-05-26 18:21:54.000000000 +0300
-@@ -0,0 +1,103 @@
-+
-+void read_theme(char *theme_file) {
-+    FILE *theme_ptr;
-+    char current_line[MAX_LINE_LEN];
-+    char *iterator;
-+
-+    /* set defaults colors. structure colors defined in slurm.h */
-+    colors.background =     DEFAULT_BACKGROUND;
-+    colors.ingoing[0] =     DEFAULT_INGOING_COLOR;
-+    colors.ingoing[1] =     DEFAULT_INGOING_BOLD;
-+    colors.outgoing[0] =    DEFAULT_OUTGOING_COLOR;
-+    colors.outgoing[1] =    DEFAULT_OUTGOING_BOLD;
-+    colors.intersection[0] =    DEFAULT_INTERSECTION_COLOR;
-+    colors.intersection[1] =    DEFAULT_INTERSECTION_BOLD;
-+    colors.data[0] =        DEFAULT_DATA_COLOR;
-+    colors.data[1] =        DEFAULT_DATA_BOLD;
-+    colors.border[0] =      DEFAULT_BORDER_COLOR;
-+    colors.border[1] =      DEFAULT_BORDER_BOLD;
-+    colors.labels[0] =      DEFAULT_LABELS_COLOR;
-+    colors.labels[1] =      DEFAULT_LABELS_BOLD;
-+    colors.power_led[0] =   DEFAULT_POWER_LED_1_COLOR;
-+    colors.power_led[1] =   DEFAULT_POWER_LED_1_BOLD;
-+    colors.power_led[2] =   DEFAULT_POWER_LED_2_COLOR;
-+    colors.power_led[3] =   DEFAULT_POWER_LED_2_BOLD;
-+    colors.version[0] =     DEFAULT_VERSION_COLOR;
-+    colors.version[1] =     DEFAULT_VERSION_BOLD;
-+
-+    /* no theme file given, just setting the defaults */
-+    if(strlen(theme_file) == 0)
-+        return;
-+
-+    /* try to open the file */
-+    if((theme_ptr = fopen(theme_file, "r")) == NULL) {
-+        perror("can't open theme file");
-+        exit(EXIT_FAILURE);
-+    }
-+
-+    /* read every line of config file */
-+    while((fgets(current_line, MAX_LINE_LEN, theme_ptr)) != NULL) {
-+        iterator = current_line;
-+
-+        /* skip whitespace */
-+        while(*iterator == ' ' || *iterator == '\t')
-+            iterator++;
-+        
-+        /* skip comments and empty lines */
-+        if(*iterator == '#' || *iterator == '\n' || iterator == NULL)
-+            continue;
-+            
-+        /* search for settings */
-+        search_value(iterator, "background",    &colors.background);
-+
-+        search_value(iterator, "data_color",    &colors.data[0]);
-+        search_value(iterator, "data_bold",     &colors.data[1]);
-+
-+        search_value(iterator, "ingoing_color", &colors.ingoing[0]);
-+        search_value(iterator, "ingoing_bold",  &colors.ingoing[1]);
-+        search_value(iterator, "outgoing_color",    &colors.outgoing[0]);
-+        search_value(iterator, "outgoing_bold",     &colors.outgoing[1]);
-+        search_value(iterator, "intersection_color",  &colors.intersection[0]);
-+        search_value(iterator, "intersection_bold",   &colors.intersection[1]);
-+
-+        search_value(iterator, "power_led_1_color", &colors.power_led[0]);
-+        search_value(iterator, "power_led_1_bold",  &colors.power_led[1]);
-+        search_value(iterator, "power_led_2_color", &colors.power_led[2]);
-+        search_value(iterator, "power_led_2_bold",  &colors.power_led[3]);
-+
-+        search_value(iterator, "version_color", &colors.version[0]);
-+        search_value(iterator, "version_bold",  &colors.version[1]);
-+        search_value(iterator, "labels_color",  &colors.labels[0]);
-+        search_value(iterator, "labels_bold",   &colors.labels[1]);
-+        search_value(iterator, "border_color",  &colors.border[0]);
-+        search_value(iterator, "border_bold",   &colors.border[1]);
-+    
-+    }
-+
-+    /* close file */
-+    fclose(theme_ptr);
-+}
-+
-+void search_value(char *line, char *setting, int *dest) {
-+    char *tmp;
-+    
-+    tmp = line;
-+    
-+    /* check for setting */
-+    if(strstr(line, setting) == NULL)
-+        return;
-+
-+    /* read variable name */
-+    while(*tmp != ' ' && *tmp != '\t' && *tmp != '\n' && *tmp != '\0')
-+        tmp++;
-+
-+    /* read whitespace */
-+    while(*tmp == ' ' || *tmp == '\t')
-+        tmp++;
-+    
-+    /* set value */
-+    *dest = atoi(tmp);
-+    
-+    return;
-+}
-+
-diff -uNr slurm-0.2.3/src/theme.h slurm-0.2.3-theme/src/theme.h
---- slurm-0.2.3/src/theme.h	1970-01-01 02:00:00.000000000 +0200
-+++ slurm-0.2.3-theme/src/theme.h	2003-05-26 18:21:54.000000000 +0300
-@@ -0,0 +1,28 @@
-+
-+/* default colors and bolding settings */
-+#define DEFAULT_BACKGROUND          0
-+#define DEFAULT_INGOING_COLOR       2
-+#define DEFAULT_INGOING_BOLD        1
-+#define DEFAULT_OUTGOING_COLOR      3
-+#define DEFAULT_OUTGOING_BOLD       1
-+#define DEFAULT_INTERSECTION_COLOR  2
-+#define DEFAULT_INTERSECTION_BOLD   1
-+#define DEFAULT_DATA_COLOR          6
-+#define DEFAULT_DATA_BOLD           1
-+#define DEFAULT_BORDER_COLOR        7
-+#define DEFAULT_BORDER_BOLD         1
-+#define DEFAULT_LABELS_COLOR        7
-+#define DEFAULT_LABELS_BOLD         1
-+#define DEFAULT_POWER_LED_1_COLOR   2
-+#define DEFAULT_POWER_LED_1_BOLD    1
-+#define DEFAULT_POWER_LED_2_COLOR   1
-+#define DEFAULT_POWER_LED_2_BOLD    1
-+#define DEFAULT_VERSION_COLOR       7
-+#define DEFAULT_VERSION_BOLD        1
-+
-+#define MAX_PATH_LEN    256
-+#define MAX_LINE_LEN    256
-+
-+void read_theme(char *theme_file);
-+void search_value(char *line, char *setting, int *dest);
-+
-diff -uNr slurm-0.2.3/theme.sample slurm-0.2.3-theme/theme.sample
---- slurm-0.2.3/theme.sample	1970-01-01 02:00:00.000000000 +0200
-+++ slurm-0.2.3-theme/theme.sample	2003-05-26 17:59:13.000000000 +0300
-@@ -0,0 +1,20 @@
-+# colors: -1 default, 0 black, 1 red, 2 green, 3 yellow, 4 blue, 5 magenta,
-+#          6 cyan, 7 white
-+# bold: 0 off, 1 on (default)
-+
-+background      0
-+data_color      1
-+labels_color    7
-+border_color    7
-+version_color   7
-+
-+outgoing_color     -1
-+outgoing_bold       0
-+ingoing_color       7
-+# intersection_color not used
-+#intersection_color  7
-+
-+power_led_1_color   2
-+power_led_2_color   1
-+
-+# eof
diff --git a/net-analyzer/slurm/slurm-0.2.3.ebuild b/net-analyzer/slurm/slurm-0.2.3.ebuild
deleted file mode 100644
index 9897c11de66c..000000000000
--- a/net-analyzer/slurm/slurm-0.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.2.3.ebuild,v 1.6 2005/03/22 14:59:41 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
-HOMEPAGE="http://www.raisdorf.net/slurm/"
-SRC_URI="http://www.raisdorf.net/files/code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-
-src_compile() {
-	# fixes some "transmited" typos and adds theme support
-	epatch ${FILESDIR}/${P}-theme.patch || "patch died"
-
-	econf || die "configure died"
-	emake || die "make failed"
-}
-
-src_install() {
-	# binary
-	dobin slurm
-
-	# sample theme to use with -t option
-	insinto /usr/share/${PN}
-	doins theme.sample
-
-	# manual and other docs
-	doman slurm.1
-	dodoc Changelog COPYRIGHT KEYS README THANKS TODO
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This version of slurm has a theme support (-t option)"
-	einfo "A sample themefile can be found at /usr/share/${PN}/theme.sample"
-	einfo
-}
diff --git a/net-analyzer/slurm/slurm-0.3.3.ebuild b/net-analyzer/slurm/slurm-0.3.3.ebuild
index f510a4fb707c..fe4d48c960d6 100644
--- a/net-analyzer/slurm/slurm-0.3.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3.ebuild,v 1.1 2005/03/30 12:45:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3.ebuild,v 1.2 2005/05/07 21:48:05 vanquirius Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.raisdorf.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"