gentoo resync : 25.08.2018

24 files changed, 44 insertions, 926 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ad582c07b38d..de165cd3e426 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/flvstreamer/Manifest b/media-video/flvstreamer/Manifest
index d9ba5b9f083e..446940d18a7b 100644
--- a/media-video/flvstreamer/Manifest
+++ b/media-video/flvstreamer/Manifest
@@ -1,3 +1,3 @@
 DIST flvstreamer-2.1c.tar.gz 77308 BLAKE2B b5c1cfc6dbbf40c32b5d46d207b54f0cffb96aa260ce4e456385d79d2062d497bed2560adc067db18d5de292ede897f777c313f1c661da900ee2d4b278314521 SHA512 029f689f47a7ecbc71fef5194456bc1dd4039bd146bf738afc3e872c96655c54bfa60140576de94bd1d9da5777509876689e9e678e64cce2baf3a8eff53ccb3f
-EBUILD flvstreamer-2.1c.ebuild 870 BLAKE2B 2c60b20e8e1a1eb08c15e7f0e9347ea4bbcd9f04e9b09c5c8464889aae9dd26f0d03c500a77dd4414e5de8a9a465e3dfd6881d9c9e47b7ace1b5c56f800ba727 SHA512 8978faa09e4f57444dac3243169d900bcd2ba04eb5b60eb5aafe181731bd62e494feb7de6e8846dc18f6e938224a4e1a9f09fac4c390f34a949cfb68046f9b1c
+EBUILD flvstreamer-2.1c.ebuild 829 BLAKE2B c0e38dad24731658b4aa45e12831f96936315c74b506f04645083eaaf22e429ba521c41729037c225dcaa469949d0b6e31ffe9001bf722fca2ac3884a79eb5f1 SHA512 369bf6edba02e02026e669fce8b6de2a72d8503aa5d8e85a0923be77e0a3f06add61d700e383656c0d9d44b0f1bafc03ad0141ada13e636bb2c9d69c58a61b2b
 MISC metadata.xml 385 BLAKE2B 31ab219b139d298adcb99aa774d56cb1af089dfd396fdd623e0d4fa04dc25f76054e2578e8bfcb20db306407f07d935c26c4e04227a85affcf7888e3f73d2b9e SHA512 a9b75e514a913af971175343873cbab4f73c130e6efa252c70e1bd28d481fccf189a13f7d8dc5b95820848d37efc53f895169da2455e51bee5b746a193061415
diff --git a/media-video/flvstreamer/flvstreamer-2.1c.ebuild b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
index f8aed0990fb4..2989c8af30d7 100644
--- a/media-video/flvstreamer/flvstreamer-2.1c.ebuild
+++ b/media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -13,12 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
+
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	default
 	#fix Makefile ( bug #298535 and bug #318353)
