gentoo resync : 13.10.2017

4 files changed, 5 insertions, 5 deletions

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 897a6b83016d..248561c12ff2 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,7 +4,7 @@ DIST mkvtoolnix-9.6.0.tar.xz 3810216 SHA256 ebab8dcc59533d248b127d375286eb47880a
 EBUILD mkvtoolnix-15.0.0-r1.ebuild 2552 SHA256 2a1846d144aed927fa144d9083fb2597b98abdf94a78f714812131b7c783e045 SHA512 29dad1e71c085a2bb54379ec1a7daa4516ef072fdd1048905b43f6adb6ee4eb988b74e7626a99908a1b149095ff4f8a42b3844b5c3a4b3bffce5f9f953d4a817 WHIRLPOOL 78b71004864f145a88214517f3d1f2ace192dd6025891740edd60a12064e5198441f80cdc119af0bad77389ed8a78536589e2f8492bc290293334caa3afd9b53
 EBUILD mkvtoolnix-16.0.0.ebuild 2552 SHA256 495214f6a7c3863894b255f3c1639d2eeaf01f25bc0b6cbd6e3b9c4613067c8a SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2 WHIRLPOOL 2b3cb0257128cef0331fd086f84f94d863fbe699b0bac8b53587a54598015fd951de9c6071f6dcd31077c3473cf76bace86373c4088b13f74f2735d44c79264a
 EBUILD mkvtoolnix-9.6.0.ebuild 2804 SHA256 46ea31710f9278a078175bfc69f3478fb3b362b66122ddc9e3691a5b52174afe SHA512 6197ff1dec6dfca50711c7165d46f8a08d0844666686142eef5124485f448428bf9c0445a9976c52dbc28cede017921d2bccc5ca7089021c35f71d394a174d51 WHIRLPOOL c372198542ccd54303345a39e67e36686a46534bf7b7268588f64d54a419ec0cb57bcbbfb3859030aeeaec7be3e2810c210f5741e35fbe6426dff09bc0eae124
-EBUILD mkvtoolnix-9999.ebuild 2552 SHA256 2a1846d144aed927fa144d9083fb2597b98abdf94a78f714812131b7c783e045 SHA512 29dad1e71c085a2bb54379ec1a7daa4516ef072fdd1048905b43f6adb6ee4eb988b74e7626a99908a1b149095ff4f8a42b3844b5c3a4b3bffce5f9f953d4a817 WHIRLPOOL 78b71004864f145a88214517f3d1f2ace192dd6025891740edd60a12064e5198441f80cdc119af0bad77389ed8a78536589e2f8492bc290293334caa3afd9b53
+EBUILD mkvtoolnix-9999.ebuild 2552 SHA256 495214f6a7c3863894b255f3c1639d2eeaf01f25bc0b6cbd6e3b9c4613067c8a SHA512 2f326f9d3300ddbe52aef7d0fceb0b393a335eb0cd8d716ba5627cde93db95d246821d959d2bff16c30cbd1aa936742c137f190b6021e2a3f78bc35679170ca2 WHIRLPOOL 2b3cb0257128cef0331fd086f84f94d863fbe699b0bac8b53587a54598015fd951de9c6071f6dcd31077c3473cf76bace86373c4088b13f74f2735d44c79264a
 MISC ChangeLog 8086 SHA256 8903d17d86b9d83c6ed274b54fea99093105d638f8ede9a7e83fcf3c70887cb9 SHA512 4b2e0e3c75c32d6cbd98b4e088c34c46927bf72ee5485dfa0643cf440033002b4868ce0e974085cc464b42b11eaa197a095e3b4265f74a48ba87ab61d5e338d8 WHIRLPOOL 3fc8cde847811db2929a0ce11930575a8e381036d6ce094a6b910f0b9faf27f6db22f9f9c9fd12bd446fa53af6871279aeb88727788a68e6f9aa403d2880f942
 MISC ChangeLog-2015 32895 SHA256 f847d3ae0f6702549f24a8d659490b8958a8b1d4b2b7632c39ed9f69c2a9f8a6 SHA512 958b8320e4ba089b7f0e391ae02838ed1c3482e72654c97776fd2e297f48ae2d55e8ff5a5c3d921cf8ad85c3b6131d54b90364eb22e163795967bc4f25bbce1c WHIRLPOOL 7b3f31a49bf0fbd6c3b768be42198b8675b5c1dc5180cd0f6b995000980aef8878a9f39da841d6436dabb36d1468c2bed40f5152f381f91e28a1c7d3f97e7cc9
 MISC metadata.xml 255 SHA256 cfa2e7e4e1ad84d152c6b2f49467e2beb07d188dad704bc9887438f2b0d95f18 SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 WHIRLPOOL 6fbb4f57853f7ac5b979c506736e63f571606215889abf768ddb44fc91b3491a846ea84d46c6984bd3cd230f4808f8f39fa83580e636576c7756fdb1564869da
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index e3d6a0086ae4..93682af702f5 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-libs/jsoncpp:=
 	dev-libs/pugixml
 	media-libs/flac
