Fix building with stable boost (#554814)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 61 insertions, 4 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 9a4aaae75fc5..35775437eb13 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.219 2015/07/06 15:56:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.220 2015/07/18 18:45:23 pacho Exp $
+
+  18 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/mkvtoolnix-6.6.0-boost-1.56.patch, mkvtoolnix-6.6.0.ebuild:
+  Fix building with stable boost (#554814)
 
 *mkvtoolnix-8.1.0 (06 Jul 2015)
 
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch b/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
new file mode 100644
index 000000000000..c99d06b52de5
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-6.6.0-boost-1.56.patch
@@ -0,0 +1,52 @@
+diff -Nuar mkvtoolnix-6.6.0/src/common/iso639.cpp mkvtoolnix-6.6.0-fix/src/common/iso639.cpp
+--- mkvtoolnix-6.6.0/src/common/iso639.cpp	2013-12-01 16:51:35.000000000 +0000
++++ mkvtoolnix-6.6.0-fix/src/common/iso639.cpp	2015-02-09 07:00:26.134735208 +0000
+@@ -13,6 +13,7 @@
+ 
+ #include "common/common_pch.h"
+ 
++#include <boost/version.hpp>
+ #include <unordered_map>
+ 
+ #include "common/iso639.h"
+@@ -590,20 +591,36 @@
+   auto range = iso639_languages | badap::indexed(0);
+   auto end   = boost::end(range);
+   for (auto lang = boost::begin(range); lang != end; lang++) {
+-    auto names = split(lang->english_name, ";");
++#if BOOST_VERSION < 105600
++    auto const &english_name = lang->english_name;
++    auto index               = lang.index();
++#else
++    auto const &english_name = lang->value().english_name;
++    auto index               = lang->index();
++#endif
++
++    auto names = split(english_name, ";");	
+     strip(names);
+     if (brng::find(names, s) != names.end())
+-      return lang.index();
++	  return index;
+   }
+ 
+   if (!allow_short_english_name)
+     return -1;
+ 
+   for (auto lang = boost::begin(range); lang != end; lang++) {
+-    auto names = split(lang->english_name, ";");
++#if BOOST_VERSION < 105600
++    auto const &english_name = lang->english_name;
++    auto index               = lang.index();
++#else
++    auto const &english_name = lang->value().english_name;
++    auto index               = lang->index();
++#endif
++
++    auto names = split(english_name, ";");
+     strip(names);
+     if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, s); }))
+-      return lang.index();
++	  return index;
+   }
+ 
+   return -1;
diff --git a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
index 23643575523e..178a9089ed64 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild,v 1.4 2014/08/27 12:29:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-6.6.0.ebuild,v 1.5 2015/07/18 18:45:23 pacho Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
@@ -48,7 +48,8 @@ pkg_pretend() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
-		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
+		"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch \
+		"${FILESDIR}"/${PN}-6.6.0-boost-1.56.patch
 	eautoreconf
 }