gentoo resync 31.01.2019

18 files changed, 16 insertions, 635 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4f49f8b5b451..5a5a3778592e 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
index 66e7db440090..816cee2d2cb1 100644
--- a/media-video/dcpomatic/Manifest
+++ b/media-video/dcpomatic/Manifest
@@ -1,15 +1,8 @@
-AUX dcpomatic-2.10.2-imagemagick-7.patch 501 BLAKE2B 5a9ed8540f66d3e79cc61bd992f75de4f3dd767c05f3723619c801b0c1f27c1bce48e9c6c6e3c768c153e0bbe46aebe313f24f037d5f1cdd282ce06805a6d403 SHA512 77631bd3123f917a9227a56877492dd9b789aed3de428d3a37df927a43f8a9abd55c4151c36a761e17ab2214ddb9ca949b7f833e57fb488279a0ef0b5789a5a2
 AUX dcpomatic-2.10.2-respect-cxxflags.patch 485 BLAKE2B cc638635801f8a27c6c7e5589d18d4befca9d72d2deff405b3115f850fdf0c02a1f3e348cdc9dbb52f7d588c267857e30544442b2d4b49b5a779886cce881505 SHA512 2766294bb2168af647086e1a905f1114fd41e8be84f1577ef3ca3e3e831def8347e1d7ec22c0e432c5e3697e76f63d55480b72422921f6a4d39d205061274625
 AUX dcpomatic-2.8.0-desktop.patch 1081 BLAKE2B 71e55abdccc9f6b071c1cd01c4dad8275e22fb8d1eb9b660a17d15eb6f68baf6cd5032f190795789efe4176ba6164b1419683ddeb507b41afd345c5c39a30589 SHA512 f7fcd1e038dda2b056a03462d601180e6105a89dee0ff6c143958678622a14fb307e375a6a645c12acbe8041a106234af3dc462bbcbdd74a35ce44159ba0b651
 AUX dcpomatic-2.8.0-no-ldconfig.patch 241 BLAKE2B b6f2c202efbac7f746b9be8b31896fd4766e338557b92b90b1b197e31f5712498aed322fd5c79d3f9e57f12faeb634a5139db74d281a0f90beed1bd8eb3b220c SHA512 6fac6ec3cacbf40a1f86bd9a5d58a847a1b7bac63acd52a10c1c0cb334e40693d945dfd7e2593d8fde27a853006ac5021bda09208d19f71d613091ca4a7ace01
 AUX dcpomatic-2.8.0-wxGTK3.patch 506 BLAKE2B 7ed80077e3e0f493f5f39526eecd61ac754427152d8c9c97e536f5c2f8eb89b490d1f54b571a507a943690b6eb6b7df0b209c212d31328987709fdd5fff2732d SHA512 127694c416d4f0d50e4e793c2b4f5d4f4a19c92bf10f56602247e1aeefe7ce638745a8434723d8973e5c6a6f8bc9af5bca1a1d7113c459c6fd59f20f1b4d94d9
-DIST dcpomatic-2.10.2.tar.bz2 37503820 BLAKE2B b7efaedaf4b43a54e70dc60e836e283e52f327263dff075549b819c1708b7c9680b9f99e8d5eb37155520101de90145b37a487bb3edec80bf85bdbf9e6cfd578 SHA512 dc4fff96db31ee7645cdc9aac59b37a8dc37f2d77287c41bd4da4df074802a518d4b9c0e5143272d50d2dfee03d46b4ac761c0423b51b327185aae0510c0deb5
-DIST dcpomatic-2.10.5.tar.bz2 37500917 BLAKE2B d56d52d1ba01a1aae0840df28f0ed92408af98f7a47c1b71495b9220595c394920c49fb4cc65279b117636270a4cfb95b073cfa1684a00534eead9056953cd0e SHA512 0cce80bfb7b6cc830ff9935a16b0610a584628e8f45ad36401c6da6c13963e90a63d0213fff9b8277074b12f522bbe7286caf4cad9beceea77e05977e726ecf4
-DIST dcpomatic-2.11.7.tar.bz2 48225986 BLAKE2B 95c1be24e606e545f95a62827e3702893ea155fae5cf8d9947e4674c4779be36b2b295b4a308e8b8f9e3fb589c66d74826f00ed00f9bfd4c1cdceca366c87538 SHA512 06421edc41c32986add3266cf6674eb44f24d4899a391d4ec354840180a83531531bb965cad86b804aa054589a4cb7587988b334882610b5fc699ae6ca0484c3
 DIST dcpomatic-2.12.4.tar.bz2 177868575 BLAKE2B 5ace00aad6bfd44790841da380b45aa28577b058e11d2f7b6ef9d8611cf4c370054735ded599da210764fa1eed45d49bc1fb111862167998f2479251dc8cd308 SHA512 e7d16c603c7c1ae8ee489279b28a22ced74794c7974a67fb2f8ff1403f3f6041223b3c89eaf4f1ad1a56fb41dc0090c9176ded36e8fa2a8dbedba49a57d2ba82
