4 files changed, 68 insertions, 22 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/Manifest b/media-video/mkvtoolnix/Manifest
index 98535be59107..7643ee8c393c 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX mkvtoolnix-5.8.0-boost-configure.patch 5428 SHA256 060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5 SHA512 8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b WHIRLPOOL 2aab1692234fb364043c07e94f39efd94ae6c57d46b12814626ea3be7afe59d3d5f79de24905fa23aed4b1446ccbc2fdfa86eb69cd2e3c0c2a6298bf5cb841b5
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
+AUX mkvtoolnix-6.6.0-boost-1.56.patch 1695 SHA256 109e2b36016a6a338e41b2744265827608b21f9e5ae54629f0c45d9c4c348403 SHA512 568198e2af3746ebac94c6b096211866a580f6171e38cb39c02e1728ec54c693742f2912600081e4ff44142a9ca8ed0c26b2ba47f7dc85b6363b73ff129a57c2 WHIRLPOOL 90da4ebd18e9df5a64934a63db02f62274814b537ab6a7341174e5016115867d12ff05a97fca9c686a3eec7ca070f0b147763f9a9e40fc7fc34240b250bfa2b6
 DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
 DIST mkvtoolnix-7.3.0.tar.xz 5225524 SHA256 2cb09f926d16bfa8091a9f8fcbd63f6490bf1f2ce3280001f8d5c4798979d420 SHA512 e725d8bbc97ca0cef0e281f8cfb3477555640bef5ce31fc9cf62d1ce36b95b895cbe757d983a9081ca626025eef3f7ae9052e810d2541d98808e09a5793d2e8f WHIRLPOOL a2ff376e540e709d029cccfd77979971fa7987e475da6a2af9fdf0ee5a85fa4caa32c563baa7a43c94b9d5b5ee7f817ae331641af429aac77e5027c5cb0ea5b5
 DIST mkvtoolnix-7.4.0.tar.xz 5267412 SHA256 6bdfec2ca4fd7ce379660289c800be91fe963bfaf2f6e167fb11d9666d1640fe SHA512 2588281125c81be37eccc33b7277be0a0dff99b7aa8e820b68f4faecbd706b53a6363a54d427b5f36bfbdc773504e4de9e2ce187c271ee0142798db7e1a5fde8 WHIRLPOOL c878fdab9d99072bf514f968e0f697c5b73e2611ab7e27bdab80f8f6d32d331321b9697ac67f948842199eb68464726961c1064e4fc26bac62a3b6437dc60dc5
@@ -11,7 +12,7 @@ DIST mkvtoolnix-7.6.0.tar.xz 5304932 SHA256 74de3298133a491ad8b28868273635385c14
 DIST mkvtoolnix-7.7.0.tar.xz 5336448 SHA256 191d8892b8fb36ac492c710134d419d7578ba802e812a32eb90ae02d4b13c028 SHA512 2ab9999ce0db189e03be130aa0eb5964ff0714da010255d84a7bd4164107dd86e7d5025c87ffc7328e0f7e899dcbc3e85a1094f7765e7393c1f4490eab4f426e WHIRLPOOL 1d18e5d690291636eb00fdbb990fc158652378eadcb3a4d34e075325396a3ac63c8a01dfb0ee0c2de4d38fe45d38b3f116e787be334238110e1fcb47310b6933
 DIST mkvtoolnix-7.8.0.tar.xz 5361192 SHA256 4ea13a75db2170944e95e180aaab97e3f0d42c04d88a0d4baadacd554248fe54 SHA512 6a56013da749fc6c661ade68a5d0fe50e710e2194f756d92cf47ccec471eb49206c14482ba1ccffedaf1ca164d3da49c3ea7f62296957bad7099baef8c7a083a WHIRLPOOL 171b09e9c5c54ce8e7b147cc5dcd28978db4d004c529af44f7900c09bf624de3fbacbae14f32c01e8cf47c4d0050c6fa3f2d7b6ba226ad68fff02e9b6c29b496
 DIST mkvtoolnix-8.1.0.tar.xz 5784428 SHA256 715d88411e23860c085639ebdc9163b4498df7f30169583a9a572add72b572e5 SHA512 00cae7c61ae1d7e9ac0eeb6756c253d05f6192bceacdffc87d7f2b01b589b158f6d76e00632d117452fa9595a93e27503877ab3d1775efbce1c0a97a78aeea99 WHIRLPOOL ad89d9e266d7d3651524b3af8be9cb61441e9eaf12fc640e509c7c18a7493786ca47f4b684dbb30f231f9f803c7c50c929aef186c488d603d85a2bcdf1da681e
