1 |
commit: 56cb960da35d2e8a0177dfce8083dc993b48f70d |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 6 22:31:30 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 6 22:32:07 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cb960d |
7 |
|
8 |
net-analyzer/ifstatus: Fixed compilation with gcc-6 (bug #594510). |
9 |
|
10 |
Thanks to Peter Levine for providing the patch. |
11 |
Also bumped ebuild to EAPI-6. |
12 |
|
13 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
14 |
|
15 |
net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch | 12 ++++++++++++ |
16 |
net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild | 15 ++++++++++----- |
17 |
2 files changed, 22 insertions(+), 5 deletions(-) |
18 |
|
19 |
diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..8acfe9adcec |
22 |
--- /dev/null |
23 |
+++ b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch |
24 |
@@ -0,0 +1,12 @@ |
25 |
+--- ifstatus/Interface.h.old 2016-09-27 03:52:02.063811332 -0400 |
26 |
++++ ifstatus/Interface.h 2016-09-27 03:53:33.305880857 -0400 |
27 |
+@@ -57,7 +57,8 @@ |
28 |
+ |
29 |
+ InterfaceData & operator=(InterfaceData & rInterfaceData); |
30 |
+ InterfaceData operator-(InterfaceData & rInterfaceData); |
31 |
+- |
32 |
++ InterfaceData & operator=(InterfaceData && rInterfaceData) = default; |
33 |
++ InterfaceData(const InterfaceData&) = default; |
34 |
+ private: |
35 |
+ |
36 |
+ unsigned long long m_ullReceived[eTotalTypes]; |
37 |
|
38 |
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild |
39 |
index 7fb2edc345f..10f512067d0 100644 |
40 |
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild |
41 |
+++ b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild |
42 |
@@ -1,7 +1,7 @@ |
43 |
-# Copyright 1999-2014 Gentoo Foundation |
44 |
+# Copyright 1999-2017 Gentoo Foundation |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
-EAPI=5 |
48 |
+EAPI=6 |
49 |
inherit eutils toolchain-funcs |
50 |
|
51 |
KEYWORDS="amd64 arm ~ppc x86" |
52 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" |
53 |
LICENSE="GPL-2" |
54 |
SLOT="0" |
55 |
|
56 |
-RDEPEND=">=sys-libs/ncurses-4.2" |
57 |
+RDEPEND=">=sys-libs/ncurses-4.2:0=" |
58 |
DEPEND=" |
59 |
${RDEPEND} |
60 |
virtual/pkgconfig |
61 |
@@ -20,9 +20,14 @@ DEPEND=" |
62 |
|
63 |
S="${WORKDIR}/${PN}" |
64 |
|
65 |
+PATCHES=( |
66 |
+ "${FILESDIR}/${P}-gcc43.patch" |
67 |
+ "${FILESDIR}/${P}-tinfo.patch" |
68 |
+ "${FILESDIR}/${P}-gcc6.patch" |
69 |
+) |
70 |
+ |
71 |
src_prepare() { |
72 |
- epatch "${FILESDIR}/${P}-gcc43.patch" |
73 |
- epatch "${FILESDIR}/${P}-tinfo.patch" |
74 |
+ default |
75 |
tc-export CXX PKG_CONFIG |
76 |
} |