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

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

5 files changed, 40 insertions, 28 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/Manifest b/app-misc/slmon/Manifest
index 0153878a2c44..5faf37d22ecc 100644
--- a/app-misc/slmon/Manifest
+++ b/app-misc/slmon/Manifest
@@ -1,5 +1,6 @@
-AUX slmon-0.5.13-invalid-free.patch 429 RMD160 20486b35f1c2e126bd5c8dd9a83a99c617d94308 SHA1 2bbb56783d1768e567062cc58c89f5140d1dda64 SHA256 7d5a9677d7b856e10dacae147c3c902d494763313c46abed61be98baf2d44c58
+AUX slmon-0.5.13-invalid-free.patch 383 RMD160 26851a946191b8d195b87718b9a4dba6a01a1f10 SHA1 ffdc76171e2bfe69920d9543f39a3837d0eb546f SHA256 83551ded011d8e526cf33de0d13d1b2bbac3aba8c70ce6a13a34f601f7544084
+AUX slmon-0.5.13-make-382.patch 243 RMD160 9373ec673caf09a721885b9d0467f368e784ad68 SHA1 df5ba41937c1874e1b9cff355d430dadddd585bb SHA256 084ce2059e66c252dbe81196410d866101228b5328dd2fff949cb2a60b309553
 DIST slmon-0.5.13.tar.gz 103826 RMD160 e60d2c645955cc49e3b32d89f1ea199623176c73 SHA1 b425b400d8a7d30092ace2ca4d8a9bc1899104eb SHA256 dc38740e4e0cccb86ccf76aaad5734d7d1e42e144615ee09bc8c8c9290110b28
-EBUILD slmon-0.5.13.ebuild 863 RMD160 723c16fd1285c0f2a5c76b07d189b3b9781a01ca SHA1 4b826c2aab7aaadd531499225b1245eb29222736 SHA256 b363fbbe1fb2cc7a183aa30faabec83ade400875b5d06ab1d88d56605bda5f49
-MISC ChangeLog 1708 RMD160 0878bb163eb68149caa3c2c151af68ce2b1a774c SHA1 7ac0905619da1e20029583f490e497139ee330fd SHA256 be17a40986ed325dda01765ecfc4a6fd3a263ed4b31680b6c93ae9dace511650
+EBUILD slmon-0.5.13.ebuild 884 RMD160 c6ae13d681822932e9b10524f82f9819b085c7da SHA1 a70dd454ec2b65171308abeed1cc2be6b744b042 SHA256 c3b8c8165e862c29dc67e6042dbaf5328e20b3545749df395cbcc4029984b9d7
+MISC ChangeLog 1673 RMD160 fba5c7fdec4a3226bfdf82939a62a204b440ece7 SHA1 2427eca98cacacb74a1a4cd04167ca8c116d0c39 SHA256 52a8ab0ab485283714c4f54838f5999c82c84ac759097c1d8f233e867c6bef92
 MISC metadata.xml 237 RMD160 c8e67b9ed38f0b1f4a09268a438fd51981e0a017 SHA1 893e2795205e43c12fbb4b034fb48356f047b449 SHA256 ba5b60fec3f01393f9e5a70f37a0372d8e99b6b15934baefa95566dce16dd3d8
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
 }