Revision bump, with patch to add support for kernel versions >= 3. Closes bug #394105.

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 56 insertions, 13 deletions

diff --git a/x11-plugins/wmmemload/ChangeLog b/x11-plugins/wmmemload/ChangeLog
index 1104ce218a98..44d668835bf7 100644
--- a/x11-plugins/wmmemload/ChangeLog
+++ b/x11-plugins/wmmemload/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmmemload
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.19 2008/11/28 18:55:10 tcunha Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/ChangeLog,v 1.20 2012/01/04 14:29:17 s4t4n Exp $
+
+*wmmemload-0.1.6-r1 (04 Jan 2012)
+
+  04 Jan 2012; Michele Noberasco <s4t4n@gentoo.org> wmmemload-0.1.6-r1.ebuild:
+  Revision bump, with patch to add support for kernel versions >= 3. Closes bug #394105.
 
   28 Nov 2008; Tiago Cunha <tcunha@gentoo.org> wmmemload-0.1.6.ebuild:
   stable sparc, bug 215651
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index a9b618515bf4..4ee76cbb224c 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX wmmemload-kernel-3-support.patch 555 RMD160 e9b18c8ee048a19921d6dd0a9aa0cec61929a5db SHA1 099ff4f1790dbb48bccfbc00533291340febd844 SHA256 3649019bda3642d75faf02e18bdfee9a19b09f860b0c810b661abd7d254c26b4
 DIST wmmemload-0.1.6.tar.gz 141606 RMD160 330f3eda7a23b79d3771d85b08ea035594024cb1 SHA1 9110c163292af5b1b0b5930b46c70042bba1c0df SHA256 207a6e0f69d2aa56054c34a3b0f7643014f2b9609ea28ad10d25901c8d34171b
+EBUILD wmmemload-0.1.6-r1.ebuild 847 RMD160 e22f16c4b6823894bed50049617aca374f01d580 SHA1 9ea438d2bac308a5c57f809eac3b630dff1cdb61 SHA256 21927113026a2126883136dc2a1f9e8b6930b7252d557cf2e02f821a190636d9
 EBUILD wmmemload-0.1.6.ebuild 798 RMD160 3dbc5e0af5f8d349ff2e6edd55cefa9aa8fb924f SHA1 473788ff87d60f41946b44b6c52b370b6c207544 SHA256 ae8b819184cca21145ab19832b9591ae3a71943081e21fc55555805c6b4f71e4
-MISC ChangeLog 2466 RMD160 f7d0382df41d6bf67a75e1ba82200949b797887c SHA1 4c81ddcecad81fd8fd8fe556394d716c56afa843 SHA256 ee40289e67634923bda829ce71efa0d6bcddb0962105e9a612381597d2c39c8f
+MISC ChangeLog 2669 RMD160 c2780730343796a376bb692f11da15e2c51cc12c SHA1 451f98c90dacbe47fc89c202e7baa15d8893a307 SHA256 a5aa0bca2fa3b7149a111cdd30de305e62d3bae79ed07d8293a69fb21d30e0f1
 MISC metadata.xml 344 RMD160 820bf8075eb5cae224a1b2a82d54ddf5dae5a6e3 SHA1 9343f0bedfafac5398b1173559068f74a9edb84f SHA256 86925c2bd4736ba970407ca22e14e4107176806842fe200a55254516d0b42f27
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkwPpQACgkQ/Kkm35zQzl6frwCgh2CMFeBxY0+sJk9pqUFBzY76
-oT8AoJfO6tItG96zp8Bg0/HBcm64OmWi
-=rTNi
------END PGP SIGNATURE-----
diff --git a/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch b/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch
new file mode 100644
index 000000000000..601991175323
--- /dev/null
+++ b/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch
@@ -0,0 +1,13 @@
+--- wmmemload-0.1.6/src/mem_linux.c	       2003-11-03 22:06:39.000000000 +0000
++++ wmmemload-0.1.6/src/mem_linux.c	       2011-11-12 11:05:13.000000000 +0000
+@@ -49,8 +49,9 @@
+ 
+    /* new format ? (kernel >= 2.5.1pre?) */
+    /* see linux/fs/proc/proc_misc.c */
+-   if (version >= 2 && patchlevel >= 5 && sublevel >= 1 || \
+-       version >= 2 && patchlevel >= 6 && sublevel >= 0)
++   if (version == 2 && patchlevel >= 5 && sublevel >= 1 || \
++       version == 2 && patchlevel >= 6 && sublevel >= 0 || \
++       version >2 )
+       isnewformat = 1;
+ }
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild
new file mode 100644
index 000000000000..463819a30717
--- /dev/null
+++ b/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild,v 1.1 2012/01/04 14:29:17 s4t4n Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="dockapp that displays memory and swap space usage."
+HOMEPAGE="http://www.markstaggs.net/wmmemload"
+SRC_URI="http://markstaggs.net/${PN}-download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-libs/libICE
+	x11-libs/libXt"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-kernel-3-support.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog THANKS
+}