gentoo resync : 19.01.2018

7 files changed, 127 insertions, 3 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 3352af7e6963..8ea62fc2af3a 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index ca69f91a650d..de8f1b6fb66d 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,5 +1,6 @@
+AUX kate-17.12.1-deps.patch 3101 BLAKE2B 6cb0a6762041c6f6f2b02d921cee39b9f8eba1f3104d05a4e9565f7e9c7287f1e3ad5cb51bf07ff2f93d1c826c646102ae47c4f67d3e34dc82524ad102fba784 SHA512 abdfce9b12de6b254fecfa8d5f9e532e01212711962c88a02ab099f81ab68ef02a95c6afbae22057467562b37fcb1036b4edd2e8d8f1bde3919c4cba171de38b
 DIST kate-17.08.3.tar.xz 5617380 BLAKE2B 582c128e1904fbd0cec6ff177296aca68c36749581b57b6d71fce3e251838699c5068945a6e43abc05339eca3c2ac9dd5ec53891c20e208e3634771d5a859dd0 SHA512 cf4be33ec05a5451322141beeb4b2a66ff34da9f34fbc1038d7303d707012ffc477510164a65837ea0b94733b0e2812b747109a78049b5e4d31a75887c66bd46
 DIST kate-17.12.1.tar.xz 5630360 BLAKE2B 69f9855fbdb71c4215de58f046fcd88253d2edb7678633f07de4803aff8fc34dad975970e1f3d4800fd3f798d46ea30b0bdfef96ca11e22cacc53b0455d58fad SHA512 63644c093316f864390a67f419be047d9ae7eea8113f5a030bef047ccd2636ba4c8e2aeadcfb71cbebc675f91babef427b23bfbd96df310ff4ac5ad3e82d5e64
 EBUILD kate-17.08.3.ebuild 1954 BLAKE2B e56b1037dc2086e035559ae054099eac3f83e832f58df68441644948d444e8db358b72209eb65e0a5a7b88381da3e92c7f1ad82874d0e1ccdf69669102e5cdf6 SHA512 05a9fa841e53979f9537499c2460e44caff377dabb6e7f93c5bd7521e8faeacf300f0579d1b261af8ab2cab401602a5ef8d90fc6f6aa2beb05e48099ac8fa346
