gentoo resync : 19.03.2019

6 files changed, 5 insertions, 512 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 548f80cd957e..b531debe7a6f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,15 +1,12 @@
 AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a7fa4dec9891f718816e44fd08970a5477cdc7ae34510b26af9971fe5d20b25c96595901117c804c7679341e1e8cd5309a14 SHA512 6c25995a518aeb1d501fa217d897962e1e81f66a4f28b6bb164dde3afe7f91772bb608f946d802857fa9a272cab1f88d3990d582be89ab8e37b1a8b6681798ae
-AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-3.0.6-libav.patch 547 BLAKE2B bff54855b61b7bc29fe50203a08c19b04d037e21f8ef337e6ea78eaad8a655e5e2f8fc38278536335e52adc8d8017ea4b2e9ab1fb716ff58c58e972dfac5b45e SHA512 2b5fb815e3d91971a3566830d24abcab27d7aed9b176212166e7806b99c4387727ae912707ad2d21346c90e84b1d489b0e458c7c3053f8dc40f5f4a55e563be9
 AUX vlc-3.0.6-libvpx-1.8.0.patch 1147 BLAKE2B b12fa40a02dcc5d6ba319b773cb4bcfa521b51a85b8d9a8288c46d059d79f6656cd7958c3003662a9c90599812dc7320781589c554ce2bf44c93c665297f6955 SHA512 bb57ec249174af38b657e2d48728de32998b74a58df3bbcaa17bf5c48338256370066247b278341e92a3116d0f56310cdea6d521c11c3380d39827449056ade3
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
-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 13153 BLAKE2B 19afd631bdbc5ec35e6a3684fd767e3530c598da299a08826c4502956b093d38b49dba2b9667095a108044501967708e0e28939750a940e31f9b6878e3f208da SHA512 990a9bad72762e3f692901f3729df394473392d0929f23f5914838863fa096cfbf8ca48e9c2e57a9df708f11c5954be6ed1d799a5d729ca2333d19ea135515c2
-EBUILD vlc-3.0.6-r1.ebuild 13329 BLAKE2B aed7c68f1192ecbce79c08a2baae396c66388ca839679db47b47785d357eb028b7f6e55ca93099a626d31375852b315d9ac91e93e9fbf0bae4de7ff0bde58823 SHA512 2ad9048a04e93f0043530daefc4a6f63ad2de92eae4c5afcb10d6f489b3731af76b0553c8778766cb6a7f7757c1ddcea14ba014a69e7f795ede5f761a3805fac
-EBUILD vlc-3.0.9999.ebuild 13072 BLAKE2B c4c50147f95acfa560900430bd8bd044830bc65807084a44224b9523a79aa33078f80f9eadb34ab55d77f25f94da39b11426b81c834f4137633053d8bd0fa0b6 SHA512 6c6ea778f55099774d5013d5f049b15c0eaf0c3adf42a065bcd38e87d12f783f566b41e4f3a2344a13a9008fb2a40742ce446f25714dd20f3e54b31135c8779a
-EBUILD vlc-9999.ebuild 13055 BLAKE2B 06d65e18aff729d603e062339034f07baff1c50947abb91de8ca1c26642e0a93adb28cf827b7f3d0ad43248b0990528b21fe9e0ec7fc5e2c81b35c0ed1a64e20 SHA512 0564d67413b5b99477379017d8384e3b44b67d7d63719c430843d9cd09eaa0f882c7c4923a8530628bb856e339f9633f11c54485e45c47323ab054686b4c6654
+EBUILD vlc-3.0.6-r1.ebuild 13270 BLAKE2B da642145add84223d0e095c36b5769813289a8741f1b2b5e992fd5b58c60e8d76999e315ad4ecbd83272a71921b0a04369f651298a5e4679cfdf67ca3ff999bb SHA512 a5c3e1a637d54f18fa22cfcaa8bdd4f4de2a2551894aa078089c8b6f2f8dbce0ebcb35e7460593913090f91fdebaf448799e2eed3018b3f42521954ea03f05c1
+EBUILD vlc-3.0.9999.ebuild 13014 BLAKE2B cefc6ab4fac4902ee210f26f4b4bd7919c61e1764c25824d20b40b90c46d7ec2e4da4ebc41f41b021f2fdd39488bb129b11c00787e740e4a9a724b8a8bbf23ba SHA512 41bcedf86ca854268e6328afc7532e353b405e7dbff39449ec4558d8755e9c14ed2fb6398c8b393128b9271480ef43559c55258a797a783ad89d76ed551d6064
+EBUILD vlc-9999.ebuild 12998 BLAKE2B 9cc1400f50f3be3f50a45ee6b87a1f4e4f286b52c15e08e34008d8ea05d0eab9b6c12a53ce11559244fe49b51680d2a3af37d32e9b6d02bbb7d704e5bb3045e8 SHA512 dc001948da9bbc1685418c31c8a510a767567a0fb40db76a91f3b532a4e18c3d73542ac07625024d2f73c2abb4113562b8b6f474438985dfefc32fdc711ddf6f
 MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
