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

Package-Manager: portage-2.1.4.4

4 files changed, 128 insertions, 3 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/Manifest b/x11-misc/lavaps/Manifest
index f9c0077e38ce..680db0df94ac 100644
--- a/x11-misc/lavaps/Manifest
+++ b/x11-misc/lavaps/Manifest
@@ -1,5 +1,7 @@
+AUX lavaps-2.7-build-fixes.patch 2989 RMD160 62bab59e3ec592cf775dec13f1ba5b06d9b51571 SHA1 f531634586dca599dc3f526deabbd9fdf84cc5f4 SHA256 fee50d6975d97bea4b1064ddf862e0eaa99f08c3477e1de022bf174709c0d63a
 AUX lavaps-2.7-this-makes-it-compile.patch 2387 RMD160 69b8bebe4d1efe44182f36db86aba0006a613ecc SHA1 1154b21087586a7c5fcc6c336cc609c54b0b62f9 SHA256 ce917421c4750a5c4a3f56de7e81cf99a4b3bc24039649a7663c4cfec6dfb665
 DIST lavaps-2.7.tar.gz 399332 RMD160 286530bca67f9d324c0edfc2def6d6b2a6f24255 SHA1 5fb788359e22f80842423f211d42d8ebe2c58236 SHA256 2c01fbe92095ac27589e3b075cf2aec12ed34280cbf15ccf779894ca48519cf7
 EBUILD lavaps-2.7-r1.ebuild 1062 RMD160 27cce2425e1bbb4e95e8d9178814c61f9ca9853f SHA1 6c737ad83e80ba5961ad1f5d00dbf456c90aeeea SHA256 0508cdd683a3116ec72806794015b8cdc95427fb42e82ec41656d3e924275c18
-MISC ChangeLog 2500 RMD160 225321ca0ed8f7a6298631c5db0be0efef01cf94 SHA1 be563b9eded3c5ddb2600b46cdd15f0b675c9d1c SHA256 8a5b1ba12f57a5d486012288b51e005ed4c19c06ad91c9161ed68ebf2a901f4d
+EBUILD lavaps-2.7-r2.ebuild 1126 RMD160 c668c5aa1412b5ffa163327fec3f2fc37e69c8d7 SHA1 2abe0e6e2b85a6ead27e77178dec60f0a2b8a1c6 SHA256 4799bd98278d56b11530b9f15de254dd2dae0797867188561eef9abf9439ce0f
+MISC ChangeLog 2787 RMD160 da72aa92bd7168d8230f67eb359ad20ed360be94 SHA1 223db7e9f21cb216ea40f6fb44fd6bc7b478141e SHA256 be56bfff831004e7aa4465b9fa9a3f0c587a95ca579bb7f5dd01b0dc1de8326c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
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
+}