-	sed -i 's/\$(MAKEFLAGS)//g' Makefile \
-		|| die "failed to fixe Makefile"
+	sed -i 's/\$(MAKEFLAGS)//g' Makefile || die "failed to fix Makefile"
 }
 
 src_compile() {
@@ -30,6 +31,6 @@ src_compile() {
 }
 
 src_install() {
-	dobin {${PN},streams} || die "dobin failed"
-	dodoc README ChangeLog || die "dodoc failed"
+	dobin {${PN},streams}
+	dodoc README ChangeLog
 }
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 3de8edddfa4f..2ea053a0a220 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -4,5 +4,5 @@ AUX kino-1.3.4-libav-0.8.patch 2622 BLAKE2B 7345a43a6bfb6473dda9899ab675426db102
 AUX kino-1.3.4-libavcodec-pkg-config.patch 451 BLAKE2B 87a6292a89627000437c07e60a39ee743e08e88e736e91db2728a19653c6d0eba22b3883e99e6c54f14b6f1262227aa883c067cd577eb69eef66caac3ee49339 SHA512 4351560f26ea47f3122ac5a44bea48eae48b8efcc6ca10e72adb31ff5c535ed17e7324444bd03a29482351c3100b07a4305f092c687f18d56f813839332f5847
 AUX kino-1.3.4-v4l1.patch 635 BLAKE2B 5f4d4c69c2505fa59aff8ed2323b303092809d1c1991387795a8cd58687b27631d697997861f1b17e921875c5e798495fc4866eb1163afc19c80c376616c95da SHA512 840b9549aa4fa639a090ffdf2e4a65b8b37e5b8c8fd7f13eacb599b6659b0a6c1a435da5f3fbb7ca2b81ce5e2759ef49267af93864aff0426e61eb63d3aede77
 DIST kino-1.3.4.tar.gz 11090771 BLAKE2B 58d61257c09638d12cc4ec1e40fa5f51c6812039825f915b0b8c32817c791c7ce89b69145ffffed8fb65ea21b57d50628bab2654df731b79c39d120ea4335bb9 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32
-EBUILD kino-1.3.4-r1.ebuild 2893 BLAKE2B 2d731a652c1e4db45f15398b713a284de8af2396047ca4c25401d3ae979f113ddb1615c99fa753e201d64bb6511633f75e80e25e985178f42707f8131b260f64 SHA512 33d51922bc141cc8937c75af230b1ef0e6b29a26870a31bea885d7d0ac6812d61cdf06720100638770b2f22f92966652b3c651745e9f83568ca30590dddc87f3
+EBUILD kino-1.3.4-r1.ebuild 2719 BLAKE2B f8342b996ff8cae911780156666d07e218bedc93cf60114b9abcf26d8244a490f66457924d4f48ef1d48ef1fc02575c37eee7aa8d8b497d5edebdb1f360302f3 SHA512 bde69841c1a193c2a40787dfc85f6dfd2f6aa7f8b115fd309afd9e273458b296a1f72c02e0fcb8ec7fce1c8687a9daab1289cf6e40fd0d7f28160279bdd4a59a
 MISC metadata.xml 439 BLAKE2B e5c5ba3dffa41f889738582a879e23b49a17ca31787c5461a6d136317d3fce8d1df4cc29657eec57af00ec8d810e52ad0a125cbd5b378fc1de63d018696e932b SHA512 b6c464f30ce0e75cad151021288fbf2e2fa360a978b707108eb39e23bb15d3d91212abbb23fa181c97959bd80ce519e4f26bf59c6a22a99ab19bc5051a0746a4
diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
index 5ff6142d3d3b..cb82c2338e31 100644
--- a/media-video/kino/kino-1.3.4-r1.ebuild
+++ b/media-video/kino/kino-1.3.4-r1.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
@@ -57,7 +57,6 @@ src_prepare() {
 	fi
 
 	# Fix bug #169590
-	# https://sourceforge.net/tracker/?func=detail&aid=3304495&group_id=14103&atid=314103
 	sed -i \
 		-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
 		-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
@@ -65,7 +64,6 @@ src_prepare() {
 		src/Makefile.in || die
 
 	# Fix test failure discovered in bug #193947
-	# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
 	sed -i -e '$a\
 \
 ffmpeg/libavcodec/ps2/idct_mmi.c\
diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 19ca50a49712..d665df77f88c 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,3 +1,3 @@
 DIST shotcut-18.03.tar.gz 4089848 BLAKE2B 811556867fb6e3160ec0daaeda2eb063f32bf527fc40a72302638fcb9445b87fbebdcf93929746d5c18f784263ead857b3b23428dc8cab0f06b5f95cac36d793 SHA512 37ec83f7c1f770e849213a2adb90ee86061e1eb17e5435dfa81068de77be8cc5791ad03c14da100b9b960b15d6ec0d01fc9d579fcbf749050385c2231e13f4a0
-EBUILD shotcut-18.03.ebuild 1390 BLAKE2B ddcac0139c93ebd61ce25021f619153ac42b19192563384189eda586a30bc3930944d4e3fe00c0932f2de70cf2e1f4fed44eeed4694c5cecf1d5786016b6d62d SHA512 82a6bc8c67a6df294abd6c369e34c975120c59b3d0f19f22b14e461d9959cc50fbb41d39fe8e2495e69af602b727001144440d86841c7e0c53825832293d16d5
+EBUILD shotcut-18.03.ebuild 1400 BLAKE2B 4a56ef380f40356358ab84ac83bf3c98209b11406ae8f742c7efb6e4af4db4fcafc801010be146a4d1bd9b0d6d0541de3e8075f37db6f561a91d7a04c604f6f2 SHA512 4148097b5c3d0af7db2a5c86f62d40794bf9b71738c7d93af5dcf8d4a9f55ee2d4d237f0af7c08c6388c1236ef658f4a31129a6d4b259b62ba49280422e74111
 MISC metadata.xml 451 BLAKE2B 7438699cd72f469998316ff1f3efd8bda67aab68f0fdbd405bb24b286e75f998a82b88c01c7d74d63fadeec47f58c381c51652854ac3dc8bd6a3a687fb8cb42f SHA512 58f1a6ddd5eef3a6cfd81936d61e34ea29aa7a26e5e841e96218642fa9fafc5529c3c6e0283f8c1e948a11eb819163e03056335d989933f390854f22aeb61ed0
diff --git a/media-video/shotcut/shotcut-18.03.ebuild b/media-video/shotcut/shotcut-18.03.ebuild
index 52af890d5db2..27b43b92dde2 100644
--- a/media-video/shotcut/shotcut-18.03.ebuild
+++ b/media-video/shotcut/shotcut-18.03.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	media-libs/ladspa-sdk
 	media-libs/libsdl:0
 	media-libs/libvpx
-	>=media-libs/mlt-6.6.0[ffmpeg,frei0r,qt5,sdl2,xml]
+	>=media-libs/mlt-6.6.0-r1[ffmpeg,frei0r,qt5,sdl,sdl2(+),xml]
 	media-libs/x264
 	media-plugins/frei0r-plugins
 	media-sound/lame
diff --git a/media-video/smtube/Manifest b/media-video/smtube/Manifest
index ff3eac24abad..f607355c529b 100644
--- a/media-video/smtube/Manifest
+++ b/media-video/smtube/Manifest
@@ -1,3 +1,3 @@
 DIST smtube-17.5.0.tar.bz2 748559 BLAKE2B 41c5be3933b74b079136788c99cf3e073eab5903596f2e39f9451493e17338d39454a8956841452f37e56c0e6051720a02a9765f3165f4e7e4aa1d93caa1a59f SHA512 bda1d166fe03eb85e5a9971b0d5422ea3e72ea91293c4dd14cdb447788635971a1d9977fd2dda60bfcda68183511b5c6ca6b39a229960fbd4c7c5f125882140b
-EBUILD smtube-17.5.0-r1.ebuild 1423 BLAKE2B f03cef7af4d7ddbf54501cb50644229f5a3fbfaf1488c4ac75413080f0f2d7acfe82953de7c6e57a5b61b53c88adef2144cede64bea8b4c8d793880e02374d13 SHA512 7eb2577917ec261703c828338c19086408641df70a5df6afb8b34cfd817d338e2d23719148e0d14e60d1d835cbf532865e4e1ccb6f65dfd715730e1be581a8af
+EBUILD smtube-17.5.0-r2.ebuild 1478 BLAKE2B e0b3ac3b26ba93aacc7a4a85937336654a90da7cdf75f327d33fe5b535a81b8dd307d3e76713fd903b9327472b8a1259142ce139deb11987d4d5c7ef24ed1df4 SHA512 04c92b7a11640595cd736021ca027e6e756d58384342ea6bbf94db3b1d6f45724bd467bff85a6f43234dc38a69aca2618a08e9946cda53909a4fde2544a2e646
 MISC metadata.xml 553 BLAKE2B 5818030e41958376eb0a4566f79a245d8bd1142dbcbf56aaeb21434e4194d2e8c7208bfd7b7e15b11f688f0e8ef47be2e1748740883a09cce1cda04836a70e24 SHA512 0e833e9f3075e066d059871c97bc951acb2d68152719388b9c1eb92776f50822585c88f662e8c5544ef15861f11bd76e469a34c593c98f3bc76ccf898eb202a6
diff --git a/media-video/smtube/smtube-17.5.0-r1.ebuild b/media-video/smtube/smtube-17.5.0-r2.ebuild
index c3aa7b62ce75..129d8081f023 100644
--- a/media-video/smtube/smtube-17.5.0-r1.ebuild
+++ b/media-video/smtube/smtube-17.5.0-r2.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
@@ -6,7 +6,7 @@ EAPI=6
 PLOCALES="bg cs da de en_GB en es eu fr gl he_IL hr hu it ja ko ms nn_NO pl pt_BR pt ru sq sr tr uk zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 
-inherit eutils l10n qmake-utils
+inherit desktop l10n qmake-utils
 
 DESCRIPTION="YouTube Browser for SMPlayer"
 HOMEPAGE="http://smplayer.sourceforge.net/smtube"
@@ -20,16 +20,23 @@ SLOT="0"
 CDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtscript:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
 "
-DEPEND="
-	${CDEPEND}
+DEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5
 "
-RDEPEND="
-	${CDEPEND}
-	|| ( media-video/smplayer media-video/mpv media-video/mplayer media-video/vlc media-video/totem media-video/gnome-mplayer )
+RDEPEND="${CDEPEND}
+	|| (
+		media-video/smplayer
+		media-video/mpv
+		media-video/mplayer
+		media-video/vlc
+		media-video/totem
+		media-video/gnome-mplayer
+	)
 "
 
 gen_translation() {
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 0adc6ff44de5..9f4d7669129b 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
-EBUILD vcsi-7.ebuild 837 BLAKE2B f9bd89584c205521e436092c28163d8ea2373db11212402474a6eed806e146868afd4cce2850306ee058a3ced14151a980b0e413300e943351bbaf24bdbae70b SHA512 b9d639e288eff34afbf53d169a22cfbcc9d9f750c5d9f654d550b63d195701c1d0d116dcf8e51e061726aa14981c8c9d5164ace00532a842b2a71a57d046d2a3
+EBUILD vcsi-7.ebuild 838 BLAKE2B e69d6df7d2cef9aa4e90f1a155fb0b94fe4881ba2774a16a398832c39f93395731b83c59264ea13d5a65c3b75db4d8cdec6ec748eec413fcd58f82ddf3d4620f SHA512 56a8a184e13fd049a02dd58d32e935bd5ec7702fc95c66f4d2545a4c54f715b125711221234c963d32226a9deecc7f8ffd31a887ee91259b40abcd0edf71b66a
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/media-video/vcsi/vcsi-7.ebuild b/media-video/vcsi/vcsi-7.ebuild
index 87cb0c19609a..01930585d6c2 100644
--- a/media-video/vcsi/vcsi-7.ebuild
+++ b/media-video/vcsi/vcsi-7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5..7} )
 
 inherit distutils-r1
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c93f3cc62450..aaa0ac55865b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,23 +1,13 @@
-AUX qt4-select.patch 2171 BLAKE2B 0034fcbc3987ed4829e0876c5ceb7e226d2050c60cc2dfd57b9ecb0be2d4791a7f87ccfa95572fcbf1758d19d12c017b7eb668eda77bb88763f18dfd4eec2e44 SHA512 0c3fab4457f1b8c9f1c2c9b690c1a137e1544a09a710e24ba9c8e228f0490ec27030846974610b8976bfca77e03054c5254719836cabc695a527f095659a651d
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a7fa4dec9891f718816e44fd08970a5477cdc7ae34510b26af9971fe5d20b25c96595901117c804c7679341e1e8cd5309a14 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae
-AUX vlc-2.2.2-qt5widgets.patch 603 BLAKE2B 912dc586e9341619dbeb20370b254bbf931ff80297f6cd703a31f3c635e70190237475e94fde6254927e6f17c7e3b0aa08ee1b803b6d099327a42be9567a2c64 SHA512 b5d8946406e84bce240376015ed994d6265d07fe9b777fd05c0f722142e99502bd129ec4acfe2cafa7a6dd98c9612913fa8644109489fa48dab6dc5522601050
-AUX vlc-2.2.4-alsa-large-buffers.patch 1805 BLAKE2B f50698f38ec048e66df23e2fa700072c860da29ee638d0419130daf4614fd00e04fd9350719f2ccc87c413c02e7f91c5aa24eb5bfda29c8d434cb63df96c3cf8 SHA512 7376c79b935d56b51a3e039728764885b531435da92dad7d9f499bb47aff5363adb06405b86809cb5371ea45c34a28cf020a10d1edde4a16e59161c8bae2a7fd
-AUX vlc-2.2.4-cxx0x.patch 598 BLAKE2B 80771a75c7f0dd8b5c2dda9d7957450a5d1b54a4a27e88a7c8a8d0c11a095fa13b1a899ddbbdab425236dfa6a2b925867c1dd370495f4e7d3eea2a2409889a4e SHA512 543357fdf86b56a236f2ff3f855e6ca3a3af2f5f6625539e923705671adcf29f8e3c967adf7f11bcec0e0d6646fcdb0c159bf70758bc2542b85f72eab8c280e4
-AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671e114ae2a2d4997fae92f1aa9e2e87eb13583f7a51e005d452547b6a965b87c7a09472723a8005a9ada0b6d5bb SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee
 AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
-AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
-AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
-AUX vlc-2.2.8-libupnp-compat.patch 815 BLAKE2B 059a1f572e39d09dc206a6af36bc5e50b800f089929456560663a631baf6b30d21b1d0234999d9f90de12a520e377c4578472b00b81f80a5f8a6c6b52c26b3e5 SHA512 befe64c5595bebbfd033db6c586e4cdf2092c3e691acc034b9aa499e462a5542fa3de21afd0953c74858bdce99db4339dd41414b96aeac1ccb60d7edcb24a964
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.1-qt-5.11.patch 350 BLAKE2B e0980ebbefa94d9388785c12fa5cba666eb3681fa94b0c512018475477974502ce0df4aa4939865f43c2bf393654db902df5f070edd802296f1d3ef71b8caeb0 SHA512 66aad0ec32d1a96f65566b04eb9c0b4574824e281940fe5c0de54ac5f92189693a9f2576203d2c8562d7174ec5315cbbd683d93c481d16119d3038e30a58cbf5
 AUX vlc-3.0.3-fix-disable-vlm.patch 1366 BLAKE2B a0ebb75f8b171063dfc4490ed8abfcad515cac85a618bcd0e157fda71a6673023d45682a5c5507ffbc1412e15f1edb3cd0e3f1e5095d9d5ce5dfb0ae51488e36 SHA512 544c3f57112e7c37c1fc3a853e45b6ca3c186ee70734cd755365b233cbd481257ec0a7be8e8213c55ee6c6110a2ee8c0d4bce50eab67cdd57cb4e74a9edab862
 AUX vlc-3.0.3-fribidi-1.patch 3406 BLAKE2B d7c670a57a442a1f093f4ca72c84b633bafcf5a631f0a31af45109cf0cedc1761f93817c26b412fc1af0a7ee8a9f84b5e318d210d4e78c95a989af37d99410f4 SHA512 403524d92607e8862836fbbdd4f32c064ee67dac521fbbfdd474d4b057b76e006cca6e9541d95765451eb147320111ef1774b6399e05ce9d32db61430ab4ef2a
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
-DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
-EBUILD vlc-2.2.8-r1.ebuild 14828 BLAKE2B b3f586131caf059eb621eb3d8b5a4acef12ea8e5a55aa5445b372777e9c67c5444e2c5ff0a2045d3a7c151b7453a10dfe6f55121b4afc7bbf2adcb065f94fa85 SHA512 de4c8f6b34dd6be0d7657c69fd926ba88e2d49fe2185d368693532c73d9ae497326742dc8608beca7f970c55a49e7471fb165a969b813cd2ac4b51afdcd4576d
-EBUILD vlc-3.0.3-r1.ebuild 13359 BLAKE2B 668dd6af48ac14b1d76303ef31aa545b80dd6759ce6a3642108439e68ea641aa8bdc3f4d54c7d2c11d63f9759bbe3fccbe96ae6f922eb228e6a20e30a84a7937 SHA512 fceddfbae1c6d4fa1c7a5877b11e3459e1b2ad7f3f1f0d2b8e673dfd21bcf374bbab2cf8a9f469dd8f78a42a8d7db1595dcb0bb9c6b575a26300b1e41ec4dd5b
-EBUILD vlc-3.0.9999.ebuild 13254 BLAKE2B f832f75df4fc3870c5f2c773016f082d845b228d79f1cb5af0221d0f66ad9662151f15e4060b7e077011e8ce6e43aa513cba7eedf7239b3b7119ebc5ab9a37fe SHA512 22a62210fea9004186863009beafc5ed813eed61f8fd13e04e29fb26b1babaf5a51102472c8d035aa17e529f5aa7a77fdc89d1036cb014e8f65c185beb772945
+EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218
+EBUILD vlc-3.0.9999.ebuild 13261 BLAKE2B b014ff22f70752b739d22521c06a642093d25037cc2355dcd19dda351b4d4c8cbc44ff0e8b86e2410a15ca8529048f6c61601c412e83cbfd32188ead64a3fcfd SHA512 e6f34bb0e1c9f0c31fcd46f5f2e22e6ebf5834ad1140ee2178cae581049bb99b0c1fd6d96bca4765ec38c0611d1ca4740b3dc4e550b62a85642716df3af2af01
 EBUILD vlc-9999.ebuild 13209 BLAKE2B 47add64565abb5e7f4fc44729f67de84d6bfe7bc025819d3f986d9497207bdb12c4a27462d917ae18197fe31899a252eed8aaf3efd80a0350e7c2c32d21e7706 SHA512 86bfd49188514a5ccd813590f8ec8eff9bd55d751b8c2f6057d250031bbcbe3dade0a18a55bfaba07ea7b11f42208d431fe04dc7c79a500679268a9cdf4fc49b
-MISC metadata.xml 6729 BLAKE2B 876e4e6ff75fd7c20ccb373acbdcb830aa44fcc3c22277ec23ac4a9e2130d88253e20bb280d4f7151341deb557071b73eac3edfbf950f822902bd1011e826903 SHA512 23ef149f37722137c3c3fc320f6bca126084edb0af94b2f6446735294bd933b575c2cfe0984100ff8f0dd333a7672657963428687537f4c69392852b87ed2dbb
+MISC metadata.xml 5187 BLAKE2B 43c8474284bb05268e6846e646ff382a1cb0f3ffa1a9ee65aa5beb95c157c427cef3df82abdaafa60f3ede953506987342de284a06fad2fcf83b5fc3b7054ca2 SHA512 c518a431a420a40e0f627e0cc713980b660db1acfb837bf20bf80220df1773bdea325998e5b8270dc7d4ad2af6290bdefb45c30a1ed07f62c73c99d57a5ca77a
diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch
deleted file mode 100644
index fb1526a30a7a..000000000000
--- a/media-video/vlc/files/qt4-select.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54
-For use until upstream ever accepts this patch or fixes it themsleves
---- a/configure.ac
-+++ b/configure.ac
-@@ -3709,7 +3709,8 @@
-   ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
--  PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-+  AS_IF([test "${enable_qt}" != "4"], [
-+    PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
-           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
-           VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-@@ -3721,20 +3722,23 @@
-       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-       AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-       AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+      enable_qt="5"
--    ], [
--      PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
--        AS_IF([test -n "${enable_qt}"],[
--          AC_MSG_ERROR([${QT_PKG_ERRORS}.])
--        ],[
--          AC_MSG_WARN([${QT_PKG_ERRORS}.])
--        ])
--        enable_qt="no"
-+    ])
-+  ])
-+  AS_IF([test "${enable_qt}" != "5"], [
-+    PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
-+      AS_IF([test -n "${enable_qt}"],[
-+        AC_MSG_ERROR([${QT_PKG_ERRORS}.])
-+      ],[
-+        AC_MSG_WARN([${QT_PKG_ERRORS}.])
-       ])
--      QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
--      AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
--      AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
--      AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+      enable_qt="no"
-     ])
-+    QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
-+    AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+    AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
-+    AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
-+  ])
- ])
- AS_IF([test "${enable_qt}" != "no"], [
-   VLC_ADD_PLUGIN([qt4])
-
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
deleted file mode 100644
index a024d0032b6d..000000000000
--- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vlc-2.2.2/configure.ac
-+++ vlc-2.2.2/configure.ac
-@@ -3754,10 +3754,6 @@
-           AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
-       ])
- 
--      PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
--        AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
--      ])
--
-       QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
-       QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
-       AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
deleted file mode 100644
index b5a9ff7267fb..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a
-
-diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
-index 2d1f99e..4e9fd53 100644
---- a/modules/audio_output/alsa.c
-+++ b/modules/audio_output/alsa.c
-@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
-     }
-     sys->rate = fmt->i_rate;
- 
-+#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */
-+    param = AOUT_MIN_PREPARE_TIME;
-+    val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
-+    if (val)
-+    {
-+        msg_Err (aout, "cannot set period: %s", snd_strerror (val));
-+        goto error;
-+    }
-+#endif
-     /* Set buffer size */
-     param = AOUT_MAX_ADVANCE_TIME;
-     val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, &param, NULL);
-@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
-         msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val));
-         goto error;
-     }
--
--    param = AOUT_MIN_PREPARE_TIME;
-+#if 0
-+    val = snd_pcm_hw_params_get_buffer_time (hw, &param, NULL);
-+    if (val)
-+    {
-+        msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val));
-+        param = AOUT_MIN_PREPARE_TIME;
-+    }
-+    else
-+        param /= 2;
-     val = snd_pcm_hw_params_set_period_time_near (pcm, hw, &param, NULL);
-     if (val)
-     {
-         msg_Err (aout, "cannot set period: %s", snd_strerror (val));
-         goto error;
-     }
-+#endif
- 
-     /* Commit hardware parameters */
-     val = snd_pcm_hw_params (pcm, hw);
diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
deleted file mode 100644
index cb3d63522de3..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-09-21 07:10:58.885508665 +0200
-+++ b/configure.ac	2016-09-21 07:19:17.835725004 +0200
-@@ -3746,7 +3746,7 @@
-     PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
-       PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
-           VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
--          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
-+          VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x])
-           PKG_CHECK_MODULES([XI], [xi], [
-             VLC_ADD_LIBS([qt4], [${XI_LIBS}])
-             VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])
diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
deleted file mode 100644
index 3bc5954920d0..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec,
- [  --enable-avcodec        libavcodec codec (default enabled)])
- AS_IF([test "${enable_avcodec}" != "no"], [
-   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
--    PKG_CHECK_EXISTS([libavutil < 55],, [
--      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
-+    PKG_CHECK_EXISTS([libavutil < 56],, [
-+      AC_MSG_ERROR([libavutil versions 56 and later are not supported.])
-     ])
-     VLC_SAVE_FLAGS
-     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
-Index: vlc-2.2.4/modules/codec/avcodec/audio.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/audio.c
-+++ vlc-2.2.4/modules/codec/avcodec/audio.c
-@@ -39,8 +39,6 @@
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
- 
--#include <libavutil/audioconvert.h>
--
- #include "avcodec.h"
- 
- /*****************************************************************************
-Index: vlc-2.2.4/modules/codec/avcodec/encoder.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c
-+++ vlc-2.2.4/modules/codec/avcodec/encoder.c
-@@ -41,7 +41,6 @@
- #include <vlc_cpu.h>
- 
- #include <libavcodec/avcodec.h>
--#include <libavutil/audioconvert.h>
- 
- #include "avcodec.h"
- #include "avcommon.h"
-@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this )
-     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
-                              &psz_namecodec ) )
-     {
--        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
-+        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
-             return VLC_EGENERIC; /* handed chroma output */
- 
-         i_cat      = VIDEO_ES;
-@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this )
- 
-         if( p_codec->pix_fmts )
-         {
--            const enum PixelFormat *p = p_codec->pix_fmts;
-+            const enum AVPixelFormat *p = p_codec->pix_fmts;
-             for( ; *p != -1; p++ )
-             {
-                 if( *p == p_context->pix_fmt ) break;
-@@ -1017,7 +1016,7 @@ errmsg:
-         }
-     }
- 
--    p_sys->frame = avcodec_alloc_frame();
-+    p_sys->frame = av_frame_alloc();
-     if( !p_sys->frame )
-     {
-         goto error;
-@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t *
-     AVFrame *frame = NULL;
-     if( likely(p_pict) ) {
-         frame = p_sys->frame;
--        avcodec_get_frame_defaults( frame );
-+        av_frame_unref( frame );
-         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
-         {
-             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
-@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc
-     //How much we need to copy from new packet
-     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
- 
--    avcodec_get_frame_defaults( p_sys->frame );
-+    av_frame_unref( p_sys->frame );
-     p_sys->frame->format     = p_sys->p_context->sample_fmt;
-     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
- 
-@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t *
-     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
-            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
-     {
--        avcodec_get_frame_defaults( p_sys->frame );
-+        av_frame_unref( p_sys->frame );
-         if( p_sys->b_variable )
-             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
-         else
-Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c
-+++ vlc-2.2.4/modules/codec/avcodec/vaapi.c
-@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod
-         return err;
- 
-     /* Only VLD supported */
--    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
-+    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
-     p_va->setup = Setup;
-     p_va->get = Get;
-     p_va->release = Release;
-Index: vlc-2.2.4/modules/codec/avcodec/video.c
-===================================================================
---- vlc-2.2.4.orig/modules/codec/avcodec/video.c
-+++ vlc-2.2.4/modules/codec/avcodec/video.c
-@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC
- static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
- static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
- #endif
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *,
--                                          const enum PixelFormat * );
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *,
-+                                          const enum AVPixelFormat * );
- 
- static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
- {
-@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     p_sys->p_codec = p_codec;
-     p_sys->i_codec_id = i_codec_id;
-     p_sys->psz_namecodec = psz_namecodec;
--    p_sys->p_ff_pic = avcodec_alloc_frame();
-+    p_sys->p_ff_pic = av_frame_alloc();
-     p_sys->b_delayed_open = true;
-     p_sys->p_va = NULL;
-     vlc_sem_init( &p_sys->sem_mt, 0 );
-@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
-     if( ffmpeg_OpenCodec( p_dec ) < 0 )
-     {
-         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
-         vlc_sem_destroy( &p_sys->sem_mt );
-         free( p_sys );
-         return VLC_EGENERIC;
-@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
-     wait_mt( p_sys );
- 
-     if( p_sys->p_ff_pic )
--        avcodec_free_frame( &p_sys->p_ff_pic );
-+        av_frame_free( &p_sys->p_ff_pic );
- 
-     if( p_sys->p_va )
-         vlc_va_Delete( p_sys->p_va );
-@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru
- }
- #endif
- 
--static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
--                                          const enum PixelFormat *pi_fmt )
-+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
-+                                          const enum AVPixelFormat *pi_fmt )
- {
-     decoder_t *p_dec = p_context->opaque;
-     decoder_sys_t *p_sys = p_dec->p_sys;
diff --git a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch b/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
deleted file mode 100644
index 218af58281fa..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b8869f97ea66ac7ec9912a74c2e8b5e15daf7752
-Author: Rafaël Carré <funman@videolan.org>
-Date:   Fri Feb 26 00:36:26 2016 +0000
-
-    Relax requirements for FFmpeg hwaccel
-    
-    It doesn't error out anymore since 5edd1f62ca1
-
-Index: vlc-2.2.4/configure.ac
-===================================================================
---- vlc-2.2.4.orig/configure.ac
-+++ vlc-2.2.4/configure.ac
-@@ -2383,7 +2383,9 @@ AS_IF([test "${have_vaapi}" = "yes" -a "
-   case "${avfork}" in
-     ffmpeg)
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
-+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+          AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+        ])
-       ])
-       ;;
-   esac
-@@ -2417,7 +2419,9 @@ AS_IF([test "${enable_dxva2}" != "no"],
-     case "${avfork}" in
-       ffmpeg)
-         PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
-+          PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+            AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+          ])
-         ])
-         ;;
-     esac
-@@ -3181,7 +3185,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "
-     libav) av_vdpau_ver="55.26.0" ;;
-     ffmpeg) av_vdpau_ver="55.42.100"
-       PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
--        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
-+        PKG_CHECK_EXISTS([libavcodec <= 57.12.100], [
-+          AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or > 57.12 or libav.])
-+        ])
-       ])
-       ;;
-   esac
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
deleted file mode 100644
index 2e8064446d05..000000000000
--- a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
-
---- a/src/input/decoder.c
-+++ b/src/input/decoder.c
-@@ -1162,7 +1162,10 @@
-         b_paused = p_owner->b_paused;
- 
-         if (!p_audio)
-+        {
-+            vlc_mutex_unlock( &p_owner->lock );
-             break;
-+        }
- 
-         /* */
-         int i_rate = INPUT_RATE_DEFAULT;
-@@ -1180,6 +1183,9 @@
- 
-         if( unlikely(p_owner->b_paused != b_paused) )
-             continue; /* race with input thread? retry... */
-+
-+        vlc_mutex_unlock( &p_owner->lock );
-+
-         if( p_aout == NULL )
-             b_reject = true;
- 
-@@ -1199,7 +1205,6 @@
- 
-         break;
-     }
--    vlc_mutex_unlock( &p_owner->lock );
- }
- 
- static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
- 
diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch b/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
deleted file mode 100644
index 57b66685ede0..000000000000
--- a/media-video/vlc/files/vlc-2.2.8-libupnp-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f9c5a343f1a8cad9c2c153f9c05e4e7201675a43 Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Wed, 29 Nov 2017 10:45:04 -0500
-Subject: [PATCH] upnp: don't clash with libupnp's own compat code
-
-Fixes build for upnp >= 1.6.23 and less than 1.8.
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
- modules/services_discovery/upnp.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
-index bdd3c55ee5..82d43632f4 100644
---- a/modules/services_discovery/upnp.cpp
-+++ b/modules/services_discovery/upnp.cpp
-@@ -38,7 +38,7 @@
- #include <set>
- #include <string>
- 
--#if UPNP_VERSION < 10800
-+#if UPNP_VERSION < 10623
- /*
-  * Compat functions and typedefs for libupnp prior to 1.8
-  */
--- 
-2.11.0
-
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 1ce2f06bd571..63d4baba876d 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -9,27 +9,19 @@
 		<flag name="aom">Enable experimental support for AV1 codec</flag>
 		<flag name="archive">Enable support for libarchive stream extractor</flag>
 		<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
