5 files changed, 96 insertions, 12 deletions
diff --git a/app-admin/torsmo/ChangeLog b/app-admin/torsmo/ChangeLog
index 3844da7a0997..88b966772423 100644
--- a/app-admin/torsmo/ChangeLog
+++ b/app-admin/torsmo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/torsmo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.22 2005/01/31 15:40:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.23 2005/02/28 07:46:36 dragonheart Exp $
+
+*torsmo-0.18-r3 (28 Feb 2005)
+
+  28 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/torsmo-0.18.noswap.patch, +torsmo-0.18-r3.ebuild:
+  added patch to eliminate a SIGFPE when there is no swap active. Bug #82903 by
+  Alias John Doe <pbx06@hotmail.com> decribes the problem and fix.
 
   31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> torsmo-0.18-r1.ebuild:
   Stable on sparc
diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest
index 841f08dd7290..00ae86fa1e18 100644
--- a/app-admin/torsmo/Manifest
+++ b/app-admin/torsmo/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 7a2556b95496bf7e5e0d50be6cd48535 torsmo-0.17.ebuild 1340
+MD5 9bf06c741f97e4d42e89637df8196851 ChangeLog 4612
 MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549
-MD5 c620f5b67197e291157ce056deb39e77 torsmo-0.18-r1.ebuild 1455
-MD5 6228b91ba850186fa85de12f8dfd59e2 ChangeLog 4318
 MD5 54314b9d79bb7baa1a44fac3b66b6317 torsmo-0.17-r1.ebuild 1481
+MD5 c620f5b67197e291157ce056deb39e77 torsmo-0.18-r1.ebuild 1455
 MD5 61f8b65e8fc7c8a06200a971cb5b24ab torsmo-0.18-r2.ebuild 1545
-MD5 7a2556b95496bf7e5e0d50be6cd48535 torsmo-0.17.ebuild 1340
+MD5 d6b6a1f742f817623b22015bfbe2f310 torsmo-0.18-r3.ebuild 1561
+MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r1 62
+MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17-r1 62
 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17 62
-MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575
 MD5 552e015366516a5ff2034d10b083c303 files/torsmo-0.17-mozilla.patch 601
-MD5 39312a5c71ba9590531a7c0ccd9aaee9 files/torsmo-0.17-mldonkey.patch 15411
-MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r1 62
 MD5 d27874dbf963063e13d6387d8ef3912f files/torsmo-0.17-kernel2.4.patch 2388
+MD5 39312a5c71ba9590531a7c0ccd9aaee9 files/torsmo-0.17-mldonkey.patch 15411
+MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r2 62
-MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17-r1 62
+MD5 665c68fb6d053d92d013ba44a84f394c files/torsmo-0.18.noswap.patch 524
+MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r3 62
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB/lFlKRy60XGEcJIRAmXlAJ9Z0wRnHF/HXOt/mzmZsRcmu9zQCwCfXXta
-sy3jQPIrl8qYqgZtNbcT5v8=
-=VZ6B
+iD8DBQFCIsxjmdTrptrqvGERAvelAJ95cFXAfsI1jiocbszPCsZKNASjzgCfQ3Xx
+57fCNX2buUeU01wI6nqRr04=
+=siPb
 -----END PGP SIGNATURE-----
diff --git a/app-admin/torsmo/files/digest-torsmo-0.18-r3 b/app-admin/torsmo/files/digest-torsmo-0.18-r3
new file mode 100644
index 000000000000..f2c1092e434d
--- /dev/null
+++ b/app-admin/torsmo/files/digest-torsmo-0.18-r3
@@ -0,0 +1 @@
+MD5 88bd8f627637d785a1d681f4f15f00b6 torsmo-0.18.tar.gz 84020
diff --git a/app-admin/torsmo/files/torsmo-0.18.noswap.patch b/app-admin/torsmo/files/torsmo-0.18.noswap.patch
new file mode 100644
index 000000000000..c8943206cc64
--- /dev/null
+++ b/app-admin/torsmo/files/torsmo-0.18.noswap.patch
@@ -0,0 +1,15 @@
+--- torsmo.c.orig	2005-02-28 17:03:39.994538136 +0930
++++ torsmo.c	2005-02-28 17:06:19.378308120 +0930
+@@ -1126,7 +1126,11 @@
+       human_readable(cur->swapmax*1024, p);
+     }
+     OBJ(swapperc) {
+-      snprintf(p, 255, "%*u", pad_percents, (cur->swap*100) / cur->swapmax);
++      if (cur->swapmax == 0) {
++	strncpy(p, "No swap", 255);
++      } else {
++      	snprintf(p, 255, "%*u", pad_percents, (cur->swap*100) / cur->swapmax);
++      }
+     }
+     OBJ(swapbar) {
+       new_bar(p, obj->data.pair.a, obj->data.pair.b,
diff --git a/app-admin/torsmo/torsmo-0.18-r3.ebuild b/app-admin/torsmo/torsmo-0.18-r3.ebuild
new file mode 100644
index 000000000000..eccb1c3fc8e7
--- /dev/null
+++ b/app-admin/torsmo/torsmo-0.18-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r3.ebuild,v 1.1 2005/02/28 07:46:36 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="minimalist system monitor for X"
+HOMEPAGE="http://torsmo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="truetype"
+
+RDEPEND="virtual/libc
+	virtual/x11
+	truetype? ( >=media-libs/freetype-2*)"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.4
+	sys-devel/autoconf
+	sys-apps/grep
+	sys-apps/sed
+	sys-devel/gcc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}.xwin.patch
+	epatch ${FILESDIR}/${P}.noswap.patch
+}
+
+src_compile() {
+	econf \
+	   `use_enable truetype xft` \
+	   --x-libraries=/usr/X11R6/lib/ || die "econf failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "make install failed"
+	dodoc ChangeLog AUTHORS README torsmorc.sample
+}
+
+pkg_postinst() {
+	einfo 'default configuration file is "~/.torsmorc"'
+	einfo "you can find a sample configuration file in"
+	einfo "/usr/share/doc/${PF}/torsmorc.sample.gz"
+	einfo
+	einfo "Comment out temperature info lines if you have no kernel"
+	einfo "support for it."
+	einfo
+	ewarn "Torsmo doesn't work with window managers that"
+	ewarn "take control over root window such as Gnome's nautilus."
+	einfo
+	ewarn "Please note that >=0.18 contains mozilla support without"
+	ewarn "patching, thus the mozilla USE flag has been dropped"
+}