gentoo resync : 12.11.2017

3 files changed, 49 insertions, 1 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 02300b3c0f45..b23c2d4ca55e 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,8 @@
+AUX okular-17.08.3-cmake-3.10.patch 1615 SHA256 8056ff72ba084c7d3333ce35d5d48891a823d85c674880386b9d28e823f062fa SHA512 2f06c6b54bba5241b3d5b72724363b3acc5554d314ea8bb5d77b0fd28963283cceee1c81627f6701ba2afd8e88f1239a14b05fea7271148bde55e4bc6d93adb1 WHIRLPOOL 512b8ef3c908b3b0f7f5a07251e9fbbae6ef377b814fb0c0dd1b14f4b844c5e6f108bb02dadb645b63707ece5ab8c8f3ceced050232c3ca32ec4aa5d906939f6
 DIST okular-17.04.3.tar.xz 5606304 SHA256 3b9e34d6f03d54b8ba17bab7be67109b8974c4f0465087fb8ad09be889aa0530 SHA512 36d843f122d7a558cba2236e0db9a4f01af2b167fd24c8e34126bcb4eadadefa97dbe25e2e6168e649e11ad56e9039e22ee45c6c4e38b0f1809266bb9b58be85 WHIRLPOOL 2c9e2a2527e2669989b2336745cc520809767910d3ddfca588af0ba1c0b041b0e8cad72481a1d5f8d5d802b1252266fa70ee336afc56c13b289131ce2a7a1cdb
 DIST okular-17.08.3.tar.xz 5618588 SHA256 d32e69b6be2a10d0eadc6f616be53dc8dd372c9123a6311628ac3f97b69054fd SHA512 33b8f1bbf1f4c5814b6df8bfd87a3deccc762564f312729a50956c85fc95f1ce9f057a8b43b51a368a3f0c2a4d9705dde09d1e575f7325ae32420c0106ce28b0 WHIRLPOOL a7288ad83ea6c0fc0590dbb9fb9bdf4d341375d922605ea07070ce67c47e0854c633be473f4b600a5a977a99cafa339fbae9c5aff0670eed2b9ffcdbe55a600e
 EBUILD okular-17.04.3.ebuild 2491 SHA256 ae1a0ac4404ab06608081254d65e8fe47e8cf051eaa56abda7ad124797064fc0 SHA512 c525952c6ee84de72d0127d25899fb4056cf2ce2aaf1383a47f939a6c2c8a88a67b238b6d7a75446a4c0e02a2e50e2e0835c80ddd1fef56888abcab73638027a WHIRLPOOL ee99d1311ed9c790117be87eb4ad231f3f98c2ab5c5551ca5fdf5bf574d24e7c6a61f4d5ffdf1f733c7e08ed975db2f71bcade40be3a9549bf538196896b0343
