gentoo resync : 02.09.2020

6 files changed, 58 insertions, 60 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6209d1b9fb25..c069c456f376 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -8,8 +8,8 @@ DIST vlc-3.0.10.tar.xz 26096828 BLAKE2B c189c91e9b4b3601552ea5c00faa6bee9944550e
 DIST vlc-3.0.11.1.tar.xz 25886644 BLAKE2B b3cf3f8776086fcd45ca20918be8951960bf3d18c219d0d512f64bfe89d3e947300875b4b8e1a27742132400fd9a3b32f5e84afd08f52254899a23922a682361 SHA512 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b
 DIST vlc-3.0.11.tar.xz 26041744 BLAKE2B 1afa0ae9e54449e32a441e9ec563fedc78476b4c0438286cbe273d9f8185f6f8be1e14688878e40180db5c6a7673f14ed53c0e763d376f5e6bb9dc1b02719bf2 SHA512 8219cc46e434c7b2f12321d4e1b21eae123a546eeb22f768c463537a4a4986ab395053f8a794628cfd17236f81665f12b2b3f6867af73b102b81628204b6c444
 EBUILD vlc-3.0.10-r1.ebuild 13009 BLAKE2B 915363b2715e7271fb89c6fac555681283253093365b9ef5ccfdf2eee7b5be0ffe2160ad815851828b31f3af93760b2a1c556b159cdea76ab3c101ebe473de72 SHA512 432477a62d98ad60fd95feaef9c990b1f8af0f388f8c950b8afb1981d370633ea9c1c86a6c516e79d97cc284c1e545eb55fa1f33bdf22aa262404a6363cda060
-EBUILD vlc-3.0.11.1.ebuild 13031 BLAKE2B 571e5e8eeb6c1e6d106762a6735550b48cd1126a39801f94e0c94f9d080afc2ad8c54876a8e2b6a06063c20aa59f94c31a242da50bf940814578a112540c5931 SHA512 c78aaf1027fef003a830fb5bc9415107dc541660f36ed73d8b3efb31103b9af75e34978cf42bb351b195b67f6a866d514fa39837c9362218d9907a63b14dce09
-EBUILD vlc-3.0.11.ebuild 13030 BLAKE2B e59e2318c28d4bfc050baa2a447bfe0f0d010a311b212f2fd0db926e83086480df06404f60d56d782340c27754bd6bbcb94667b8456c2cb637cbc39beb0256e7 SHA512 007a1aca0faa60190e9234b5a89de62d15b89175c25ac1010ba8109679acc35cbfddb9715bd11e570c5a48fd23cd14cf35ce917165d53d577a10289ebfa18fcd
-EBUILD vlc-3.0.9999.ebuild 13031 BLAKE2B 571e5e8eeb6c1e6d106762a6735550b48cd1126a39801f94e0c94f9d080afc2ad8c54876a8e2b6a06063c20aa59f94c31a242da50bf940814578a112540c5931 SHA512 c78aaf1027fef003a830fb5bc9415107dc541660f36ed73d8b3efb31103b9af75e34978cf42bb351b195b67f6a866d514fa39837c9362218d9907a63b14dce09
-EBUILD vlc-9999.ebuild 12937 BLAKE2B 0706fe59186e82855680acfb51ccf60c9aa8fefc9e018e5cb7ca820eb64854e21e4081b57251c32a27f3910faac7e48926fe885255b68cadd13149565ae7b2b4 SHA512 78f9120d87c905832a40bf05e76046569830f687a6bf3eabc1e97456cc797263b38f382d911b567f2da80cdd4af322cc31ac06b18ad28fb2a80974bc7acd3090
-MISC metadata.xml 4746 BLAKE2B 797c2f7c113915fe8e1508eef1a110db4c7717fa0ee5bfdd49c4260532be2929b6551a453a79c08aa9a6e62f109396778ce9efc823eb18db2bf25f3e9db10068 SHA512 49828ab8f168e49210c7c259b7c0242f9c68bfc9fa9151e5663a8dea781d34f40a6cb22e354332b9efba0610b70995b511ffef20b844914d0dea0118251905b8
+EBUILD vlc-3.0.11.1.ebuild 13034 BLAKE2B 51d55a3eb1f0be21bf1c77051bcd7efe3ef58e6410dc054acf0a54638d087582a91e2979c6dc91fed093c237aeff0a3d05cbf9db7db51b6d43ff417963f03a87 SHA512 6fe634a69d04cdee4a4472afcfbbd8b589a8c1bb475c8fdcbcce92e32ea7fea61adb70b9c363fd3c2f6930545f7fbdf9d38d4279a6d866f272fdb6c01485c35d
+EBUILD vlc-3.0.11.ebuild 13013 BLAKE2B 60a4e52693fdc2bd57c9ceddfb162219b5880d3e56f03c43277f4e015bf400a293978edec82b22d5233cb554abdd9d4749db2b930724489c0bfe35e7f94c5c6a SHA512 eeb8ad807680cb9e23a37ba21c8a96876a6b85f9c9369d44bcaf1fc4e7b875a997048bef2c211128a6d52475874fa32eeb28f744ed402d27aa565474cca6b9b0
+EBUILD vlc-3.0.9999.ebuild 12972 BLAKE2B 8e482bb570241a0dd0f521969ee61ac27ca778e543b7a3a4fa929a7625cd0e665996a35cc0372029b89f2be7371b45027228d1b34122aaa5dd2a759d4b0796ae SHA512 deabd1124cf6b8a265c0efc6ae9d594a3d46a820fe857acddae873b0bc3c24ab2abcc56329579b1049845879860626fc9be94cd70ce29796fdf02f1eaa326fc1
+EBUILD vlc-9999.ebuild 12993 BLAKE2B 9229920f8ebd589629e6d01e41a4ebb6e6cd60cc90522eae3e5fab31248416f6ac3fbc11c2fa14fe99ec5dc8b2d5f79bc5d6bdd619f39c25cce8add803d45753 SHA512 9d582e9ef7529630471a6c6f79db22425c10cfb3ba0d7ce50f0713efce8f12829e9834b4fb79ede558513238ae180f204635f6816074465e292122920a9f4e68
+MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 8442a26823a0..0e818723404b 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Gentoo Video project</name>
 	</maintainer>
 	<use>
