Revision bump, with patch to fix a floating point exception

when there is no swap on the system.
Package-Manager: portage-2.1.4.4

4 files changed, 68 insertions, 6 deletions

diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index 8efbe0732a3f..4dc2fb3fc5aa 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmmemfree
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.12 2008/01/15 08:11:47 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.13 2008/02/16 09:22:01 s4t4n Exp $
+
+*wmmemfree-0.7-r2 (16 Feb 2008)
+
+  16 Feb 2008; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r2.ebuild:
+  New revision trivial patch to fix floating point exception when there is no swap
+  on the system. See bug #210300. Stable for x86 since the patch is trivial.
 
   15 Jan 2008; Samuli Suominen <drac@gentoo.org> wmmemfree-0.7-r1.ebuild:
   Stop pre-stripping wmmemfree binary during src_compile and keyword ~amd64.
@@ -34,15 +40,13 @@
   wmmemfree-0.7-r1.ebuild, wmmemfree-0.7.ebuild:
   Masked wmmemfree-0.7.ebuild stable for ppc
 
-*wmmemfree-0.7-r1 (02 Sep 2004)
-
   02 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   wmmemfree-0.7-r1.ebuild:
   Masked wmmemfree-0.7-r1.ebuild stable for ppc
 
-*wmmemfree-0.7-1 (28 Aug 2004)
+*wmmemfree-0.7-r1 (28 Aug 2004)
 
-  28 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-1.ebuild:
+  28 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r1.ebuild:
   New revision with 2.6 kernel support...
 
   04 Jul 2004; David Holm <dholm@gentoo.org> wmmemfree-0.7.ebuild:
diff --git a/x11-plugins/wmmemfree/Manifest b/x11-plugins/wmmemfree/Manifest
index 8d94ce5ceb1b..39d4522ada2e 100644
--- a/x11-plugins/wmmemfree/Manifest
+++ b/x11-plugins/wmmemfree/Manifest
@@ -1,5 +1,7 @@
 AUX wmmemfree-0.7-add-kernel-26-support.patch 2480 RMD160 a54a5bd55b3dcf8d52e6ca91008fb8958153b515 SHA1 519f057a5aa28b89206444e5a61c46019916acff SHA256 7de60b8415623c33731723b2b5a2c5d41252aef1eb4d54bfcd1d717d9a2f2ce1
+AUX wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch 753 RMD160 40eae9f430ba7094bbaca08d3af40cc3b3b574c9 SHA1 6ad704fb5b7c0608c528c46170b78b6f19de15f9 SHA256 deb7bb7dc93f4925fef1ec30f23f62b50e42e2238a6fb59fa573be7797e98ac5
 DIST wmmemfree-0.7.tar.bz2 14287 RMD160 d38314fe989474e3e19647e7bbc91304216a7f5a SHA1 be5ef86589917a1c41b5428161d06abd8419c943 SHA256 52cff4e2850de4528e55459ab3eab6b14c7ad29d15e793eb1eb6e69b94aace34
 EBUILD wmmemfree-0.7-r1.ebuild 879 RMD160 30e1fe18197a768c0657dbd853679311f903c722 SHA1 d07230351441def99aa4228f90fad4d3e4503e74 SHA256 ee3eae343ae34cad52ab35c8a1011f26d5a4c8d09806e444485b52cfc919470b
-MISC ChangeLog 1814 RMD160 0801f7ea3171e526e37bec6f8e7b83b53b6f8388 SHA1 1a9a8489f48b61d977c72a1211affed2adeffb50 SHA256 7f6562cf3f73a11cf03d6ac5ea4d64b2242e2917148c1d6b123ecc7a11889de1
+EBUILD wmmemfree-0.7-r2.ebuild 948 RMD160 c6af60dd66e540b5864e2bbd9ff0b3d55ae9a75a SHA1 c930cef294b4ff5efce44d182b05c40f66b434d1 SHA256 aba511241769d1e82b037075954cf274a54ddcee7ef3e10ffff1606b67f05c38
+MISC ChangeLog 2055 RMD160 1fa794b81cdbdb4840657066561da00e28595043 SHA1 5deed3dbe6e9fe3c59e748848844d30c35355562 SHA256 307de5a5b3daf7d227d3eeb8da911713309f2ddafe457dfecf9ecc4ffd54b637
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
diff --git a/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch b/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch
new file mode 100644
index 000000000000..06aea65052fa
--- /dev/null
+++ b/x11-plugins/wmmemfree/files/wmmemfree-0.7-fix-crash-when-there-is-no-swap.patch
@@ -0,0 +1,18 @@
+--- wmmemfree-0.7/draw.c	2003-03-21 21:56:25.000000000 +0100
++++ wmmemfree-0.7/draw.c	2008-02-16 10:02:51.000000000 +0100
+@@ -44,13 +44,13 @@
+    XCopyArea(display, on, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 27);
+   else
+    XCopyArea(display, off, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 27);
+-  if(n < (swp * 25 / swp_total))
++  if(n < (swp_total) ? (swp * 25 / swp_total) : 0)
+    XCopyArea(display, on, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 47);
+   else
+    XCopyArea(display, off, buffer, gc, 0, 0, 2, 11, 7 + n * 2, 47);
+  }
+  mem_percent = mem * 100 / mem_total;
+- swp_percent = swp * 100 / swp_total;
++ swp_percent = (swp_total) ? swp * 100 / swp_total : 0;
+  if(mem_percent == 100)
+   XCopyArea(display, numbers, buffer, gc, 5, 0, 5, 6, 33, 20);
+  else
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
new file mode 100644
index 000000000000..9102e39d763b
--- /dev/null
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r2.ebuild,v 1.1 2008/02/16 09:22:01 s4t4n Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a blue memory monitoring dockapp."
+HOMEPAGE="http://misuceldestept.go.ro/wmmemfree"
+SRC_URI="http://ibiblio.org/pub/linux/X11/xutils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-add-kernel-26-support.patch
+	epatch "${FILESDIR}"/${P}-fix-crash-when-there-is-no-swap.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
+		STRIP="true" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog README THANKS TODO WMS
+}