Revision bump, closing bug #97856

(Portage version: 2.0.51.19)

6 files changed, 110 insertions, 4 deletions

diff --git a/x11-plugins/wmdf/ChangeLog b/x11-plugins/wmdf/ChangeLog
index 91502777acdc..828eeb5544d2 100644
--- a/x11-plugins/wmdf/ChangeLog
+++ b/x11-plugins/wmdf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-plugins/wmdf
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.6 2004/11/24 05:26:53 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/ChangeLog,v 1.7 2005/07/06 08:21:57 s4t4n Exp $
+
+*wmdf-0.1.6-r1 (06 Jul 2005)
+
+  06 Jul 2005; Michele Noberasco <s4t4n@gentoo.org> wmdf-0.1.6-r1:
+  Revision bump, with patch to remove special filesystem entries from
+  listing, see bug #97856, and another one to remove unimplemented
+  command line args... The changes so atomic that I feel confident
+  enough to mark this directly as stable...
+  metadata.xml:
+  Assigned to desktop-dock herd.  
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmdf-0.1.6.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmdf/Manifest b/x11-plugins/wmdf/Manifest
index 6e42a6042e40..d31fc54ce7db 100644
--- a/x11-plugins/wmdf/Manifest
+++ b/x11-plugins/wmdf/Manifest
@@ -1,4 +1,8 @@
-MD5 2fbbac829b571cf4385d1f05453673b1 ChangeLog 851
-MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
+MD5 38e7c0c8c382b69a53408867ee224145 wmdf-0.1.6-r1.ebuild 839
+MD5 71237910a93c6b6206e439e690b04afa ChangeLog 1248
 MD5 5ca9abec5208cf21071822651ef67af7 wmdf-0.1.6.ebuild 669
+MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 f12992b80bc1875d12e86a74a6496923 files/digest-wmdf-0.1.6 62
+MD5 212d3ec9305c95f80873f17ffdc0fa0b files/wmdf_sys-fs.patch 1057
+MD5 f12992b80bc1875d12e86a74a6496923 files/digest-wmdf-0.1.6-r1 62
+MD5 54fd7dd35b7dec866321174337e9d6d5 files/wmdf_cmd_line_args.patch 699
diff --git a/x11-plugins/wmdf/files/digest-wmdf-0.1.6-r1 b/x11-plugins/wmdf/files/digest-wmdf-0.1.6-r1
new file mode 100644
index 000000000000..66ab718a895f
--- /dev/null
+++ b/x11-plugins/wmdf/files/digest-wmdf-0.1.6-r1
@@ -0,0 +1 @@
+MD5 159bf4bbf90eaffcf8db53d7e1e57a35 wmdf-0.1.6.tar.gz 119388
diff --git a/x11-plugins/wmdf/files/wmdf_cmd_line_args.patch b/x11-plugins/wmdf/files/wmdf_cmd_line_args.patch
new file mode 100644
index 000000000000..5c506d47d211
--- /dev/null
+++ b/x11-plugins/wmdf/files/wmdf_cmd_line_args.patch
@@ -0,0 +1,11 @@
+--- wmdf.c	2005-07-06 10:05:19.000000000 +0200
++++ wmdf.c.new	2005-07-06 10:06:24.000000000 +0200
+@@ -986,8 +986,6 @@
+            "  -i,  --interval <number>       number of secs between updates (1 is default)\n"
+            "  -h,  --help                    show this help text and exit\n"
+            "  -v,  --version                 show program version and exit\n"
+-           "  -w,  --windowed                run the application in windowed mode\n"
+-           "  -bw, --broken-wm               activate broken window manager fix\n"
+            "  -at, --alarm_threshold         set the disk usage percent to sound alarm at (95 is default)\n",
+            prog, prog);
+     /* OPTIONS SUPP :
diff --git a/x11-plugins/wmdf/files/wmdf_sys-fs.patch b/x11-plugins/wmdf/files/wmdf_sys-fs.patch
new file mode 100644
index 000000000000..eefa3f1301ce
--- /dev/null
+++ b/x11-plugins/wmdf/files/wmdf_sys-fs.patch
@@ -0,0 +1,42 @@
+--- wmdf.c.orig	2005-07-06 10:03:10.000000000 +0200
++++ wmdf.c	2005-07-06 10:05:19.000000000 +0200
+@@ -332,9 +332,10 @@
+ 	FILE *fp,*fd;
+ 	char mountpoint[255], dummy[255],devnme[255],fstype[255],options[255];
+ 	char s[255];
+-
++	char *ref[] ={"none","proc","sysfs","usbfs","udev","devpts"};
+ 	unsigned int rio = 0,wio = 0,temprio = 0,tempwio = 0;
+ 	int i = 0;
++	int j=0;
+ 	int pos = 0;
+ 	int x;
+ 
+@@ -342,13 +343,20 @@
+ 
+ 	if((fp = fopen("/etc/mtab","r")) != NULL) {
+ 
+-	   while(!feof(fp)) {
+-		   fscanf(fp,"%s %s %s %s %s %s\n",devnme,mountpoint,fstype,options,dummy,dummy);
+-		   if((x = strcmp("none",devnme)) != 0) {
+-			  add_disk(&cur_disk_infos,mountpoint,devnme,i);
+-			   i++;
+-		   }
+-	   }
++	while(!feof(fp)) {
++		x=0;
++		fscanf(fp,"%s %s %s %s %s %s\n",devnme,mountpoint,fstype,options,dummy,dummy);
++		for (j=0;j<6;j++){
++			if(strcmp(ref[j],devnme)==0) {
++				x=1;
++				break;
++			}
++		}
++		if(x==0) {
++			add_disk(&cur_disk_infos,mountpoint,devnme,i);
++			i++;
++		}
++	}
+ 	} else { 
+ 		fprintf(stderr,"Error opening /etc/mtab\n");
+ 		return;
diff --git a/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild b/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..281ca4f0c29a
--- /dev/null
+++ b/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdf/wmdf-0.1.6-r1.ebuild,v 1.1 2005/07/06 08:21:57 s4t4n Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="An app to monitor disk space on partitions"
+SRC_URI="http://dockapps.org/download.php/id/359/${P}.tar.gz"
+HOMEPAGE="http://dockapps.org/file.php/id/175"
+
+DEPEND="virtual/x11"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc ppc64 ~sparc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+
+	# Remove special filesystem entries, see bug #97856
+	epatch ${FILESDIR}/wmdf_sys-fs.patch
+
+	# Remove non-implemented command line args from 'wmdf -h' listing
+	epatch ${FILESDIR}/wmdf_cmd_line_args.patch
+}
+
+src_compile() {
+	econf || die "Configure failed"
+	emake || die "Make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+	dodoc README AUTHORS COPYING ChangeLog NEWS THANKS TODO INSTALL
+}