gentoo resync : 19.01.2018

28 files changed, 659 insertions, 111 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 60cc0f440d8f..b551012f22dd 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest
index 9f0ef80c53e2..6ec6ea1ce7dc 100644
--- a/media-video/cheese/Manifest
+++ b/media-video/cheese/Manifest
@@ -1,5 +1,5 @@
 DIST cheese-3.22.1.tar.xz 1843092 BLAKE2B ac96629373bf02fc8e92eaea372045c72b7a69230d970d346cb3fffccf3083d03e7d9a96b85281a6725a6e96f792c7ae993e598e47f074ceee39f43f50304d52 SHA512 193e421a0310a60871b8e0ac7ac28c16b7ed1caf0869904f803f45c4b15be74ab98dd88df54e5ce8c0885f466004d182450350295d3d89264e6f39035a389656
 DIST cheese-3.24.0.tar.xz 1846412 BLAKE2B bc18ee7009f4297df232c0ffdc40f5783891f721efe137e4127c7ea61595dcb033e98b415ea31e5918d93c408355e6534ddd95687a570b5abcc1c5ce0603d262 SHA512 c81d2f3038970f735960a2cbcec3a074ac2e9835d3f1fa6aae83d65299692d0464fed274e71caa59831a105430ce5db56557ea0cda27c72cdb050a59331b3107
-EBUILD cheese-3.22.1.ebuild 1853 BLAKE2B 68e823867d6c755d25bc1984173e2273847291067b3ec32c0c387f43ffb675ad5258a5dcae8f8be627b621c43848e31c79b1032ec58279016320021b0fc4ac62 SHA512 892c0f3ec60f9e7d8f54c4ccd70543d2daf3ec92791245e6c9e179cff7cfa3e8a43687bd4d37f731355abdd09fb1c0768dacb331ffcdf05c2533c11c344a23e3
-EBUILD cheese-3.24.0.ebuild 1873 BLAKE2B 4f0a9dff0d35eec833967e3bfea39726b69bd1ee42686c28fa7737058ade8f41412d3909ae8969cc84f048ec41a805ec3c5989258f0be28fc7773b0061a83a3a SHA512 ee5ceb7c2edd4b6cc74b199a4660fd2277d626f1c07bdfe6531b9d7616c062dcf110667868a8342fa9cf2477887676ca8a582e022f2ba2f0675517218b212273
+EBUILD cheese-3.22.1.ebuild 1957 BLAKE2B 26f7ddaf5b479b95d808f5e1936c8338242a5e72f9cdeb8962843416d5b114b332a52be4d8b4c587ab169a4f44e06fe39934f8c674dee803476c551e16b7c930 SHA512 bb8de1b7023f1d23272dae0ac89d7651705c78002d17af02625849e4c7cda99550349d52581a9b1f5c0e87cd39dbc784207197103baf1a3d79677c124b97ebed
+EBUILD cheese-3.24.0.ebuild 1976 BLAKE2B 0a7f9d670698ad6a70a33fdf108b2e94fbb6731eeb38dfa5ed901cd3cefc8a3116259422444b2731068a232fab7b1247773ee7c3dfffe7e17eae214cde04d4b3 SHA512 7d63c767ecd10e858fc17b9c5bcdf38a4c0ccb7e4d9d10c2a542823fb3d81e42f431c1b571f3aa1a40763d58d88f7ec8706e0d2028e04d45c27478823c3223e3
 MISC metadata.xml 428 BLAKE2B 3a6b33697b144cba857668b55e04897b8b6c6c4323f09be85ce827843ef50c9c6d988a4e60ffde4ecf1e66a73d70f0e71f2f05371f33f3853429107684abbc9a SHA512 cbe065cc8fe75a86d8f16788dc2ddeafda2b1c27858427f6c9ec83841730e3d9c1c9f7815718c86e19626098b96782a1017b614bac5a0121c92af04b11a30a22
diff --git a/media-video/cheese/cheese-3.22.1.ebuild b/media-video/cheese/cheese-3.22.1.ebuild
index f75ab6e69169..417f004eff11 100644
--- a/media-video/cheese/cheese-3.22.1.ebuild
+++ b/media-video/cheese/cheese-3.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -71,5 +71,6 @@ src_configure() {
 }
 
 src_test() {
-	virtx emake check
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
 }
diff --git a/media-video/cheese/cheese-3.24.0.ebuild b/media-video/cheese/cheese-3.24.0.ebuild
index 3fade1b47ba0..b4ec71a08b2c 100644
--- a/media-video/cheese/cheese-3.24.0.ebuild
+++ b/media-video/cheese/cheese-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
 LICENSE="GPL-2+"
 SLOT="0/8" # subslot = libcheese soname version
 IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.39.90:2
@@ -72,5 +72,6 @@ src_configure() {
 }
 
 src_test() {
-	virtx emake check
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
 }
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 3bb7ba54ee62..d1432644a857 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,4 +1,5 @@
-AUX chromium.patch 1421 BLAKE2B e8e6331c5ddf0a09c1865d3e0b7af84798772b81b638614944de4bbf28ae95069f14f8394615f19d40ab5a09093bd8b46869315ee84f1f928d0b9b4098346d4c SHA512 08bd38c21f4ecb07c4fc015f00eea326255f3014d65c9e5f651e5ba4e0e3b7c135426d1ee94f164e60cdcb018475f2cf5862a9abee011ab7d6e5f38b41b40bdd
+AUX chromium-r1.patch 1492 BLAKE2B efa332eb9cc842e2a9fa949c6c00d3c1956ae7ad55b5567e880e48a2fe21325ffcb7a7bc13f726cb8cfad44f0f63e23887c16d9938fcf80ed7427cc2f9253035 SHA512 55d7a06b630ac28c7b8e91112536fd67356664c7c91c3ca38b02733beb91d9a8a28247fd122e4b1d94009ffce5b83d29de10f331323179ae268e42851af10000
+AUX chromium.patch 1420 BLAKE2B 1acf931cd2e635b0b6c2c42d649d1bc92ac59321acc451501c70076d84449fd17b3a95c24a33208994df9aac8f8959a084f0ebaedaf0c997f535008594872bd8 SHA512 1f3f6d08aac64bb8c9d8a974170064b8a3531a6d06cea6fb208439dc687addeaf0c90f7f407dd7e71f50cd524f69c110c92d5276d04fe3bcaf7fb1ff2494ec59
 AUX ffmpeg32-openjpeg22.patch 4777 BLAKE2B 4ea7ed6b6b31c6d0d3e99358231ce27f18423aab866ceed75c10bf2c4b514ae4d023f9b0f4dd91346773f2ef2014943a08e6093e53266fa307557da69d766c8b SHA512 0d619b0e353ee9f80dffdb94bedd31b55fb4e6a18a0e60d8ef7119e5012583c1c0531b0b200b41c32caaa71cbade4899f74c9d0ae70d15403ef0aa6f3d77e07d
 AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e463c8d7d640db3c3e52dd0f12149e5a095388c3b8db0d7c37bb4080be3141b90fd554c46aa4650585b27 SHA512 8a198910cdf43df83fdf50e372c2ec5d911637dd61768d5ac3a1984f99d1f374f594af9ff6c501b248c390a22898e4964f7d07c81eb3586fa1bebad2c9e00730
 AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7