-EBUILD kate-17.12.1.ebuild 1921 BLAKE2B 748abb9b062aae35fc929455f9c5211a69fc6981d69a52def8ba5b7805f68a2d2f876310cc0b4babd55d80a490dbcbfc3b6418cb0b81dcd5bf932f2dbc456472 SHA512 3b5b8b82bfb824ee94ac9e654f75a7dbb588d9c9a3b01077e83d4700553b0ffa0428a5aa121171e25584b5041e763a400c798cfca0e8b696e5bfce5f04fc0c07
+EBUILD kate-17.12.1-r1.ebuild 1940 BLAKE2B 228f52e0e74e42fa9d47371b4c81420b74fb2bb5d4a09a5506609979a1f7a786a35b4476adbd7eae8f02dcadf989a5e5d35b272fdf5864b70ed05599755d1a02 SHA512 2f660686f97bb6e9b20a67152f6f8c99a74b6fac443edede4cdee19fb8069cfdff42367653246a81d7ef2ef257f632faf31d058d39c0121bd028553efe2a61e1
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/files/kate-17.12.1-deps.patch b/kde-apps/kate/files/kate-17.12.1-deps.patch
new file mode 100644
index 000000000000..05f3d53ff15f
--- /dev/null
+++ b/kde-apps/kate/files/kate-17.12.1-deps.patch
@@ -0,0 +1,79 @@
+From 4a157701ad3fae7fed67a92a9d9359dd36f08341 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?K=C3=A5re=20S=C3=A4rs?= <kare.sars@iki.fi>
+Date: Tue, 12 Dec 2017 07:24:53 +0200
+Subject: Remove obsolete QScript includes from CMake files
+
+Differential Revision: https://phabricator.kde.org/D9291
+---
+ CMakeLists.txt                 | 2 +-
+ addons/katesql/CMakeLists.txt  | 2 +-
+ addons/project/CMakeLists.txt  | 2 +-
+ addons/search/CMakeLists.txt   | 2 +-
+ addons/snippets/CMakeLists.txt | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fc7d3e..b746376 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ include (CheckFunctionExists)
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Sql)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Sql)
+ 
+ if(BUILD_TESTING)
+   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+diff --git a/addons/katesql/CMakeLists.txt b/addons/katesql/CMakeLists.txt
+index aba9a38..c4fee13 100644
+--- a/addons/katesql/CMakeLists.txt
++++ b/addons/katesql/CMakeLists.txt
+@@ -32,6 +32,6 @@ kcoreaddons_desktop_to_json (katesqlplugin katesql.desktop)
+ target_link_libraries(katesqlplugin
+     KF5::TextEditor
+     KF5::Parts KF5::I18n KF5::Wallet
+-    Qt5::Script Qt5::Sql KF5::ItemViews KF5::IconThemes)
++    Qt5::Sql KF5::ItemViews KF5::IconThemes)
+ 
+ install(TARGETS katesqlplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
+diff --git a/addons/project/CMakeLists.txt b/addons/project/CMakeLists.txt
+index 6787197..12a0ff7 100644
+--- a/addons/project/CMakeLists.txt
++++ b/addons/project/CMakeLists.txt
+@@ -38,7 +38,7 @@ target_link_libraries(kateprojectplugin
+     KF5::TextEditor
+     KF5::Parts KF5::I18n
+     KF5::GuiAddons
+-    Qt5::Script KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
++    KF5::ItemViews KF5::ItemModels KF5::IconThemes KF5::ThreadWeaver
+     KF5::NewStuff # For KMoreTools
+ )
+ 
+diff --git a/addons/search/CMakeLists.txt b/addons/search/CMakeLists.txt
+index d86c326..856221f 100644
+--- a/addons/search/CMakeLists.txt
++++ b/addons/search/CMakeLists.txt
+@@ -19,6 +19,6 @@ kcoreaddons_desktop_to_json (katesearchplugin katesearch.desktop)
+ target_link_libraries(katesearchplugin
+     KF5::TextEditor
+     KF5::Parts KF5::I18n KF5::IconThemes
+-    Qt5::Script KF5::ItemViews)
++    KF5::ItemViews)
+ 
+ install(TARGETS katesearchplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor)
+diff --git a/addons/snippets/CMakeLists.txt b/addons/snippets/CMakeLists.txt
+index a19277e..4182866 100644
+--- a/addons/snippets/CMakeLists.txt
++++ b/addons/snippets/CMakeLists.txt
+@@ -29,6 +29,6 @@ kcoreaddons_desktop_to_json (katesnippetsplugin katesnippetsplugin.desktop)
+ target_link_libraries(katesnippetsplugin
+     KF5::TextEditor
+     KF5::Parts KF5::I18n
+-    KF5::NewStuff Qt5::Script KF5::ItemViews KF5::IconThemes)
++    KF5::NewStuff KF5::ItemViews KF5::IconThemes)
+ 
+ install(TARGETS katesnippetsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/ktexteditor )
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kate/kate-17.12.1.ebuild b/kde-apps/kate/kate-17.12.1-r1.ebuild
index c1929deb4d51..d3e0aa0fc853 100644
--- a/kde-apps/kate/kate-17.12.1.ebuild
+++ b/kde-apps/kate/kate-17.12.1-r1.ebuild
@@ -38,7 +38,6 @@ DEPEND="
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	addons? (
@@ -54,6 +53,8 @@ RDEPEND="${DEPEND}
 	!kde-misc/ktexteditorpreviewplugin
 "
 
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
 src_prepare() {
 	kde5_src_prepare
 	# test hangs
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index b63166e0b6de..890a7cad13cb 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,6 @@
+AUX libkgapi-17.12.1-gmail-tokenpage.patch 1489 BLAKE2B e7bdc938d26b41e2e880f3932adc7e6db4aea6ea6d9fbfc6fd56143f783978617241ed61f3e8588c3c537a994406449c1ecb424ce5299698c0976637d71a0f71 SHA512 393da4cb35cc9e0c55e7073113cb51aecb72ab7d2c6b062512d1d7c46fafa3dbd7b091fd2377608930cb0a7413d7d7260580d565f07fd0531070a594136176e8
 DIST libkgapi-17.08.3.tar.xz 175300 BLAKE2B 80b1d6a19bd8953d4bae36f13da2b92d8f14314ec557ee61b0d1d86d0a856c0635fa2e0b96e0d8e2b2b2b5d9577d25a61b07af2a7226c3e57326171f3ad96334 SHA512 6f0c6afb39a0654d8cb5d03a43439fda3b3a1e508b579f46c8c6c7ace050b6b749e2c2673bc5fd9d8a502e91315d8f60f052c290ba31e9cd3cf9413d7ecd3906
 DIST libkgapi-17.12.1.tar.xz 175212 BLAKE2B e3a3792df13085bc6c18b3d36f120c4a49efd171524affe3f6f8a26d07acbc2e958cd812ddd0f46df17a8dda350a59d9cbdd57a68ef0c18279a3a374a5a9ff2b SHA512 62b6e392aa79469991d4293792fb1f21316f369c5f3c7885d073a82d5e1510ec45217dd5199023337108108aa043b66c51e8b3710c3aa6df80538df76a7844e4
 EBUILD libkgapi-17.08.3.ebuild 779 BLAKE2B ada0fc1706910256912f006c7a6832709cf8d8aa5544bfba952f2bafe7edb9a80b0e99db6c542cccda0adede7a42992305f0639404383183eff2e7e721d9610f SHA512 3f6c35f56a065c7e4bf75b9bf35d3d861288a05c8603fb63f74c3341d1560f7b84257c7aad10278d1f63e94d9499f2fded4ae215e89efeb968861428fe7ca068
-EBUILD libkgapi-17.12.1.ebuild 757 BLAKE2B 551e4d7347e476635b2800f3c45f66271ec8a71bf719faec7434f1bc44335d4b6393c5ea0b2379d53ade5f7b03f868985cb1075efe36804d8077ff2faaff3d74 SHA512 5f93d6951e92d348785e2d2145d115c28e686981629806acece86fc3d04e452649cafb41eec14cfab9555265d90c5ebf43b379527a02ee3ee299c7a2ef12e741
+EBUILD libkgapi-17.12.1-r1.ebuild 811 BLAKE2B 07f51a4a19b2f2f0831390277cac06dfb1fd49540c342d676e57d69681eea438673874379fb43e7c003433c925cdfdd205f89f9cef0fbf1bfdd66975aad87361 SHA512 15c2535c1842054a54a7f721d131bc2cae91869f4418c106e0156f1a95f62896106a5ff50ebd827211757ef888deb70ae6f5a5ff7dd5b1420304033556b219b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch b/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch
new file mode 100644
index 000000000000..61162ddf7c0d
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-17.12.1-gmail-tokenpage.patch
@@ -0,0 +1,40 @@
+From fa572d93cfa463f61432dd92239e747f9642fbae Mon Sep 17 00:00:00 2001
+From: David Kahles <david.kahles96@gmail.com>
+Date: Fri, 12 Jan 2018 15:23:53 +0100
+Subject: Fix token page URL
+
+Summary:
+It seems like Google changed the URL of the token page.
+Maybe we should use QString::startsWith, to be futureproof?
+
+BUG: 388483
+
+Test Plan:
+- Login in KOrganizer and KMail works again
+- All tests pass (though i think there is no oauth2 test)
+
+Reviewers: dvratil, mlaurent
+
+Reviewed By: mlaurent
+
+Differential Revision: https://phabricator.kde.org/D9843
+---
+ src/core/ui/authwidget_p.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/ui/authwidget_p.h b/src/core/ui/authwidget_p.h
+index 78b0e7f..29ece44 100644
+--- a/src/core/ui/authwidget_p.h
++++ b/src/core/ui/authwidget_p.h
+@@ -79,7 +79,7 @@ class Q_DECL_HIDDEN AuthWidgetPrivate: public QObject {
+     bool isSigninPage(const QUrl &url) const { return url.path() == QLatin1String("/signin/oauth"); }
+     bool isUsernameFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/oauth/identifier"); }
+     bool isPasswordFrame(const QUrl &url) { return url.path() == QLatin1String("/signin/v2/challenge/pwd"); }
+-    bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2"); }
++    bool isTokenPage(const QUrl &url) { return url.path() == QLatin1String("/o/oauth2/approval/v2/approvalnativeapp"); }
+ 
+     void setSslIcon(const QString &icon);
+ 
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/libkgapi/libkgapi-17.12.1.ebuild b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
index 9f3e37a77649..d3c67b28e4f0 100644
--- a/kde-apps/libkgapi/libkgapi-17.12.1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-17.12.1-r1.ebuild
@@ -32,3 +32,5 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
+
+PATCHES=( "${FILESDIR}/${P}-gmail-tokenpage.patch" )