gentoo resync : 03.11.2018

3 files changed, 22 insertions, 14 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7de1b5a084c5..1cad64a8cf7c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -10,6 +10,6 @@ DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc14
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0 SHA512 55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271
 EBUILD vlc-3.0.3-r1.ebuild 13450 BLAKE2B 90c0942f1018dc8bae1bc15c4417bb7555aede9e6ec7d3a87ddd048af03d816855cc3f96e1042a2f6c0d2949ca76dd8b9d80b240509413af3bb61e212ffd11ad SHA512 072af5095c8fda41fe7c29d4254a4147687b64a8593b117d37466dc8012d1c64bb7291ecf6a5ef0f806f6de0522dd90eb796568f73201cd1a327d85efd3f7218
 EBUILD vlc-3.0.4.ebuild 13221 BLAKE2B 65f35cbb37b2da5bf91ceea246a32f70980c96eae0a30dd816dd43c26eba4326682b8a8a5b52b351eb666b6c107352498f1918f59b47edb34d0c13054f7af95f SHA512 3698903d40c16dee702bfedd47888b465d11a5a7d93442ceb758a92d8c14c93710a349a4e83943e39cdf9c8aa5fcd6e879dd1bca9fb71b06faf5a93cebc5266e
-EBUILD vlc-3.0.9999.ebuild 13226 BLAKE2B 612c0e25b550e63fe14d871d95737b7d7f7388feb22db02685419a7ff86effc30e6a8591b267650154a3807b33a4a347a09510b778303324b7199ebb5d41c96d SHA512 5a619b52dc28b8aab14519c274483e44d1b71d2f26d8740fd4e757b7759899ec2ec123f0811ca6a353a4d1009c91f0f7403097806475f041cfed8752c4d2f4f2
-EBUILD vlc-9999.ebuild 13209 BLAKE2B 47add64565abb5e7f4fc44729f67de84d6bfe7bc025819d3f986d9497207bdb12c4a27462d917ae18197fe31899a252eed8aaf3efd80a0350e7c2c32d21e7706 SHA512 86bfd49188514a5ccd813590f8ec8eff9bd55d751b8c2f6057d250031bbcbe3dade0a18a55bfaba07ea7b11f42208d431fe04dc7c79a500679268a9cdf4fc49b
+EBUILD vlc-3.0.9999.ebuild 13335 BLAKE2B 6fae468451c37a769c158af2bb1a63a6f20d4a09f0abd4a8f8591e328dc3b3fb757634e1ce157b8c7ef8e33ce326f55a6128569a1f778a6b4eeae4191def98a2 SHA512 da6f54017dfe0bd81632898a45141f837ca18e09e67765726a36f814b2f675bd3e9a1ff295bd318a37d1a98d059576da58f2df9700467abe2fe64d2a9dbf4207
+EBUILD vlc-9999.ebuild 13318 BLAKE2B a04c1806ced8930329d08146b407ed5ee7fae86727e2a77fd472296358eb9295a06b6f4e95a9f5c0f567b134e2339adbabfe0a978d13dccf726dd0adf71b8062 SHA512 0a431903eef79e28c7349f6a2737c5e82359258758641125ae30f60cedadeb1cb3e18143241fdb730a96b7776552241c0e95915351d48ef5110cda3ee46cc8bb
 MISC metadata.xml 5126 BLAKE2B 107f372c830ec4bdb8ee0ca64dedb7259b08c5ee0832e9a371bf62f0a2908a76fda48cb0738e3c406090824a0c4840784004878c4364307ad76dc997e5425517 SHA512 39e2ddb1ff53603585b54410d04c783077f681b93be2f00ad91b418f029a6fb432671efb5ae3eede535d4c7b45bf43d7e5ce5cb8649064401e11eef6b025cd7a
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index b2e1f771823a..c06e6f61f05c 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	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
+	macosx-notifications macosx-qtkit 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 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
@@ -130,13 +130,14 @@ RDEPEND="
 	lirc? ( app-misc/lirc:0 )
 	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
+	mad? ( media-libs/libmad )
 	matroska? (
 		dev-libs/libebml:0=
 		media-libs/libmatroska:0=
 	)
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:0= )
 	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -272,6 +273,7 @@ src_configure() {
 		--disable-aa
 		--disable-dependency-tracking
 		--disable-optimizations
+		--disable-rpath
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
@@ -333,9 +335,10 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable macosx-qtkit)
+		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
-		$(use_enable mp3 mad)
+		$(use_enable mp3 mpg123)
 		$(use_enable mpeg libmpeg2)
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
@@ -390,6 +393,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index bc8a5669d833..f38f3b52ffb8 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive aribsub bidi bluray cddb chromaprint chromeca
 	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
-	macosx-notifications macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses
+	macosx-notifications macosx-qtkit 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 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
@@ -131,13 +131,14 @@ RDEPEND="
 	lirc? ( app-misc/lirc:0 )
 	live? ( media-plugins/live:0 )
 	lua? ( >=dev-lang/lua-5.1:0 )
+	mad? ( media-libs/libmad )
 	matroska? (
 		dev-libs/libebml:0=
 		media-libs/libmatroska:0=
 	)
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-sound/mpg123 )
+	mpeg? ( media-libs/libmpeg2 )
 	mtp? ( media-libs/libmtp:0= )
 	musepack? ( media-sound/musepack-tools:0 )
 	ncurses? ( sys-libs/ncurses:0=[unicode] )
@@ -274,6 +275,7 @@ src_configure() {
 	local myeconfargs=(
 		--disable-dependency-tracking
 		--disable-optimizations
+		--disable-rpath
 		--disable-update-check
 		--enable-fast-install
 		--enable-screen
@@ -336,9 +338,10 @@ src_configure() {
 		$(use_enable lua)
 		$(use_enable macosx-notifications osx-notifications)
 		$(use_enable macosx-qtkit)
+		$(use_enable mad)
 		$(use_enable matroska)
 		$(use_enable modplug mod)
-		$(use_enable mp3 mad)
+		$(use_enable mp3 mpg123)
 		$(use_enable mpeg libmpeg2)
 		$(use_enable mtp)
 		$(use_enable musepack mpc)
@@ -391,6 +394,7 @@ src_configure() {
 		$(use_enable zeroconf avahi)
 		$(use_enable zvbi)
 		$(use_enable !zvbi telx)
+		--with-kde-solid=/usr/share/solid/actions
 		--disable-asdcp
 		--disable-coverage
 		--disable-cprof