-EBUILD dcpomatic-2.10.2.ebuild 2498 BLAKE2B b0435ed476541fcf5d33188840063f694dc96a1bd54b7daaafbb6dab17947d4925bbcea81ea602444e1dd0a87979b9bc93fb075f58e2c7d12e5ccf6eb51e7972 SHA512 ae3f4bcaf743a05af85086e250cd4abbea9c6321bc6c10a16c326ff88ab8a86049b626f0102667f902985796710843f99cc0cb7d5ca176d55f9ae3b64b48ddd4
-EBUILD dcpomatic-2.10.5.ebuild 2486 BLAKE2B 1d2e3ef1033bfb784d12c2484d8d962e7c9bf7e3c25d59c796e752d6b8a7ef40f0f488498bf36dd7e8e97442d421cf4561db40e62a9938da3be0be120a0d80d0 SHA512 79d0fd2d05e939f1f8938a1dbcdeb94f7a7d05401bab7fde9648d3a1d3fb42109355e606b75a8122dcaaeeb144eb1d5b3e083795a0ad7532939c31e11abe91ea
-EBUILD dcpomatic-2.11.7.ebuild 2808 BLAKE2B 84d7f675a00b32c590ab265e4ec1ce489e1cf4d4585f399cbe8daad144b827178475705021cd023421b44def04477dd32ecb413b0bca3145538c42a0672f4929 SHA512 11d1488679e5847cd3e846c133007971e79b58b4a69e0e44d7cf79974689141cb94da6c884560275ee566d1354d92811d0dddf25d370b63a3a6fec2c346823d5
 EBUILD dcpomatic-2.12.4.ebuild 2829 BLAKE2B ff8b93cd217e7ee8739b61d7c04f317a66e86099f33e19d78caffceefdf985f6167da35d72d14cd588b3e14c6bb7eb2af93757724e080f43306e194d61ff37ec SHA512 56ddd265247e9b095648aebd9d402424839b210bfb029a2ddea298731e966d67caff626840f4fd00f909fb36374b09bdb07b86dd72de84f756a14ef8d6e0aae3
 EBUILD dcpomatic-9999.ebuild 2829 BLAKE2B 8e7fb2e0d6d6e56525d05ea2658e1b14347d317408488156450b99abf4f7d5d4298eb2a33fe1860d3d54a2e631495bea78ec8c6b95d0dc925fa58a6b37321ea0 SHA512 504339fec5b4c9ea4a17044175f4e1b7a55733a38ed17086cf7a281fe36036cfa14ab49c4318aefbe8dad3d0ad669b8c5ec62d0935c37d102bfbdbb62ca3f391
 MISC metadata.xml 825 BLAKE2B bc4f168f5e2ef9efb6a2918929f3943fbbf1b7924f6515d136d660fec6a0bf4219111015bdb876857fbab7792da92b285f290b1c137562a01c38d00d2ea976cf SHA512 f9412a388e2f3af8be5c501db7105861dd9ec2670b461e99e7c0401846fb9cbe9fd0aeaff343212e8a83631f348182b0371079bf8a29914c68c02bdc4901ee95
diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
deleted file mode 100644
index beaa2a871645..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gtk"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>=media-libs/libdcp-1.4.1:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild b/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
deleted file mode 100644
index d10c7ec57aef..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+gtk"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>=media-libs/libdcp-1.4.1:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild b/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
deleted file mode 100644
index d3619999bcf1..000000000000
--- a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
-PYTHON_REQ_USE="threads(+)"
-inherit python-any-r1 waf-utils wxwidgets
-
-DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
-HOMEPAGE="https://dcpomatic.com/"
-SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+alsa +gtk jack pulseaudio"
-
-REQUIRED_USE="^^ ( alsa jack pulseaudio )"
-
-RDEPEND="dev-cpp/cairomm
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-libs/boost
-	dev-libs/glib:2
-	dev-libs/icu
-	dev-libs/libcxml
-	dev-libs/libzip
-	dev-libs/openssl:0
-	|| ( media-gfx/graphicsmagick media-gfx/imagemagick )
-	media-libs/fontconfig:1.0
-	>media-libs/libdcp-1.4.4:1.0
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/libsub-1.2.1:1.0
-	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
-	>=media-video/ffmpeg-3:=
-	net-libs/libssh
-	net-misc/curl
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/wxGTK:3.0 )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/waf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
-	"${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-2.8.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
-	)
-
-src_prepare() {
-	rm -v waf
-	export WAF_BINARY=${EROOT}usr/bin/waf
-	if [ -z "${PYTHONPATH}" ] ; then
-		export PYTHONPATH="${S}"
-	else
-		export PYTHONPATH="${S}:${PYTHONPATH}"
-	fi
-
-	ewarn "Some tests failing due missing files/certs are disabled."
-	sed \
-		-e '/4k_test.cc/d' \
-		-e '/audio_analysis_test.cc/d' \
-		-e '/audio_decoder_test.cc/d' \
-		-e '/audio_processor_test.cc/d' \
-		-e '/black_fill_test.cc/d' \
-		-e '/client_server_test.cc/d' \
-		-e '/dcp_subtitle_test.cc/d' \
-		-e '/ffmpeg_decoder_sequential_test.cc/d' \
-		-e '/file_naming_test.cc/d' \
-		-e '/import_dcp_test.cc/d' \
-		-e '/interrupt_encoder_test.cc/d' \
-		-e '/j2k_bandwidth_test.cc/d' \
-		-e '/recover_test.cc/d' \
-		-e '/reels_test.cc/d' \
-		-e '/render_subtitles_test.cc/d' \
-		-e '/repeat_frame_test.cc/d' \
-		-e '/scaling_test.cc/d' \
-		-e '/skip_frame_test.cc/d' \
-		-e '/srt_subtitle_test.cc/d' \
-		-e '/ssa_subtitle_test.cc/d' \
-		-e '/vf_test.cc/d' \
-		-e '/video_mxf_content_test.cc/d' \
-        -e '/film_metadata_test.cc/d' \
-		-i test/wscript || die
-
-	if has_version ">media-gfx/imagemagick-7" ; then
-		epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
-	fi
-
-	if use alsa ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
-			-i src/wx/wx_util.h || die
-	elif use jack ; then
-		sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
-			-i src/wx/wx_util.h || die
-	fi
-
-	default
-}
-
-src_configure() {
-	waf-utils_src_configure $(usex gtk "" "--disable-gui")
-}
-
-src_test() {
-	./run/tests || die
-}
diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
deleted file mode 100644
index 2e4e9e8838ef..000000000000
--- a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- dcpomatic-2.10.2/src/lib/environment_info.cc
-+++ dcpomatic-2.10.2/src/lib/environment_info.cc
-@@ -25,12 +25,13 @@
- #include <dcp/version.h>
- #include <libssh/libssh.h>
- #ifdef DCPOMATIC_IMAGE_MAGICK
--#include <magick/MagickCore.h>
-+#include <MagickCore/MagickCore.h>
-+#include <MagickCore/version.h>
- #else
- #include <magick/common.h>
- #include <magick/magick_config.h>
--#endif
- #include <magick/version.h>
-+#endif
- extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index c33d8368efb1..2b85590b87e8 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,13 +1,8 @@
-AUX 110_all_implicitdecls.patch 1048 BLAKE2B a3be6992cd5aff8d99aad583a4c6fae8f0df754d00dc14e46c1c95a192fbf0ab4716132e74957533c30bff7fd896359c151745393c45f94a8a696c127ba53e97 SHA512 cbd949b72bbe708decd7f4d24c2e1f9fbfda658fd6b355f11bc20b19ebf583e74eebb8ffc3c5b9945619efe4022123638fa243abaf07841d41101f62ad51e5ee
 AUX ffmpeg4.patch 1832 BLAKE2B 1770e99dacc641b066d79b83ad145631a1cbe0330e5bcf938b7f6b12bbf648de4185c09ef0fd0cc86e3dd257f1e99f194ab2c5cc5e1125b1c48ed24d413656ab SHA512 81d2f029f0b07e3e32a28a0a9fd6c35ea278d671a6173a58ddb7825b8eb38307d4be58e8dcfb3ca9bb19441964111438fa0b850033ec3f1cc69408b7e9bc9a66
