gentoo resync : 03.12.2017

15 files changed, 19 insertions, 179 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4368c85adbb6..1c8f6eee66fa 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest
index 3872b24dc0cf..dc50dcbde67b 100644
--- a/media-video/bdsup2sub/Manifest
+++ b/media-video/bdsup2sub/Manifest
@@ -2,6 +2,5 @@ AUX bdsup2sub-4.0.0-xdg.patch 1036 BLAKE2B c87a7b82a66c6bccc4b283a13ecef0d54b15d
 AUX build-4.0.0.xml 1836 BLAKE2B 39b481344bee30e17f5a825b8d6eced1f6c410468da5382978a6f07bd9b081d12ba04f7973d3cc127cb6353b7cc1853f8ad196bd1e46994fbffcc42058cbc190 SHA512 ec2f7c82dd00243a692182e8ecf363674703a11fcc59b81bb290bb9ef2afb0617da506459f7dc7e50018560364b2e5bddfb40e766e33cc15111b6984c18c6119
 DIST bdsup2sub-4.0.0.tar.xz 199796 SHA256 72d06f013ab13a89e213ada48e0b43dc8abee87e8eb16ba2d07b5d1a96f69569 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6 WHIRLPOOL fd1d5feddb5387bcc26a9f75aba901398e72da3f57f2d85e0a23c4b8bb5c6eaa43955373ff93e0e0a3705f68978b89283c6253b9322e63c02c871cf50fbab7f2
 DIST xdg-20100731.java.xz 648 SHA256 b6a189323fcc25ae5bebc006d870b4191a3bec34c80de7e337e5ed8a39f332c6 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b WHIRLPOOL 8a79fe5a73fae9662f0c74d293dbbe43d034484601649f170232e1b79ad0bb337fa8a6b3160683839893cc9e83171ad77e645fc64724c75321b02ef9f47efc85
-EBUILD bdsup2sub-4.0.0-r1.ebuild 1141 BLAKE2B 5dff63003c07facc1ed79b0cb798278c0ad743da3a300bfba59c12797f402af4bb772298429a99a4b5d9b4ae281119e781d908678a2e7927ce7d6a47a1fdced8 SHA512 9b4ea1ead50da4073fcd91e4ffe23e786d453526165770926af65ab3d267ecb146350200d02e423a52c49b52a54e93e4de64a67f3bf9e4132a8ed597b59ed5dd
 EBUILD bdsup2sub-4.0.0-r2.ebuild 1175 BLAKE2B 6aa6772e05051dde6fb0471d843666fd32bccb6d808fc90cba53f5c0994a086dbf9c0b625756a56440d670e761e5c3c11232974ca55de44632194930ad74b147 SHA512 1cf68cb7898a039a58cbcd794466e10c6249895234b6ac3add213cff2b862016b342a2796c550b141291ad7c63416fb3adfa6529b2a0bcadd552c4778093a3b9
 MISC metadata.xml 381 BLAKE2B 20afab01fc23bf5b640a7f71b67dd87f3420093c9c4b4db5e4b48d5d347c536da2a752af0dadb35e4566192b526e8df3bdb589daa1f11f2d44543170c377713f SHA512 5f9298ee19a292eea7612e7055b7c689f8ad7c86be2f820aec2b6b1afcf2bb5ab01ace028656a0e9daca9791e45c5b1ffdb70d959014b7bd0e42fc5f2f1da8bd
diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
deleted file mode 100644
index 7818e675d5d2..000000000000
--- a/media-video/bdsup2sub/bdsup2sub-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-XDG_P="xdg-20100731"
-
-DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams"
-HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm"
-SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/xz-utils"
-
-S="${WORKDIR}/${PN}/${PV}"
-
-java_prepare() {
-	# apply XDG patch
-	cp -f "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java"
-	epatch "${FILESDIR}/${P}-xdg.patch"
-
-	# copy build.xml
-	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
-}
-
-src_compile() {
-	eant build $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/BDSup2Sub.jar
-	java-pkg_dolauncher BDSup2Sub --main BDSup2Sub --java_args -Xmx256m
-	newicon bin_copy/icon_32.png BDSup2Sub.png
-	make_desktop_entry BDSup2Sub BDSup2Sub BDSup2Sub
-	use doc && java-pkg_dojavadoc apidocs
-	use source && java-pkg_dosrc src
-}
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 4b6c415251ce..a72bd6320817 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,6 +1,5 @@
-AUX kaffeine-2.0.9-kf5.34.patch 691 BLAKE2B 97bb6bd5094ae4fe8d4fa4933ee810b828648e2305ef43ca1f5a9eecc7c28e49587c6d24d163a89b75b7fd32f6f221ba0538a93c80631bf4b7027528d5de7038 SHA512 4078bd1542fd344321333d4566c0c9756b7b8bc19624a36b8dc3e622f3048304c256042c283c54b639aae23562af590355240d4bf953959a439cb1c3b54c0b3e
 DIST kaffeine-2.0.13.tar.xz 4374124 SHA256 1ac52ac811a9c9e88fcd466a7df13860fcd749cd125e7d533f589e6a6ee176fd SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5 WHIRLPOOL 3748a8a01289b14a466d3d6651ade04c712350a78ae539811d01ce681b2b2afb96f0882503eccf3e4195ac474429394f874f08560300841f73bc9b9a6860273f
-DIST kaffeine-2.0.9.tar.xz 4398832 SHA256 ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f SHA512 5adf86185aaafce4eadda4cfe40af2e0c867477f51b74a464bf813c018ecf035f9e13f47fffd21c0cd547289825441d2d80298ec7035e260f3cc0414c5fdd0d7 WHIRLPOOL 948eecec4957046c6ddee872747959661725f4d9f8408c735803d0dcc82c38dfcc7df6e9e92c46e8fda58e2f53a41ab6cf8c33da4b88f7d89542aa427a486223
+DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
 EBUILD kaffeine-2.0.13.ebuild 1431 BLAKE2B 6df2475430dfb14f0867ce9661fbb5e83e641554608471c23bacf78f5cbff3ffbc82304fd2cb4d3e22da82ba1b0e13f0a23b6f2c555f92f7565bfbb5c9860f1a SHA512 7a89677fd7a5c0f4f820da6a76037ff032ba9bb24e0a92fa529d01dfe8eea88c36830d99e311cb60b26c538ec18999a2d904688c252f50bddf7538a720bbe419
-EBUILD kaffeine-2.0.9.ebuild 1516 BLAKE2B e3e39ee419530d2ed7df9561f0a0362ec98643d8af470b753e9e81d72e66a1845f2ce0d17102f00523af9d55dd4450dbd8f8118aaf6900eef63f4c7457152ed1 SHA512 108f38faafd1fccd302a4ebde30079ee8e2718e57e9335c473249ab4154264c99a395034c6feff9ddded6707c3d95d9885b64bad11cba1602d7afc8c78506832
+EBUILD kaffeine-2.0.14.ebuild 1293 BLAKE2B 987066f62a18c2bc3a81f4b855e2b7af639d7232df95f219ba511b3cbce96123b54549b08a9c142722713a7fef9dc8d241c3677ddcec15efe5089b2cce2301da SHA512 267b89463830580fbeb1db2d12bf68f3ec1faa413ad5978a3308af82202d33a01fd7eb892fad46ba011925873bcd3c8c3d9f5748a34dd695c22aa2309f9c34d8
 MISC metadata.xml 447 BLAKE2B a8d3f7396f9ec720f0a47f90a81218ec536edef061cdf11912caa7e99370f03061594fa8c8943eeb0b494a341c3aae6cd1460979c11f306b1a426ecab9df2e1c SHA512 e2c7a2f56b06dae76e7714fa7a2b2170b47330712bf6b9d91a22854d75469bef20e16b916678674e81ba089f920d9bd27b04cd796cabb7fc4762f79740828d7c
