7 files changed, 72 insertions, 7 deletions
diff --git a/x11-plugins/wmsysmon/ChangeLog b/x11-plugins/wmsysmon/ChangeLog
index f9632b23f92a..c9d37f6087c6 100644
--- a/x11-plugins/wmsysmon/ChangeLog
+++ b/x11-plugins/wmsysmon/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-plugins/wmsysmon
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.10 2004/07/18 23:55:59 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/ChangeLog,v 1.11 2004/08/02 12:07:02 s4t4n Exp $
+
+*wmsysmon-0.7.6-r3 (August 02 2004)
+
+  02 Aug 2004; Michele Noberasco <s4t4n@gentoo.org>
+  wmsysmon-0.7.6-r3.ebuild, wmsysmon-0.7.6-high-ints.patch:
+  New patch to add support for minitoring 24 interrupts in Makefile.
+  New revision that makes use of alpha and high-ints USE flags
+  to decide wether to enable 24 interruputs monitoring support.
+  wmsysmon-0.7.6-r2.ebuild, files/wmsysmon-0.7.6-s4t4n.patch:
+  Change s4t4n patch to better handle CFLAGS stuff.
+  Change ebuild not to DEPEND on sed and still honour Gentoo CFLAGS.
 
   19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wmsysmon-0.7.6-r2.ebuild:
   Stable on alpha.
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index a3dc994a3675..406d4bd1297e 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1,10 +1,13 @@
 MD5 e6f91476828e4f83d4c89756c0496a5c wmsysmon-0.7.6.ebuild 697
 MD5 bda5d5e112857e678ba3b3e2b77ee836 wmsysmon-0.7.6-r1.ebuild 877
+MD5 447774e8370acab3829655b39747505d wmsysmon-0.7.6-r3.ebuild 1013
 MD5 2123a83d56faf292de2a23724da27407 wmsysmon-0.7.6-r2.ebuild 946
 MD5 f44dc897b9c8f5a14a13fbfd6ae15127 ChangeLog 1514
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 MD5 f6ea24927a41e35eff0f022c8f74612c files/digest-wmsysmon-0.7.6-r1 65
 MD5 f6ea24927a41e35eff0f022c8f74612c files/digest-wmsysmon-0.7.6-r2 65
+MD5 f6ea24927a41e35eff0f022c8f74612c files/digest-wmsysmon-0.7.6-r3 65
 MD5 cb3fe81dd11ad3973b2151e228fa2f53 files/fanta.diff 423
 MD5 f6ea24927a41e35eff0f022c8f74612c files/digest-wmsysmon-0.7.6 65
+MD5 8a52ce7fdbd3e3a541139f96fddafc0d files/wmsysmon-0.7.6-high-ints.patch 455
 MD5 4bfad0f19a1aaec77e69ed9dd3872c36 files/wmsysmon-0.7.6-s4t4n.patch 34217
diff --git a/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3 b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3
new file mode 100644
index 000000000000..251f0cd76a3e
--- /dev/null
+++ b/x11-plugins/wmsysmon/files/digest-wmsysmon-0.7.6-r3
@@ -0,0 +1 @@
+MD5 1f8b7872c20fa6af1c89265ea2126c31 wmsysmon-0.7.6.tar.gz 22792
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-high-ints.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-high-ints.patch
new file mode 100644
index 000000000000..4ba89fb33212
--- /dev/null
+++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-high-ints.patch
@@ -0,0 +1,11 @@
+--- Makefile	2004-08-02 13:18:22.780070984 +0200
++++ Makefile	2004-08-02 13:19:07.776230528 +0200
+@@ -3,7 +3,7 @@
+ LIBDIR += -L/usr/X11R6/lib
+ LDFLAGS += -lXpm -lXext -lX11 -lm -s
+ #CFLAGS = -g #-DMONDEBUG
+-CFLAGS += ${GENTOO_CFLAGS} -W -Wall -pedantic -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
++CFLAGS += ${GENTOO_CFLAGS} -W -Wall -pedantic -I/usr/X11R6/include -DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
+ 
+ BIN = wmsysmon
+ OBJS =	wmgeneral.o \
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-s4t4n.patch b/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-s4t4n.patch
index 8f30d10b9290..7858b559144e 100644
--- a/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-s4t4n.patch
+++ b/x11-plugins/wmsysmon/files/wmsysmon-0.7.6-s4t4n.patch
@@ -6,7 +6,7 @@ diff -Naur wmsysmon-0.7.6-orig/src/Makefile wmsysmon-0.7.6-new/src/Makefile
  LDFLAGS += -lXpm -lXext -lX11 -lm -s
  #CFLAGS = -g #-DMONDEBUG
 -CFLAGS += -O3 -m486 -fomit-frame-pointer -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
-+CFLAGS += -W -Wall -pedantic -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
++CFLAGS += ${GENTOO_CFLAGS} -W -Wall -pedantic -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
  
  BIN = wmsysmon
  OBJS =	wmgeneral.o \
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild
index aeab8925b2f0..e93868de8340 100644
--- a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild,v 1.3 2004/07/18 23:55:59 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r2.ebuild,v 1.4 2004/08/02 12:07:02 s4t4n Exp $
 
 inherit eutils
 IUSE=""
@@ -12,8 +12,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc alpha ~amd64 ~ppc"
 
-DEPEND="virtual/x11
-	>=sys-apps/sed-4"
+DEPEND="virtual/x11"
 
 src_unpack()
 {
@@ -30,8 +29,7 @@ src_unpack()
 
 src_compile()
 {
-	sed -i 's/^CFLAGS/#CFLAGS/' src/Makefile
-	make -C src
+	GENTOO_CFLAGS="${CFLAGS}" make -C src
 }
 
 src_install ()
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
new file mode 100644
index 000000000000..0e9813967119
--- /dev/null
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsysmon/wmsysmon-0.7.6-r3.ebuild,v 1.1 2004/08/02 12:07:02 s4t4n Exp $
+
+inherit eutils
+
+IUSE="high-ints"
+DESCRIPTION="WMaker DockUp to monitor: CPU, Memory, Swap usage, system uptime, hardware interrupts, paging and swap activity."
+SRC_URI="http://www.gnugeneration.com/software/wmsysmon/src/${P}.tar.gz"
+HOMEPAGE="http://www.gnugeneration.com/software/wmsysmon/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~sparc ~alpha ~amd64 ~ppc"
+
+DEPEND="virtual/x11"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# bug 48851
+	epatch ${FILESDIR}/${P}-s4t4n.patch
+
+	# Monitor all the 24 interrupts on alpha and x86 SMP machines
+	if use alpha || use high-ints; then
+		cd src
+		epatch ${FILESDIR}/${P}-high-ints.patch
+	fi
+}
+
+src_compile()
+{
+	GENTOO_CFLAGS="${CFLAGS}" make -C src
+}
+
+src_install ()
+{
+	dobin src/wmsysmon
+	dodoc COPYING ChangeLog FAQ README
+}