-		<flag name="aom">Enable experimental support for AV1 codec</flag>
+		<flag name="aom">Enable AV1 encoding/decoding support using <pkg>media-libs/libaom</pkg></flag>
 		<flag name="archive">Enable support for libarchive stream extractor</flag>
 		<flag name="aribsub">Enable support for decoding ARIB STD-B24 subtitles</flag>
 		<flag name="bluray">Enable libbluray for Blu-ray disc support</flag>
@@ -30,6 +30,7 @@
 		<flag name="libtiger">Enable Ogg Kate subtitles rendering using libtiger</flag>
 		<flag name="linsys">Enable support for Linux Linear Systems Ltd. SDI and HD-SDI input cards</flag>
 		<flag name="live">Enable live555 streaming media support (client support for rtsp)</flag>
+		<flag name="loudness">Enable loudness normalisation according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg></flag>
 		<flag name="lua">Enable Lua scripting support, needed for including support for Jamendo (online music platform) and similar things</flag>
 		<flag name="macosx-notifications">Enable Mac OS X notifications module (formerly growl)</flag>
 		<flag name="matroska">Enable matroska support using reference libraries (fallback on other existing matroska support if disabled, i.e., matroska enabled FFmpeg)</flag>
diff --git a/media-video/vlc/vlc-3.0.11.1.ebuild b/media-video/vlc/vlc-3.0.11.1.ebuild
index c88bc2c4ce25..14d2c16fc755 100644
--- a/media-video/vlc/vlc-3.0.11.1.ebuild
+++ b/media-video/vlc/vlc-3.0.11.1.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"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 -sparc x86"
 fi
 inherit autotools flag-o-matic toolchain-funcs virtualx xdg
 
@@ -196,7 +196,7 @@ RDEPEND="
 	)
 	twolame? ( media-sound/twolame )
 	udev? ( virtual/udev )
-	upnp? ( net-libs/libupnp:= )
+	upnp? ( net-libs/libupnp:=[ipv6] )
 	v4l? ( media-libs/libv4l:= )
 	vaapi? ( x11-libs/libva:=[drm,wayland?,X?] )
 	vdpau? ( x11-libs/libvdpau )
diff --git a/media-video/vlc/vlc-3.0.11.ebuild b/media-video/vlc/vlc-3.0.11.ebuild
index b8d9427fbadf..362aad443acd 100644
--- a/media-video/vlc/vlc-3.0.11.ebuild
+++ b/media-video/vlc/vlc-3.0.11.ebuild
@@ -79,7 +79,7 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
 	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
@@ -227,7 +227,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
+	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index c88bc2c4ce25..7b9bcc5e9502 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-9" # vlc - vlccore
 
-IUSE="a52 alsa 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 libcaca libnotify +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png 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 +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
+IUSE="a52 alsa 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 +gui ieee1394 jack jpeg kate
+	libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua
+	macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg
+	omxil optimisememory opus png projectm pulseaudio 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 +X x264 x265 xml zeroconf zvbi
+	cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -47,7 +46,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	skins? ( qt5 truetype X xml )
+	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
@@ -79,7 +78,7 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
 	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
