[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/, media-video/kaffeine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     e335eb7a0ad985e43cc740ec33d5abc0c0c85add
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 18:20:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 18:46:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e335eb7a

media-video/kaffeine: Fix configure with >=KF-5.34

Reported-by: Geoff Madden <mgmadden <AT> internode.on.net>
Gentoo-bug: 615616

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 .../kaffeine/files/kaffeine-2.0.9-kf5.34.patch     | 22 ++++++++++++++++++++++
 media-video/kaffeine/kaffeine-2.0.9.ebuild         |  2 ++
 2 files changed, 24 insertions(+)

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
new file mode 100644
index 00000000000..3fba1d22ba9
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.9-kf5.34.patch
@@ -0,0 +1,22 @@
+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.9.ebuild
index 8d37f639db5..31cb79ae2e7 100644
--- a/media-video/kaffeine/kaffeine-2.0.9.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.9.ebuild
@@ -45,6 +45,8 @@ RDEPEND="${CDEPEND}
 
 DOCS=( Changelog NOTES README.md )
 
+PATCHES=( "${FILESDIR}/${P}-kf5.34.patch" )
+
 src_prepare() {
 	kde5_src_prepare