-AUX gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch 542 BLAKE2B 31a9898e8a9741833acacdfa40db23b252a7c4de8491d7c9b80ed700499e11c078205889e402aa415a9e718cfa72783ac40ecc9956dc2e86db45cd5d90964fdc SHA512 65746044b1a8f2125b5113f4ec1ffa2c46b53f1927202c38130431e53875483ac834444e6e5ea1e589176dba0139e9703b4fc61be038ac305234b53765ba16cd
-AUX gpac-0.5.3-static-libs.patch 2843 BLAKE2B 99b301f9e4e0e87d9d93763dc40daa2bc2c57cbac4e09de4e9e86baff98c5ad62e598d532ba843e3eef8e0445c5fe66b03be0e3ef42b54c6dd3a84cff975878f SHA512 aa130e8744124c8cf4d280b669a0e1d133f57e3637a1ab7f151610439d37366145e1aec28a07338118f1c19e5a81c5068dcda813e15787575953332040603d5c
 AUX gpac-0.7.1-configure.patch 2928 BLAKE2B 98ce3227f87c3c4576f5d4bc3a28d560ca3f8d7912414984c7ea58dd27c5717ce30f28b0508368b39fb5b19159e363892fecd0d60d137bd65a4c3d7e02a6d69f SHA512 f359693d43b3d033bc05c8af4951aff9cb432601421d888e50296c6164157b85be368ea4ae828e5229ae9344738bd49136d947ef0eb57bf545f80c3243c94046
 AUX gpac-0.7.1-openssl-1.1.patch 4037 BLAKE2B e03c781c54a78ae3b36aec5766b47a8bc1fafceccf03e04517bdf5756cc15214dc22fe3ee20a1deb1a68b4ead6b198fd30fac04bccb584fd2fda321e4ff2204e SHA512 1ffdde35f09e0ae8b037d00c0e57fabf402053acc46201ed3be791b16436bcdebd6c0ed232de45d40279891c06ddb9bf26a3a5093fd379850495808930f878bb
 AUX gpac-freetype.patch 622 BLAKE2B b27d2ae313ca95cd46280b56d42b631854995d5e283269ea2f059b6be8bb547949e6c241f62ec4692b7b31626898cf31874ee8e8462e6cc414353aa8b72965cf SHA512 8361efbe7fa8989d63a8de733094e2f9e0f7467d7bf437330477bcbc4091517619c925aef056a1ee57c3cc7b0f3e973abab5cb095a5a8444ff1b220bbb7a2dde
-DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
 DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