diff --git a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
deleted file mode 100644
index 932223632d73..000000000000
--- a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/codec/avcodec/audio.c	2016-09-10 13:46:51.066453337 -0700
-+++ a/modules/codec/avcodec/audio.c	2016-09-10 13:42:26.061451090 -0700
-@@ -38,6 +38,7 @@ 
- 
- #include <libavcodec/avcodec.h>
- #include <libavutil/mem.h>
-+#include <libavutil/channel_layout.h>
- 
- #include "avcodec.h"
- 
diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
deleted file mode 100644
index 16570f46d8fd..000000000000
--- a/media-video/vlc/vlc-3.0.4.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 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-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromecast 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
-	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
-	neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
-	rdp run-as-root samba sdl-image sftp shout sid skins soxr speex srt ssl
-	svg taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx
-	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	postproc? ( ffmpeg )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-RDEPEND="
-	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
-	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	aribsub? ( media-libs/aribb24 )
-	bidi? (
-		dev-libs/fribidi:0
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts:0
-	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
-	chromecast? (
-		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
-	)
-	dbus? ( sys-apps/dbus:0 )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
-	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
-	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
-	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-12.2:0=[vaapi?,vdpau?] )
-	)
-	flac? (
-		media-libs/flac:0
-		media-libs/libogg:0
-	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
-	)
-	gme? ( media-libs/game-music-emu:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394:0
-		sys-libs/libraw1394:0
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:0=
-	)
-	libcaca? ( media-libs/libcaca:0 )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify:0
-	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
-	)
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg:0 )
-	opencv? ( media-libs/opencv:0= )
-	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
-	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
-	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	sdl-image? ( media-libs/sdl-image:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
-	)
-	soxr? ( media-libs/soxr )
-	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
-	)
-	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo:0
-	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora: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:0 )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( net-libs/libvncserver:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( <media-libs/libvpx-1.8:0= )
-	wayland? (
-		>=dev-libs/wayland-1.15
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	amd64? ( dev-lang/yasm:* )
-	x86? ( dev-lang/yasm:* )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	has_version '>=net-libs/libupnp-1.8.0' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-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 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
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-aa
-		--disable-dependency-tracking
-		--disable-optimizations
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vcd
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable altivec)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable aribsub)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable chromecast microdns)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(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-notifications osx-notifications)
-		$(use_enable macosx-qtkit)
-		$(use_enable matroska)
-		$(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 omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable opencv)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable postproc)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable srt)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_enable wma-fixed)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-schroedinger
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-vsxu
-		--disable-wasapi
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# 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
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	# 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 bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--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
-
-	econf ${myeconfargs[@]}
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' 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" "/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.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 61aba8e45383..e53ae722722d 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-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 toolchain-funcs virtualx xdg
 
@@ -230,7 +230,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
 	"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 74f7c1d116ee..d76f7c6455ad 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -230,7 +230,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 )
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 060a5ca89aed..a3d4b0a05170 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="Media player and framework with support for most multimedia files a
 HOMEPAGE="https://www.videolan.org/vlc/"
 
 LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
+SLOT="0/12-9" # vlc - vlccore
 
 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
@@ -233,7 +233,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 )