gentoo resync : 02.06.2018

7 files changed, 63 insertions, 89 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e1f800ad2674..aa399de88669 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,15 +10,15 @@ AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e3
 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-arm-neon-fix.patch 2110 BLAKE2B a75c8d558611c249e6e5e77c2f826320f1dbe0657ac3016c8528047af3b815ea5fcaaa5c3c5e5cd6ef2a5ad4d0ee6e55b315aa30b699f04e9a676a8736b2c324 SHA512 85ab0a39e989dc09402dbaa807ffb392ab9b66caa0689ac0352bb01897ee664eb238aa8b390a3b41c1259a650ea1b859dcacc3104679cc65b7f2d0f283539e54
 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-9999-libupnp-slot-1.8.patch 757 BLAKE2B 816ef97e0dc7218ed49ee8880aaa94649f2cffd4792520549c2627d0bc77a0ce6f7ec31538a740e0db75cb62e2c65b881aae50a955e7db95254c41e833aae898 SHA512 ad0831ddef22849f05d7c325e11723613f99f5b37cbf6a6361396375431f7ea7f7c113a412ee3f77e8822355e22abfa8c2c51c5eab0d4bd4db36b239ab01175b
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
-DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
 DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
+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.1-r1.ebuild 13499 BLAKE2B 73a4d22e21b0198ea06d3049a323c4acf728f026d46a407137caab96fff63e9f45720cda16ac8961ee48e497baf3f5b5fb7296e439ba8f5b605b7774fcf68b1d SHA512 f928a50049fdbcd6bb498ab2dfbd40470ff92279339034320b722dba0ead2aeb01580aa394380011cf32c68117caf4ddfcddbe30cf61e45f4d3cd421a8d133b7
-EBUILD vlc-3.0.2.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f
-EBUILD vlc-3.0.9999.ebuild 13485 BLAKE2B fb9dc8f56742f349f8f421bbb56d6b2981c95dbe8e3414756be1b8070715c9a29c6703170b9d6500e68f69b00a1f36a7b886e0d88dc16c893fdd685453b0592b SHA512 7578b6b9bae07a0ebdd095b6082f0253479c7f4ddbb07d45a1645f1a6e40489fd74fb06559f996288ee25baf15e8c8c4d78b456d06f802e4ef48c405a10a756f
-EBUILD vlc-9999.ebuild 13395 BLAKE2B bdb64730d08aa744300a4af237863940b5e8178be375879447a8b358122e75980cca93e0bd193b98e8e4c16d8de70fbdcd2947ff729f5e888c2e0c21339e1d9a SHA512 c5435dd7038057d256cbaef11cc654d521881cca8f28a8a94fef12c3a6e89252fa90a687ca65653fe42c10f467d0811ab0e698297f2b000548b93f8886fcf1b6
+EBUILD vlc-3.0.2-r1.ebuild 13436 BLAKE2B 7ac65a355a8d490ee6d4b2b10367f7e07010f5b3875d7fa02852186d1076ba565c5c9326b75b71635629a1f040f305dbed86817fe746f9bbb7c10cdc079b090a SHA512 fd565e3519b7b2b223aacff1ba77238463704eb96d59cf0fcd6ac5bc32786e616395c25a51375b7e708a30691e2d42de3823445d92915c3a77b30717ddc29c9d
+EBUILD vlc-3.0.3-r1.ebuild 13493 BLAKE2B 5a43ba5bfaffa55524db4df8aad415de0dbe975c0cfb34028d52153ae7584040a8c708505601494d574a85627ae93e16fbc23001308d2032fbd8b714b21bc874 SHA512 154a89f124649b56ba80370288bc56e08192b5aa941702387a54a94e09d8d557bfefc7df44b570371dadf045323d2bd8fe44b4e2308ef7197ff8d9d6161069b7
+EBUILD vlc-3.0.9999.ebuild 13438 BLAKE2B 30a55e20865b0bfd5dc0820189289aea9879e6d64cb36a8874edefcb4ac9d1df3621200926599ce349a001f3b4bb4d8e530ac03a52076dfb439eb0e2dfd1cfcf SHA512 a949edbf940f6f7cb039be03baf6d72ededf25a9e73c791e98baab31511527306c4f55b5eb4a04fa3e74f13a640df4095019ee5e75135e125ffee83f6a9a3a6f
+EBUILD vlc-9999.ebuild 13348 BLAKE2B 0522a7d9f5db627af6c1e9f8f537f166c3a0482cabb7a3576022d811987cff264007627b6f2bec5c22f20212366760bd56035858759fec564ee8eb73c9c2c81d SHA512 218b12d15abaebe83aa2edc9e8782a3bb04d806b76fbe1afc21870ac9d5704fcb42ed3e9c6e56d7667437d85877a432bbced2d3be1d09291bf8e4086a94f41f4
 MISC metadata.xml 6646 BLAKE2B 569faa5b058689cd2fae2bf6832c166d0e7ab539cf489188b7ed5e780ed5a8d6fcb3a2bd1ef71b3905ad66b6f53c05ebff98b9b56a969ecb5a43383b94ab49a1 SHA512 e239b5ef49f73bce91cff3cd420c16435943f8ee8a22503a41cb610033fe3b9e1e13482398c26f7f1315257b3fc381eb9b49a59ae577f9bc516fdd0ef460bedc
diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
deleted file mode 100644
index 6ea45d5abf0b..000000000000
--- a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Janne Grunau <janne-vlc@jannau.net>
-Date: Mon, 19 Feb 2018 00:47:53 +0100
-Subject: arm: make the assembler functions compatible with non ELF/gas
- platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Allow assembling arm neon functions for IOS and arm windows.
-
-Signed-off-by: Martin Storsjö <martin@martin.st>
-(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005)
-Signed-off-by: Thomas Guillem <thomas@gllm.fr>
-
-[Add modules/arm_neon/asm.S missing from orig tarball.]
----
- modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
- create mode 100644 modules/arm_neon/asm.S
-
-diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
-new file mode 100644
-index 0000000..728391e
---- /dev/null
-+++ b/modules/arm_neon/asm.S
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 2018 Janne Grunau <janne-libav@jannau.net>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifdef __APPLE__
-+#   define EXTERN_ASM _
-+#else
-+#   define EXTERN_ASM
-+#endif
-+
-+#if defined(__APPLE__) || defined(_WIN32)
-+#   define HAVE_AS_ARCH_DIRECTIVE 0
-+#   define HAVE_AS_FPU_DIRECTIVE  0
-+#else
-+#   define HAVE_AS_ARCH_DIRECTIVE 1
-+#   define HAVE_AS_FPU_DIRECTIVE  1
-+#endif
-+
-+.macro  function name
-+	.globl  EXTERN_ASM\name
-+#ifdef __ELF__
-+	.type   EXTERN_ASM\name, %function
-+#endif
-+EXTERN_ASM\name:
-+.endm
diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
new file mode 100644
index 000000000000..fe4eecb8e767
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
@@ -0,0 +1,42 @@
+From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
+Date: Mon, 28 May 2018 18:25:15 +0200
+Subject: [PATCH] qt: Fix build with --disable-vlm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fix #20495
+
+(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8)
+Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
+---
+ modules/gui/qt/Makefile.am | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
+index cb77b14d96..c67f4afc13 100644
+--- a/modules/gui/qt/Makefile.am
++++ b/modules/gui/qt/Makefile.am
+@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \
+ 	gui/qt/dialogs/open.moc.cpp \
+ 	gui/qt/dialogs/openurl.moc.cpp \
+ 	gui/qt/dialogs/podcast_configuration.moc.cpp \
+-	gui/qt/dialogs/vlm.moc.cpp \
+ 	gui/qt/dialogs/firstrun.moc.cpp \
+ 	gui/qt/dialogs/extensions.moc.cpp \
+ 	gui/qt/dialogs/fingerprintdialog.moc.cpp \
+@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
+ 
+ nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
+ 
++if ENABLE_VLM
++nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp
++endif
++
+ gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES)
+ 	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
+ 
+-- 
+2.11.0
+
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.2-r1.ebuild
index 1ac9c9a5b143..27977bca29e3 100644
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.2-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}
 