@@ -14,5 +15,5 @@ EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc
 EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616
 EBUILD ffmpeg-3.3.6.ebuild 16112 BLAKE2B 9ed6f79b8077b4cb8402963ef7a48bed40a5cfd2cd277ae1fe2a05862927593e060ee18414f0f4226857038c253b4e44e302dfea3e50b3fda610fbc631e7fc02 SHA512 6ca88a7099bfb63c04b6e4a4580de3b4523e58eb04e730da24de4abdd48d7583757f050dc8259cc31090ca34abe06d0741d8f66481b9b3ee380d109008ce3d7c
 EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39
-EBUILD ffmpeg-9999.ebuild 16054 BLAKE2B 764a29d4cdbb2497c5de98244547e55d1b8ea44fecdf26fdc087019a2589087864d9efb7be58ac8486dddc104353fc65285902c3b8a09a39c881558781c7c856 SHA512 805f234318e8de2db5fbf436d51e76bdec834f75743bd7fc029281f9dfc1b4040ab2392da012393a293dbffe3cb5279b6f61c60c9c65e569cdf8e77e7320f819
+EBUILD ffmpeg-9999.ebuild 16057 BLAKE2B 262d140c3b9e9eb2f663336a77cfa94610401bcc41e5bb81ab50b7eead6bcef70a70b1ce314196557c7f334ff42e7aacdbb5914d50b8611f5a1cba8a77d0314d SHA512 bfdcf1a4c23372da65eb2be595e05975f1b28677ef04a101ee9150b6347a61f4b634a4e50a78a5b58c4514453d523550d5a2af4929a2d03e1ff9525cee454381
 MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f78260745ad0..bae322e21e76 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -291,7 +291,7 @@ RESTRICT="
 S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
-	"${FILESDIR}"/chromium.patch
+	"${FILESDIR}"/chromium-r1.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
new file mode 100644
index 000000000000..cfe06a7aec8d
--- /dev/null
+++ b/media-video/ffmpeg/files/chromium-r1.patch
@@ -0,0 +1,36 @@
+Allow libffmpeg to be built for Chromium-based browsers
+https://patchwork.ffmpeg.org/patch/4500/
+
+NOTE: This patch lacks the Makefile include line. We append it
+manually instead to make patching across different versions easier.
+
+diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
+new file mode 100644
+index 0000000..992cf3c
+--- /dev/null
++++ b/ffbuild/libffmpeg.mak
+@@ -0,0 +1,21 @@
++LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
++LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
++
++libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++
++libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++
++$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
++libffmpeg: $(LIBFFMPEG)
++
++install-libffmpeg: $(LIBFFMPEG)
++	$(Q)mkdir -p "$(SHLIBDIR)/chromium"
++	$(INSTALL) -m 755 $< "$(SHLIBDIR)/chromium/$<"
++	$(STRIP) "$(SHLIBDIR)/chromium/$<"
++
++uninstall-libffmpeg:
++	$(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
++
++.PHONY: libffmpeg libffmpeg-* install-libffmpeg
+-- 
+2.13.1
+
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
index 307f31f4a3a5..60a3e5d6cb99 100644
--- a/media-video/ffmpeg/files/chromium.patch
+++ b/media-video/ffmpeg/files/chromium.patch
@@ -14,7 +14,7 @@ index 0000000..992cf3c
 +LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG)
 +
 +libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