-EBUILD gpac-0.6.1-r2.ebuild 3211 BLAKE2B abcf08b642fec5182c653b186fc61a16b0f8be87bcad28cd7494c3a871cc9717c3d8e9cef51616a7a9b99ed61d9e12644f284ecf95d3fb9fb0f8462faa6667eb SHA512 2bfa94a7e2ccfb8953a505047bcbf2843218530d79b66a839dc2ee9c6d324914d37f673563a0bc71eca4fdd18ee720acdc30fe58d24efb8b347df6030afb75a5
-EBUILD gpac-0.7.1-r1.ebuild 3413 BLAKE2B a10347bed4a34cbab0f5565cd841140053f12db8a9adc2adaa4b6dd839ebc2cf82122b9acde57269b8137708494d7e216dd8478ecbaf227cdcfd8c75d8302333 SHA512 80c93f26bb891b83bf1e6026e0c1e148f7362b3547d6557e3a55aa14426f4c722e8552e6d67efee27b4f17337c9fb5a746cb68cfa7568e6ebc18fa1c628fad49
+EBUILD gpac-0.7.1-r1.ebuild 3412 BLAKE2B 93f5c9bcd17312d6b6ade841b034ca170e72a34a0e18da4d72e02273e3e2af8f99b73ee6d6e2da895437c6015e2dd9720d725347fd19ea5891f933298daf48a0 SHA512 7097bc7a7e299496834d2450fe73e58c079e12bbc85c9864fb4194fa96db9080e1ca96da5a1942928934ed89a55681b6cd206a048b1e7ddc3d663210af40cb1d
 EBUILD gpac-9999.ebuild 3181 BLAKE2B 8c51ec87f24e14deac39139aab5546585a7a84a1ecb80623237390b7189d519bcaccbc9481f64c225d50879cb586b20ee4f02af21f11ae746730ff6c269dbfd3 SHA512 af202c5d441454bc677c7b7e5dc0766530164465e1776b4f764fbe967d07c05fb0f8d3183af4e63a2c9f15988361bfc1b2286a1d8e703f191d992083ab1222e7
 MISC metadata.xml 356 BLAKE2B 02d021261f873991949e9d24bdd1f2791a93e033c6a350bd014bdc9d2fa32f733547d8f7b78733f010d95420e07d4d1c0dd63ac367757dcc505a4eb0801921bb SHA512 651073c0156c19eda006ee7622db5a127f1e2f747ed7e0cb141be1abca2084a1427ea82a888b335a68b056980b68a693f852b44d96bfe47f28cc985bf72dfac4
