[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ifstatus/, net-analyzer/ifstatus/files/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/ifstatus/, net-analyzer/ifstatus/files/

[Lars Wendler]

commit:     56cb960da35d2e8a0177dfce8083dc993b48f70d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat May  6 22:31:30 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May  6 22:32:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cb960d

net-analyzer/ifstatus: Fixed compilation with gcc-6 (bug #594510).

Thanks to Peter Levine for providing the patch.
Also bumped ebuild to EAPI-6.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch | 12 ++++++++++++
 net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild        | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
new file mode 100644
index 00000000000..8acfe9adcec
--- /dev/null
+++ b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch
@@ -0,0 +1,12 @@
+--- ifstatus/Interface.h.old	2016-09-27 03:52:02.063811332 -0400
++++ ifstatus/Interface.h	2016-09-27 03:53:33.305880857 -0400
+@@ -57,7 +57,8 @@
+ 
+ 	InterfaceData & operator=(InterfaceData & rInterfaceData);
+ 	InterfaceData operator-(InterfaceData & rInterfaceData);
+-	
++	InterfaceData & operator=(InterfaceData && rInterfaceData) = default;
++	InterfaceData(const InterfaceData&) = default;
+ private:
+ 
+ 	unsigned long long m_ullReceived[eTotalTypes];

diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
index 7fb2edc345f..10f512067d0 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils toolchain-funcs
 
 KEYWORDS="amd64 arm ~ppc x86"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND=">=sys-libs/ncurses-4.2"
+RDEPEND=">=sys-libs/ncurses-4.2:0="
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
@@ -20,9 +20,14 @@ DEPEND="
 
 S="${WORKDIR}/${PN}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-tinfo.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-tinfo.patch"
+	default
 	tc-export CXX PKG_CONFIG
 }