From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 7 Sep 2015 03:11:50 +0000 (-0400)
Subject: media-video/cclive: fix building w/gcc-5 #548310
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ae39c3d04203862680a9b776393aec91a46285c;p=gentoo.git

media-video/cclive: fix building w/gcc-5 #548310
---

diff --git a/media-video/cclive/cclive-0.9.3-r1.ebuild b/media-video/cclive/cclive-0.9.3-r1.ebuild
index e911be3df68f..8566a4e9e4d7 100644
--- a/media-video/cclive/cclive-0.9.3-r1.ebuild
+++ b/media-video/cclive/cclive-0.9.3-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-iostream.patch #527658
+	epatch "${FILESDIR}"/${P}-boost-ver-check.patch #548310
 }
 
 src_configure() {
diff --git a/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
new file mode 100644
index 000000000000..23e69dd1b665
--- /dev/null
+++ b/media-video/cclive/files/cclive-0.9.3-boost-ver-check.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/548310
+
+apply boost.m4 updates to fix building w/gcc-5
+
+--- a/configure
++++ b/configure
+@@ -17481,8 +17481,10 @@
+ boost-lib-version = BOOST_LIB_VERSION
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  grep -v '#' |
+   tr -d '\r' |
+-  $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
++  tr -s '\n' ' ' |
++  $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
+   boost_cv_lib_version=`cat conftest.i`
+ fi
+ rm -rf conftest*