gentoo resync : 03.12.2017

5 files changed, 9 insertions, 20 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 9254693a58c5..9eab6e1be0e0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,9 +11,9 @@ AUX vlc-2.2.4-qt57.patch 8624 BLAKE2B 5b2521dc8d793c9b44dfbb6c0c23ca90e32d45d16c
 AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa
 AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3
 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968
-DIST vlc-2.2.6.tar.xz 22198720 SHA256 c403d3accd9a400eb2181c958f3e7bc5524fe5738425f4253d42883b425a42a8 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d WHIRLPOOL a2747219e4b12b4274468348c47c543f3266bb1ebc222d02f34d6679dfb8e56a6f2eebda4e1749de0eb91a84e3358700ea2e5ed1a6871ddfc9f19ef1e191cbc8
-EBUILD vlc-2.2.6-r2.ebuild 15134 BLAKE2B 5443c43e19643574fe4cdd526c553fa0f05299e7238b96e026e73b015f5f128e331ee3c5dc85ff240e78ac39a7f69fe1e710ac845b88f34c60679580586f603e SHA512 dd67d770e647236292a59212841addcb45ba9420b355c8f28c25493e9588f8513c7f05abf5fd05510d89ea544c227144c6322d3d97c8722aeba4fde5bcb2226e
-EBUILD vlc-2.2.6.ebuild 15609 BLAKE2B b31852ae043c48fda5a49c5e556a93991b49afe27b7d6b29aadf03a5f8f4ea281aa5e9e7c5a552e0e21b7e80939f6b31028f75f3925ba5506f60d8d097606f2d SHA512 d096a788aadebe0494bf355e50da62405e0eeaaefd1870a98ffc30075ac2048b7237e1243f9bf092481122f11242bba838a41f6f5443ec51e973e40c8968e3e4
-EBUILD vlc-2.2.9999.ebuild 15130 BLAKE2B d89273cc2c89477292b18402208fa44b3a4f9795bb565696f64481bb413496de41db2eba58035f4f23edfbe49268f3a7306429ee205b8bc9d7535ae37c7a7d8d SHA512 92f703830575bd46c916ee3485cd0a51a13e331785f62033d5dc7229a78d229b7b9b2f9c6dbdfffc87b5c6902c6c1a079edf8f59a48869aaed01c6a621c010a1
-EBUILD vlc-9999.ebuild 14422 BLAKE2B b0aac3c9fd5e553858b9166ae44529df76b927fedfa3758c46c4c4c28a4992f67bc7722cfc0938f139581fd174e0b1ca58e537e3e877793d7c7b604abc125eac SHA512 ad69e3ea17c28faf9b001e8e9f32ff83d14f69d1ce8f9fe5f43f05b3eda8a8a4a7e79fe4ca6ed3157481c0f33df5a342317b0d6460d0f1ad67c35eb7eb617ea8
+DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
+EBUILD vlc-2.2.6-r2.ebuild 15044 BLAKE2B 9988d763c4ef0017c16e21872c776e27eaee14787ff5b3a7b4201334683f0df91146ab82b80cf18123271bcaaf7b7974fc9b1cee05acc40f6750702694b06b3f SHA512 15a86d738cc81fb894c5724fc2ab91c7bfdd1a878d0c353253100f7ad648d2f4b2fe75a6e84977287aa25d01d46e7ce59e8974fae187679d509d3e32c8fc2d8a
+EBUILD vlc-2.2.6.ebuild 15519 BLAKE2B cbc55f76288176d91b8e53b188778aa1f50b42942a60aafe9c9fc0278a6da13a04b8acaa0d7dcd76b0f1b54ad23b7048c76f07cca0ccd478659fb94492a6257a SHA512 ba381af8546d8d55b4394dd0db2859146f3fc0c015ac50767f945a38c3abb3034d1ff98b5a0793d4a201e694477ac8d1fd3d092b8274e09170a200a49ff13e94
+EBUILD vlc-2.2.9999.ebuild 15040 BLAKE2B 95ff6305466d2b25375a77f34ec69382fe9b20edb672f9083cdcd72b84a8194c06baf9a2c278bce1a8d3a34922c68733c33b79b5b74cb43a691b54e8c9bf921b SHA512 ee3bc1da6893c579be1b47cea17094a0d48ebcc23b462ae53f60fd227b582e2a09a9aa3f80be88a4b38789e4d38b3d659138daaf9cbe034598e200da8df503c5
+EBUILD vlc-9999.ebuild 14306 BLAKE2B de76c0992dcbd8bcba51ef7706c90fcec47f3e0cf94d912d7ede4987f90e81fc53b7394f21b2b7ddd1e335ae3ff6d450243b59f65259af206f88af176314192d SHA512 f303ba6573d1d0c64155649178d3ee57b5db0d6fefcf0cf322ceaa56e8c4f669111da0a31af9f5b29fc054773102037399c978c35a7f75e7aa6e6a9756cf62fb
 MISC metadata.xml 6325 BLAKE2B 3665fcc2e92d1738052df6054676a8dbc9b32d6e8061338d5c780f87d4802f21c7126d6b6e6e61a9164161a1b493b5094abded00c8a8b78b216c54c96a9f116a SHA512 737cc412a5b4832df066631792744c3e8cecd217634af6cc8feed4c0ab89a3ba324312af73c6da545eeb7f861896c0237c0f47397cdfbcd6cf08de33293e1ea9