-EBUILD mkvtoolnix-6.6.0.ebuild 2124 SHA256 d85a5cf968972ea40fe08ae64e5c86a18e6ccbd62787a908f4e30524c5701d86 SHA512 b3c22836b30bdc1bfd60c4b4969ddfa09fa11fb57f3e6184a68ca4f398b4cead7d72cdb5df7394996c95e23b6c83a2373c838efda4d3b07d9c4064687dd70981 WHIRLPOOL 1dbcb589914de13a7b5631350abaa185f281ee47a309cad0c7816addbcbd07b8fbc6fd04f91d960072a7739e352bb5cd4dce634b4d676393a41af2462ced9009
+EBUILD mkvtoolnix-6.6.0.ebuild 2173 SHA256 a9a7aac11c97dcb68a4b4452656ea5ce4fcf8c45241edeb48915bb5fd6b0711c SHA512 ed2995a33968acc34a3e52ea8d2b074afee47f297bb3a29d4ce7ce7f54bd20350213695b69cdb1c726825dfd93102754ad49259a813cc15f0c369d50e6a26336 WHIRLPOOL 205e4c8eb0a8ae62a8a702917d80da3f0aa9c2882fe43f59abd60a5d3ffdcd98a4726a8944bd7e99a489b596e4aed139f66ef70e9ab32fedd743853ed8e92a2b
 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
 EBUILD mkvtoolnix-7.4.0-r1.ebuild 2822 SHA256 1da6ab90ee31b8e6763446f099467fce1a22061f00a9caadfc2abd28c84aaadb SHA512 52eef643f6a65e367914c78ba6523cb4f05b5e0628b3d99d6212c03d219a823de495d73529124b1459fc959c60977b5d271d5d1ec84a5da0c0ed4f3e180625b7 WHIRLPOOL 01b165eb0fffe95f88b9bf32b5efcd40e0a5bc1913f1d1848569359cfdb72c50afb5904a75878aea9f5c8fc654f8714fef795820563de01c704ed5f8ffe07125
 EBUILD mkvtoolnix-7.5.0.ebuild 3127 SHA256 f36788f37c132e459ff9b14e961508ee3b4ede25b1898bc195932e8c7714395f SHA512 2a94337179659c17dfaf478df7773fbc2d0453daaecbb339351adc74b61dfa2585e0b1d0243b8815d43cd96b8aa0f8a0ee40c6efd93ca47c6b732272bd92eca3 WHIRLPOOL 89153ef5b18301f5236e9328e7bd7476ef869a0c0cda289a1de3e7e3c56702e6a7fbfee482902a7f9513438d71fa36426981f936722d6e376b0c53adbcd812b8
@@ -19,24 +20,12 @@ EBUILD mkvtoolnix-7.6.0.ebuild 3127 SHA256 af880186f346b0881015eedc39e45b8f7d11c
 EBUILD mkvtoolnix-7.7.0.ebuild 3127 SHA256 55486802d2812e2ce24bf4f1a40b967f4de371412731a58bb79b9155aa3fe1c6 SHA512 58d3e30a9312c636b8130b1ab1ad95f0e8eba3afda52306cf26dab2df03f48a9c7cb95bce1d1ed6ffb9ae89e788ce60164c67375beda3447a797af586a2b3210 WHIRLPOOL 5353617ab7820d8c23da8a0ab8017463dc373c4ecf465bd736df9e180287195923c87731e8921d5ae0366c1f0567a0c399fb49bd7bc928b994eedb0a762376d4
 EBUILD mkvtoolnix-7.8.0.ebuild 3127 SHA256 08c54641a52dff43bd97f38fd4bf1ed6855401f78e18ad761067eefdfdc3ab2e SHA512 18509f19b0fdb5a47f77c3d0783d5f21638e31de9e91b84af8e07b0fa66286ca0e7d0868c116abec4cb1df4d435a27706c79ec2aa5c1f4f68dfac3eef9f04b17 WHIRLPOOL 3ac7e0eb2db149216d55f65300cca20fa3032a7f14213f06d398f453fd10720e5685fc1b71a3f05e468af56071d73cfc65eb72d2774641bba029bce75592fdf5
 EBUILD mkvtoolnix-8.1.0.ebuild 3145 SHA256 c53b05f5b692e4d031c85b862dcb4550a32188e58a4a9bada04a74729f6ff15e SHA512 e1f77f77a9e5609fe66f46652a68895a6fa4d0c8e2ce0e3321b247d0df0753315b449deb1d447a9b19b2f8fcab6d6fde87fd505b785899278b76f3d170d6911c WHIRLPOOL 3451e306edd9564399b3b05d298e8fc87d6eacf969567ff8676b5a93cb5f40d0d920f488e8fff46a57b3114273a61857ef3b577e04ce6cace7786c8a5fb34034
