gentoo resync : 03.12.2017

3 files changed, 8 insertions, 42 deletions

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