-		<flag name="atmo">Enable support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
-		<flag name="audioqueue">Enable AudioQueue audio module for Mac OS X</flag>
-		<flag name="avcodec">Enable libavcodec support for video/audio encoding/decoding. libavcodec is part of FFmpeg</flag>
-		<flag name="avformat">Enable libformat support for reading and writing various media containers. libavformat is part of FFmpeg</flag>
 		<flag name="bluray">Enable libbluray for Blu-ray disc support</flag>
 		<flag name="chromaprint">Enable libchromaprint for Chromaprint based audio fingerprinter support</flag>
 		<flag name="chromecast">Enable experimental support for Google Chromecast</flag>
 		<flag name="dc1394">Enable IIDC cameras support</flag>
-		<flag name="directx">Enable Win32 DirectX support</flag>
+		<flag name="directx">Enable Win32 DirectX, D3D11va and DxVA2 support</flag>
 		<flag name="dvbpsi">Enable support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg></flag>
-		<flag name="dxva2">Enable Win32 DxVA2 support</flag>
 		<flag name="encode">Enable streaming-output support and videolan manager to control multiple streams from within one instance</flag>
 		<flag name="faad">Enable AAC audio decoding library support via media-libs/faad2</flag>
 		<flag name="fdk">Enable the Fraunhofer AAC codec library</flag>
 		<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis (with external sound fonts)</flag>
 		<flag name="gcrypt">Enable cryptography support via libgcrypt</flag>
 		<flag name="gme">Enable support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats</flag>
