5 files changed, 109 insertions, 11 deletions
diff --git a/x11-misc/lavaps/ChangeLog b/x11-misc/lavaps/ChangeLog
index 3e18c2561cc3..8e226b25f25c 100644
--- a/x11-misc/lavaps/ChangeLog
+++ b/x11-misc/lavaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/lavaps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.11 2005/06/14 23:13:11 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.12 2005/06/23 20:45:32 smithj Exp $
+
+*lavaps-2.7-r1 (23 Jun 2005)
+
+  23 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/lavaps-2.7-this-makes-it-compile.patch, +lavaps-2.7-r1.ebuild:
+  fixed compilation problem for bug 96372; thanks to Stian Skjelstad
+  <stian@nixia.no> for the patch
 
 *lavaps-2.7 (14 Jun 2005)
 
diff --git a/x11-misc/lavaps/Manifest b/x11-misc/lavaps/Manifest
index 483aed845503..322d89c5a16a 100644
--- a/x11-misc/lavaps/Manifest
+++ b/x11-misc/lavaps/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a576a3d120465440ac4a522fd32e3c88 ChangeLog 1517
 MD5 aca5c916c1abf640fb9ee6f8fcd56fdc lavaps-2.4.ebuild 571
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 2cb93bb0986a5dcc864d49184cb61e04 lavaps-2.7.ebuild 875
+MD5 15d607eb1db4b9f49dcadc65b00f93d3 lavaps-2.7-r1.ebuild 984
 MD5 34d8c98cfb7f3c538f8177c24c2b4152 files/digest-lavaps-2.4 62
 MD5 ccae6ec1333b846db55deb7538155cc6 files/digest-lavaps-2.7 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCr2Sjl5AvwDPiUowRAhIwAJ49rCBnsgjnHiFWMyToG4SSjr1OtgCgz7ka
-ztUZWm96tA6xhGeQhwyK0Io=
-=2yO7
------END PGP SIGNATURE-----
+MD5 308abf7f4c9df163feabd98e62c1e9b6 files/lavaps-2.7-this-makes-it-compile.patch 2387
+MD5 ccae6ec1333b846db55deb7538155cc6 files/digest-lavaps-2.7-r1 62
diff --git a/x11-misc/lavaps/files/digest-lavaps-2.7-r1 b/x11-misc/lavaps/files/digest-lavaps-2.7-r1
new file mode 100644
index 000000000000..72a53d47d70b
--- /dev/null
+++ b/x11-misc/lavaps/files/digest-lavaps-2.7-r1
@@ -0,0 +1 @@
+MD5 cf56a2becae9053130768e4dff5b4a59 lavaps-2.7.tar.gz 399332
diff --git a/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch b/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch
new file mode 100644
index 000000000000..c2238a80307c
--- /dev/null
+++ b/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch
@@ -0,0 +1,56 @@
+diff -ur lavaps-2.7/doc/Makefile.am lavaps-2.7.fixed/doc/Makefile.am
+--- lavaps-2.7/doc/Makefile.am	2004-12-10 21:36:01.000000000 +0100
++++ lavaps-2.7.fixed/doc/Makefile.am	2005-06-23 08:35:50.000000000 +0200
+@@ -23,10 +23,10 @@
+ lavaps.1: master.pod
+ 	$(PERL) podprune $(MANUAL_NON_SECTIONS) <master.pod >lavaps.pod
+ 	$(POD2MAN) --section=1 --release="lavaps-@VERSION@" --center="Lavaps Documentation" lavaps.pod >lavaps.1
+-	rm lavaps.pod
++	rm -f lavaps.pod
+ 
+ lavaps_man.html: master.pod
+ 	$(PERL) podprune $(MANUAL_NON_SECTIONS)  <master.pod >lavaps.pod
+ 	$(POD2HTML) --title "lavaps-@VERSION@ manual page" lavaps.pod >lavaps_man.html
+-	rm lavaps.pod
++	rm -f lavaps.pod
+ 
+diff -ur lavaps-2.7/doc/Makefile.in lavaps-2.7.fixed/doc/Makefile.in
+--- lavaps-2.7/doc/Makefile.in	2004-12-25 03:42:02.000000000 +0100
++++ lavaps-2.7.fixed/doc/Makefile.in	2005-06-23 08:36:29.000000000 +0200
+@@ -573,12 +573,12 @@
+ lavaps.1: master.pod
+ 	$(PERL) podprune $(MANUAL_NON_SECTIONS) <master.pod >lavaps.pod
+ 	$(POD2MAN) --section=1 --release="lavaps-@VERSION@" --center="Lavaps Documentation" lavaps.pod >lavaps.1
+-	rm lavaps.pod
++	rm -f lavaps.pod
+ 
+ lavaps_man.html: master.pod
+ 	$(PERL) podprune $(MANUAL_NON_SECTIONS)  <master.pod >lavaps.pod
+ 	$(POD2HTML) --title "lavaps-@VERSION@ manual page" lavaps.pod >lavaps_man.html
+-	rm lavaps.pod
++	rm -f lavaps.pod
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -ur lavaps-2.7/src/linux/proc/devname.c lavaps-2.7.fixed/src/linux/proc/devname.c
+--- lavaps-2.7/src/linux/proc/devname.c	2004-12-17 18:34:44.000000000 +0100
++++ lavaps-2.7.fixed/src/linux/proc/devname.c	2005-06-23 08:37:00.000000000 +0200
+@@ -20,6 +20,7 @@
+  * Thanks to Ashley Howes for the feedback.
+  */
+ /* #define __KERNEL__ */
++#include <asm/types.h>
+ #include <linux/kdev_t.h>
+ /* #undef __KERNEL__ */
+ 
+diff -ur lavaps-2.7/src/linux/proc/version.c lavaps-2.7.fixed/src/linux/proc/version.c
+--- lavaps-2.7/src/linux/proc/version.c	1998-10-02 23:34:07.000000000 +0200
++++ lavaps-2.7.fixed/src/linux/proc/version.c	2005-06-23 08:37:19.000000000 +0200
+@@ -5,6 +5,7 @@
+  * GNU Library General Public License; see ../COPYING.LIB
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef MINORVERSION
+ char procps_version[] = "procps version " VERSION "." SUBVERSION "." MINORVERSION;
diff --git a/x11-misc/lavaps/lavaps-2.7-r1.ebuild b/x11-misc/lavaps/lavaps-2.7-r1.ebuild
new file mode 100644
index 000000000000..f65cf765f0ee
--- /dev/null
+++ b/x11-misc/lavaps/lavaps-2.7-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r1.ebuild,v 1.1 2005/06/23 20:45:32 smithj Exp $
+
+inherit eutils
+
+DESCRIPTION="Lava Lamp graphical representation of running processes."
+SRC_URI="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/${P}.tar.gz"
+HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="gtk"
+
+DEPEND=">=dev-lang/tk-8.3.3
+	virtual/x11
+	gtk? ( x11-libs/gtk+ )
+	!gtk? ( dev-lang/tcl )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-this-makes-it-compile.patch
+}
+
+src_compile() {
+	local myconf="--with-x"
+	use gtk && myconf="${myconf} --with-gtk" \
+		|| myconf="${myconf} --with-tcltk"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	doman lavaps.1
+	dodoc COPYING README
+	dohtml doc/*.html
+}