Build-only fixes to avoid makefile patching, acinclude patching, and sundry other ways people have abused this package over the years. Fixes bug #226845.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

4 files changed, 20 insertions, 60 deletions

diff --git a/x11-misc/lavaps/ChangeLog b/x11-misc/lavaps/ChangeLog
index 5be9b0ad5a4f..af49bcdada19 100644
--- a/x11-misc/lavaps/ChangeLog
+++ b/x11-misc/lavaps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/lavaps
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.20 2008/06/29 12:44:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v 1.21 2008/06/29 13:19:23 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/lavaps-2.7-build-fixes.patch,
+  files/lavaps-2.7-this-makes-it-compile.patch, lavaps-2.7-r2.ebuild:
+  Build-only fixes to avoid makefile patching, acinclude patching, and
+  sundry other ways people have abused this package over the years. Fixes
+  bug #226845.
 
   29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/lavaps-2.7-gcc43.patch, lavaps-2.7-r2.ebuild:
diff --git a/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch b/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch
index b464bd003e26..08111f5e66fe 100644
--- a/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch
+++ b/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch
@@ -32,41 +32,3 @@
  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/files/lavaps-2.7-this-makes-it-compile.patch b/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch
index c2238a80307c..fecd2680b27a 100644
--- 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
@@ -14,24 +14,6 @@ diff -ur lavaps-2.7/doc/Makefile.am lavaps-2.7.fixed/doc/Makefile.am
 -	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
diff --git a/x11-misc/lavaps/lavaps-2.7-r2.ebuild b/x11-misc/lavaps/lavaps-2.7-r2.ebuild
index 3d164d841084..c6407e860acd 100644
--- a/x11-misc/lavaps/lavaps-2.7-r2.ebuild
+++ b/x11-misc/lavaps/lavaps-2.7-r2.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2008/06/29 12:44:25 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild,v 1.3 2008/06/29 13:19:23 loki_val Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Lava Lamp graphical representation of running processes."
 HOMEPAGE="http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/"
@@ -16,7 +16,8 @@ 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 )
+		>=gnome-base/libgnomeui-2.2
+		dev-util/intltool )
 	!gtk? ( dev-lang/tcl )"
 RDEPEND="${DEPEND}"
 
@@ -26,6 +27,14 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-this-makes-it-compile.patch"
 	epatch "${FILESDIR}/${P}-build-fixes.patch"
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	#We need to get rid of the old macros.
+	rm acinclude.m4
+	#Update to newer namespace.
+	sed -i \
+		-e "s:AC_PROG_INTLTOOL:IT_PROG_INTLTOOL:" \
+		-e "s:AM_GLIB_GNU_GETTEXT:GLIB_GNU_GETTEXT:" \
+		configure.gtk.ac
+	eautoreconf
 }
 
 src_compile() {