gentoo resync : 16.02.1018

6 files changed, 198 insertions, 227 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 11d24b529dce..16ff1c6e9edb 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,8 +5,8 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 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 13148 BLAKE2B 5b7ca68d78ffa3807705b3468d3b410b28808123b2dc56604fde529d0d18aba0876064022105f0a0cd24b5bee4d466b169c648c24544c20b61f0031a5ecc3062 SHA512 c546a5398ad1ae41157763b39bc36946c05e8944c39c3df02c550043e205f9aa405a64fad19f55b936a0caca2a0e163f3e629406fe6b0ba92cd907854806cc5d
-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
+EBUILD vlc-3.0.4.ebuild 13153 BLAKE2B 19afd631bdbc5ec35e6a3684fd767e3530c598da299a08826c4502956b093d38b49dba2b9667095a108044501967708e0e28939750a940e31f9b6878e3f208da SHA512 990a9bad72762e3f692901f3729df394473392d0929f23f5914838863fa096cfbf8ca48e9c2e57a9df708f11c5954be6ed1d799a5d729ca2333d19ea135515c2
+EBUILD vlc-3.0.6.ebuild 13173 BLAKE2B db1a24367368929bdfa11370c20c13d95057bcf66a390851c6b9fcf677ffd310d50e4ee6d099e1ff5bffc61e435b927cadc2d50e86265539f65ad09d994740d9 SHA512 75ccaaaa0527b3b71b25ecaa9828bc70b26cf6773b31d667fd1e12d0ea2776bad8aa5ae22a09bed7937fe9416affb3eb134c79a898f96aef5ea277752e0406e6
+EBUILD vlc-3.0.9999.ebuild 13050 BLAKE2B 6c00b6deadcbeac7e7aae647b22b73912be3e79761a5381aa4836ac9e2c2c92a1de3c123a4d4c124e62cfbc84e1f01bf4841a9b7d7899410770bd37baa8ac532 SHA512 49c5ea4784352a8e7837fc7cd9f9d9b3c9f307c768b291ce2139ccf60189a6459f6157ec37fc053ecd10d58c932603be7ffd36c8d9775d06ce99402b37caaa61
+EBUILD vlc-9999.ebuild 13033 BLAKE2B 098e5b91118a1963a68c76d52b3f045aa0de68ad37e1ec4904bb7d29ad2b4f8b7c660cd6a682fbfacf0d326073dead9b12709bb1610ee50ef577b777b74c0c84 SHA512 19f93977e935fa588e8f3faad57f212ab255cc0b9c5ebefc730e619694c2cbe35ad9fbbfb2383593ed02614285691b628c0ac22cd13472ed38eac3937a09a1f8
+MISC metadata.xml 4965 BLAKE2B 70ae1489394175d3a5b7972089da76553c01b28206eb2c97e748941c685f49a8ef5b98b204f81a748a7da463bb69c4051a1dd9017072b30412b6ae392b2e7fd5 SHA512 9777cc29b4bba9fe74a03f2b4157fb5bf782624a80a7971e6b738a035cd72fbac908eb414ad72c7e1924fa2acff757615ca4b1d66b5ce84c6f0d028a91dfc11e
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 8a7aef8ab363..2c87fbf15408 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="10bit">Enable H264 10-bit encoding support with <pkg>media-libs/x264</pkg></flag>
 		<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>
diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
index 44f97c55f69a..16570f46d8fd 100644
--- a/media-video/vlc/vlc-3.0.4.ebuild
+++ b/media-video/vlc/vlc-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -199,7 +199,7 @@ RDEPEND="
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( <media-libs/libvpx-1.8:0= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
diff --git a/media-video/vlc/vlc-3.0.6.ebuild b/media-video/vlc/vlc-3.0.6.ebuild
index 93c5c8b00a07..9743750ed2e1 100644
--- a/media-video/vlc/vlc-3.0.6.ebuild
+++ b/media-video/vlc/vlc-3.0.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -52,6 +52,12 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
 	sys-libs/zlib:0[minizip]
@@ -201,7 +207,7 @@ RDEPEND="
 	vdpau? ( x11-libs/libvdpau:0 )
 	vnc? ( net-libs/libvncserver:0 )
 	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
+	vpx? ( <media-libs/libvpx-1.8:0= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
@@ -219,10 +225,6 @@ RDEPEND="
 	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 )
 "
 
@@ -237,7 +239,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
@@ -436,8 +438,6 @@ src_configure() {
 	# 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
@@ -454,7 +454,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -472,7 +472,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${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
@@ -481,9 +481,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -491,7 +489,5 @@ pkg_postrm() {
 		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
+	xdg_pkg_postrm
 }
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index ebea92479e02..7ef85d86eb35 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -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
@@ -52,107 +52,113 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	aribsub? ( media-libs/aribb24 )
 	bidi? (
-		dev-libs/fribidi:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
 	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	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
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	gme? ( media-libs/game-music-emu )
 	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
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
 	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 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -163,45 +169,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[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 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	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:0= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		dev-libs/wayland-protocols
@@ -212,20 +218,13 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? (
-		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
-		10bit? ( >=media-libs/x264-9999:0= )
-	)
-	x265? ( media-libs/x265:0= )
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[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 )
 "
 
@@ -240,7 +239,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
@@ -390,6 +389,7 @@ src_configure() {
 		$(use_enable X xcb)
 		$(use_enable X xvideo)
 		$(use_enable x264)
+		$(use_enable x264 x26410b)
 		$(use_enable x265)
 		$(use_enable xml libxml2)
 		$(use_enable zeroconf avahi)
@@ -422,12 +422,6 @@ src_configure() {
 	)
 	# ^ 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"
 
@@ -444,8 +438,6 @@ src_configure() {
 	# 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
@@ -462,7 +454,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -480,7 +472,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${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
@@ -489,9 +481,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -499,7 +489,5 @@ pkg_postrm() {
 		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
+	xdg_pkg_postrm
 }
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 7246c78556aa..87447fb82505 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then
 	else
 		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
 	fi
-	SCM="git-r3"
+	inherit git-r3
 else
 	if [[ ${MY_P} = ${P} ]] ; then
 		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
@@ -21,7 +21,7 @@ else
 	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}
+inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
 DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
 HOMEPAGE="https://www.videolan.org/vlc/"
@@ -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 kms
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
@@ -52,108 +52,114 @@ REQUIRED_USE="
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
 "
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+"
 RDEPEND="
 	net-dns/libidn:=
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
+	sys-libs/zlib[minizip]
+	virtual/libintl
 	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
+	a52? ( media-libs/a52dec )
+	alsa? ( media-libs/alsa-lib )
 	aom? ( media-libs/libaom:= )
 	archive? ( app-arch/libarchive:= )
 	aribsub? ( media-libs/aribb24 )
 	bidi? (
-		dev-libs/fribidi:0
+		dev-libs/fribidi
 		media-libs/freetype:2[harfbuzz]
 		media-libs/harfbuzz
-		virtual/ttf-fonts:0
+		virtual/ttf-fonts
 	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
+	bluray? ( media-libs/libbluray:= )
+	cddb? ( media-libs/libcddb )
+	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
 	dav1d? ( media-libs/dav1d )
-	dbus? ( sys-apps/dbus:0 )
+	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
+		sys-libs/libraw1394
 	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
+	dts? ( media-libs/libdca )
+	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= )
 	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
+		>=media-libs/libdvdnav-4.9
+		>=media-libs/libdvdread-4.9
 	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
+	faad? ( media-libs/faad2 )
+	fdk? ( media-libs/fdk-aac:= )
 	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
+		media-libs/flac
+		media-libs/libogg
 	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fontconfig? ( media-libs/fontconfig:1.0 )
 	gcrypt? (
 		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
+		dev-libs/libgpg-error
 	)
-	gme? ( media-libs/game-music-emu:0 )
+	gme? ( media-libs/game-music-emu )
 	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
+		sys-libs/libavc1394
+		sys-libs/libraw1394
 	)
 	jack? ( virtual/jack )
 	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
+	kate? ( media-libs/libkate )
 	kms? ( x11-libs/libdrm )
 	libass? (
 		media-libs/fontconfig:1.0
-		media-libs/libass:0=
+		media-libs/libass:=
 	)
-	libcaca? ( media-libs/libcaca:0 )
+	libcaca? ( media-libs/libcaca )
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
-		x11-libs/libnotify:0
+		x11-libs/libnotify
 	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
+	libsamplerate? ( media-libs/libsamplerate )
+	libtar? ( dev-libs/libtar )
+	libtiger? ( media-libs/libtiger )
 	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
+	lirc? ( app-misc/lirc )
+	live? ( media-plugins/live:= )
+	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
+		dev-libs/libebml:=
+		media-libs/libmatroska:=
 	)
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-sound/mpg123 )
 	mpeg? ( media-libs/libmpeg2 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
+	mtp? ( media-libs/libmtp:= )
+	musepack? ( media-sound/musepack-tools )
 	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 )
+	ogg? ( media-libs/libogg )
+	opencv? ( media-libs/opencv:= )
+	opus? ( >=media-libs/opus-1.0.3 )
 	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
+	postproc? ( libav? ( media-libs/libpostproc ) )
 	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
+		media-fonts/dejavu
+		media-libs/libprojectm
 	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
+	pulseaudio? ( media-sound/pulseaudio )
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -164,45 +170,45 @@ RDEPEND="
 			x11-libs/libX11
 		)
 	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[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 )
+	sdl-image? ( media-libs/sdl-image )
+	sftp? ( net-libs/libssh2 )
+	shout? ( media-libs/libshout )
 	sid? ( media-libs/libsidplay:2 )
 	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXpm
 	)
 	soxr? ( media-libs/soxr )
 	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
+		>=media-libs/speex-1.2.0
+		media-libs/speexdsp
 	)
 	srt? ( net-libs/srt )
-	ssl? ( net-libs/gnutls:0 )
+	ssl? ( net-libs/gnutls:= )
 	svg? (
 		gnome-base/librsvg:2
-		x11-libs/cairo:0
+		x11-libs/cairo
 	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
+	taglib? ( >=media-libs/taglib-1.9 )
+	theora? ( media-libs/libtheora )
+	tremor? ( media-libs/tremor )
 	truetype? (
 		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
+		virtual/ttf-fonts
+		!fontconfig? ( media-fonts/dejavu )
 	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
+	twolame? ( media-sound/twolame )
+	udev? ( virtual/udev )
 	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:0= )
+	v4l? ( media-libs/libv4l:= )
+	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
+	vdpau? ( x11-libs/libvdpau )
+	vnc? ( net-libs/libvncserver )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx:= )
 	wayland? (
 		>=dev-libs/wayland-1.15
 		>=dev-libs/wayland-protocols-1.12
@@ -215,20 +221,13 @@ RDEPEND="
 		x11-libs/xcb-util
 		x11-libs/xcb-util-keysyms
 	)
-	x264? (
-		!10bit? ( >=media-libs/x264-0.0.20160712:0= )
-		10bit? ( >=media-libs/x264-9999:0= )
-	)
-	x265? ( media-libs/x265:0= )
+	x264? ( >=media-libs/x264-0.0.20190214:= )
+	x265? ( media-libs/x265:= )
 	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
+	zeroconf? ( net-dns/avahi[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 )
 "
 
@@ -243,7 +242,7 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	default
+	xdg_src_prepare # bug 608256
 
 	has_version '>=net-libs/libupnp-1.8.0' && \
 		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
@@ -391,6 +390,7 @@ src_configure() {
 		$(use_with X x)
 		$(use_enable X xcb)
 		$(use_enable x264)
+		$(use_enable x264 x26410b)
 		$(use_enable x265)
 		$(use_enable xml libxml2)
 		$(use_enable zeroconf avahi)
@@ -423,12 +423,6 @@ src_configure() {
 	)
 	# ^ 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"
 
@@ -445,8 +439,6 @@ src_configure() {
 	# 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
@@ -463,7 +455,7 @@ src_configure() {
 		)
 	fi
 
-	econf ${myeconfargs[@]}
+	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.
@@ -481,7 +473,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then
+	if [[ -z ${ROOT} ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then
 		einfo "Running /usr/libexec/vlc/vlc-cache-gen on /usr/libexec/vlc/plugins/"
 		"/usr/libexec/vlc/vlc-cache-gen" "/usr/libexec/vlc/plugins/"
 	else
@@ -490,9 +482,7 @@ pkg_postinst() {
 		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
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
@@ -500,7 +490,5 @@ pkg_postrm() {
 		rm /usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
 	fi
 
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }