Version bump. Fixes also building failure with GCC 4.3. Thanks to Peter Alfredsen wrt #218909.

Package-Manager: portage-2.1.5_rc6

5 files changed, 73 insertions, 24 deletions

diff --git a/net-analyzer/nload/ChangeLog b/net-analyzer/nload/ChangeLog
index 164afad6d9c3..66b9bb17fcd5 100644
--- a/net-analyzer/nload/ChangeLog
+++ b/net-analyzer/nload/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nload
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.24 2007/09/23 18:37:44 philantrop Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.25 2008/04/22 17:29:05 drac Exp $
+
+*nload-0.7.1 (22 Apr 2008)
+
+  22 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/nload-0.7.1-gcc43.patch, -nload-0.6.0.ebuild, +nload-0.7.1.ebuild:
+  Version bump. Fixes also building failure with GCC 4.3. Thanks to Peter
+  Alfredsen wrt #218909.
 
   23 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   nload-0.6.0-r2.ebuild:
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index 4719e845e48f..b4d81d0a169e 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -1,7 +1,9 @@
 AUX nload-0.6.0-prevent-stripping.patch 592 RMD160 1ba0691ced3d591909d461d46b1148d0f9a6de8a SHA1 9bcfde2518901760bcbebf36a0259702019a1341 SHA256 9367907e43aa05a50d4d74efc3d9d360e52c316640505ac9f77ed4ad46ef49c6
 AUX nload-0.6.0-signedness.patch 2382 RMD160 1fbdc77b07c6c80c48e13614c8d97950651b0140 SHA1 7c3fcff9084db36c2bf8e64fcfe46e23fa079c41 SHA256 21bc1dd5f45dfd3bf01173026f5703af88400f49ad1bf4e78024a0e4b28a4522
+AUX nload-0.7.1-gcc43.patch 820 RMD160 a75dff26f2e70ed6652a487338a14616120171d5 SHA1 6533be86e5e87dd2cd47ee3f8c1c8d2d55335203 SHA256 c061f37ea193da89373ac04cef6722a545437166725a5bad2b84de03a797e8a9
 DIST nload-0.6.0.tar.gz 121136 RMD160 d7bcd89d32b90ce4e5676c6630e478cd3e73a9d7 SHA1 3f71fb4fce9b8f4da7dccf9ab9696c3d051012c2 SHA256 546c7934a1e97aed34982eca6a4f17d33956479f76de9151371fa58eb24766c9
+DIST nload-0.7.1.tar.gz 144658 RMD160 7d5b87aa3de35c9114bfa6ba1e697e72ba0acb25 SHA1 7d096f3941d57046310768ffc6f63ccc228f65a5 SHA256 d4f34c65b72014b5d4f21f24262b8ba1f714dc87851a1bf05c929cb4a7767bc6
 EBUILD nload-0.6.0-r2.ebuild 808 RMD160 76311b48053f25aa117dafdb7a5090d051a1f1ed SHA1 9db6c0db445de97e28547d7eae47a8f664f30cef SHA256 2bad4cb32bdb84d01ee0eb423eddb4379537f60a8d0ab6a978ce8d4771dde651
-EBUILD nload-0.6.0.ebuild 629 RMD160 f6f0c7dfe4c35d437a846b0f6c31b3e0c992d179 SHA1 6625c663142d520f97187623515763ce666e5efe SHA256 805167e3ba394d1ee4e584b933fb19c89dc57f44805fc82f40b53efe0455f4d8
-MISC ChangeLog 3653 RMD160 a1a16ff3f6f6705dea882a3178ece2cd31d25e77 SHA1 c6702a235a94e9e9210818a4669c5f896370223d SHA256 5fa122272d6fb1c782ff6c320626eed970640b43bba85b4253c699917dcd2025
+EBUILD nload-0.7.1.ebuild 809 RMD160 9ae8fcc8a1d706d42a054b5a1e5d2f74fe851450 SHA1 1b4322a57cff6e8fec4a6e46e041f446cac7d690 SHA256 2f3d635005a2c94a8ec10215b5635b3bbfa707d3e16ec57e5d762f1e6845ee25
+MISC ChangeLog 3900 RMD160 b4fe5284a001e163352fbba3cc9e10d87e6d6a16 SHA1 05eaa5648721cde9e7c667e4b47b1eaa244a9c52 SHA256 379f93c286a98786ad7b40974fcde9204577570b36b49be3ef6cf5c4956a0a79
 MISC metadata.xml 342 RMD160 38eeeee554b815d283175ed3640c51116aff4dd8 SHA1 fb126e68c220fb3266d2e00d6d0df44d980538d0 SHA256 83a6e222ff40f06fb5b65bca6dd62b2709eff276bd8e9b1ed1d5c5aaf7939e09
diff --git a/net-analyzer/nload/files/nload-0.7.1-gcc43.patch b/net-analyzer/nload/files/nload-0.7.1-gcc43.patch
new file mode 100644
index 000000000000..c51e1d934818
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.7.1-gcc43.patch
@@ -0,0 +1,31 @@
+diff -NrU5 nload-0.7.1.orig/src/device.cpp nload-0.7.1/src/device.cpp
+--- nload-0.7.1.orig/src/device.cpp	2008-02-02 17:14:34.000000000 +0100
++++ nload-0.7.1/src/device.cpp	2008-04-22 08:08:40.000000000 +0200
+@@ -19,10 +19,11 @@
+ #include "devreader.h"
+ #include "graph.h"
+ #include "setting.h"
+ #include "settingstore.h"
+ #include "window.h"
++#include <climits>
+ 
+ #include <iomanip>
+ 
+ using namespace std;
+ 
+diff -NrU5 nload-0.7.1.orig/src/main.cpp nload-0.7.1/src/main.cpp
+--- nload-0.7.1.orig/src/main.cpp	2008-02-27 21:22:35.000000000 +0100
++++ nload-0.7.1/src/main.cpp	2008-04-22 08:11:26.000000000 +0200
+@@ -50,10 +50,12 @@
+ 
+ #include <ctype.h>
+ #include <time.h>
+ #include <curses.h>
+ #include <signal.h>
++#include <cstring>
++
+ #undef clear
+ #undef erase
+ #undef refresh
+ 
+ #define STANDARD_AVERAGE_WINDOW 300
diff --git a/net-analyzer/nload/nload-0.6.0.ebuild b/net-analyzer/nload/nload-0.6.0.ebuild
deleted file mode 100644
index 7f7a49a79ddf..000000000000
--- a/net-analyzer/nload/nload-0.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/nload-0.6.0.ebuild,v 1.11 2007/07/11 23:49:24 mr_bones_ Exp $
-
-DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time"
-SRC_URI="mirror://sourceforge/nload/${P}.tar.gz"
-HOMEPAGE="http://roland-riegel.de/nload/index_en.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2"
-
-src_install () {
-	#make DESTDIR=${D} install
-	einstall || die
-	dodoc README INSTALL ChangeLog AUTHORS
-}
diff --git a/net-analyzer/nload/nload-0.7.1.ebuild b/net-analyzer/nload/nload-0.7.1.ebuild
new file mode 100644
index 000000000000..49891fc4da12
--- /dev/null
+++ b/net-analyzer/nload/nload-0.7.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/nload-0.7.1.ebuild,v 1.1 2008/04/22 17:29:05 drac Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time"
+HOMEPAGE="http://roland-riegel.de/nload/index_en.html"
+SRC_URI="mirror://sourceforge/nload/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.6.0-prevent-stripping.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README
+}