@@ -35,8 +35,8 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
 	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
 	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
-	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+	run-as-root samba schroedinger 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="
@@ -53,7 +53,7 @@ REQUIRED_USE="
 	vdpau? ( ffmpeg X )
 "
 RDEPEND="
-	net-dns/libidn:0
+	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
 	virtual/libintl:0
 	virtual/opengl
@@ -175,6 +175,7 @@ RDEPEND="
 		>=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
@@ -193,7 +194,6 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
@@ -226,8 +226,7 @@ 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}-arm-neon-fix.patch # bug 649798
-	"${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream
+	"${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -281,6 +280,7 @@ src_configure() {
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vcd
 		--enable-vlc
 		$(use_enable a52)
 		$(use_enable alsa)
@@ -368,6 +368,7 @@ src_configure() {
 		$(use_enable skins skins2)
 		$(use_enable soxr)
 		$(use_enable speex)
+		$(use_enable srt)
 		$(use_enable ssl gnutls)
 		$(use_enable svg)
 		$(use_enable svg svgdec)
@@ -379,7 +380,6 @@ src_configure() {
 		$(use_enable upnp)
 		$(use_enable v4l v4l2)
 		$(use_enable vaapi libva)
-		$(use_enable vcd)
 		$(use_enable vdpau)
 		$(use_enable vnc)
 		$(use_enable vorbis)
@@ -415,7 +415,6 @@ src_configure() {
 		--disable-shine
 		--disable-sndio
 		--disable-spatialaudio
-		--disable-srt
 		--disable-vsxu
 		--disable-wasapi
 	)
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild
index 9ee5edc366b8..848949599d65 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -36,7 +36,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
 	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
 	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+	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="
@@ -194,7 +194,6 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
@@ -228,6 +227,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
+	"${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -281,6 +281,7 @@ src_configure() {
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vcd
 		--enable-vlc
 		$(use_enable a52)
 		$(use_enable alsa)
@@ -380,7 +381,6 @@ src_configure() {
 		$(use_enable upnp)
 		$(use_enable v4l v4l2)
 		$(use_enable vaapi libva)
-		$(use_enable vcd)
 		$(use_enable vdpau)
 		$(use_enable vnc)
 		$(use_enable vorbis)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 9ee5edc366b8..a80409c4a816 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -36,7 +36,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
 	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
 	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+	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="
@@ -194,7 +194,6 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
@@ -281,6 +280,7 @@ src_configure() {
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vcd
 		--enable-vlc
 		$(use_enable a52)
 		$(use_enable alsa)
@@ -380,7 +380,6 @@ src_configure() {
 		$(use_enable upnp)
 		$(use_enable v4l v4l2)
 		$(use_enable vaapi libva)
-		$(use_enable vcd)
 		$(use_enable vdpau)
 		$(use_enable vnc)
 		$(use_enable vorbis)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index a8bd9326940d..2ee5c30ef9ca 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -36,7 +36,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus
 	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
 	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
 	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
+	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="
@@ -194,7 +194,6 @@ RDEPEND="
 	upnp? ( net-libs/libupnp:= )
 	v4l? ( media-libs/libv4l:0 )
 	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
@@ -280,6 +279,7 @@ src_configure() {
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
+		--enable-vcd
 		--enable-vlc
 		$(use_enable a52)
 		$(use_enable alsa)
@@ -378,7 +378,6 @@ src_configure() {
 		$(use_enable upnp)
 		$(use_enable v4l v4l2)
 		$(use_enable vaapi libva)
-		$(use_enable vcd)
 		$(use_enable vdpau)
 		$(use_enable vnc)
 		$(use_enable vorbis)