-MISC ChangeLog 32133 SHA256 8100e2ec916a28824fd6573b1ce9f2df39888ba34f6fecf2bbda2d11f3dfeafc SHA512 a9b3684539225a1eff151b54b7f990cec4ec0d31b890a9b0a36edc52d79da4eaf8636cd4ca3aa8ae0d75b08690edacb94561fd803dd45ddc00b1122f54cbeb1b WHIRLPOOL be1d544c2edf76b1665abb21133a91424014cce04c0108a4f752192efc65c7837c46a7f29741e3f93bd90c18f3c3a6efe24971fb446b08eaf50e9d7eb18fcef4
+MISC ChangeLog 32291 SHA256 6fcc65f5aa210f4c18daab3f864012abd8ef5649a3b8a08c600d6f4143da729e SHA512 cf2e18f08684252303d7f4cdfec067f55115c4399a67dd92208e139bc781d4dceaeb1a0451f545801e28e5de1bc1068a0847df3b7fff027c7d347d47ac9a7ab2 WHIRLPOOL c3c522801e4a6b23efaebf36d4cec665e71045a7bdce84b9a0e691f9a4dfdfc3bc94bb2ac421868c0177fca9c246eaa903ec5f6fb47f1c86dfef8581d6f5d947
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVmqU2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOcHQQAL/KVUl/EqNdh27o+qkCQBO+
-qJoMDK2RuWq9tlC37Pl/aThbYTk8kXe9PCvLFdv4PS+3CtXOjFOQZwMy0cv4JKHD
-XdkFLTbYg/poCtRII5Bd0O3X52PgfHn53zPxTSMWJQcA0aoFKPaHaHYfs9BSU8FH
-mWjIKs7ouVE3yyLxPOT1JjxVzzkPyhPK8Gj7LKQbTkH5qY8CQnxr5jO1VNqoOcAm
-TWJ/x8m8CnImxovLZdW/HHf6weirC9Q2ZoWus6Q/HqDir146aLZ/3L0uklGc4XuA
-VA1ojEMyylXVOMae/kLi63Xp/ttzeyGD+KecLd2PJ++JnJcTnwQd4oe06PB6oEkm
-SW0OhLGlk+lPRCcHHhqgMvl1xwlbOXSflziUoVBSd4RcIstzn+0nhJ844YKenZw7
-I2cKUnhCAyuyeu0/zjA4qvR/7UjwUiryVKD1UP09sc+VfVy0nr2011t/3hn8zbG4
-Q2POoV4oPyRj8hnpHNLk+6AD/Gp1OaHIA939oYqgtm5X1OAbs6jrHrMyed0hS67o
-vyHi6WL77KkNIGsE+GscSEJQkw+O0P7qgJePkPzHjg9hqvz+yQ7usfe9MHDXmJkV
-75z8AtETLm00n6co0raqyfR7qdYagm9Z4aPOmz0p6CLAa8VoR00BBKQXQM6VEYjX
-gHglvwNX70jItjUUxJMY
-=V/JL
+iEYEAREIAAYFAlWqnsQACgkQCaWpQKGI+9RT3QCfaFZ/QPodKiLlF840RpuHmOHM
+4gEAnAh2cwSVCuMvqtx4XoJMn3Y6exPD
+=OOJx
 -----END PGP SIGNATURE-----
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
 }