gentoo resync : 24.12.2018

4 files changed, 6 insertions, 71 deletions

diff --git a/kde-apps/kate/Manifest b/kde-apps/kate/Manifest
index 169f423a9500..89f9474fb636 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-AUX kate-18.04.3-root-user.patch 2754 BLAKE2B 98c0edf87332b3cceecc1af326730603adc72088915bd4373799cf8376b22edee536b1d04a97b0f303b2f4563288b48211fed899a363c70d5884d069c41fe122 SHA512 0b4cf0dfddc7060702c19824d4aa9b863a3ff1958e809d8112eec2cc6f3e4f3c594a69ee36390ba20d7067facb87f0c83a2cdee28c643cda7690cc3876aaea2c
-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 kate-18.04.3.ebuild 2166 BLAKE2B d23223dea86c2a770358ba874466ca50b6a14248beac2a17e3d92869f9b532e925b04cdb5fb1022288fd969c565f81ac4fb15a175e4146f88524eead3bf18bd3 SHA512 0730e7eddf12c896a8739f1c356bbe96ff8deb3a4ef68f61ccd089327309a89018ae3d5b3a646371037382f4e979e5e3afc0a070184335a5cd2a1628614bfa09
-EBUILD kate-18.08.3.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
+DIST kate-18.12.0.tar.xz 5770752 BLAKE2B a50b755497bc1adcc4c117c39f942f34ff2c2b80ed4b5e3ddb28942b11b0e823fd2865607949ee6aaae714dd0974611bd99175baec5f524e701dd8e7f4bde5cd SHA512 72fcec478a3beb789cbb6fa104c11191a8389866a4cb15e0a10d91392666b16f8ff6620827dc4756306fa58dc392c2735c1a683decc725a2ab477f8b421c53b1
+EBUILD kate-18.08.3.ebuild 2106 BLAKE2B e776a85fd1750c79d578cd4289893095b59993341ac11aedbdfc8bd474e769a23fc3b8f33aee4e0e8658c28a58483faa57caa6e1b37fbba47d183eedb63ebb8c SHA512 95a4d5fd6139f150224774873700105c9327165d2c051d37acb29c8c01585a91145ba42753ee1bbe8f169440abdde61332b10281e40fc7bd6785f42cafae46bb
+EBUILD kate-18.12.0.ebuild 2108 BLAKE2B 4c25ff3239dc6912b391b270e16f24aabd5ea634fe7569ec97634fd31438016de30107bb78ac022cd22bbd8d0b847d54749678b03d1fd8aae81e970aec4e426c SHA512 b1a128d1610843a62ebd58eca5af5f9629dede704549647916b188753c838b1bdb7cf70e78d55f50a1bdf70a9bad2de15269d8f2986a96141f4c025337b8c965
 MISC metadata.xml 330 BLAKE2B 2c8081efb3a1a1a6c87988dcdf0ac12e4e3efd85ad5c3965662683891113c9a60caa085a97734ae793bc6d12ac3ae0b8cf5249120b45c98897651ea23c7c3045 SHA512 41ae5a022aca855524ba8c6d4c98e54408853a94398a3ae65afd162200e6e4bb8fb9909ac270a27e99a8dc489a61eb48d732a04a73321113874dfcf605d60e6e
diff --git a/kde-apps/kate/files/kate-18.04.3-root-user.patch b/kde-apps/kate/files/kate-18.04.3-root-user.patch
deleted file mode 100644
index 320c17403595..000000000000
--- a/kde-apps/kate/files/kate-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
----
- kate/main.cpp   | 14 ++++++++------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/kate/main.cpp b/kate/main.cpp
-index e20fcff..19f7a99 100644
---- a/kate/main.cpp
-+++ b/kate/main.cpp
-@@ -61,13 +61,15 @@
- 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 Kate as root is not possible. To edit files as root use:" << std::endl;
--        std::cout << "SUDO_EDITOR=kate 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/kate/kate-18.08.3.ebuild b/kde-apps/kate/kate-18.08.3.ebuild
index 451e525f55cb..3f406c95b912 100644
--- a/kde-apps/kate/kate-18.08.3.ebuild
+++ b/kde-apps/kate/kate-18.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+addons"
 
 DEPEND="
diff --git a/kde-apps/kate/kate-18.04.3.ebuild b/kde-apps/kate/kate-18.12.0.ebuild
index a2aecefc4f84..451e525f55cb 100644
--- a/kde-apps/kate/kate-18.04.3.ebuild
+++ b/kde-apps/kate/kate-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
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+addons"
 
 DEPEND="
@@ -53,8 +53,6 @@ RDEPEND="${DEPEND}
 	!kde-misc/ktexteditorpreviewplugin
 "
 
-PATCHES=( "${FILESDIR}/${PN}-18.04.3-root-user.patch" )
-
 src_prepare() {
 	kde5_src_prepare
 	# test hangs