diff --git a/media-video/vlc/vlc-2.2.6-r2.ebuild b/media-video/vlc/vlc-2.2.6-r2.ebuild
index 62e7d7e9ef21..26fdf96987e1 100644
--- a/media-video/vlc/vlc-2.2.6-r2.ebuild
+++ b/media-video/vlc/vlc-2.2.6-r2.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-8" # vlc - vlccore
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
 	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
 	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
-	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav
+	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
 	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
 	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
 	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
@@ -185,7 +185,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.18.3:*
 	virtual/pkgconfig:*
-	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )
@@ -306,7 +305,6 @@ src_configure() {
 		else
 			myconf+=" --disable-qt"
 		fi
-		use kde && myconf+=" --with-kde-solid"
 	fi
 
 	econf \
diff --git a/media-video/vlc/vlc-2.2.6.ebuild b/media-video/vlc/vlc-2.2.6.ebuild
index f821f2168cc0..9652a5dba1e4 100644
--- a/media-video/vlc/vlc-2.2.6.ebuild
+++ b/media-video/vlc/vlc-2.2.6.ebuild
@@ -41,7 +41,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
 	+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
 	directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
 	fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
-	growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+	growl gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca libnotify
 	+libsamplerate libtiger linsys libtar lirc live lua
 	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
 	matroska cpu_flags_x86_mmx modplug mp3 mpeg
@@ -175,7 +175,6 @@ RDEPEND="${RDEPEND}
 "
 
 DEPEND="${RDEPEND}
-	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )
@@ -332,7 +331,6 @@ src_configure() {
 		else
 			myconf+=" --disable-qt"
 		fi
-		use kde && myconf+=" --with-kde-solid"
 	fi
 
 	econf \
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 069a19e151fa..4bb7346a5f85 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-8" # vlc - vlccore
 IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
 	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
 	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
-	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate kde libass libav
+	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
 	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
 	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
 	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
@@ -185,7 +185,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.18.3:*
 	virtual/pkgconfig:*
-	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )
@@ -306,7 +305,6 @@ src_configure() {
 		else
 			myconf+=" --disable-qt"
 		fi
-		use kde && myconf+=" --with-kde-solid"
 	fi
 
 	econf \
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 11808b476de3..c406ba1759e9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -32,7 +32,7 @@ SLOT="0/5-8" # vlc - vlccore
 IUSE="a52 aalib alsa altivec +audioqueue +avcodec +avformat bidi bluray cddb
 	chromaprint chromecast dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd
 	dxva2 elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt
-	gme gnutls gstreamer httpd ieee1394 jack jpeg kate kde libass libav libcaca
+	gme gnutls gstreamer httpd ieee1394 jack jpeg kate libass libav libcaca
 	libnotify +libsamplerate libtiger linsys libtar lirc live lua macosx-eyetv
 	macosx-notifications macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3
 	mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
@@ -183,7 +183,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils:0
 	>=sys-devel/gettext-0.19.6:*
 	virtual/pkgconfig:*
-	!qt5? ( kde? ( kde-frameworks/kdelibs:4 ) )
 	amd64? ( dev-lang/yasm:* )
 	x86?   ( dev-lang/yasm:* )
 	xcb? ( x11-proto/xproto:0 )
@@ -286,10 +285,6 @@ src_configure() {
 		myconf+=" --enable-qt"
 	fi
 
-	if ! use qt5 && use kde ; then
-		myconf+=" --with-kde-solid"
-	fi
-
 	econf \
 		${myconf} \
 		--enable-vlc \