gentoo resync : 24.12.2018

4 files changed, 6 insertions, 71 deletions

diff --git a/kde-apps/kwrite/Manifest b/kde-apps/kwrite/Manifest
index 44d82b56499c..52f626a66def 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,6 +1,5 @@
-AUX kwrite-18.04.3-root-user.patch 2791 BLAKE2B 504d19baecc1a31c00fe32ed25c4f5c42400b33e788a94559a0833dad0dba0600bf5f763dffbfb4868c213d1825d852c988cded0bf2937f8e5614e5edb953b84 SHA512 b8d71b7e609ae671071419d75dcc6fcfb1577e25d4dbea5f62baafe00862fb45d4d91b01e90cb874a849897a9fe4d3ce50b02ff1b7ac7faaf6f5fc5b9ccf3634
-DIST kate-18.04.3.tar.xz 5639892 BLAKE2B 76b36061ec758964e3644fc3893069791e060566646eb03ce0bb6ed04c6c2707f5f48240887078e309128f09e3316ee1bb7076063a8d937d1c4ee67e1dedc906 SHA512 7a41ef21e28e275a448fa80f6d6a7890e221669343c30f946a4522e7f9b4812407ff5b168939508568ce17965fa2dea965aa63062f4fe059a2612021f877694e
 DIST kate-18.08.3.tar.xz 5664744 BLAKE2B 6645600156844c52ca8162bec98f107b45f8f4040aa94adbcf51470fb0102c300fb6755b6d6fb6bd856e6792ce770cae72d3675a2ac7fe0519f0c18d4df70e7e SHA512 08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3
-EBUILD kwrite-18.04.3.ebuild 1244 BLAKE2B 560f4a9565e365369c3d03e37ceddf14b15b4676b214fb2b54b30975c3e3f44ea5503336bbaec6f3ed413075bf508767310b6f9c06a47000df5bd00e9cc650c3 SHA512 7f57248d3385701220f03f7a3d5737a388d407cdb5d5913200284822f76e8151d9ab71875cf45838e319ecc2ede69a1cb84ab5174eb9c8aaea8d1c3864864c91
-EBUILD kwrite-18.08.3.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
+DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+EBUILD kwrite-18.08.3.ebuild 1184 BLAKE2B 23fa41c246b1ae097d7ee090a3c842551633b46e07a03b60ae22d46c9f6a1a0a00ac86798037cc9ebf8282e1a21c7e50f5ad5c05c24c13b66a5859621f44b902 SHA512 6046dcd2fbd951faa6da692a1bc3d896d88452e25d692afc081a3ab6255e1d50c7d8665a64b35c1bd2743a0499979649355d76918d922335172c8d4fa740a6d9
+EBUILD kwrite-18.12.0.ebuild 1186 BLAKE2B 1a701254e0f3a90f196da08b9a816e9fa5221b9144259ebbc54985638721a3740c80e159258433774b5f20caed802a786d748184ec955f088da21e673277db21 SHA512 63e9ab92825b3f9fdc65d64fc60d231720443764022200bb2a5823c6096d905dd6172ec5d7582128ebcfed6ae213a9c6b8899a5e62ebdd755a741614a160b22c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch b/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
deleted file mode 100644
index 5bbf2da605ea..000000000000
--- a/kde-apps/kwrite/files/kwrite-18.04.3-root-user.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bf6d5b7532968763bdc629aa90426c53500af13f Mon Sep 17 00:00:00 2001
-From: Nathaniel Graham <nate@kde.org>
-Date: Sat, 26 May 2018 14:50:24 -0600
-Subject: Re-allow running Kate and KWrite as the actual root user (but still
- not using sudo)
-
-Summary:
-The original change (9adcebd3c2e476c8a32e9b455cc99f46b0e12a7e) to prevent sudo usage broke the use case of running KWrite or Kate while logged in as the actual `root` user with a GUI session. This is how the Kali distro is set up by default, so the original change amounted to making Kate and KWrite not launch at all on this KDE distro.
-
-This patch re-enables running as the actual root user, but keeps blocking usage via `sudo` or `kdesu`. There are no negative security implications associated with re-allowing usage via the root user, since if you're running a GUI session, you were already exposed to the original security threat and Kate and KWrite do not increase the attack surface.
-
-I have submitted a similar change for Dolphin that has been accepted (D12795), but @elvisangelaccio wants that to go in at the same time as this, to keep them in sync.
-
-BUG: 387973
-FIXED-IN: 18.08.0
-
-Test Plan:
-- Log in as normal user and run `sudo kate` or `sudo kwrite`: you get an error message.
-- Log in as normal user and run `kdesu kate` or `kdesu kwrite`: you get an error message.
-- Log in as the root user and run Kate or KWrite normally: it works.
-
-Reviewers: #kate, dhaumann, cullmann, #ktexteditor
-
-Reviewed By: #kate, dhaumann, #ktexteditor
-
-Subscribers: kwrite-devel, elvisangelaccio
-
-Tags: #kate
-
-Differential Revision: https://phabricator.kde.org/D13138
----
- kwrite/main.cpp | 14 ++++++++------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/kwrite/main.cpp b/kwrite/main.cpp
-index 62f4f2d..d3f3ca9 100644
---- a/kwrite/main.cpp
-+++ b/kwrite/main.cpp
-@@ -50,13 +50,15 @@
- extern "C" Q_DECL_EXPORT int main(int argc, char **argv)
- {
- #ifndef Q_OS_WIN
--    /**
--     * Check whether we are running as root
--     **/
-+    // Prohibit using sudo or kdesu (but allow using the root user directly)
-     if (getuid() == 0) {
--        std::cout << "Executing KWrite as root is not possible. To edit files as root use:" << std::endl;
--        std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl;
--        return 0;
-+        if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
-+            std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
-+            std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
-+            return EXIT_FAILURE;
-+        }
-     }
- #endif
-     /**
--- 
-cgit v0.11.2
diff --git a/kde-apps/kwrite/kwrite-18.08.3.ebuild b/kde-apps/kwrite/kwrite-18.08.3.ebuild
index 7452e0dfe13b..357d5b74b061 100644
--- a/kde-apps/kwrite/kwrite-18.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-18.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
diff --git a/kde-apps/kwrite/kwrite-18.04.3.ebuild b/kde-apps/kwrite/kwrite-18.12.0.ebuild
index a4c814923cc2..7452e0dfe13b 100644
--- a/kde-apps/kwrite/kwrite-18.04.3.ebuild
+++ b/kde-apps/kwrite/kwrite-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -30,8 +30,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# delete colliding kate translations