-		<flag name="gnome">Adds support for GNOME's filesystem abstraction layer, <pkg>gnome-base/gnome-vfs</pkg>. This flag is not GUI-related</flag>
-		<flag name="growl">Enable growl notification support (over UDP for remote access and native on OSX)</flag>
 		<flag name="gstreamer">Enable GStreamer based decoding support (currently supports only video decoding)</flag>
-		<flag name="httpd">Enable a web based interface for vlc</flag>
 		<flag name="kate">Adds support for Ogg Kate subtitles via libkate</flag>
 		<flag name="kms">Enable kernel mode setting video output plugin via <pkg>x11-libs/libdrm</pkg></flag>
 		<flag name="libtar">Uses libtar instead of the built-in tar reader for reading custom skins</flag>
@@ -37,10 +29,7 @@
 		<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
 		<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag>
 		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag>
-		<flag name="macosx-dialog-provider">Enable Mac OS X dialog module</flag>
-		<flag name="macosx-eyetv">Enable Mac OS X EyeTV (TNT Tuner) module</flag>
 		<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag>
-		<flag name="macosx-quartztext">Enable Mac OS X quartz text module</flag>
 		<flag name="macosx-qtkit">Enable Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module</flag>
 		<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
 		<flag name="mpeg">Add libmpeg2 support for mpeg-1 and mpeg-2 video streams</flag>