-EBUILD okular-17.08.3.ebuild 2498 SHA256 b8189a9b46105aa84bc16dd98e3e278119a26c489575e42f0f1184e7e4e0ad5e SHA512 bacfb769df832a45c5272b6265c2dda49aed25e78da8f6baa980c87f543cddca7bc0733b9be599a506e24c57452872bc4444839f1c167716738dea0cf15d6ed5 WHIRLPOOL 81ccdb55d201cf6771618b5090a804e404bb75fc358931a7d5de1bdab7ee2e13daf74c17a28a70df9ba96ffeac0b0f22cb6a9da4d03563b97193ae3c4ffb2302
+EBUILD okular-17.08.3.ebuild 2547 SHA256 2c770527e1ab8ed8236aab2754d7e5e09e07c0f52d607ec600c5bcdc9f0389d9 SHA512 83da79e17569786c697a68168e83c118a65751fea40d194cf36cc2babab7f98cf3ef36d4c83f2c5620f188b5183a3cb52aaaa09f4c0399107c63b407c9a42e89 WHIRLPOOL 0b917d18f0c14ab5098ab6209e43e9cf8083d461205c3ea80b34b1980ffa0b6b03b0151679e4c2409ef937afdf01ea01c0c5d7e33006b748c4a294985828030a
 MISC ChangeLog 8063 SHA256 9e6be973b329f28e5b1260cf3260b1778311f316036c9e3dd6ba179615c69ec9 SHA512 8da1acee4e5256af5c76ba817863d434d7a9eaf9bd85104b882bb7a3e81f34147b77e4c2e5411044ae7a9977df99678bfd82066304ebcd41d0f1af3814955fde WHIRLPOOL c673c0122a65841b7765e362f4845abf53da30f59988ec394dc66fd3d022c97051e85532796b7a046fe136d68fc46fdfa34898546af5f8cc0eb01d6e0bedc2b8
 MISC ChangeLog-2015 33594 SHA256 c291611acb200b0a762db87cea5895150653cc54f9b5519569ea8cdcea8ece51 SHA512 fd9fd4423a6510e29210fbd895e37f9a0cbf459aea4cff5b9770a5257ddcbafda704825311c5cd3817100c0e720a5f3c3bc008f556df8efde95beb3ce2837a51 WHIRLPOOL 299bfab17e1ef29ee94602f0aee3a74d3b87453fe3957e21b6151a381ba582a427774eafe53a4e47b3fc3f65ec7e7210fc2effd40b0dc38a64cad978ed8a200d
 MISC metadata.xml 738 SHA256 442286d8bcf84cd662452d552488eaea13febc3c5468b7179cb0ed2440c30dbe SHA512 cb722697cc24b68eeebed77f1c637be465e287a01627d58d76e6fb597319d2443acbe14389eaa2c8e8f4c24a78b1df005569b95f21d3122465092b4524ab5086 WHIRLPOOL de487d28b00fe512d24ab754d809c356a934ff29a3ea2678896ae36db2fa4495f81453e4269367da9e2ec4bac6d2d00eda1f12f5e39bf322223df64fe6522224
diff --git a/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
new file mode 100644
index 000000000000..33c56a6e7ecb
--- /dev/null
+++ b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
@@ -0,0 +1,45 @@
+From f777e2a9241c4f384f60c467e226eee85fb5bc98 Mon Sep 17 00:00:00 2001
+From: Henrik Fehlauer <rkflx@lab12.net>
+Date: Sat, 4 Nov 2017 00:22:09 +0100
+Subject: Fix CMake Error in generators/spectre/CMakeLists.txt
+
+Summary:
+When porting from `add_library` to `okular_add_generator`, 2f9246ae42ce
+missed to remove `MODULE` for spectre, which is already implicitly added
+as can be seen [here](https://phabricator.kde.org/source/kcoreaddons/browse/master/KF5CoreAddonsMacros.cmake;83623a46c9862ee37535de93427dec0b0c55e24d$139).
+
+This causes the upcoming CMake 3.10 to print the error `Cannot find
+source file`, which can be fixed by removing the superfluous `MODULE`.
+
+BUG: 386176
+
+Test Plan:
+No error shown anymore with CMake 3.10.0-rc4. Still works with CMake
+3.5.1.
+
+Reviewers: #okular, ngraham
+
+Reviewed By: ngraham
+
+Tags: #okular
+
+Differential Revision: https://phabricator.kde.org/D8612
+---
+ generators/spectre/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt
+index d808c36..5d6927d 100644
+--- a/generators/spectre/CMakeLists.txt
++++ b/generators/spectre/CMakeLists.txt
+@@ -24,7 +24,7 @@ ki18n_wrap_ui(okularGenerator_ghostview_SRCS
+ kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc )
+ 
+ 
+-okular_add_generator(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS})
++okular_add_generator(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS})
+ 
+ target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml)
+ 
+-- 
+cgit v0.11.2
diff --git a/kde-apps/okular/okular-17.08.3.ebuild b/kde-apps/okular/okular-17.08.3.ebuild
index 283bc3eb368c..d5f22e6d85aa 100644
--- a/kde-apps/okular/okular-17.08.3.ebuild
+++ b/kde-apps/okular/okular-17.08.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 # bug 603116
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-cmake-3.10.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	use mobile || cmake_comment_add_subdirectory mobile