diff --git a/media-video/gpac/files/110_all_implicitdecls.patch b/media-video/gpac/files/110_all_implicitdecls.patch
deleted file mode 100644
index 71017b53b9eb..000000000000
--- a/media-video/gpac/files/110_all_implicitdecls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: gpac/applications/generators/SVG/svggen.h
-===================================================================
---- gpac.orig/applications/generators/SVG/svggen.h
-+++ gpac/applications/generators/SVG/svggen.h
-@@ -107,6 +107,17 @@ typedef struct {
- } SVGGenAttrGrp;
- 
- 
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generate_laser_tables_da(GF_List *atts);
-+void generate_laser_tables(GF_List *svg_elements);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
- 
- /*******************************************
-  * Structures needed for static allocation *
diff --git a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch b/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
deleted file mode 100644
index df3a5fc32990..000000000000
--- a/media-video/gpac/files/gpac-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Export gf_isom_set_pixel_aspect_ratio.
-media-video/x264-encoder needs it and this funcion used to be exported.
-
-diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
-index e935acc..9841d85 100644
---- a/src/isomedia/isom_write.c
-+++ b/src/isomedia/isom_write.c
-@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes
- 	}
- }
- 
-+GF_EXPORT
- GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
- {
- 	GF_Err e;
diff --git a/media-video/gpac/files/gpac-0.5.3-static-libs.patch b/media-video/gpac/files/gpac-0.5.3-static-libs.patch
deleted file mode 100644
index ec11eaea172a..000000000000
--- a/media-video/gpac/files/gpac-0.5.3-static-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 62b7850..ff4b589 100644
---- a/Makefile
-+++ b/Makefile
-@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
- 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
- endif
- 	mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
-+ifeq ($(STATICLIBS),yes)
- 	$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
-+endif
- 	$(MAKE) installdylib
- 
- uninstall-lib:
-diff --git a/configure b/configure
-index df00dff..561bcd3 100755
---- a/configure
-+++ b/configure
-@@ -101,6 +101,7 @@ has_xmlrpc="no"
- has_openjpeg="no"
- gprof_build="no"
- static_build="no"
-+static_libs="no"
- want_pic="no"
- want_gcov="no"
- has_joystick="no"
-@@ -252,6 +253,7 @@ GPAC configuration options:
-   --enable-amr-wb          enable AMR WB library
-   --enable-amr             enable both AMR NB and WB libraries
-   --enable-static-bin      link statically against libgpac
-+  --enable-static-lib      GPAC static libraries build
-   --static-mp4box          configure for static linking of MP4Box only.
-   --enable-depth           enables depth handling in the compositor
- 
-@@ -1849,6 +1851,8 @@ for opt do
-             ;;
-         --enable-static-bin) static_build="yes";
-             ;;
-+        --enable-static-lib) static_libs="yes";
-+            ;;
-         --disable-ipv6) has_ipv6="no"
-             ;;
-         --disable-wx) has_wx="no"
-@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
- echo "debug version: $debuginfo"
- echo "GProf enabled: $gprof_build"
- echo "Static build enabled: $static_build"
-+echo "Static libs build enabled: $static_libs"
- echo "Memory tracking enabled: $use_memory_tracking"
- echo "Fixed-Point Version: $use_fixed_point"
- echo "IPV6 Support: $has_ipv6"
-@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
- echo "GPROFBUILD=$gprof_build" >> config.mak
- echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
- echo "STATICBUILD=$static_build" >> config.mak
-+echo "STATICLIBS=$static_libs" >> config.mak
- 
- echo "CONFIG_IPV6=$has_ipv6" >> config.mak
- if test "$has_ipv6" = "yes" ; then
-diff --git a/src/Makefile b/src/Makefile
-index ba9d9ab..89ea67f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
- 	@echo "LIBS $(EXTRALIBS)"
- 
- ifeq ($(CONFIG_DARWIN),yes)
--
-+ifeq ($(STATICLIBS),yes)
- 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
- endif
- 
- else
- 
-+ifeq ($(STATICLIBS),yes)
- 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	$(RANLIB) ../bin/gcc/libgpac_static.a
-+endif
- ifneq ($(STATICBUILD),yes)
- 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)	
- 	mv $@ $@.$(VERSION_SONAME)
diff --git a/media-video/gpac/gpac-0.6.1-r2.ebuild b/media-video/gpac/gpac-0.6.1-r2.ebuild
deleted file mode 100644
index 86e1355ce3fd..000000000000
--- a/media-video/gpac/gpac-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999 ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/gpac/gpac"
-else
-	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-
-inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
-
-DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
-HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
-	pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
-
-RDEPEND="
-	a52? ( media-libs/a52dec )
-	aac? ( >=media-libs/faad2-2.0 )
-	alsa? ( media-libs/alsa-lib )
-	dvb? ( media-tv/linuxtv-dvb-apps )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= ) )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	mad? ( >=media-libs/libmad-0.15.1b )
-	opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
-	>=media-libs/libogg-1.1
-	png? ( >=media-libs/libpng-1.4:0= )
-	vorbis? ( >=media-libs/libvorbis-1.1 )
-	theora? ( media-libs/libtheora )
-	truetype? ( >=media-libs/freetype-2.1.4:2 )
-	xml? ( >=dev-libs/libxml2-2.6.0:2 )
-	xvid? ( >=media-libs/xvid-1.0.1 )
-	sdl? ( media-libs/libsdl )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= ) )
-	pulseaudio? ( media-sound/pulseaudio )
-	X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-	)
-"
-# disabled upstream, see applications/Makefile
-# wxwidgets? ( =x11-libs/wxGTK-2.8* )
-DEPEND="${RDEPEND}"
-
-my_use() {
-	local flag="$1" pflag="${2:-$1}"
-	if use ${flag}; then
-		echo "--use-${pflag}=system"
-	else
-		echo "--use-${pflag}=no"
-	fi
-}
-
-src_prepare() {
-	default
-	eapply	"${FILESDIR}"/110_all_implicitdecls.patch \
-		"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
-		"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
-	sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	econf \
-		--enable-svg \
-		--enable-pic \
-		--disable-amr \
-		--use-js=no \
-		--use-ogg=system \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable jack jack yes) \
-		$(use_enable opengl 3d) \
-		$(use_enable oss oss-audio) \
-		$(use_enable pulseaudio pulseaudio yes) \
-		$(use_enable sdl) \
-		$(use_enable ssl) \
-		$(use_enable static-libs static-lib) \
-		$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
-		--disable-wx \
-		$(my_use a52) \
-		$(my_use aac faad) \
-		$(my_use dvb dvbx) \
-		$(my_use ffmpeg) \
-		$(my_use jpeg) \
-		$(my_use jpeg2k openjpeg) \
-		$(my_use mad) \
-		$(my_use png) \
-		$(my_use theora) \
-		$(my_use truetype ft) \
-		$(my_use vorbis) \
-		$(my_use xvid) \
-		--extra-cflags="${CFLAGS}" \
-		--cc="$(tc-getCC)" \
-		--libdir="/$(get_libdir)" \
-		--verbose
-}
-
-src_install() {
-	emake STRIP="true" DESTDIR="${D}" install
-	emake STRIP="true" DESTDIR="${D}" install-lib
-	dodoc AUTHORS BUGS Changelog README.md TODO
-	dodoc doc/*.txt
-	dohtml doc/*.html
-}
diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 470e9607ff77..ff65e99eef40 100644
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpac/gpac"
 else
 	SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 inherit flag-o-matic toolchain-funcs ${SCM}
diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index a5b1b496ec2c..cf4b095d7477 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,5 +1,4 @@
 AUX imagination-3.0-cflags.patch 834 BLAKE2B 7f3a995282a4e6fb0c505a6ad6fd1cb813a550c3a43ac131498ab38487a9c286b19518898f87cd11b51bf846a409ce15890c08b4cd466fe76f76f83e89d4bf38 SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369
 DIST imagination-3.0.tar.gz 3327784 BLAKE2B 0322a68ab6c44e2b0d47bb89de6522249ca3507808ee3733f2f195923c4269591c2225271ef27b24c648cb6784a5c85bd6ca97142072e52641bdf7f80b9a9bc7 SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8
 EBUILD imagination-3.0-r1.ebuild 877 BLAKE2B aba9416246dd074a8d0f3266e1e5c3813209d8902ed4a133b92bce3b6ac2ffc55b90418e79fe7c06680edb07a8f6af1c5221cffd9d49506873e35fc47c12d2a3 SHA512 bd905ef216979793e05121bb0fefff215d1e25cfffb8bfffcb13e255ef31e410bc912f0f92b12a8c39c8dcf89781eca5e1fb8751d28b57ef0d828bf8c140f952
-EBUILD imagination-3.0.ebuild 599 BLAKE2B fa3bb9d25c6442167bea271a3cb4010ac1b0dcfa9f1630a45fe99e791aadf4d7c55d66a8fb9acbef2077b50ac6ad7d60fc1b7311b68b5a1ef02e0a0ba14011fd SHA512 1cbcb1e2e7705992962c22b5780983ec8a1812d4122d3911fd24e656b1b93b5b87440354142ca60849dcdf1e67c14daedb6d86eb8ebe123b15ff978010356718
 MISC metadata.xml 248 BLAKE2B 3ab98ae1a4ef9f5b48116280f559a78a05aff568f1464a23c3ffd8c25e0f788481c046c094d2b76a8cb8e9198c1caadc4234efcda268ec4517d53f4d86df9838 SHA512 edb9d1136a99fbf3a5340bcd6957639bbd0b75a8772a319f60ce6505404cacd90d4fc6aabd06c3529c87f7471a3dce7f96a6e11b2fe1a6c6913164bad7ac04fd
diff --git a/media-video/imagination/imagination-3.0.ebuild b/media-video/imagination/imagination-3.0.ebuild
deleted file mode 100644
index ab89012a58b7..000000000000
--- a/media-video/imagination/imagination-3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils
-
-DESCRIPTION="Simple DVD slideshow maker"
-HOMEPAGE="http://imagination.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="x11-libs/gtk+:2
-	media-sound/sox"
-RDEPEND="${DEPEND}
-	virtual/ffmpeg"
-
-LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	doicon icons/48x48/${PN}.png
-}
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5d2294e8d872..11d24b529dce 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,7 +6,7 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f SHA512 7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 EBUILD vlc-3.0.4.ebuild 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d
-EBUILD vlc-3.0.6.ebuild 13449 BLAKE2B 5cb15a244371750ad391322cdd20dc0bda48657c191341bf0a977763c4f72e89ef00566f125b33344880c1139b607bbf9ce66a2ece786ed2af0f6df0730a4d43 SHA512 4b4b4990f6473cd8d1f0337c833316b240c0e3c68ca954109bfdc33361039a8b3306d6767bc9d5ac33a72faa891b80b776e09f3ff5743633a8aabbc428926996
-EBUILD vlc-3.0.9999.ebuild 13442 BLAKE2B d3c9a30af6e4ed8bab1e7ce601c3c6660405196192a7feb18a8d3e254ebb41b1aab3a7d3e092d6d83ec6e006d8ece235c7ac19c9bb866c713d9329cbe99e2f4b SHA512 a407ea8b98ce3ac828c266c3c8712370609e018df9e46622a23fa90fa1032beb73bc51450f087a35dc269f9765a4111241f1678315d62d44647318b714b135de
-EBUILD vlc-9999.ebuild 13425 BLAKE2B 50b812df40511e99bc3c571b267dada553451054f115425b03f2c1d28148d2fd3c3c855c1f6742103a6cd96c2a5767be0c1a78ff9c42004aabd4b10549bf87cd SHA512 ccae9000dc217220a654e88eedb0e78de8bc86aec8e602b97a0b7bf50a09a08cc94f8227a318fc287584fc7b9b2b5354c5a1ba6c3e204f8aebbaa7e5bc760175
+EBUILD vlc-3.0.6.ebuild 13341 BLAKE2B 73eb7be9ac9845e6b830bc5f36f2df10e75f9f27f4576cf22e47d278cdf6ad220a89e5cafee8eab8b14be60c8cab48e00c34f1aa43b5d90cdac559b17116dc29 SHA512 256446b09df7cd825326ab1514257c50c48148240ff469b3bfc447e7c77996d5387265b7e57c02d1adba2b7709d3f6dbea871882e55812d200a4763acf28c3a4
+EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B f1e84c3e0769bc0a36065811157681f4cde626f1d3092af4d090fdf4acdf6c55949695b3f0b34344c5dcc2a199cdf115543053c6bae5982920c692e380f72b16 SHA512 f85c281514e2b6174b63de0ec6aa376f326af150eadfdf67bcb1eb324679824acdee93cca9d12c1b444428e83d372567dea69c7f9691d328756908b2a2fd8fec
+EBUILD vlc-9999.ebuild 13471 BLAKE2B 8d838fb84ad28a8d49f5e7fad00e528d064b12b1de0b468f7988f10ce2a5f402af7b81566a63f3149c4118b7bd3732c33deaf0838c98840d020c3f93fd05f19a SHA512 97a293758e636c5d3efdc41e92b54605f93df4d34264e9cb46049da72591c967a07779956d0fd97c1eeb65eb781811ae8792ea21e2381e45e322817afaa1c743
 MISC metadata.xml 5061 BLAKE2B 88d5027fa2a50db6a100bcb7cb6755ba56e056fc9cbb7d031e8c65d506082914421aa7b88809f07b34969388216f6fa402d045b48cb2919e6d61696eef76a1c7 SHA512 0ad4e4ba9d609ee349adf68d959629a7979757652fb841ce12e23a712d2f08a555211c5a5ac1f2f9b12acca307de19fbc04b9bccef402018a371892ffd9b7967
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild
index 77c3ccca2221..93c5c8b00a07 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="10bit a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
+IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast
 	dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
@@ -212,7 +212,7 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? ( >=media-libs/x264-0.0.20160712:0= )
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )
@@ -416,15 +416,10 @@ src_configure() {
 		--disable-spatialaudio
 		--disable-vsxu
 		--disable-wasapi
+		--disable-x26410b
 	)
 	# ^ We don't have these disabled libraries in the Portage tree yet.
 
-	if use x264; then
-		myeconfargs+=( $(use_enable 10bit x26410b) )
-	else
-		myeconfargs+=( --disable-x26410b )
-	fi
-
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a42a129f841e..ebea92479e02 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -212,7 +212,10 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? (
+		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
+		10bit? ( >=media-libs/x264-9999:0= )
+	)
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a2dda47b1dd8..7246c78556aa 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -215,7 +215,10 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? ( >=media-libs/x264-0.0.20160712:0=[10bit?] )
+	x264? (
+		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
+		10bit? ( >=media-libs/x264-9999:0= )
+	)
 	x265? ( media-libs/x265:0= )
 	xml? ( dev-libs/libxml2:2 )
 	zeroconf? ( net-dns/avahi:0[dbus] )