Fix bug #211193 thanks to Lionel Bouton <lionel-dev at bouton dotname>, imported amd64 patch from Debian and added ~amd64 keyword.

(Portage version: 2.1.4.4)

3 files changed, 125 insertions, 2 deletions

diff --git a/x11-misc/lavaps/ChangeLog b/x11-misc/lavaps/ChangeLog
index ce311dcc75f1..077f6797b22f 100644
--- a/x11-misc/lavaps/ChangeLog
+++ b/x11-misc/lavaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/lavaps
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.18 2006/10/18 00:18:20 omp Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.19 2008/03/08 19:54:29 coldwind Exp $
+
+*lavaps-2.7-r2 (08 Mar 2008)
+
+  08 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/lavaps-2.7-build-fixes.patch, +lavaps-2.7-r2.ebuild:
+  Fix bug #211193 thanks to Lionel Bouton <lionel-dev at bouton dotname>,
+  imported amd64 patch from Debian and added ~amd64 keyword.
 
   18 Oct 2006; David Shakaryan <omp@gentoo.org> lavaps-2.7-r1.ebuild:
   Fix dependencies and various aesthetic changes.
diff --git a/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch b/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch
new file mode 100644
index 000000000000..b464bd003e26
--- /dev/null
+++ b/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch
@@ -0,0 +1,72 @@
+--- lavaps-2.7/src/process_model.cc
++++ lavaps-2.7/src/process_model.cc
+@@ -86,7 +86,7 @@
+ void
+ process_model::dump()
+ {
+-	cout << int(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
++	cout << long(this) << " "<< pid_ << " " << uid_ << " " << cmd_.c_str() << " " <<
+ 		endl;
+ }
+ 
+--- lavaps-2.7/src/blob.cc
++++ lavaps-2.7/src/blob.cc
+@@ -503,7 +503,7 @@
+ blob::print()
+ {
+ 	ENTRY_TRACE(__FILE__,__LINE__);
+-	cout << O_("blob: ") << (unsigned)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
++	cout << O_("blob: ") << (unsigned long)this << O_(" x=") << x_ << O_(" step=") << x_step_ << O_(" num=") << num_ << O_(":");
+ 	for (int i = 0; i < num_; i++) {
+ 		cout << O_(" ") << y_lows_[i] << O_("-") << y_highs_[i];
+ 	};
+--- lavaps-2.7/src/linux/proc/ps.h
++++ lavaps-2.7/src/linux/proc/ps.h
+@@ -5,9 +5,6 @@
+ /* get definition of HZ */
+ #include <asm/param.h>
+ 
+-/* get page info */
+-#include <asm/page.h>
+-
+ char *wchan(unsigned long);
+ char *find_func(unsigned long address);
+ void *xcalloc(void *pointer, int size);
+--- lavaps-2.7.orig/acinclude.m4
++++ lavaps-2.7/acinclude.m4
+@@ -1556,7 +1556,7 @@
+ ], [])[extern int _nl_msg_cat_cntr;
+ extern int *_nl_domain_bindings;],
+             [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
++return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+             gt_cv_func_gnugettext_libc=yes,
+             gt_cv_func_gnugettext_libc=no)])
+ 
+@@ -1592,7 +1592,7 @@
+ #endif
+ const char *_nl_expand_alias ();],
+               [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
++return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+               gt_cv_func_gnugettext_libintl=yes,
+               gt_cv_func_gnugettext_libintl=no)
+             dnl Now see whether libintl exists and depends on libiconv.
+@@ -1613,7 +1613,7 @@
+ #endif
+ const char *_nl_expand_alias ();],
+                 [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
++return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 gt_cv_func_gnugettext_libintl=yes
+@@ -2077,7 +2077,7 @@
+         [AC_TRY_LINK([
+ #include <libintl.h>
+ ],
+-          [return (int) dgettext ("","")],
++          [return (long) dgettext ("","")],
+ 	  gt_cv_func_dgettext_libc=yes,
+           gt_cv_func_dgettext_libc=no)
+         ])
diff --git a/x11-misc/lavaps/lavaps-2.7-r2.ebuild b/x11-misc/lavaps/lavaps-2.7-r2.ebuild
new file mode 100644
index 000000000000..61a44a43a149
--- /dev/null
+++ b/x11-misc/lavaps/lavaps-2.7-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild,v 1.1 2008/03/08 19:54:29 coldwind Exp $
+
+inherit eutils
+
+DESCRIPTION="Lava Lamp graphical representation of running processes."
+HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
+SRC_URI="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+DEPEND=">=dev-lang/tk-8.3.3
+	gtk? ( >=x11-libs/gtk+-2.2
+		>=gnome-base/libgnomecanvas-2.2
+		>=gnome-base/libgnomeui-2.2 )
+	!gtk? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-this-makes-it-compile.patch"
+	epatch "${FILESDIR}/${P}-build-fixes.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() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc README
+	doman doc/lavaps.1
+	dohtml doc/*.html
+}