From 6b74b9f2bc3164443919f5893909191531cc8f6c Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Tue, 6 Jun 2017 14:59:07 +0200
Subject: [PATCH] app-text/apvlv: Fix gcc6 compilation (#597670)

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 app-text/apvlv/apvlv-0.1.5-r1.ebuild        |  3 ++-
 app-text/apvlv/files/apvlv-0.1.5-gcc6.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 app-text/apvlv/files/apvlv-0.1.5-gcc6.patch

diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
index dc6b7a188bc1..94e7aec16202 100644
--- a/app-text/apvlv/apvlv-0.1.5-r1.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# preserve cflags
 	epatch "${FILESDIR}/${PN}-0.1.5-cflags.patch"
+	epatch "${FILESDIR}/${PN}-0.1.5-gcc6.patch"
 }
 
 src_configure() {
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
new file mode 100644
index 000000000000..0ffe3659d6d7
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
+--- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
++++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
+@@ -90,7 +90,7 @@
+ 	return false;
+       }
+ 
+-    while ((getline (os, str)) != NULL)
++    while (getline (os, str))
+       {
+ 	string argu, data, crap;
+ 	stringstream is (str);
-- 
2.26.2