Fix building with make >= 3.82 wrt #337403 by Diego E. Pettenò. Fix some of my own old ChangeLog entries too... mess

(Portage version: 2.2_rc86/cvs/Linux x86_64)

4 files changed, 36 insertions, 25 deletions

diff --git a/app-misc/slmon/ChangeLog b/app-misc/slmon/ChangeLog
index 3504745208d4..26f99ff38b84 100644
--- a/app-misc/slmon/ChangeLog
+++ b/app-misc/slmon/ChangeLog
@@ -1,20 +1,16 @@
 # ChangeLog for app-misc/slmon
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.13 2008/02/09 05:46:39 drac Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/ChangeLog,v 1.14 2010/09/25 11:41:04 ssuominen Exp $
 
-  09 Feb 2008; Samuli Suominen <drac@gentoo.org>
-  -files/slmon-0.5.13-slang-2.patch, slmon-0.5.13.ebuild,
-  -slmon-0.5.13-r1.ebuild:
-  Fix slmon to work with slang 2.1.3.
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> slmon-0.5.13.ebuild,
+  files/slmon-0.5.13-invalid-free.patch, +files/slmon-0.5.13-make-382.patch:
+  Fix building with make >= 3.82 wrt #337403 by Diego E. Pettenò.
 
 *slmon-0.5.13-r1 (24 Jan 2008)
 
-  24 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  24 Jan 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/slmon-0.5.13-slang-2.patch, +slmon-0.5.13-r1.ebuild:
-  Use >=sys-libs/slang-2.
-
-  24 Jan 2008; Samuli Suominen <drac@gentoo.org> slmon-0.5.13.ebuild:
-  Depend on =sys-libs/slang-1* and keyword for ~amd64.
+  Fix sys-libs/slang to use version 2.x and keyword ~amd64.
 
   14 Apr 2007; Raúl Porcel <armin76@gentoo.org>
   +files/slmon-0.5.13-invalid-free.patch, slmon-0.5.13.ebuild:
diff --git a/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
index 9728492fcc88..d7b0e24e07d9 100644
--- a/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
+++ b/app-misc/slmon/files/slmon-0.5.13-invalid-free.patch
@@ -1,5 +1,7 @@
---- rc.c.orig	2004-06-20 18:56:48.000000000 +0300
-+++ rc.c	2007-04-09 19:14:05.000000000 +0300
+http://bugs.gentoo.org/151293
+
+--- rc.c
++++ rc.c
 @@ -177,9 +177,10 @@
      char *home, dotrc[1024] = { 0 };
  
diff --git a/app-misc/slmon/files/slmon-0.5.13-make-382.patch b/app-misc/slmon/files/slmon-0.5.13-make-382.patch
new file mode 100644
index 000000000000..bb128f5803e6
--- /dev/null
+++ b/app-misc/slmon/files/slmon-0.5.13-make-382.patch
@@ -0,0 +1,11 @@
+http://bugs.gentoo.org/337403
+
+--- Makefile.am
++++ Makefile.am
+@@ -15,5 +15,5 @@
+ #slmon_LDFLAGS = `libgtop-config --cflags --libs`
+ 
+ release:
+-        $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
++	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+ 
diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild
index aa1bc097317c..d560ee01a987 100644
--- a/app-misc/slmon/slmon-0.5.13.ebuild
+++ b/app-misc/slmon/slmon-0.5.13.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13.ebuild,v 1.4 2008/02/09 05:46:39 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/slmon/slmon-0.5.13.ebuild,v 1.5 2010/09/25 11:41:04 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Colored text-based system performance monitor"
 HOMEPAGE="http://slmon.sourceforge.net"
@@ -13,25 +14,26 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE="debug"
 
-RDEPEND=">=dev-libs/glib-2
+RDEPEND="dev-libs/glib:2
 	sys-libs/slang
 	gnome-base/libgtop"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-invalid-free.patch # bug 151293
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch \
+		"${FILESDIR}"/${P}-invalid-free.patch
+	eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable debug)
-	emake || die "emake failed."
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable debug)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README slmonrc TODO
 	dohtml *.html
 }