-+	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FF_EXTRALIBS)
++	$(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS)
 +
 +libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
 +	$(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index f939b0a322d7..e39d371d8f0b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,6 @@
 AUX makemkv-path.patch 2153 BLAKE2B bab155f5aea1c7f5e3d1923b580b3f36115d32bf0d384a347379dd9ea80b650ea9755c641be0253c9d5b269f9aa4d2774ace89ea598b5206391794263530a84a SHA512 c7744f92ed7a5f09f0301c454afa32e4fce7251f276129917d2ce602b35f5961e629fa0328213f6e5a8d260b5964db099c44b1e870b209f7bb78712cf52b6e95
 AUX makemkv-wget.patch 1013 BLAKE2B 123152789d07f8fd0497e5fbd3f3f54108434991242a5a7665920b6007c653c5ffdb2f66467ab8ed3e1f23b7257906340cdc26282d6ba2a087b3f4632ca57f6f SHA512 09ece751d6765a93ff18e0eb8edbb7c413e1074676bc5c6fbc57bb1b8c2314f66198737c5077ecef18d286d724088d2db6731977885713bc095531281f104e0f
-DIST makemkv-bin-1.10.8.tar.gz 9062487 BLAKE2B 12402d2f7562194840f895453fd0f887673eae7525d1076722485046021ae557f4c427af8539e5cd0daf66b7763ac8e89e7c5b89e6412567a12f07528e37a92f SHA512 8a71c60598ca73369e68ff4a9377e6a74e29e13d82de58b8e18baf6446ebad31169d86e6377de3a14bb13c46bd5fde60fa965a6524917d916be5c9eb0308f78e
-DIST makemkv-oss-1.10.8.tar.gz 4572214 BLAKE2B f2557004e59888788d035abd853a3480e1b429e1a3ef879d3adbf29b6a600823fc4a58aa48841c5777aa6790a2fa7921f4120504fa1a837b9c256a528e40b072 SHA512 c76438adca70af8049774c8f9e2d8109d04e121b7eafeb08f0aa7b2f149dfc9fa691e73aced7b08f1a296e1907e411ffd673199e6f59841d2921ab3f01f6f468
-EBUILD makemkv-1.10.8.ebuild 2910 BLAKE2B c4fc8c3beeb8e637729efcbd7e3079bcbc45218fa98af9a7d6e361a2dfb4a44816851d6648f8b01914955a0f5c5d9b898695dc914e92d42e28d50877464fc359 SHA512 9f72258fcce7878938b086613fd31d0197f4b1380d4a02ce5e3ef67356d0f2ade43e8e2066875bed76f8051539c646ccd401b9f292b73a70f7bb69cc0f437a46
+DIST makemkv-bin-1.10.9.tar.gz 9115532 BLAKE2B 2e8d290d3dbdfcd560f73aeb8f286d02e34006d29fb29de817407f0e8ce9880a8af99331646b7e28b1d9e3b3101a6285848e5e28bd955c55af3cebf6e5c6e910 SHA512 36d2a7f8bace847a89dec5a821d6c6235d9e3aaffac4dbd59233a611070d30758d039a5f27fce5a857a80410d586e15d948a9b980392ba31759ccb7ca9ee6155
+DIST makemkv-oss-1.10.9.tar.gz 4572328 BLAKE2B 47667c04c05faa8438b93c97178646fd6e1db0affdf38d72982a978e9bd80a8ece2c123a55d60147c602203218f30d9e951bd2c9b41b049dd2e68ac4334d07be SHA512 cdcdd0479ff3c6600a1aba823eea3214e57bfe0d3023f8efc44ca55c8f7653931c13f3f0ad7a7c31cc97c6e2dc50974315e7dceffe9383a511cfe298938d875e
+EBUILD makemkv-1.10.9.ebuild 2910 BLAKE2B 52773c4a13197954e6efd92a2120f1f52bd33be35342cc1b54a2d250e6448947bfcba03b327629da4a43416560832b1b2d9352c1371e70fab98f2b8cc69bd508 SHA512 bf41dcc543f64a6c764d4e6639cab2dc9519f0efbcda034e4463316f084e459b4fe4a208fdbb9b3867c1058b65da5ae4a601b0f1c1ba64c335bf44ef7072fea8
 MISC metadata.xml 1225 BLAKE2B c65dc32de4283f661bb1725d24d7346ad93a5cc77fc794cb41ef95174eaabd3fe17fac4ae7c4a4791170563e7ae0596c37ec734880723f9a9e81b5d991646b4d SHA512 b5730528c0efef8dc5d98248d0eaa85625b292e610cb7aa294d87f968fabdd45a6d240e66d7d2a4f0cdfc7642ad11dbaf36417b36b8895b8e50b307202ac1bb9
diff --git a/media-video/makemkv/makemkv-1.10.8.ebuild b/media-video/makemkv/makemkv-1.10.9.ebuild
index 8ae13a9e98f9..9b3bdc586d57 100644
--- a/media-video/makemkv/makemkv-1.10.8.ebuild
+++ b/media-video/makemkv/makemkv-1.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 07e6f5a92af9..02c7ea9877ea 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -13,11 +13,13 @@ DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b65
 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
 DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7
 DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4
+DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70
 DIST waf-1.8.12 97567 BLAKE2B 99f68b37163b67d511fe6f917b12ec3764dff7c62c4d4408f56559b497dc69f9a1b17a915fe519451f30e7a8ad1113cfad423fa23e3392e055b3bc3c1e149ca8 SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939
 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
 EBUILD mpv-0.18.0-r1.ebuild 8452 BLAKE2B 0d6b675cba5587a1330991c634af72b537a80130045fa8784816a48062cb7870e434fbf721515b23ba16f328788781ba5052d53bf449934389984b9d43c6a330 SHA512 67506868d59230a1333fb89822e7c3d6e8652bc43c53c1c41afd980d5b6f76e01a64ee39a9f0debcb57cad000aa141b8f2dd5d909157072f1abc2ca00600725e
 EBUILD mpv-0.25.0-r2.ebuild 10838 BLAKE2B 38cf2272870a4c0ca913ff007bd7e86c892039308f1b3067001bf873d8e01e87756a2579f47e0b73c7c7cc047f0775c9ea30ad14ae1aff1ba5cbb08cd7234e45 SHA512 328533ba4c5a9714a604b6d71da5dcd076113988382e17406f5fb88f11eba83a7ad7b25ab59aff86de6d1b42f0878edc2eef953f17d337bdaa1e3f15189ec4e0
 EBUILD mpv-0.26.0.ebuild 10557 BLAKE2B 2c330a98e946fd306144b6fa1f8554c93aabad75f64d286681257ce991ce9e1be37e0789ae960532c039ea3ac2623becfa6c7eea4b67cde277ce558808437930 SHA512 ffda8bdf4691643e6619334fe1b401c367c8ce7a0a3bc61494a27ad888c8121d045d22111bb98c72551a15d5dbf6e3b34252681a8642be8fa92785cb2b40944e
 EBUILD mpv-0.27.0-r1.ebuild 10546 BLAKE2B 03096c1e04283da1c0deb3c31a68d6289d2dff7ce40d94027def753364e0cb0db64985fbe7aacb04740bafcaf1552979bd34d045700226f5206017a2500ae376 SHA512 a1fed55edbb1e93e10821f8ff78911cf3c8b2fad285b90b78ecc46f271e7c872d4066d2163b716eeb2de8c96f200cf053ad70a4a2e962769e00dc23781da22c3
+EBUILD mpv-0.28.0.ebuild 10286 BLAKE2B c4ce38c3f3b3a312e00c4229d1d1db8e8327f5d9392c3480b67ae66c4d6e65788331e5a3b5f8e00db12b0122c76e70abe6331f7a5a0a2078eda5a0dcfdf5161a SHA512 443932b6709c33fcabf209db06dae7860cf7a1329336fd6def619d2cfab619e1e4453b7cf870d672494042bf0210afdd402a807aa6b4d9272b8930ad23e2d40a
 EBUILD mpv-9999.ebuild 10286 BLAKE2B 8866ee5e4817eeeabed02799640ff4390ecc32c922d255052e4a2d171e157296c71b8438fb6ea9a0ed2276c54a38e9dc320cfb9ffc27f0625c3a5630051d1e15 SHA512 dd71019d9a8533a475c1bae6c7d720b4b59b72b7f2d031e314c9bebc810446d2f3a27b6c7376e6d498b7965b1c8bb9c6a9cc21306dd8528866b3bbfd1a3d3486
 MISC metadata.xml 2605 BLAKE2B f904ae1613a39130a0cf0b5c784e8f20e698548bff742f9bacda64b2337cb1f8a8995bcc6402fb56e7a5a18d26938c6a964619a9c51962f72e7c092ee968fcf7 SHA512 44088b7e21ef2adb8b69cdb9b7bb3db9874f5c4cf5668d8adca219f0ae7e3b8ae6c0d329ad8489bbf3a95ec5333455d95209d897f239a9c015c6c97acb7f8826
diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild
new file mode 100644
index 000000000000..9e4020ca8237
--- /dev/null
+++ b/media-video/mpv/mpv-0.28.0.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+	DOCS=( RELEASE_NOTES )
+else
+	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+	inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+	dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+	libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+	samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+	zsh-completion"
+
+REQUIRED_USE="
+	|| ( cli libmpv )
+	aqua? ( opengl )
+	cuda? ( !libav opengl )
+	egl? ( || ( gbm X wayland ) )
+	gbm? ( drm egl opengl )
+	lcms? ( opengl )
+	luajit? ( lua )
+	opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+	raspberry-pi? ( opengl )
+	test? ( opengl )
+	tools? ( cli )
+	uchardet? ( iconv )
+	v4l? ( || ( alsa oss ) )
+	vaapi? ( || ( gbm X wayland ) )
+	vdpau? ( X )
+	wayland? ( egl )
+	X? ( egl? ( opengl ) )
+	xv? ( X )
+	zsh-completion? ( cli )
+	${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+	!libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] )
+	libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
+	alsa? ( >=media-libs/alsa-lib-1.0.18 )
+	archive? ( >=app-arch/libarchive-3.0.0:= )
+	bluray? ( >=media-libs/libbluray-0.3.0:= )
+	cdda? ( dev-libs/libcdio-paranoia )
+	drm? ( x11-libs/libdrm )
+	dvd? (
+		>=media-libs/libdvdnav-4.2.0
+		>=media-libs/libdvdread-4.1.0
+	)
+	egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+	iconv? (
+		virtual/libiconv
+		uchardet? ( app-i18n/uchardet )
+	)
+	jack? ( virtual/jack )
+	javascript? ( >=dev-lang/mujs-1.0.0 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( >=media-libs/lcms-2.6:2 )
+	libass? (
+		>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+		virtual/ttf-fonts
+	)
+	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+	lua? (
+		!luajit? ( <dev-lang/lua-5.3:= )
+		luajit? ( dev-lang/luajit:2 )
+	)
+	openal? ( >=media-libs/openal-1.13 )
+	pulseaudio? ( media-sound/pulseaudio )
+	raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.0 )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl2[sound,threads,video] )
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+	vdpau? ( x11-libs/libvdpau )
+	wayland? (
+		>=dev-libs/wayland-1.6.0
+		>=x11-libs/libxkbcommon-0.3.0
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		opengl? (
+			x11-libs/libXdamage
+			virtual/opengl
+		)
+		xv? ( x11-libs/libXv )
+	)
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/docutils
+	virtual/pkgconfig
+	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
+	test? ( >=dev-util/cmocka-1.0.0 )
+	v4l? ( virtual/os-headers )
+	zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
+	selinux? ( sec-policy/selinux-mplayer )
+	tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+)
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+	cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+	chmod +x "${S}"/waf || die
+	default_src_prepare
+}
+
+src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
+	local mywafargs=(
+		--confdir="${EPREFIX}/etc/${PN}"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+		$(usex cli '' '--disable-cplayer')
+		$(use_enable libmpv libmpv-shared)
+
+		--disable-libmpv-static
+		--disable-static-build
+		# See deep down below for build-date.
+		--disable-optimize		# Don't add '-O2' to CFLAGS.
+		--disable-debug-build	# Don't add '-g' to CFLAGS.
+		--enable-html-build
+
+		$(use_enable doc pdf-build)
+		$(use_enable cplugins)
+		$(use_enable zsh-completion zsh-comp)
+		$(use_enable test)
+
+		--disable-android
+		$(use_enable iconv)
+		$(use_enable samba libsmbclient)
+		$(use_enable lua)
+		$(usex luajit '--lua=luajit' '')
+		$(use_enable javascript)
+		$(use_enable libass)
+		$(use_enable libass libass-osd)
+		$(use_enable zlib)
+		$(use_enable encode encoding)
+		$(use_enable bluray libbluray)
+		$(use_enable dvd dvdread)
+		$(use_enable dvd dvdnav)
+		$(use_enable cdda)
+		$(use_enable uchardet)
+		$(use_enable rubberband)
+		$(use_enable lcms lcms2)
+		--disable-vapoursynth	# Only available in overlays.
+		--disable-vapoursynth-lazy
+		$(use_enable archive libarchive)
+
+		--enable-libavdevice
+
+		# Audio outputs:
+		$(use_enable sdl sdl2)	# Listed under audio, but also includes video.
+		--disable-sdl1
+		$(use_enable oss oss-audio)
+		--disable-rsound		# Only available in overlays.
+		--disable-sndio			# Only available in overlays.
+		$(use_enable pulseaudio pulse)
+		$(use_enable jack)
+		$(use_enable openal)
+		--disable-opensles
+		$(use_enable alsa)
+		$(use_enable coreaudio)
+
+		# Video outputs:
+		$(use_enable aqua cocoa)
+		$(use_enable drm)
+		$(use_enable gbm)
+		$(use_enable wayland wayland-scanner)
+		$(use_enable wayland wayland-protocols)
+		$(use_enable wayland)
+		$(use_enable X x11)
+		$(use_enable xv)
+		$(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+		$(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+		$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+		$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+		$(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+		$(use_enable vdpau)
+		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+		$(use_enable vaapi)		# See below for vaapi-glx, vaapi-x-egl.
+		$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+		$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+		$(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+		$(use_enable libcaca caca)
+		$(use_enable jpeg)
+		$(use_enable raspberry-pi rpi)
+		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+		--disable-mali-fbdev	# Only available in overlays.
+		$(usex opengl '' '--disable-gl')
+
+		# HWaccels:
+		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+		$(use_enable cuda cuda-hwaccel)
+
+		# TV features:
+		$(use_enable v4l tv)
+		$(use_enable v4l tv-v4l2)
+		$(use_enable v4l libv4l2)
+		$(use_enable v4l audio-input)
+		$(use_enable dvb dvbin)
+
+		# Miscellaneous features:
+		--disable-apple-remote	# Needs testing first. See Gentoo bug 577332.
+	)
+
+	if use vaapi && use X; then
+		mywafargs+=(
+			$(use_enable opengl vaapi-glx)
+			$(use_enable egl vaapi-x-egl)
+		)
+	fi
+
+	# Create reproducible non-live builds.
+	[[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+	waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+	waf-utils_src_install
+
+	if use lua; then
+		insinto /usr/share/${PN}
+		doins -r TOOLS/lua
+	fi
+
+	if use cli && use luajit; then
+		pax-mark -m "${ED}"usr/bin/${PN}
+	fi
+
+	if use tools; then
+		dobin TOOLS/{mpv_identify.sh,umpv}
+		newbin TOOLS/idet.sh mpv_idet.sh
+		python_replicate_script "${ED}"usr/bin/umpv
+	fi
+}
+
+pkg_postinst() {
+	local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+	for rv in ${REPLACING_VERSIONS}; do
+		version_compare ${rv} 0.18.1
+		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
+		version_compare ${rv} 0.24.0
+		[[ $? -eq 1 ]] && txtsubs_0_24_0=1
+		version_compare ${rv} 0.25.0
+		[[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+	done
+
+	if [[ ${softvol_0_18_1} -eq 1 ]]; then
+		elog "Since version 0.18.1 the software volume control is always enabled."
+		elog "This means that volume controls don't change the system volume,"
+		elog "e.g. per-application volume with PulseAudio."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+		elog
+	fi
+
+	if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+		elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+		elog
+	fi
+
+	if [[ ${opengl_0_25_0} -eq 1 ]]; then
+		elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+		elog "the 'opengl' video output and no longer explicitly requires"
+		elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+	fi
+
+	if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+		elog "If you want to have command-line completion via bash-completion,"
+		elog "please install app-shells/mpv-bash-completion."
+	fi
+
+	if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+		has_version 'app-shells/mpv-bash-completion'; then
+		elog "If command-line completion doesn't work after mpv update,"
+		elog "please rebuild app-shells/mpv-bash-completion."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+src_test() {
+	cd "${S}"/build/test || die
+	local test
+	for test in *; do
+		if [[ -x ${test} ]]; then
+			./"${test}" || die "Test suite failed"
+		fi
+	done
+}
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index bd6e3d7325f1..e244ea774acf 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,5 +1,7 @@
 DIST peek-1.0.1.tar.gz 2602750 BLAKE2B 84ed887847ed915f2690ab4ef02a25f3eb5d773a0dca74879580449dc092389809e0cc348f6b41cf9ac4f6ee05cec7102040977ed057642933cccadfe3c30a2a SHA512 c021e6e686de25afdd2e66bea9f2d50c08909847bf2e4d8dfbda8e18975febb2ed247a86d46c7f2a954768f8683cfc218be75ad8f495cd729e787e16f09b2dfe
 DIST peek-1.0.3.tar.gz 2620773 BLAKE2B 51615a9bf2f291786bbba8312453b3dbbbdd5c3848e04d55611f078bbcd52582e0f3b494667d3d7efbe41bb6dfc855e253f34cccc8a0bb6d3de9534200e733d7 SHA512 92e7d61fdd32b4525991a45a0781c304160dbbdaf518ffbc6389d3df2829593a830e8b1cf499b10c02ab1809984c945770c3394221dc31b29041da45ca291ab7
+DIST peek-1.2.1.tar.gz 2650099 BLAKE2B 4b53bc6cce94c585029d179937c680a3743fabc9722cc9474dd870f4be1d1d79c994420e528581c0006df81f6b6caaad285fc9f35c0addd1ae0072b40f461786 SHA512 fcb3b30bc7b434e9daafad243f82d2849d308fcd22371cdf790b60f765b78d6009ffb3c519f571718e26cf285d1cc6bc8fdd3f61dbb427f95fd08f1e3cc52a42
 EBUILD peek-1.0.1.ebuild 810 BLAKE2B d98fb6cdce6a1f050e6d49daff649c88893d310d9dd09d12c28b4f186b9026a488a2383289170decbc934ba46a206fee4e72feda6a541390dc2219239151cf08 SHA512 099234d0943401d7d55b3a01a055f7b7e0a6c588effdb480c1d3df06ffeab53bd860c78eb515005e6f72cc4107cae6b085df5565118501d612c4053450e7cd3d
 EBUILD peek-1.0.3.ebuild 828 BLAKE2B c94c8dc01b9250edd8881993469aaa2fa135ae1b710ec2fb415375f20fa242b33d5fc83ce8c62ef10327b196e73d49f5310481698b48e41660a198cbca7f3d21 SHA512 427c2aa225f5f4e746269991c40631e60bfc5236129b8e9b91c66a2c1ae29eb3b6ec96f99ae79ac23440e3cc18212f10dcedfbee5df9a12fc4dcaaa210521009
-MISC metadata.xml 325 BLAKE2B d956676c2204aee8f69fde21a45136bdaeced5061e80ecc8a0b9ae910db754911cc584247e3ef31ae313129e3f52b19c47e30d3394fbf3867240f34e8dabcce0 SHA512 88370fc35f06586fe1b050cf48b88a598b40cc0b14c72b14fdf0cdfb4275ffac8e71694ecdf0babfbeaa09a3b688a41d326dde5933773d3728ec14e5d98deb2c
+EBUILD peek-1.2.1.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
+MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a
diff --git a/media-video/peek/metadata.xml b/media-video/peek/metadata.xml
index f7b4c866d5c9..d500d3059a28 100644
--- a/media-video/peek/metadata.xml
+++ b/media-video/peek/metadata.xml
@@ -5,6 +5,9 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<use>
+		<flag name="keybinder">Enable support for global hotkeys using <pkg>dev-libs/keybinder</pkg></flag>
+	</use>
 	<upstream>
 		<remote-id type="github">phw/peek</remote-id>
 	</upstream>
diff --git a/media-video/peek/peek-1.2.1.ebuild b/media-video/peek/peek-1.2.1.ebuild
new file mode 100644
index 000000000000..8715e8e623aa
--- /dev/null
+++ b/media-video/peek/peek-1.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome2 vala cmake-utils
+
+DESCRIPTION="Simple animated Gif screen recorder"
+HOMEPAGE="https://github.com/phw/peek"
+SRC_URI="https://github.com/phw/peek/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="keybinder test"
+
+RDEPEND=">=dev-libs/glib-2.38:2
+	media-video/ffmpeg[X,encode]
+	virtual/imagemagick-tools
+	>=x11-libs/gtk+-3.14:3
+	keybinder? ( dev-libs/keybinder:3 )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/txt2man
+	>=sys-devel/gettext-0.19"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGSETTINGS_COMPILE=OFF
+		-DKEYBINDER_FOUND=$(usex keybinder 1 0)
+		-DVALA_EXECUTABLE="${VALAC}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# Compile helper programs for tests
+	if use test; then
+		cmake-utils_src_make -C tests
+	fi
+}
diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest
index 1f9fe97d150c..99a3f72de221 100644
--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@@ -3,6 +3,8 @@ AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b6
 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d
 DIST smplayer-17.11.2.tar.bz2 5033433 BLAKE2B 0fa783172c5b3c68314d656a395db6c953de64057cdf9acc78e4bc448807bc39293ff292183fc167a122f9cf295aac786b52c0465e3d9584c506e1dd9cd73614 SHA512 e0a6e6fc29063b5f82303febdc8243c10276feb4500985e96ce418298c8f10796df44363df3136452a6cb3f8156ebdb4fba3e865a37d433f3d258db493343f81
 DIST smplayer-17.12.0.tar.bz2 5040463 BLAKE2B 6171cc0071e35c001678816464c55a9c16a5978ae4cae9a428c609e4940d0d0516e7d4928e961ca1e97469d77776c7e03f8c9a5c1c6ea3597c9724a2f6ea1ada SHA512 7b09ed08cf94f03eb4f992bc1a70ba938d081410044892e55236aec791732ec34bbdd31c6cbd05aa0eeb5cab6c0bf0a7b458373157ba49eed2c6a90e0ac257d1
-EBUILD smplayer-17.11.2.ebuild 3018 BLAKE2B 7817664c0e229b77c508b7fe24775a26266a8d4e91f9d3b9daa0ef4399f45c9c66d999f5b82f09e5872f381f76dd8d3df7bf38af0c88e2650deec33f5a736678 SHA512 f91392e1a442f48103b5d35765e7821b253d16e528f53ab903ed4ac2fd7ea2c05695120bd14c8288b89ed2b396a3ce024c250ef04472617b9d87ab0ca92a209e
-EBUILD smplayer-17.12.0.ebuild 3020 BLAKE2B 46919ea0eac2a4c50a48da344850ed881ae9e93720f9ca8c76d25fc911bd7afef3eda1eb6d2795124a3d5686d6f2facbd4069bc4b32a8580c8ca390e33e1cb9d SHA512 acd70c7c17ab8c1b749d9f2e51877347c59c31c6b0e7178e1586f1cce902ef4cc2749b4815576de3660317f8ed4790b56bc91edab9c3ce90bd83e04b673625ba
+DIST smplayer-18.1.0.tar.bz2 5033686 BLAKE2B e05a8044e725ddcd1a31c9209fe83abf03553d671570db0affabd55c28fa11ac7c81c853c5ac0ef7e9bb5b0d69e7924e2ef8a8f57fd07e2354b926b887c4cba8 SHA512 f0fb844634fbb22c975744cc4d557503aba7131cb52c5e1165a3ff9eec259bf45ebde5b7dfefa48d5f17e2946c1cfa0cce34429b373918f488e3f51c3398884e
+EBUILD smplayer-17.11.2.ebuild 3083 BLAKE2B 28ea91680564dd29721212de2084ba86debe81cccc258d4075d39b534526486e55ee94ddda6b9a5ce2ff12fc7d2f985ea6b2ed3b8f9e98b089faba46748b6bca SHA512 a8a9bc7e29d2a2f3a2fa08ea28a762bfe258213980fe2c2057a9ef49d096a62cd1d7e412dd0e82a277a6e4b11539514e717458c773789c747028ea450d5d0a7c
+EBUILD smplayer-17.12.0.ebuild 3085 BLAKE2B 4981f54ed4407df2f7b651dea4714cfba67c976c393a54f58d76e0710e9b8de0e42befd3b5c396ba9682f28a31ca40796369e3a6213e6870f723157eac99d085 SHA512 6337e293afb3e2c2d8543bf4659336dfb960bdae78cc619a3e2842557e2568fad88b68010f31d3ab76bbf31022eb3f131b1d57df105ba85ef0261515146c4cb9
+EBUILD smplayer-18.1.0.ebuild 3085 BLAKE2B 957838821f4ee49ba66a174a3bfeb265c32f983169c5d335deb690568d3bbceaaced28ca2f5e3ddea37393525f486b5e738c786888cca96c9d751db6a040cac5 SHA512 ff69d7c4889daeffce883737ae554a547263a03f79c10cd9340d5caf7ea102777302357c18d843829aadcc178fd997b57135398a1d16fb730a6ee85ce9e8c5f7
 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4
diff --git a/media-video/smplayer/smplayer-17.11.2.ebuild b/media-video/smplayer/smplayer-17.11.2.ebuild
index 583903b5976e..3610468fd601 100644
--- a/media-video/smplayer/smplayer-17.11.2.ebuild
+++ b/media-video/smplayer/smplayer-17.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
 sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
 PLOCALE_BACKUP="en_US"
 
-inherit l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
 HOMEPAGE="http://www.smplayer.eu/"
@@ -123,8 +123,10 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-video/smplayer/smplayer-17.12.0.ebuild b/media-video/smplayer/smplayer-17.12.0.ebuild
index 3a43e40959a4..9e07115e9edc 100644
--- a/media-video/smplayer/smplayer-17.12.0.ebuild
+++ b/media-video/smplayer/smplayer-17.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
 sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
 PLOCALE_BACKUP="en_US"
 
-inherit l10n qmake-utils xdg-utils
+inherit gnome2-utils l10n qmake-utils xdg-utils
 
 DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
 HOMEPAGE="http://www.smplayer.eu/"
@@ -123,8 +123,10 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/media-video/smplayer/smplayer-18.1.0.ebuild b/media-video/smplayer/smplayer-18.1.0.ebuild
new file mode 100644
index 000000000000..70deb3e4a369
--- /dev/null
+++ b/media-video/smplayer/smplayer-18.1.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="am ar_SY ar bg ca cs da de el en_GB en en_US es et eu fa fi fr gl
+he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt_BR pt ro_RO ru_RU
+sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
+PLOCALE_BACKUP="en_US"
+
+inherit gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
+HOMEPAGE="http://www.smplayer.eu/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="autoshutdown bidi debug mpris"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5=
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtscript:5
+	dev-qt/qtsingleapplication[X,qt5]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/zlib
+	autoshutdown? ( dev-qt/qtdbus:5 )
+	mpris? ( dev-qt/qtdbus:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		media-video/mplayer[bidi?,libass,png,X]
+		(
+			>=media-video/mpv-0.15.0[libass,X]
+			>=net-misc/youtube-dl-2014.11.26
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
+	"${FILESDIR}/${PN}-17.1.0-advertisement_crap.patch"
+)
+
+src_prepare() {
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )
+
+	default
+
+	# Upstream Makefile sucks
+	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
+		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
+		-e '/\.\/get_svn_revision\.sh/,+2c\
+	cd src && $(DEFS) $(MAKE)' \
+		Makefile || die
+
+	# Turn off online update checker, bug #479902
+	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
+		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
+		-i src/smplayer.pro || die
+
+	# Turn off intrusive share widget
+	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
+		-i src/smplayer.pro || die
+
+	# Toggle autoshutdown option which pulls in dbus, bug #524392
+	if ! use autoshutdown ; then
+		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Turn debug message flooding off
+	if ! use debug ; then
+		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# MPRIS2 pulls in dbus, bug #553710
+	if ! use mpris ; then
+		sed -e 's:DEFINES += MPRIS2:#&:' \
+			-i src/smplayer.pro || die
+	fi
+
+	# Commented out because it gives false positives
+	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
+}
+
+src_configure() {
+	cd src || die
+	eqmake5
+}
+
+gen_translation() {
+	local mydir="$(qt5_get_bindir)"
+
+	ebegin "Generating $1 translation"
+	"${mydir}"/lrelease ${PN}_${1}.ts
+	eend $? || die "failed to generate $1 translation"
+}
+
+src_compile() {
+	default
+
+	cd src/translations || die
+	l10n_for_each_locale_do gen_translation
+}
+
+src_install() {
+	# remove unneeded copies of the GPL
+	rm -f Copying* docs/*/gpl.html || die
+	# don't install empty dirs
+	rmdir --ignore-fail-on-non-empty docs/* || die
+
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index e591399e52e3..6ed268f19f4b 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,5 +1,5 @@
 DIST totem-3.22.1.tar.xz 1982788 BLAKE2B fe9dae757201dc0f0c39f635f192322ec12fff5f3f02202771dc6f97d83f3e5865db757b3a42e98a0c172f43f0c82198e51be88e8b84915670a4f81af600e120 SHA512 919f313d2af1d72256ccfa1fe41fe897427b7558c2308da8c257e5b5439f90af9a47a905dd692ab4cabec730a5be0e55710932f91bc6e2f63949f5d83c840e97
 DIST totem-3.24.0.tar.xz 1987260 BLAKE2B 81cb8c359b2225148a18f7a5c6ae9990cbe2e2f3b9a6a31012c9c8c0920c0cea6bad0a5d9407a79530fadf00fb845fe9e6aa8dbc84d0f8d6e84fbc144d86bc9e SHA512 488db91e09b7f5947e81cb5474444c753367542820777faab561582707b012e664f232d3810d543dfbe0823adf3d8302c2fe6cc387f4225a362d15a6df8b4342
 EBUILD totem-3.22.1-r1.ebuild 3878 BLAKE2B c448e18a99f1b5e1b249e066b2a4b4a3540aeafb1006665b493d91257aa728702f95f139ea1b3b3c63844c5a3231981eec52eb49eb0e6e8981b467f2a9a420e5 SHA512 b74fb308090d9dc823aab3e83d835c75aa462238a6ebec1f0257386424f15d57b36efdf66dd7ec52f77ecb5c5717d442dafff48ea49da1aeed2bfb2ca6a093e6
-EBUILD totem-3.24.0.ebuild 3884 BLAKE2B 06cbfaabbae47bb3c57b2d534c602a94166056b7c4ccd16e96ea887bd1814745d75dc7db0075175f50174e4fbe468ac3fa3b157a02682da99def0f4577b82ecc SHA512 98a05f734bd85f22987a6dc38bfe8c480a9e87730e6ee7eb9d254bd3bbf30a24734df89e060ed1f7a9e28919bfabd7a5794f842b807107e2c941df2fc08e3647
+EBUILD totem-3.24.0.ebuild 3883 BLAKE2B 05147a6be9fb27c72b54d44801002b2b2dbef7d0eaaa3c5ed82cb8b6e2eb43626334273f55c2aeb8c78a59d5dcf11408e50c1729c5320445813e75d40eb38a31 SHA512 0f6ade1021f152ddf02a9d45103bcf39dd746471a8bc9084b2c7a998f04306e624cd54270aeb6d6172b75ba8d9cc76bc996c3fb8a73b0a2b36b7b5aae2b8fc7b
 MISC metadata.xml 1203 BLAKE2B 17dbe39772d0e1e06ddc792e26344fa17d957c7fbc483030be4c48a3ebe262c23670f77f5ed811161f0419f020a435af791147f94276285b5c9e72b9fcf1e03f SHA512 d361035197d6ecbd6f2ad3cabc641cae06144148f468b5311c778950806fb0fffc9f2f4685ea557b64c7da67e08830b3ae4d11535849a01b9c06bb1c813b3b08
diff --git a/media-video/totem/totem-3.24.0.ebuild b/media-video/totem/totem-3.24.0.ebuild
index e1b273398547..3f37a962464e 100644
--- a/media-video/totem/totem-3.24.0.ebuild
+++ b/media-video/totem/totem-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	zeitgeist? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
 # FIXME:
 # Runtime dependency on gnome-session-2.91
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 28c052ae6604..e3010067dd43 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,6 +1,4 @@
-DIST tsMuxeR_shared_1.10.6.tar.gz 640010 BLAKE2B aa60341e372d7537ea881ac481f7052af3cc0db5d2eb61687bc23ebdaefcaa8b04f9a4e02075489911c885563f172ec64fd3f54779d130f404ac96378d839ecc SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
 DIST tsmuxer-icon.png 1634 BLAKE2B 400a1101ae382264d66a07e389157f055a7346c80065be159ffda6ce8c28450c1ff954b50fd1ce6df05384fdb892eeab7319bc42f154878c2fccfb5638b90a3d SHA512 4af3b1bd0e1a2c8379773e16121aa1c0ae749a3a9b9fdef0622991ea4ea632f51fbd91af0f6b5a415c28b375bd71adde2e9aacfb8b495242168cc97e1c8bf4ff
-EBUILD tsmuxer-1.10.6-r1.ebuild 1841 BLAKE2B 88dd2d6a43c2772787b7a2be1d07c54e0e03ac9df095118570eda6ac26e8ef5c6b92b24c70c6d245a7d73b9132e695f72ca0e86dd71cec85dcb384e4fbe93202 SHA512 7dc81a67b021580d395caec24a067646a77569a493f5a0f3568f70a14ca4b776b5be398c7da6958c643967f2ec129113d253d6cc4834a74e099d15b5d23e5878
 EBUILD tsmuxer-2.6.11.ebuild 1579 BLAKE2B 4ac8a08e0051002674b3e76983ca73423c941a7d2be5eeb8b0128f3cb5906799afdd014c5bc74861fcc6c91c2b8d58a7da05e91ed86a1dc49f0e64244c659535 SHA512 8c381c1db6dfa56dd668a9963bd6dde4b8221382f8455a99f49fa7db91f3fe3bcaffefb0eb6ea59461d8fb97ebd185968fad446ee43a919a23302c1b1bd733a3
 MISC metadata.xml 645 BLAKE2B 8361c4d4af9715af8709b464ca2ce53b3a826f448538f4ed9c631ad8be42cb67abe2dd39ef1dee8e3fc072634f3c186cdde51b5e7acf88097f4b60d4cfa25ad7 SHA512 66d7f11ae0acb6082f91b40fc3c5990f0f957a82d722bee2958b9cc3ea0bcd2e094f4be0e1984397c6664267328ef5212a2131a1fb20d191b3a81b6cf9d524a1
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
deleted file mode 100644
index 5734f9720e38..000000000000
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils base qt4-r2
-
-DESCRIPTION="Utility to create and demux TS and M2TS files"
-HOMEPAGE="http://www.smlabs.net/en/products/tsmuxer/"
-SRC_URI="http://www.smlabs.net/tsMuxer/tsMuxeR_shared_${PV}.tar.gz
-	http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png"
-LICENSE="SmartLabs"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4 l10n_ru"
-
-QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
-
-DEPEND="|| (
-	>=app-arch/upx-ucl-3.01
-	>=app-arch/upx-bin-3.01
-)"
-RDEPEND="
-	x86? (
-		media-libs/freetype:2
-		qt4? (
-			dev-libs/glib:2
-			dev-qt/qtcore:4
-			dev-qt/qtgui:4
-			media-libs/fontconfig
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXrender
-		)
-	)
-	amd64? (
-		>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
-		qt4? (
-			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-			>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
-			>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-			>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-			>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-			>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-		)
-	)"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	upx -d tsMuxeR tsMuxerGUI || die
-}
-
-src_install() {
-	dodir /opt/bin
-	exeinto /opt/${PN}/bin
-
-	doexe tsMuxeR
-	dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
-
-	if use qt4; then
-		doexe tsMuxerGUI
-		dosym ../${PN}/bin/tsMuxerGUI /opt/bin/tsMuxerGUI
-		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
-		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
-	fi
-
-	use l10n_ru && dodoc readme.rus.txt
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 4ec10dc21661..5cc3d5a3bbbc 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -17,8 +17,8 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b9
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
-EBUILD vlc-2.2.8-r1.ebuild 14486 BLAKE2B 18e0bd2a2a3e56bcc944f64e3bf67558bc7b1d49c7aeab1e9b5f5e586f06578517ddec0c6c219a67ff4e21109a3794bdb5811a62dae4358a8023088e2b5017c6 SHA512 ce132d458f3f3a83344be86b26e106e18a9134c5186ad6b7d9bce5886eef186df853cd9161b9a1a954acd86008ce995c3eda22d6a5842cab7f0a7ffbfd87419b
-EBUILD vlc-2.2.9999.ebuild 14502 BLAKE2B 0e052bfee82b41f15f2b61da02a1674dda8445520f45c0f0ee2a05d5da1f81dbe9666c5c6efd3eb9a6ef11f798dd736cfc6381ec0d45d5c51bada3905aaf106e SHA512 e2a5009595678aa48bd84328529d4bb8dd4a3e70fd4a5a608ba8b6cede9f2fcbbe209107273b18d627fc1b5fdbb81bd10f3672294c93b8fdf46f9112929c3060
-EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B 95f5eabafdabc5e45eb0df7e6075d42674b17ca06fa03025d56e6ddc6a192277b3a020e323358024628ec0f70b08e86d506409f2e31e776eeaa19cc6ed24c6eb SHA512 96f80b716829f4b7e3c3b0bf757f31d3797d18b76735c42f332e8019577d3a06c97890d97a2781accc033b56a83212a25a194610c6019ce885251f02be180136
-EBUILD vlc-9999.ebuild 13481 BLAKE2B ab969226645372b0360dc12482c3d19514b7abfe3c27d1460b97a9a4c3b9e2a0c888b984e196c2d314ab27f6c841a1371094870a3b200f0aeb67c14e7ad0ea12 SHA512 5c3b6f746401b6e423af49238025ee509ba40bf567495b3a966fe42e97da07badfcb463e4f89cfeb431d60747d59b9ae493bf94c167864f2e0a567a400f55834
+EBUILD vlc-2.2.8-r1.ebuild 14813 BLAKE2B 7c03fd365a135eeb9c2a859dfc7e6e878940f621d8dd0a27022cd984fd17d22e41be524ae6899281eb7b273072606e3b38b7f0a6e524215e0779a1b155316a00 SHA512 b506c3c01ce5e35e31194622bde4eab21cb698a3280edb83b553752caa42428abc07a744d3aaae458405c97facb7b7eef10ee652afd667d16546af34fd89a207
+EBUILD vlc-2.2.9999.ebuild 14829 BLAKE2B d7ffc34f6e72390a45ae5bb4218dc25c3eebcab96047a7ab43f5695ca833f7bf492cdd22337aee635c5fb3b9d9bc04c4fe4d750a44b9020babbfe8e20fc27aeb SHA512 46ee0565bfa2884abce8a0b230721ce3c9adfda7cffb0d43cb2d3a7fa3099ba226ee7aff3534f42de0fa09302be0c89da3b8460575bf550eeb65dedc973e8bed
+EBUILD vlc-3.0.9999.ebuild 13815 BLAKE2B 5748955ba987e4fbaa8b7f9851f94aadbc4612d12b4be80cbceae29c43a54262a0064975934dd61714b63c9ed540a718406e01625eb18a5828ddece87b6a245b SHA512 55da89559e31ae099c21f17eaa346ad39afbd0de637fb24ecd7674c38faa1319eadf264cbaed8e00df4b93a2f0b211f4086ddda6e01964f7e230b0441af663aa
+EBUILD vlc-9999.ebuild 13808 BLAKE2B 02fe3a017cd07b06b19d337c2e09f687820be7b095a8a33110d02d15710a14dee07d183eaaaeb38d29be0af0389005e15a60d2a66943966287f4cc20f06c2778 SHA512 d1d4f508d185dad2c38b11548950daf2edd7f39220371e1537a1f765d92d788693d28dd8018f5fe6bb93b9d3ed9df3a3d7cbd914f9306682d7ce8299a6aa0cf7
 MISC metadata.xml 6560 BLAKE2B 7a079c7b3d008646d49c8669834fccb7e78cf2ab88e0eb2671c571f91f012ab8b33989ef2035e35b55c585c1bdc930e9a5fd7d26c7f1a2fc7cab819fca54f21f SHA512 ed19d0f4e3349e13ef9967911c16a4b6569cefa97169ad79d7a9510ca88965c9e8fefcd593ceb2e5b0c31e82ad92e9513ff36460eddf3605d2250d285b19530f
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index 997cd366883d..e5ea17223128 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -242,6 +242,10 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
 	eautoreconf
 
 	# Disable automatic running of tests.
@@ -466,6 +470,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 5d8fafca1886..e9fdb939b366 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -242,6 +242,10 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
 	eautoreconf
 
 	# Disable automatic running of tests.
@@ -466,6 +470,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 044aa2ff014a..f97e73f1b770 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -267,6 +267,10 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
 	eautoreconf
 
 	# Disable automatic running of tests.
@@ -473,6 +477,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 86a7661c3f4d..d4545b0e1f96 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -267,6 +267,10 @@ src_prepare() {
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
 	fi
 
+	# Disable running of vlc-cache-gen, we do that in pkg_postinst
+	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
 	eautoreconf
 
 	# Disable automatic running of tests.
@@ -473,6 +477,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+		rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+	fi
+
 	gnome2_icon_cache_update
 	xdg_mimeinfo_database_update
 	xdg_desktop_database_update