[gentoo-commits] gentoo-x86 commit in x11-misc/lavaps: ChangeLog lavaps-2.7-r2.ebuild

[Peter Alfredsen (loki_val)]

loki_val    08/06/29 13:19:23

  Modified:             ChangeLog lavaps-2.7-r2.ebuild
  Log:
  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)

Revision  Changes    Path
1.21                 x11-misc/lavaps/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lavaps/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	29 Jun 2008 12:44:25 -0000	1.20
+++ ChangeLog	29 Jun 2008 13:19:23 -0000	1.21
@@ -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@g.o>
+  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@g.o>
   +files/lavaps-2.7-gcc43.patch, lavaps-2.7-r2.ebuild:



1.3                  x11-misc/lavaps/lavaps-2.7-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild?r1=1.2&r2=1.3

Index: lavaps-2.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lavaps/lavaps-2.7-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lavaps-2.7-r2.ebuild	29 Jun 2008 12:44:25 -0000	1.2
+++ lavaps-2.7-r2.ebuild	29 Jun 2008 13:19:23 -0000	1.3
@@ -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 @@
 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 @@
 	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() {



-- 
gentoo-commits@l.g.o mailing list