diff --git a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
deleted file mode 100644
index 3fba1d22ba98..000000000000
--- a/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 657c11d76271f66fc3f40b60c5ba782061e8d895
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed May 17 20:15:43 2017 +0200
-
-    Remove duplicate call of ki18n_install
-    
-    Release script is adding this as well to tarball CMakeLists.txt.
-    That has worked in the past, but is fatal in KDE Frameworks 5.34.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9a88958..3c4601d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -95,8 +95,6 @@ add_subdirectory(src)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-   if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
-     add_subdirectory(po)
--  else()
--    ki18n_install(po)
-   endif()
- endif()
- 
diff --git a/media-video/kaffeine/kaffeine-2.0.9.ebuild b/media-video/kaffeine/kaffeine-2.0.14.ebuild
index 31cb79ae2e7f..5b8d68d6fdf8 100644
--- a/media-video/kaffeine/kaffeine-2.0.9.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.14.ebuild
@@ -8,11 +8,11 @@ inherit kde5
 
 DESCRIPTION="Media player with digital TV support by KDE"
 HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
+IUSE="dvb"
 
 CDEPEND="
 	$(add_frameworks_dep kconfig)
@@ -22,6 +22,7 @@ CDEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
 	$(add_qt_dep qtdbus)
@@ -31,9 +32,9 @@ CDEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
-	media-libs/libv4l
 	media-video/vlc[X]
 	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l )
 "
 DEPEND="${CDEPEND}
 	sys-devel/gettext
@@ -45,23 +46,11 @@ RDEPEND="${CDEPEND}
 
 DOCS=( Changelog NOTES README.md )
 
-PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependencies incorrectly added during the release process
-	# they do not appear in upstream git
-	sed -i \
-		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
-		-e "/kdoctools_install(po)/d" \
-		CMakeLists.txt || die
-}
-
 src_configure() {
 	# tools working on $HOME directory for a local git checkout
 	local mycmakeargs=(
 		-DBUILD_TOOLS=OFF
+		$(cmake-utils_use_find_package dvb Libdvbv5)
 	)
 
 	kde5_src_configure
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index b4a085fbd909..f5972756fded 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -5,6 +5,6 @@ AUX kmplayer-0.12.0b-qfile.patch 1387 BLAKE2B 6c04f0dc3eeed0635397a22fe5dc5b6fe5
 AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r1.ebuild 2412 BLAKE2B aba908df73ace9800020e95d43fafc57384770eb87bf7531e344289abe1f682997a0a3b2f938748253da6558f610c344aa725caa1daa2ed7e6746751323471ec SHA512 420bd68c05e6713f49cae6c548ddb21a9b13558e908aa6921f606d37de16a39bfeb2040bddc3d80e27491459dff3a35da78649e69527ed6d568f4c9b6650d6a5
+EBUILD kmplayer-0.12.0b-r1.ebuild 2411 BLAKE2B 8dbbdffc72deaddc831fd7c3ed2965befd532fc25206ff0a37ca3075d5e8ff5db25963eccbb82adba0cd5a7b602220035143273931c3a83613939d7b62a00b6d SHA512 acc899ef9080136d6ff976c37fd5676cd3b7c3ea04c4e1776e7c3408bcb951b49420b633d8622761f3c570694e79615ba92a96382890ee88dbdc2ce522abf56a
 EBUILD kmplayer-0.12.0b.ebuild 2103 BLAKE2B a60e24e72562d7cc85741bfd6c384bb626790714221ee0f670e3221a80923c87bbbedbabd0622cefbfc657c5be3b3fc4e6e03f5cef03cdf926f1287109ecfb34 SHA512 3e64bf1ecca26da93c2e6417a811a9610d7cd5ba4b5216bb53891bc47b4215dbe845bb0d68ea9532f0ac12e9f398f17727382468e6b4e67e05e7afe7cb80933f
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
index de870f58b17f..3c55fbb65624 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kmplayer.kde.org"
 SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
 
 LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cairo npp"
 
 CDEPEND="
diff --git a/media-video/sonic-snap/Manifest b/media-video/sonic-snap/Manifest
index 23aa71985c3a..9e132977edb6 100644
--- a/media-video/sonic-snap/Manifest
+++ b/media-video/sonic-snap/Manifest
@@ -1,4 +1,3 @@
 DIST sonic-snap-1.7.tar.gz 16760 SHA256 013a1f480d2f205caa2d2ceb8fe82e2af9ed6c86ecca4124760322e4b3dd9e9c SHA512 0c2fe5a7403ac003aad308d064a4d981a25f52e478943125090cb96d337aebe0a9fef160217b4f37cfd1991c0517f5f869f60f4c93a6abe9a127821f7906a664 WHIRLPOOL da2b6dfd37ce5f182619d3f8141cd4d888b26b36ee06b7f7152d3497ab6fd3f54834370cebf58c1422705420bde3d647966ab5860cc542ea52af86060c82e26e
 EBUILD sonic-snap-1.7-r1.ebuild 1720 BLAKE2B b17b6d4c5648b77d843fa6eba630a0a3ab51870a87d9fae3edbb886800342e8cc6c2c5c62446094c9a368b9c4cd9008d36175a6f75126cd1fd6c8eb8e2b01d57 SHA512 b986c0b5656afa101fab3254559c0243a583720884300b7be7896a2acd6d0051afcc5f95445ec97a2d2b79cf8fef76bcdb5f7b5573bf2c90a1d3e62786bfbf39
-EBUILD sonic-snap-1.7.ebuild 1676 BLAKE2B 6da3c6a457121ecae71c18083c76a53c6471240e9b0b1235d0aff0f06d3e5b83777206f3c24061e0a2e81165da9b963597849ebd1503f11152ad8795603ed2d6 SHA512 b18244ba1d135865ba5fe647344b7e4c3322b8d013754b311ffbb71a456b23d199e991c43c7e2fddf00ea68e869a5ab9320d239082e7f515d91609494e8fbcbc
 MISC metadata.xml 389 BLAKE2B c2aa867a3cfeccc38b53de2725cf6eb4d19732253a83838b7873e59c37ecb115940dc019ef20d0415b54655693a498754a7d2a8b2a56d767f934a906459fc367 SHA512 231e6383dd068d1b4a52f8cee7293a4adb9c7f527f16c1023fb9cb8f8407c758cb694c4166c55b5494eb9ed5fef7a368ed1ccde52210d77cae4cb71901fcbcd8
diff --git a/media-video/sonic-snap/sonic-snap-1.7.ebuild b/media-video/sonic-snap/sonic-snap-1.7.ebuild
deleted file mode 100644
index 48a5f4180085..000000000000
--- a/media-video/sonic-snap/sonic-snap-1.7.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils linux-info multilib toolchain-funcs
-
-DESCRIPTION="Webcam app for sn9c10x based camera controllers (with optional MPEG4 support)"
-HOMEPAGE="http://www.stolk.org/sonic-snap/"
-SRC_URI="http://www.stolk.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mpeg"
-
-DEPEND="x11-libs/fltk:1
-	mpeg? ( >=media-libs/libfame-0.9.1 )
-	sys-libs/zlib
-	x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft"
-
-CONFIG_CHECK="~USB_SN9C102"
-ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \
-enabled, under V4L USB devices, as a module in your kernel."
-
-src_prepare() {
-	# fix bad assumptions
-	sed -i \
-		-e "s|\$(HOME)/include|/usr/include|" \
-		-e "s|\$(HOME)/lib|/usr/$(get_libdir)|" \
-		-e "s|CFLAGS=|CFLAGS= ${CXXFLAGS} |" \
-		-e "s|LFLAGS=|LFLAGS= ${LDFLAGS} |" \
-		-e "s/g++-4.0 -O3/$(tc-getCXX)/" \
-		Makefile
-
-	use mpeg || sed -i -e "s?USE_FAME=1?USE_FAME=0?g" Makefile
-}
-
-src_compile() {
-	make || die '"make" failed.'
-}
-
-src_install() {
-	dodir /usr/bin
-	make DESTDIR="${D}" install || die '"make install" failed.'
-
-	dodoc ChangeLog README
-	doman debian/sonic-snap.1
-}
-
-pkg_postinst() {
-
-	elog
-	elog "This driver is V4L v2 only, so V4L v1 apps will not work."
-	elog "Finally, only a few image sensors are supported, eg, PAS106B"
-	elog "so (check dmesg or /var/log/messages for USB device info when"
-	elog "you plug the cam in)."
-	elog
-	elog "Now try sonic-snap-gui /dev/videoX (where X is 0, 1 , etc)."
-	elog
-}
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 \