@@ -61,17 +50,13 @@
 		<flag name="skins">Enable support for the skins2 interface</flag>
 		<flag name="soxr">Enable SoX Resampler support via <pkg>media-libs/soxr</pkg></flag>
 		<flag name="srt">Enable support for Secure Reliable Transport (SRT) via <pkg>net-libs/srt</pkg></flag>
-		<flag name="swscale">Enable image scaling and conversion via libswscale (part of FFmpeg)</flag>
 		<flag name="tremor">Enable tremor, a fixed-point version of the Ogg Vorbis decoder</flag>
 		<flag name="twolame">Enable twolame support (MPEG Audio Layer 2 encoder)</flag>
 		<flag name="upnp">Enable support for the Intel SDK stack based UPnP discovery module instead of CyberLink</flag>
-		<flag name="vcdx">Enable VCD with navigation via libvcdinfo (depends on cdio)</flag>
-		<flag name="vlm">New videolan (media) manager (vlm), a little manager designed to launch and manage multiple streams from within one instance of VLC</flag>
 		<flag name="vpx">Enable the decoder(s) from the WebM VP8 / VP9 Codec SDK</flag>
 		<flag name="wma-fixed">Enable fixed point WMA decoder</flag>
-		<flag name="X">Enable support for, e.g., fullscreen mode via the X Window System. By itself, this flag does not build a graphical interface</flag>
+		<flag name="X">Enable support for e.g. fullscreen mode via X and the X C-language binding. It does not build a graphical interface</flag>
 		<flag name="x265">Support X265 Encoder</flag>