-	>=media-libs/libmatroska-1.4.7:=
+	>=media-libs/libmatroska-1.4.8:=
 	media-libs/libogg
 	media-libs/libvorbis
 	sys-apps/file
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 01f64221320e..bc3518b372f3 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,7 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf
 DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
 EBUILD mplayer-1.2.1-r1.ebuild 17429 SHA256 96024a2fc6ec79a8c8fc32c9fb2173e4287d10807f6371961b3c95aaeaf81b75 SHA512 b36f8bfb7eb246787af2779b27d3cd17825a5f9e944a12c71a751615567b0f4a1015ca344b4e4a4bc64acdb52fb99dd1462a867505b24792472f5919fa6389c3 WHIRLPOOL 8f8e334b08ff302eeeb164f0aa48f052ce144a108e1f5de9ff2e37bcdb1e721d20c91cb823a4f7b11d0e6191c75d7c7c19b88ea36a822ef00e3b9b1eabfad97b
 EBUILD mplayer-1.3.0-r2.ebuild 17194 SHA256 1424b2b4087e9f83d60f37a8f1fccae9f9818ef6372b1713670b08dda6b28ef9 SHA512 ec49627e9094314b6595a501c6057e5f0643b3035e92edebc6a2d778260a78c2553962b0cd72f56b290ceb80dffee891362786db18c2e948d295452eb0a9009d WHIRLPOOL 53a194edac6cf2520f9c4180f4f0741ce938a9c23fde391eb5cbc8452fe8be5b739e51c08cfd4587b35085b37142d26386b1424c90d25e3a6247a0ae8a12c393
-EBUILD mplayer-1.3.0-r3.ebuild 17298 SHA256 24a1c908d0a0193bc30a6775d182a3218d9944c1fc003469994a23e79fdc0a2a SHA512 7cef1b3c1e747a2ae720cd19172bd3cad4ebf7097267064a2b3c9ee1e465ce63ea884edc2491f9381b267ce0a80299a9d3d8d412651f20cb5be1ae2a719c1693 WHIRLPOOL 695b2582dbacc8eea312bbc0e22aa8532b2adb14c5439e8229133c9ac40bfc3a3628aa4fd3df52b52004fc8b0511640b51b1ac8321a3a82d34d44fa7bdb39324
+EBUILD mplayer-1.3.0-r3.ebuild 17295 SHA256 d5821147ecbf5250285cb3709f9671123da43c6e42d3a13a4f6905c89726ba25 SHA512 0570f81f9b3b3e938498cebb1da7e20dcf6d510fe67ab8adcb5da12341a2c65dbe7a6392edaa4e74e360e5d3e0e88c9b722fe90c22853b0ec08021a3139423f8 WHIRLPOOL 197db40c80586bb88ab4bbdae91e796fea6c227f1ba0785c50159748a12ea9e34ad7680ddd57e2adaddacc612d9bcb873046e21bb68a0b158b47054d45bce186
 EBUILD mplayer-9999.ebuild 17206 SHA256 a8ce728287a09091c4d2917a3e91bc686e31eb7cb5bfbbbef6716d97ea64735e SHA512 b99dacae704b960366f0406bb5e99a9a34a3b454b29ce538ac8a46af48ecb86929ef0c59a80fd67b9187309fb7cca608a1385b6a229238fb114d0b2ebc9a723a WHIRLPOOL 1d23c6754b0c21f3eb3b515396a4a1dc4d2bcb3dee1b2472b38edf91fd987f31b7ee5fb7f229529f826a502d7ae4643b9d57df300cfcc21477a2c4aeb4591f47
 MISC ChangeLog 10735 SHA256 6c3dcfc43705566e97c1761d41f94e41aa26a6a1d7893c25b14e635979e2d267 SHA512 97d8be790bbc844cb59784d2b87dbf9ad0125e69949e502373a7e3cf230d6b5a964eea20b06648efc67634768af865ee5639aff155b61f4eecfa13e08ac93a73 WHIRLPOOL 28daecebbcea2937847c7c1122971327454dcc05ed41b01f1b4a79586c2d5d3db93226ed0ecf4870a2d43061d39192eb63b5fc05ef207ce9408c8b7873d5aa62
 MISC ChangeLog-2008 107064 SHA256 d9949e0e21fd6fd00f1417201455ee399240ef1010dcf56611ac0fc1f6f9505b SHA512 622543b379b4c44f5845566b4e697bd92dd3e864e2f01a1b0f303c8ae5c7fb5de24839f6503765d51b4a3bfa777d175a7e410383e62ef2bbacf3e87cdc28c705 WHIRLPOOL e731af47505ffa646c92386dfb14acaffc2bb14ab4da74520c0b4dbc15ca5c20aacadbb53c4b91ba8d126a75bf7d2fb61877eeda354064e20c48cf4137bf6a74
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index b0404afad77d..5a9dd1320680 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
 fi
 
 # faac codecs are nonfree