gentoo resync : 15.12.2019

4 files changed, 30 insertions, 30 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6542609e28f9..60f91e472148 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,7 +4,7 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.8.tar.xz 26041520 BLAKE2B 4a507206e5a183fe036a95c84d7e94592973a0bd913aa764881bf73928b3c770a776fde1fce7878c4385cf11876813c7d7d48dfe219e71b0e13a9f6be9aa701a SHA512 5ade0b350e98fd6fa90035bffabda96f0addb3844a7c0a242b4db1cab6a746e1adb1d713ddcb48ae51a7d1736090f096f5d3b0637a9f958ccf4fcf27e838cf70
-EBUILD vlc-3.0.8.ebuild 13060 BLAKE2B 2003cd2e1625476f2857c98eb996fcd8b13539587a730591dedb345bbcc6c6181c5e9e57cce6f7d91d2fb0be3d83ec4a66799c7f8eaff5f719c4594b7286c861 SHA512 11919e27811167ba322640a83a12f3c74c58dd644a1b101ca8316f015e3aebad20fb5287da9ff619a8e382e8dccad931a0f3b879bcc7ae82ea2351d6848b9aa7
-EBUILD vlc-3.0.9999.ebuild 13065 BLAKE2B 6e43d8f3ac4b1e2f7e02e78461085c658c5e5198c7577049dcdb6af593baa1bf520f0a70dfb507f17f2700f297fb71abb508adc20bfd7a6eb55b19383e3c4663 SHA512 bfde9f5f4a76bd8fd55c6d976c2be11549c35fcc9d33186fd4b4991880e018fd16ce4c859ea86850a652ec0ac116c96e24b60131aeaa791bd09dc9c40b4d6fc9
-EBUILD vlc-9999.ebuild 13004 BLAKE2B 82df7a4bb8c9573288c3df49d7a983df7aa3d87f3087678139d5b7fbc31f4debf31ec535d703b0e2e2bb6f0d264e0cec829a4a9d629d34412a8b6a1fd5f4775b SHA512 8417d3bcf672e4bc4aac2fce628c4941b21fe50e49ba1dc4f15f4d9171201c58b5acfc5f316ea4b9b6abd491bcb4460d7207bacba44232e11776ef5dd06132c0
+EBUILD vlc-3.0.8.ebuild 13113 BLAKE2B 74c803645380d5ebdd9a38368e1ea12c6ef30999efcb53303d92e2acdd73ae92b1df473369a5adc3ea465d6c96169bdf87d60104f769ff4a6570fc34667c36ce SHA512 b82d345e198838297d5001ea80191adf694abe151b4bfa6c58d31b0b9cf2794458d341efbe5bf3e97d6a710df65eb05fb22ef79a6b084ec01699eacb6affe95f
+EBUILD vlc-3.0.9999.ebuild 13118 BLAKE2B 3c6f37e7bf28f15ba51a461270657900b11689bf42b2360cc62b13e8d16eccafb1cb02b3cf7f21fc443f9e6d7a9e24af494c5f10a509230fc56b85b9044c35c3 SHA512 ce64b488341416225f9dc3c24b7dcfb2a6e60d734e517a839c2807be10471c06dabc9841e55fb2f9a1b423798805969818d1ed21b14ff5a0c5e764c7638ce1f9
+EBUILD vlc-9999.ebuild 13057 BLAKE2B 357665845d812917c6e6833839a96aca5fb837041fa9b21d8d32293bf7185072a234c8e831cce3150a8d07edda3c25186856da200661d7731a2249d2fa55839d SHA512 6f13e5f234dc210281b411df857dcdab56806ab8613fa07857276354f1552506329379f02a38e7f98ef074ad5811740180beefb5e3d860a7b866b89c033df530
 MISC metadata.xml 4914 BLAKE2B 9cc2e2e3d4da8bb4c5ec63bc5c0e4b7b9e6e5c567ba0b1c515d806e0ec0fe4a90b15406a6c978a2e37b91805ef922182cc09057364203b641c64365d95b2a9b8 SHA512 37ef990f0444d819d8b68da62a5929964e3d247339347c84ddc929b608b358efa94503caeb379ce1c39dfda4fac3c679db33a7d590d8dd09d7e2552f482cd889
diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 8c53749a75b0..91eb7fe2f527 100644
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad 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 +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	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 +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -241,7 +241,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -294,6 +294,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -345,7 +346,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
@@ -394,7 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -446,7 +446,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index eff579106bd9..8fad44625193 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate
 	libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad 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 +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	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 +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -241,7 +241,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -294,6 +294,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -345,7 +346,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable omxil omxil-vout)
@@ -394,7 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -446,7 +446,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 07483fd7d3a1..6f1c27b496de 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -34,10 +34,10 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate kms
 	libass libav libcaca libnotify libplacebo +libsamplerate libtar libtiger linsys lirc
 	live lua macosx-notifications mad 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 +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
+	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 +X
+	x264 x265 xml zeroconf zvbi cpu_flags_arm_neon cpu_flags_x86_mmx cpu_flags_x86_sse
 "
 REQUIRED_USE="
 	chromecast? ( encode )
@@ -81,7 +81,7 @@ RDEPEND="
 		>=dev-libs/protobuf-2.5.0:=
 		>=net-libs/libmicrodns-0.0.9:=
 	)
-	dav1d? ( media-libs/dav1d )
+	dav1d? ( media-libs/dav1d:= )
 	dbus? ( sys-apps/dbus )
 	dc1394? (
 		media-libs/libdc1394:2
@@ -244,7 +244,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	xdg_src_prepare # bug 608256
 
-	has_version '>=net-libs/libupnp-1.8.0' && \
+	has_version 'net-libs/libupnp:1.8' && \
 		eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
 
 	# Bootstrap when we are on a git checkout.
@@ -296,6 +296,7 @@ src_configure() {
 		$(use_enable chromaprint)
 		$(use_enable chromecast)
 		$(use_enable chromecast microdns)
+		$(use_enable cpu_flags_arm_neon neon)
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable dav1d)
@@ -349,7 +350,6 @@ src_configure() {
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
 		$(use_enable ncurses)
-		$(use_enable neon)
 		$(use_enable ogg)
 		$(use_enable omxil)
 		$(use_enable opencv)
@@ -396,7 +396,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
-		--with-kde-solid=/usr/share/solid/actions
+		--with-kde-solid="${EPREFIX}"/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
@@ -445,7 +445,7 @@ src_configure() {
 	fi
 
 	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
+		local dejavu="${EPREFIX}/usr/share/fonts/dejavu/"
 		myeconfargs+=(
 			--with-default-font=${dejavu}/DejaVuSans.ttf
 			--with-default-font-family=Sans