-		<flag name="xcb">Support the X C-language Binding, a replacement for Xlib; !!! you will need this option to be able to integrate video in the Qt interface, see bug #500678</flag>
 		<flag name="zeroconf">Enable support for zero-configuration networking via avahi</flag>
 		<flag name="zvbi">Enable support for teletext subtitles via the zvbi library</flag>
 	</use>
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
deleted file mode 100644
index df48927b371c..000000000000
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,480 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	SCM="git-r3"
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
-	cddb chromaprint dbus dc1394 debug directx dts dvb +dvbpsi dvd dxva2
-	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
-	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
-	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
-	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
-	+qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
-	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
-	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi
-"
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt5? ( X )
-	sdl? ( X )
-	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-RDEPEND="
-	dev-libs/libgpg-error:0
-	net-dns/libidn:0
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.3:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
-	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	dts? ( >=media-libs/libdca-0.0.5:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
-	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
-	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
-	gme? ( media-libs/game-music-emu:0 )
-	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
-	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
-	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
-	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
-	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl? ( >=media-libs/libsdl-1.2.10:0
-		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
-	sid? ( media-libs/libsidplay:2 )
-	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
-	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
-	swscale? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-	tremor? ( media-libs/tremor:0 )
-	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 ) )
-	twolame? ( media-sound/twolame:0 )
-	udev? ( >=virtual/udev-142:0 )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? (
-		x11-libs/libva:0=[X,drm]
-		!libav? ( media-video/ffmpeg:0=[vaapi] )
-		libav? ( media-video/libav:0=[vaapi] )
-	)
-	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-	vdpau? (
-		x11-libs/libvdpau:0
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-10:0= )
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
-	X? ( x11-libs/libX11:0 )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	# Fix build system mistake.
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
-	# Bug #541678
-	"${FILESDIR}"/qt4-select.patch
-
-	# Allow QT5.5 since Gentoo has a patched QTwidgets
-	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
-	# Bug #575072
-	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
-	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
-	# Bug #589396
-	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
-	# Bug #594126, #629294
-	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
-	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
-	# Bug #593460
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-
-	"${FILESDIR}"/${P}-libupnp-compat.patch
-
-	# Bug 590164
-	"${FILESDIR}"/${P}-freerdp-2.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		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.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
-	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	xdg_environment_reset # bug 608256
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	if use qt5 ; then
-		myconf+=" --enable-qt=5"
-	else
-		myconf+=" --disable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable gstreamer gst-decode) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable matroska mkv) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opengl glspectrum) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rdp freerdp) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable x265) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zeroconf bonjour) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-directfb \
-		--disable-gles1 \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal-codec \
-		--disable-mmal-vout \
-		--disable-opensles \
-		--disable-oss \
-		--disable-quicktime \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm /usr/$(get_libdir)/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.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index f446a7144305..be1767efa8e5 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
@@ -201,7 +201,13 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
-		dev-libs/wayland
+		|| (
+			>=dev-libs/wayland-1.15
+			(
+				<dev-libs/wayland-1.15
+				<media-libs/mesa-18.1.1-r1[egl]
+			)
+		)
 		dev-libs/wayland-protocols
 	)
 	X? (
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index ba1680c7e687..de11890d1bcd 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -202,7 +202,7 @@ RDEPEND="
 	vorbis? ( media-libs/libvorbis:0 )
 	vpx? ( media-libs/libvpx:0= )
 	wayland? (
-		dev-libs/wayland
+		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
 	)
 	X? (