@@ -109,6 +108,16 @@ RDEPEND="
 	gme? ( media-libs/game-music-emu )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
 	ieee1394? (
 		sys-libs/libavc1394
 		sys-libs/libraw1394
@@ -154,16 +163,6 @@ RDEPEND="
 		media-libs/libprojectm
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	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:=[client(+)] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	sdl-image? ( media-libs/sdl-image )
@@ -227,7 +226,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
-	"${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
@@ -321,6 +319,7 @@ src_configure() {
 		$(use_enable gme)
 		$(use_enable gnome-keyring secret)
 		$(use_enable gstreamer gst-decode)
+		$(use_enable gui qt)
 		$(use_enable ieee1394 dv1394)
 		$(use_enable jack)
 		$(use_enable jpeg)
@@ -353,7 +352,6 @@ src_configure() {
 		$(use_enable png)
 		$(use_enable projectm)
 		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
 		$(use_enable rdp freerdp)
 		$(use_enable run-as-root)
 		$(use_enable samba smbclient)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index c501e315737d..a93a385cb40e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -29,16 +29,15 @@ HOMEPAGE="https://www.videolan.org/vlc/"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/12-9" # vlc - vlccore
 
-IUSE="a52 alsa 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 libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
-	live lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
-	nfs ogg omxil optimisememory opus png 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 +X
-	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx
-	cpu_flags_x86_sse
+IUSE="a52 alsa 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 +gui ieee1394 jack jpeg kate kms
+	libass libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc live
+	loudness lua macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses
+	nfs ogg omxil optimisememory opus png projectm pulseaudio 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 +X x264 x265 xml zeroconf
+	zvbi cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -47,7 +46,7 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	skins? ( qt5 truetype X xml )
+	skins? ( gui truetype X xml )
 	ssl? ( gcrypt )
 	vaapi? ( ffmpeg X )
 	vdpau? ( ffmpeg X )
@@ -79,9 +78,9 @@ RDEPEND="
 	chromaprint? ( media-libs/chromaprint:= )
 	chromecast? (
 		>=dev-libs/protobuf-2.5.0:=
-		>=net-libs/libmicrodns-0.0.9:=
+		>=net-libs/libmicrodns-0.1.2:=
 	)
-	dav1d? ( media-libs/dav1d:= )
+	dav1d? ( >=media-libs/dav1d-0.5.0:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -109,6 +108,16 @@ RDEPEND="
 	gme? ( media-libs/game-music-emu )
 	gnome-keyring? ( app-crypt/libsecret )
 	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		X? (
+			dev-qt/qtx11extras:5
+			x11-libs/libX11
+		)
+	)
 	ieee1394? (
 		sys-libs/libavc1394
 		sys-libs/libraw1394
@@ -125,7 +134,6 @@ RDEPEND="
 	libnotify? (
 		dev-libs/glib:2
 		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)
 	libplacebo? ( media-libs/libplacebo )
@@ -135,6 +143,7 @@ RDEPEND="
 	linsys? ( media-libs/zvbi )
 	lirc? ( app-misc/lirc )
 	live? ( media-plugins/live:= )
+	loudness? ( >=media-libs/libebur128-1.2.4:= )
 	lua? ( >=dev-lang/lua-5.1:0= )
 	mad? ( media-libs/libmad )
 	matroska? (
@@ -156,16 +165,6 @@ RDEPEND="
 		media-libs/libprojectm
 	)
 	pulseaudio? ( media-sound/pulseaudio )
-	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:=[client(+)] )
 	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
 	sdl-image? ( media-libs/sdl-image )
@@ -322,6 +321,7 @@ src_configure() {
 		$(use_enable gme)
 		$(use_enable gnome-keyring secret)
 		$(use_enable gstreamer gst-decode)
+		$(use_enable gui qt)
 		$(use_enable ieee1394 dv1394)
 		$(use_enable jack)
 		$(use_enable jpeg)
@@ -337,6 +337,7 @@ src_configure() {
 		$(use_enable linsys)
 		$(use_enable lirc)
 		$(use_enable live live555)
+		$(use_enable loudness ebur128)
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable mad)
@@ -355,7 +356,6 @@ src_configure() {
 		$(use_enable png)
 		$(use_enable projectm)
 		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
 		$(use_enable rdp freerdp)
 		$(use_enable run-as-root)
 		$(use_enable samba smbclient)
@@ -396,7 +396,6 @@ src_configure() {
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
-		--disable-crystalhd
 		--disable-decklink
 		--disable-gles2
 		--disable-goom