From d12e8af5c6a9e7a92fbf0872b847cf56e1d0969c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 23 May 2018 23:11:58 +0200 Subject: [PATCH] kde-plasma: Drop KDE Plasma 5.11.5 Package-Manager: Portage-2.3.38, Repoman-2.3.9 --- kde-plasma/bluedevil/Manifest | 1 - kde-plasma/bluedevil/bluedevil-5.11.5.ebuild | 40 -- kde-plasma/breeze-grub/Manifest | 1 - .../breeze-grub/breeze-grub-5.11.5.ebuild | 30 -- kde-plasma/breeze-gtk/Manifest | 1 - .../breeze-gtk/breeze-gtk-5.11.5.ebuild | 12 - kde-plasma/breeze-plymouth/Manifest | 1 - .../breeze-plymouth-5.11.5.ebuild | 26 -- kde-plasma/breeze/Manifest | 1 - kde-plasma/breeze/breeze-5.11.5.ebuild | 87 ---- kde-plasma/drkonqi/Manifest | 1 - kde-plasma/drkonqi/drkonqi-5.11.5.ebuild | 58 --- .../drkonqi/files/drkonqi-5.11.1-x11.patch | 46 -- kde-plasma/kactivitymanagerd/Manifest | 1 - .../kactivitymanagerd-5.11.5.ebuild | 35 -- kde-plasma/kde-cli-tools/Manifest | 1 - .../kde-cli-tools/kde-cli-tools-5.11.5.ebuild | 59 --- kde-plasma/kde-gtk-config/Manifest | 1 - .../kde-gtk-config-5.11.5.ebuild | 58 --- kde-plasma/kde-gtk-config/metadata.xml | 3 - kde-plasma/kdecoration/Manifest | 1 - .../kdecoration/kdecoration-5.11.5.ebuild | 16 - kde-plasma/kdeplasma-addons/Manifest | 1 - .../kdeplasma-addons-5.11.5.ebuild | 56 --- kde-plasma/kgamma/Manifest | 1 - kde-plasma/kgamma/kgamma-5.11.5.ebuild | 26 -- kde-plasma/khotkeys/Manifest | 1 - kde-plasma/khotkeys/khotkeys-5.11.5.ebuild | 46 -- kde-plasma/kinfocenter/Manifest | 1 - .../kinfocenter/kinfocenter-5.11.5.ebuild | 91 ---- kde-plasma/kmenuedit/Manifest | 1 - kde-plasma/kmenuedit/kmenuedit-5.11.5.ebuild | 44 -- kde-plasma/kscreen/Manifest | 1 - kde-plasma/kscreen/kscreen-5.11.5.ebuild | 38 -- kde-plasma/kscreenlocker/Manifest | 1 - .../kscreenlocker/kscreenlocker-5.11.5.ebuild | 92 ---- kde-plasma/ksshaskpass/Manifest | 1 - .../ksshaskpass/ksshaskpass-5.11.5.ebuild | 49 --- kde-plasma/ksysguard/Manifest | 1 - kde-plasma/ksysguard/ksysguard-5.11.5.ebuild | 47 -- kde-plasma/kwallet-pam/Manifest | 1 - .../kwallet-pam-5.11.5-CVE-2018-10380-1.patch | 206 --------- .../kwallet-pam-5.11.5-CVE-2018-10380-2.patch | 135 ------ .../kwallet-pam-5.11.5-CVE-2018-10380-3.patch | 54 --- .../kwallet-pam/kwallet-pam-5.11.5-r1.ebuild | 35 -- kde-plasma/kwayland-integration/Manifest | 1 - .../kwayland-integration-5.11.5.ebuild | 22 - kde-plasma/kwin/Manifest | 1 - .../kwin/files/kwin-5.11.5-cmake-3.10.patch | 49 --- kde-plasma/kwin/kwin-5.11.5.ebuild | 95 ---- kde-plasma/kwrited/Manifest | 1 - kde-plasma/kwrited/kwrited-5.11.5.ebuild | 23 - kde-plasma/libkscreen/Manifest | 1 - .../libkscreen/libkscreen-5.11.5.ebuild | 27 -- kde-plasma/libksysguard/Manifest | 1 - .../libksysguard/libksysguard-5.11.5.ebuild | 53 --- kde-plasma/milou/Manifest | 1 - kde-plasma/milou/milou-5.11.5.ebuild | 30 -- kde-plasma/oxygen/Manifest | 1 - kde-plasma/oxygen/oxygen-5.11.5.ebuild | 93 ---- kde-plasma/plasma-desktop/Manifest | 1 - kde-plasma/plasma-desktop/metadata.xml | 3 - .../plasma-desktop-5.11.5.ebuild | 161 ------- kde-plasma/plasma-integration/Manifest | 1 - .../plasma-integration-5.11.5.ebuild | 43 -- .../plasma-meta/plasma-meta-5.11.5.ebuild | 70 --- kde-plasma/plasma-nm/Manifest | 1 - kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild | 67 --- kde-plasma/plasma-pa/Manifest | 1 - kde-plasma/plasma-pa/plasma-pa-5.11.5.ebuild | 29 -- kde-plasma/plasma-sdk/Manifest | 1 - .../plasma-sdk/plasma-sdk-5.11.5.ebuild | 39 -- kde-plasma/plasma-vault/Manifest | 1 - .../plasma-vault/plasma-vault-5.11.5.ebuild | 34 -- .../plasma-workspace-wallpapers/Manifest | 1 - .../plasma-workspace-wallpapers-5.11.5.ebuild | 18 - kde-plasma/plasma-workspace/Manifest | 1 - ...lasma-workspace-5.11.5-CVE-2018-6790.patch | 409 ------------------ ...lasma-workspace-5.11.5-CVE-2018-6791.patch | 31 -- .../plasma-workspace-5.11.5-r1.ebuild | 175 -------- kde-plasma/plymouth-kcm/Manifest | 1 - .../plymouth-kcm/plymouth-kcm-5.11.5.ebuild | 36 -- kde-plasma/polkit-kde-agent/Manifest | 1 - .../polkit-kde-agent-5.11.5.ebuild | 30 -- kde-plasma/powerdevil/Manifest | 1 - .../powerdevil/powerdevil-5.11.5.ebuild | 81 ---- kde-plasma/sddm-kcm/Manifest | 1 - kde-plasma/sddm-kcm/sddm-kcm-5.11.5.ebuild | 41 -- kde-plasma/systemsettings/Manifest | 1 - .../systemsettings-5.11.5.ebuild | 51 --- kde-plasma/user-manager/Manifest | 1 - .../user-manager/user-manager-5.11.5.ebuild | 27 -- 92 files changed, 3167 deletions(-) delete mode 100644 kde-plasma/bluedevil/bluedevil-5.11.5.ebuild delete mode 100644 kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild delete mode 100644 kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild delete mode 100644 kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild delete mode 100644 kde-plasma/breeze/breeze-5.11.5.ebuild delete mode 100644 kde-plasma/drkonqi/drkonqi-5.11.5.ebuild delete mode 100644 kde-plasma/drkonqi/files/drkonqi-5.11.1-x11.patch delete mode 100644 kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.5.ebuild delete mode 100644 kde-plasma/kde-cli-tools/kde-cli-tools-5.11.5.ebuild delete mode 100644 kde-plasma/kde-gtk-config/kde-gtk-config-5.11.5.ebuild delete mode 100644 kde-plasma/kdecoration/kdecoration-5.11.5.ebuild delete mode 100644 kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild delete mode 100644 kde-plasma/kgamma/kgamma-5.11.5.ebuild delete mode 100644 kde-plasma/khotkeys/khotkeys-5.11.5.ebuild delete mode 100644 kde-plasma/kinfocenter/kinfocenter-5.11.5.ebuild delete mode 100644 kde-plasma/kmenuedit/kmenuedit-5.11.5.ebuild delete mode 100644 kde-plasma/kscreen/kscreen-5.11.5.ebuild delete mode 100644 kde-plasma/kscreenlocker/kscreenlocker-5.11.5.ebuild delete mode 100644 kde-plasma/ksshaskpass/ksshaskpass-5.11.5.ebuild delete mode 100644 kde-plasma/ksysguard/ksysguard-5.11.5.ebuild delete mode 100644 kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-1.patch delete mode 100644 kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch delete mode 100644 kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch delete mode 100644 kde-plasma/kwallet-pam/kwallet-pam-5.11.5-r1.ebuild delete mode 100644 kde-plasma/kwayland-integration/kwayland-integration-5.11.5.ebuild delete mode 100644 kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch delete mode 100644 kde-plasma/kwin/kwin-5.11.5.ebuild delete mode 100644 kde-plasma/kwrited/kwrited-5.11.5.ebuild delete mode 100644 kde-plasma/libkscreen/libkscreen-5.11.5.ebuild delete mode 100644 kde-plasma/libksysguard/libksysguard-5.11.5.ebuild delete mode 100644 kde-plasma/milou/milou-5.11.5.ebuild delete mode 100644 kde-plasma/oxygen/oxygen-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-integration/plasma-integration-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-meta/plasma-meta-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-pa/plasma-pa-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-sdk/plasma-sdk-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-vault/plasma-vault-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.11.5.ebuild delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6790.patch delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild delete mode 100644 kde-plasma/plymouth-kcm/plymouth-kcm-5.11.5.ebuild delete mode 100644 kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.5.ebuild delete mode 100644 kde-plasma/powerdevil/powerdevil-5.11.5.ebuild delete mode 100644 kde-plasma/sddm-kcm/sddm-kcm-5.11.5.ebuild delete mode 100644 kde-plasma/systemsettings/systemsettings-5.11.5.ebuild delete mode 100644 kde-plasma/user-manager/user-manager-5.11.5.ebuild diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index 168a1be0e452..158e09d04bcd 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,2 +1 @@ -DIST bluedevil-5.11.5.tar.xz 153380 BLAKE2B 1342ea233c6ea2b7a325eefafe1528d27d1f060bdf628ecd6c7dcddb0323ed10d6dc11ddcbf96a9f6913202ea327979a4f06d9cc7fdc70d02595b0a593a9a819 SHA512 273c1d3a649c7e78e78f27a10199057e2b06940e281eeeb7555bd2d40a6d9f9f7aaa38b5c0a84549f3ff13ec3209b63dde00dcce2ef8855a0cf46030f477594b DIST bluedevil-5.12.5.tar.xz 149604 BLAKE2B 3be0b934e91bc7bd739284674d2bd734db0b1d6d76e1cb1e75b92e72cab46dd86a0e17f455dd570f1c05881826ebaabd6c42653a2b352e8dfc783a5ba60634b1 SHA512 e99ac736110dde8042920ced22aeee965c2080766f2043b20b26937c9573310ebee9db71c347f3e7ebcd46798871b2c14f47ac2177241d3b2d539fe7bffda017 diff --git a/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild deleted file mode 100644 index d7a9db8d251f..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.11.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://cgit.kde.org/bluedevil.git" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep bluez-qt) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -DEPEND="${COMMON_DEPEND} - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - !app-mobilephone/obexd - !app-mobilephone/obex-data-server - !kde-plasma/bluedevil:4 -" diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest index 89ccd67576f2..368c483aba74 100644 --- a/kde-plasma/breeze-grub/Manifest +++ b/kde-plasma/breeze-grub/Manifest @@ -1,2 +1 @@ -DIST breeze-grub-5.11.5.tar.xz 3157272 BLAKE2B 1c4f9bed314f4968b00e7283203ce24ffa7911c4e7fcd0631ddb942ece5eaa104773bf267ee23449125cc902a20e7d8eae5be595d12c7b1eeae055455b5849d4 SHA512 87802343c23cf4a73160a669fbec69cd529b992c31fb6d4a3578e31f5c9eeb4bc418ba811e705d95c37b1e2047bd08619c369f3e16208dba7fcde1f8d56bd6f8 DIST breeze-grub-5.12.5.tar.xz 3140852 BLAKE2B 66ded1641a181eb1cc888c890030f46f4b36292917fda7fd32a6e61a36123580c3191a997a92438e51f38f4169cbc80c10a1851fb9602c269e6019713d52e598 SHA512 27dad6a97ae128c8827d65324ea5975718489e5b1961861dcb72dbc17bbb1e38d9d6065583d49fe96d0bdd5ecba31f61efbb3a222191b8b5420e2023ed339aa8 diff --git a/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild deleted file mode 100644 index 8d76ae6cf10e..000000000000 --- a/kde-plasma/breeze-grub/breeze-grub-5.11.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 - -DESCRIPTION="Breeze theme for GRUB" -LICENSE="GPL-3+" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -src_prepare() { - default -} - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - insinto /usr/share/grub/themes - doins -r breeze -} diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest index afc30320d18c..8924b14745c4 100644 --- a/kde-plasma/breeze-gtk/Manifest +++ b/kde-plasma/breeze-gtk/Manifest @@ -1,2 +1 @@ -DIST breeze-gtk-5.11.5.tar.xz 218340 BLAKE2B 9f729336e0a5844fc8258f9900f7e5dc738c33e4d6a63f3a8b7fcc0f5fdf202d36a991397568dcdd3c608e3a93e9c5ff085d47b2d91a345f7b6587b530b035b1 SHA512 d940624cff5b785d2b32ca6329f463b4c545ae613fb5e7364537703086900f920fe72c25f5731ba24409e27469e2281b5d74bfd36ffedee66cbd8ac62be0c53d DIST breeze-gtk-5.12.5.tar.xz 213800 BLAKE2B b13c218af535b4c7f469c52f76e1bafee7ac89fdc9f75eab43b25930ce8e3ba0759681cf0dfa586b09c987c7af1d1de6c3eadcd3b1bb4f3efe89c5771ab234ab SHA512 448b66642587bddf9a49c64ff7b1fd01aab63283f91d16b572105cda39811edbfeccb13131cb3f0bebdd16dc8ba2f2d0bc4e2970690fa958a1fac1ca1357c1b8 diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild deleted file mode 100644 index 016965c6d10c..000000000000 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.11.5.ebuild +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" -HOMEPAGE="https://cgit.kde.org/breeze-gtk.git" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm x86" -IUSE="" diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest index ce55701b1ba1..6e055b41f0ae 100644 --- a/kde-plasma/breeze-plymouth/Manifest +++ b/kde-plasma/breeze-plymouth/Manifest @@ -1,2 +1 @@ -DIST breeze-plymouth-5.11.5.tar.xz 106612 BLAKE2B d2f3f63e1f04f31de8b98a4ca63a529cbd2282db64527fe6faf030bd6bfa441da9213b467ac441eddffd870028f3e5bbfe79562fa7eb3f485d5f391f4c7d1dae SHA512 218045bf35efff475bf9aa4f1e8d117b42b671ba036a7dd67a2b6a8538ee4317f84415e53ffd17bb9645f7971bf575beae1cc1de7b6f67e37166fde25cf92c44 DIST breeze-plymouth-5.12.5.tar.xz 105636 BLAKE2B 733011a010c8e142e1572031b06093d4285e870448d2ca4035366959e343cada9f2bc7c3fe3db1eef32164b39eccee74bbe655669a4e22e45f479487dfcbb20b SHA512 cafc0df15d1b429d7e5d3253940039d118467fd6fa9ebaad9ff2c1ff9f747a7d82f5311ea181aca675d03f0b7067d7602517378e5e0bfb6476291229dd96deb3 diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild deleted file mode 100644 index 864289fc692e..000000000000 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.11.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_AUTODEPS="false" -inherit kde5 - -DESCRIPTION="Breeze theme for Plymouth" -LICENSE="GPL-2+ GPL-3+" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND="sys-boot/plymouth" -DEPEND="${RDEPEND} - $(add_frameworks_dep extra-cmake-modules) -" - -src_configure() { - local mycmakeargs=( - -DDISTRO_NAME="Gentoo Linux" - -DDISTRO_VERSION= - ) - - kde5_src_configure -} diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index 0700c63a194c..844736361d75 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,2 +1 @@ -DIST breeze-5.11.5.tar.xz 22228964 BLAKE2B f3fdcc10b7350acf612bec9edf4cbea544c6f1dbbc713c8cf9903054b3fb015fffa3a9be5fed4ce5d19209a476d9a84fbcc219ff5cdcdc93e05f3537bb209e85 SHA512 4ef2e7507f7175af7725157611bfe6339d417749d565e50760a5da70db7603f59a9c41deec42f343149442b2e82204eb9519354fb91e407d4c89a9300edad2df DIST breeze-5.12.5.tar.xz 22207864 BLAKE2B a3963b4e236391d1e8ea0709f7fe68ebc1f4b644a8fc33f83992bba2675853c25addde43edfdf01700eea06c4121f23eebfa0ee64259da31a298d78592f975af SHA512 5d21fe948c8a480ce04c45ce21b56a3b2517c7642de588debfd1e76d2b53bd1e1ef1204cbb28398d5a673a986698baf91dbfb49d95e8810188f21c104e185d46 diff --git a/kde-plasma/breeze/breeze-5.11.5.ebuild b/kde-plasma/breeze/breeze-5.11.5.ebuild deleted file mode 100644 index 79bc91235ae1..000000000000 --- a/kde-plasma/breeze/breeze-5.11.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic kde5 multibuild - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://cgit.kde.org/breeze.git" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="qt4 wayland X" - -REQUIRED_USE="qt4? ( X )" - -COMMON_DEPEND=" - $(add_frameworks_dep frameworkintegration) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_plasma_dep kdecoration) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - qt4? ( - kde-frameworks/kdelibs:4 - x11-libs/libX11 - ) - wayland? ( $(add_frameworks_dep kwayland) ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libxcb - ) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kpackage) - qt4? ( dev-util/automoc:0 ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep breeze-icons) - $(add_plasma_dep kde-cli-tools) -" - -pkg_setup() { - kde5_pkg_setup - MULTIBUILD_VARIANTS=( kf5 $(usev qt4) ) -} - -src_configure() { - myconfigure() { - local mycmakeargs=() - - if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then - use debug || append-cppflags -DQT_NO_DEBUG - mycmakeargs+=( - -DUSE_KDE4=true - -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc - ) - cmake-utils_src_configure - else - mycmakeargs+=( - $(cmake-utils_use_find_package wayland KF5Wayland) - $(cmake-utils_use_find_package X XCB) - ) - kde5_src_configure - fi - } - - multibuild_foreach_variant myconfigure -} - -src_compile() { - multibuild_foreach_variant kde5_src_compile -} - -src_test() { - multibuild_foreach_variant kde5_src_test -} - -src_install() { - multibuild_foreach_variant kde5_src_install -} diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index 4e853aef2628..f2fbc2bd031a 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,2 +1 @@ -DIST drkonqi-5.11.5.tar.xz 746660 BLAKE2B 9ca5290ff64186347bc03133440c54da94256064868e1c854fb7813b7211d480e34ada74ae312dc7f18219ea81072eef5e2e4204e0bfcf7a712296157c37086b SHA512 6bf7435e091494627f50d2c047467e585f31e51ad5ecab242664230b118272303d245c07ff65fb3fbdbcfe2fb1283134fa69c029c5e42b4df98e6f9a859c0105 DIST drkonqi-5.12.5.tar.xz 737996 BLAKE2B e16e9dd2b902e68bfbac2618152cafe978adeac53007b3e79f4a3f05ecd34b8a5652888e6875e05b4ffa1d1fb6a016389c27e19b7c880c48d271a4040e9698a7 SHA512 eb6a24a3c3b6dd8e2451b0a0ce365ec9c17a00864ba54f26796d195af0f7194a72eb31c816b77a5a6c86f0c9df0e5438cbc4fc0bcdc6415194ca54290b20a7a4 diff --git a/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild deleted file mode 100644 index e9850d9e5e54..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.11.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" - -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="X" - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlrpcclient) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - X? ( $(add_qt_dep qtx11extras) ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/drkonqi:4 - ! -Date: Sun, 15 Oct 2017 18:52:53 +0200 -Subject: Make Qt5::X11Extras really optional - -Summary: -Otherwise may fail. - -Reviewers: rjvbb, sitter, davidedmundson - -Reviewed By: sitter, davidedmundson - -Subscribers: apol, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D8307 ---- - CMakeLists.txt | 2 +- - config-X11.h.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43eeea5..8c8f9b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets Test - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n CoreAddons Service ConfigWidgets JobWidgets KIO Crash Completion XmlRpcClient WidgetsAddons Wallet Notifications IdleTime) - --find_package(Qt5 ${QT_MIN_VERSION} CONFIG COMPONENTS X11Extras) -+find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG) - - include_directories("${CMAKE_CURRENT_BINARY_DIR}") - configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -diff --git a/config-X11.h.cmake b/config-X11.h.cmake -index 26064aa..2f779a2 100644 ---- a/config-X11.h.cmake -+++ b/config-X11.h.cmake -@@ -1,2 +1,2 @@ --#cmakedefine Qt5X11Extras_FOUND 1 -+#cmakedefine01 Qt5X11Extras_FOUND - #define HAVE_X11 Qt5X11Extras_FOUND --- -cgit v0.11.2 - diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest index d97ef98ddc76..98f550e6b301 100644 --- a/kde-plasma/kactivitymanagerd/Manifest +++ b/kde-plasma/kactivitymanagerd/Manifest @@ -1,2 +1 @@ -DIST kactivitymanagerd-5.11.5.tar.xz 89720 BLAKE2B b4fea473744ed25abd44831418a2e427b86b865385392044aea8b3bada705b8038c2e85b6273f05874c2bd26d6f283e7bf674f082f5435690a08b2348ae2c1f2 SHA512 8c10b5a8716580dbbb42883bf7acc78e23877797e30208400cca9b37d7d921a2873854733ffd730fbb37b6d79b0b44aebbfa6274376123fdfc0999f362793745 DIST kactivitymanagerd-5.12.5.tar.xz 85024 BLAKE2B 568ef25da41bfe8edb0a07d9c6f72d73640331262ed50f8952d0efc44404c7f8702157146ae24d2ebcc1c1f5520ab7646b5e43269757240511286ab73140d2f6 SHA512 59c3d0dfd07f5bf620860c0a5e6d5989855ba323134e826c2ae79b3e40fc62768ef179f6969d9abace249963d99ba0db0eaea0de23686b67eb0fafcd2f1af84f diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.5.ebuild deleted file mode 100644 index 44c92ce623f9..000000000000 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.11.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="System service to manage user's activities, track the usage patterns etc." -LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtsql 'sqlite') - $(add_qt_dep qtwidgets) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.54 -" -RDEPEND="${COMMON_DEPEND} - !kde@gentoo.org Gentoo KDE Project - - Add support for gtk+3-based applications. - diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest index 69907383dfea..afe7dde8963e 100644 --- a/kde-plasma/kdecoration/Manifest +++ b/kde-plasma/kdecoration/Manifest @@ -1,2 +1 @@ -DIST kdecoration-5.11.5.tar.xz 36280 BLAKE2B 64a8bbe8d9891f011bfbce69de5b989931f2129a87d01486378ae2a327c11615baca1223113c6a2e21a9bd2698cee7c908a6454b598389fca6082788df8f683e SHA512 a7dbec450e7a67b6c029ebba1663ffb3fa199f4c855322673ddedc4411506b20ff922a1dc6c728a6a8b5332ca8b0eb542fc52dad91ce3d01ed39d5bc5efc4cbc DIST kdecoration-5.12.5.tar.xz 35572 BLAKE2B ac84eddfe6a095aa611d61ef4bbf3f823e780d9c1e4503cc4cd76a7eed6a670235650b07a0d9ae55b9ff1b39835c5f75c2372ede2b3aba377e6aa2a8b77f5f02 SHA512 4e13f61c46f5fc825f9b759ee5406fbbad6eb040b737c7994e5c60d5daf5c035877df9cb84c53ab672dafd035c3e67c5b27b8107d0383bfdaf61f4d9388ccada diff --git a/kde-plasma/kdecoration/kdecoration-5.11.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.11.5.ebuild deleted file mode 100644 index 25ef3325803d..000000000000 --- a/kde-plasma/kdecoration/kdecoration-5.11.5.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Plugin based library to create window decorations" -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -DEPEND="$(add_qt_dep qtgui)" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index c098731762f3..8e10cbca1a86 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,2 +1 @@ -DIST kdeplasma-addons-5.11.5.tar.xz 1459308 BLAKE2B e64360e7607b7ee653953dd487bc4bc087be349304909f88546f6f7bd1c79903f3b67d239bbca63d4b145cb95317e4542e3b8fba0cfc5c7cd470c3b8c9bf9d94 SHA512 b4a2e191573dc72d6a32d3f1a612153ccc502232fe7908dea90a7dc869002da6e50e6126a0b6b921478fe687479eac096971fb105ed757d82bacbbfb15fed471 DIST kdeplasma-addons-5.12.5.tar.xz 567064 BLAKE2B 19f7c5401f371af7fbda416076b48454de134bc511e1f76e25e8f7544857181a65f9614247b9bac2df11e67f0505b3820fbcc83758e19c56624e7060dedafcd4 SHA512 38a2f5c5d3296167337d8288e52eb0d5045db755df4ae85e3dceba1fa8456eff8b82dc34384a4bae23054daeee39221440c27a0d17548933f325e8d47acb13d7 diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild deleted file mode 100644 index 1263c95fea21..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.11.5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Extra Plasma applets and engines" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="amd64 ~arm x86" -IUSE="share" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kross) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kunitconversion) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep sonnet) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - share? ( kde-frameworks/purpose:5 ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep plasma-workspace) - !kde-plasma/kdeplasma-addons:4 -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package share KDEExperimentalPurpose) - ) - - kde5_src_configure -} diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest index 991f9bb37569..f5518382ad36 100644 --- a/kde-plasma/kgamma/Manifest +++ b/kde-plasma/kgamma/Manifest @@ -1,2 +1 @@ -DIST kgamma5-5.11.5.tar.xz 64108 BLAKE2B 0eb21c1c79a40c60e066f7aa80e336768cbd89405a0083019a299d6dc379d7ccb9100efe01ccb1481413d465afbdf61f64db546337c4b2c1675e18a54951cff7 SHA512 ac923f6e899b2b35ce80ed990315c3e72bfd239ad79a8630cdbdfbdc3248dd72608ac219cbeafd1d20e768496dc6bd2d71d1d326017a84f30b681b6c65e604df DIST kgamma5-5.12.5.tar.xz 60520 BLAKE2B 32b57acb6304cf68dea7c4c61902f7646fbab40a26e70e1ecc0df13a7b417c6f40cb16ff33e9f3a0306bf8328f35faf0821373a64d2936a9763ec2a05ff9c50c SHA512 dc1bc7fe868548a4136bf981dfa086cf9a0d20b0b01905608646f99e29f5e57a5e5b4fff704df79e8d8fc5b500d21c440e6172b99f6175fc959eadf7e0566790 diff --git a/kde-plasma/kgamma/kgamma-5.11.5.ebuild b/kde-plasma/kgamma/kgamma-5.11.5.ebuild deleted file mode 100644 index b83173d30fcb..000000000000 --- a/kde-plasma/kgamma/kgamma-5.11.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KMNAME="${PN}5" -inherit kde5 - -DESCRIPTION="Screen gamma values kcontrol module" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - x11-libs/libX11 - x11-libs/libXxf86vm -" -DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto -" diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest index 332c265cd3be..7f7dadac3d54 100644 --- a/kde-plasma/khotkeys/Manifest +++ b/kde-plasma/khotkeys/Manifest @@ -1,2 +1 @@ -DIST khotkeys-5.11.5.tar.xz 1071588 BLAKE2B ded5b2936068cc0a540ed6ec6f0229c62babefc8038db76578180625f04214dd98d3c06da7ee3d4b8a7d7286319039c2fa8c1fb5107f595cfaeb2109a9677c25 SHA512 fbbe09514cba58749945fc310b67e4ee716a49c38e602087c26e9c531334e0d1483a388778ef013678f7705ef575d18d403d922d83058d6025eedff0420693a3 DIST khotkeys-5.12.5.tar.xz 1064388 BLAKE2B f57451b0fceef79c99e238d8abc68ad8081c42ff48ac6ab1a82aa37785696a6eddae228d1909d7ceec9552ddcae7c507cb1319f90f0169cdb7f741b81dc1bdd9 SHA512 7d69a90900e644a38d3b905b019b4cd0038626c1dfd55755483b1a6f02b05b4c93bb59011cd9163293a8a3603b77c21c9c03c4312d45d0cf7bdfab7817974e18 diff --git a/kde-plasma/khotkeys/khotkeys-5.11.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.11.5.ebuild deleted file mode 100644 index 1fc504a9d9e0..000000000000 --- a/kde-plasma/khotkeys/khotkeys-5.11.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="KDE Plasma workspace hotkey module" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support X) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libX11 - x11-libs/libXtst -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) - $(add_plasma_dep kde-cli-tools) - !kde-plasma/khotkeys:4 - !kde-plasma/systemsettings:4 -" -DEPEND="${COMMON_DEPEND} - x11-libs/libxcb - x11-libs/libXtst - x11-proto/xproto -" diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest index 6c79e64788d6..eef7e83df6bc 100644 --- a/kde-plasma/kinfocenter/Manifest +++ b/kde-plasma/kinfocenter/Manifest @@ -1,3 +1,2 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 -DIST kinfocenter-5.11.5.tar.xz 1302960 BLAKE2B bd938c9c330c8f335825810e3fc8e8c97b1629d89bfeef0eb18bd4852f939f5ba0fb55640338b6d817c08d0b8f0099cdc303a19874811af52c35afd2a63a728c SHA512 d64cf466b4b883c9a57a0dddfe5a1d1cae0687655897803e5f14bcf73e90c1ea05d96458dbe131428c6d19a50d92b2614036136fdb897e422b1c1fc3d38f5303 DIST kinfocenter-5.12.5.tar.xz 1270224 BLAKE2B 5c2b0148f82862d32393804bd98ca99ec71f476d4103f015f159420223bb695b8d237673aa94c12d9be4147b36c52d9cbbd0d8f0e69208f6afcb18363283a50f SHA512 f8178452b2611473733ec707be1683234bcd22bac381d6d8fa47e695653c5d2983dab37dd24dea19024cd4a68e4736bb08a3b197c8a6932a45c927ee7a61638d diff --git a/kde-plasma/kinfocenter/kinfocenter-5.11.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.11.5.ebuild deleted file mode 100644 index 6b359cfb845c..000000000000 --- a/kde-plasma/kinfocenter/kinfocenter-5.11.5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="A utility that provides information about a computer system" -HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/" -SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" -KEYWORDS="amd64 ~arm x86" -IUSE="gles2 ieee1394 +opengl +pci wayland" - -REQUIRED_USE="wayland? ( || ( gles2 opengl ) )" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - x11-libs/libX11 - ieee1394? ( sys-libs/libraw1394 ) - opengl? ( - $(add_qt_dep qtgui 'gles2=') - media-libs/mesa[gles2?] - !gles2? ( media-libs/glu ) - ) - pci? ( sys-apps/pciutils ) - wayland? ( - $(add_frameworks_dep kwayland) - media-libs/mesa[egl] - ) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep plasma) -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - !kde-apps/kcontrol:4 - !kde-misc/about-distro - !kde-plasma/kinfocenter:4 -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package gles2 OpenGLES) - $(cmake-utils_use_find_package ieee1394 RAW1394) - $(cmake-utils_use_find_package opengl OpenGL) - $(cmake-utils_use_find_package pci PCIUTILS) - $(cmake-utils_use_find_package wayland EGL) - $(cmake-utils_use_find_package wayland KF5Wayland) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - insinto /etc/xdg - doins "${FILESDIR}"/kcm-about-distrorc - - insinto /usr/share/${PN} - doins "${DISTDIR}"/glogo-small.png -} - -pkg_postinst() { - if ! has_version "net-fs/nfs-utils"; then - einfo "Installing net-fs/nfs-utils will enable the NFS information module." - fi - if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then - einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module." - fi -} diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest index 7fb969b4732b..c1002033a230 100644 --- a/kde-plasma/kmenuedit/Manifest +++ b/kde-plasma/kmenuedit/Manifest @@ -1,2 +1 @@ -DIST kmenuedit-5.11.5.tar.xz 663336 BLAKE2B 2a3adeb669c00cacb0e5334f7e5c41f38683926db315714d2026256b702cef9788c8d9014dbaf63c6e68b28de953f42b9421ec5a94a165e121341e7d945ca2f7 SHA512 65fd7e67eb67c56adad3f9dc422f8005fefa40fae37a29444e305a20434a1e228c63c8db04c4f031cf60f9f06d07d794727344ad10d8f3d5681119ea44e3c5b7 DIST kmenuedit-5.12.5.tar.xz 652192 BLAKE2B cabbc2849e6311ce14b83bfff52e03b73f32443eda49e652f94604f9d71f1894a8b75f2e8eca25edd16939c05dfcd5e7985461c5ffad2e785c2af1ed337a2122 SHA512 d73ee3d80ac9954f7e636ebeda3a8306dc4f2ea6b0b4430a0bc87a57afc2fed760fbd4b7e20543ce17303aac65dd8ca9035aae0bd148ced78c5ec8c71b96abd1 diff --git a/kde-plasma/kmenuedit/kmenuedit-5.11.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.11.5.ebuild deleted file mode 100644 index f8a9158860f4..000000000000 --- a/kde-plasma/kmenuedit/kmenuedit-5.11.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="KDE Plasma menu editor" -HOMEPAGE="https://cgit.kde.org/kmenuedit.git" -KEYWORDS="amd64 ~arm x86" -IUSE="+hotkeys" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - hotkeys? ( $(add_plasma_dep khotkeys) ) -" -RDEPEND="${DEPEND} - !kde-plasma/kmenuedit:4 -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface) - ) - - kde5_src_configure -} diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 2fd15732cdcf..ab6b3e59c6e3 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,2 +1 @@ -DIST kscreen-5.11.5.tar.xz 124060 BLAKE2B f9af27d740c3467700aeab51b8cf75cb087379dff833f2bb43c1fe4c958fc28204af41c81247d3835bb376516ccc2e400272b4cc9d0f9778af38a0fdf17b65f6 SHA512 a6224de2c9f3c2e539e97461ef2a7cdd626c78dc3a1e3eeebdc63b12368df26c83315497d647abd008f9246f9b7aa2f1b94425a2c6d366200811725b64d012ab DIST kscreen-5.12.5.tar.xz 117820 BLAKE2B c7c073a9fa6e982f5474f11ab5073ce5279bd8f67faa20cfec18e18b8ea01228b508f642e4b0c0d00168ff9b3033b75935fc3e00603cea7e91340fd0b3b922a9 SHA512 d2f7bd25c93409e6198a1a3f65c3a85ae22e1031daf3115814e5f4f5252e1f6c6e0c7d94e3208840598a4ef2ec7bec31f8728f96eb735a887b00ce5e34c4466e diff --git a/kde-plasma/kscreen/kscreen-5.11.5.ebuild b/kde-plasma/kscreen/kscreen-5.11.5.ebuild deleted file mode 100644 index 25fbcb5d7729..000000000000 --- a/kde-plasma/kscreen/kscreen-5.11.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="KDE Plasma screen management" -HOMEPAGE="https://cgit.kde.org/kscreen.git" - -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_plasma_dep libkscreen) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep plasma) - $(add_plasma_dep kde-cli-tools) - $(add_qt_dep qtgraphicaleffects) - !kde-plasma/kscreen:4 -" - -# bug #580440, last checked 5.6.3 -RESTRICT+=" test" diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index 769ede89f22d..98573004b533 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,2 +1 @@ -DIST kscreenlocker-5.11.5.tar.xz 125528 BLAKE2B 32bad30682da09245cc567f3cb79c0e0fd4ffdba26b47ef0c49c3094374503640cab7718033cb9c366ef7acddb6180995f4121b61ed1d04bbd867e1361e9d7ea SHA512 20eefbb4f970b2476d3df2e36bf74021d854f0ba61cba4946b3fc7190cff9edc9fef753d3bdde24ab135cc0dc5ad826cb22063db7b12ce817007355a98a3011a DIST kscreenlocker-5.12.5.tar.xz 118332 BLAKE2B 87705ff5aff4d73c8b7823f4aa505be282fa9a152352aacf1682d5d7f4dff06fdca1b39d30a43dddd6c0dbfd267586d2a74bbdbd8bdacf487a251cb496311dce SHA512 c07cae22cc4500aeb4d38388d2033a677171659a76d81ff55155a97aca439babcb912f47586697657c7944c80b0d250770ed3a080fad0ed9463058dc879f390a diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.11.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.11.5.ebuild deleted file mode 100644 index bbf213b8aa70..000000000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.11.5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 pam - -DESCRIPTION="Library and components for secure lock screen architecture" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="+pam seccomp" - -REQUIRED_USE="seccomp? ( pam )" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - dev-libs/wayland - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxcb - x11-libs/xcb-util-keysyms - pam? ( virtual/pam ) - seccomp? ( sys-libs/libseccomp ) -" -DEPEND="${COMMON_DEPEND} - x11-proto/xproto -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - ! -Date: Tue, 1 May 2018 12:29:02 +0200 -Subject: Move salt creation to an unprivileged process - -Opening files for writing as root is very tricky since through the power -of symlinks we can get tricked to write in places we don't want to and -we don't really need to be root to create the salt file ---- - pam_kwallet.c | 121 ++++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 71 insertions(+), 50 deletions(-) - -diff --git a/pam_kwallet.c b/pam_kwallet.c -index 20d9603..083c9aa 100644 ---- a/pam_kwallet.c -+++ b/pam_kwallet.c -@@ -82,7 +82,7 @@ const static char *envVar = "PAM_KWALLET_LOGIN"; - - static int argumentsParsed = -1; - --int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key); -+int kwallet_hash(pam_handle_t *pamh, const char *passphrase, struct passwd *userInfo, char *key); - - static void parseArguments(int argc, const char **argv) - { -@@ -325,7 +325,7 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons - } - - char *key = malloc(KWALLET_PAM_KEYSIZE); -- if (!key || kwallet_hash(password, userInfo, key) != 0) { -+ if (!key || kwallet_hash(pamh, password, userInfo, key) != 0) { - free(key); - pam_syslog(pamh, LOG_ERR, "%s: Fail into creating the hash", logPrefix); - return PAM_IGNORE; -@@ -352,6 +352,26 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, cons - return PAM_SUCCESS; - } - -+static int drop_privileges(struct passwd *userInfo) -+{ -+ /* When dropping privileges from root, the `setgroups` call will -+ * remove any extraneous groups. If we don't call this, then -+ * even though our uid has dropped, we may still have groups -+ * that enable us to do super-user things. This will fail if we -+ * aren't root, so don't bother checking the return value, this -+ * is just done as an optimistic privilege dropping function. -+ */ -+ setgroups(0, NULL); -+ -+ //Change to the user in case we are not it yet -+ if (setgid (userInfo->pw_gid) < 0 || setuid (userInfo->pw_uid) < 0 || -+ setegid (userInfo->pw_gid) < 0 || seteuid (userInfo->pw_uid) < 0) { -+ return -1; -+ } -+ -+ return 0; -+} -+ - static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], int envSocket) - { - //In the child pam_syslog does not work, using syslog directly -@@ -366,18 +386,8 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW - //This is the side of the pipe PAM will send the hash to - close (toWalletPipe[1]); - -- /* When dropping privileges from root, the `setgroups` call will -- * remove any extraneous groups. If we don't call this, then -- * even though our uid has dropped, we may still have groups -- * that enable us to do super-user things. This will fail if we -- * aren't root, so don't bother checking the return value, this -- * is just done as an optimistic privilege dropping function. -- */ -- setgroups(0, NULL); -- - //Change to the user in case we are not it yet -- if (setgid (userInfo->pw_gid) < 0 || setuid (userInfo->pw_uid) < 0 || -- setegid (userInfo->pw_gid) < 0 || seteuid (userInfo->pw_uid) < 0) { -+ if (drop_privileges(userInfo) < 0) { - syslog(LOG_ERR, "%s: could not set gid/uid/euid/egit for kwalletd", logPrefix); - goto cleanup; - } -@@ -619,7 +629,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const c - return PAM_SUCCESS; - } - --int mkpath(char *path, struct passwd *userInfo) -+static int mkpath(char *path) - { - struct stat sb; - char *slash; -@@ -639,10 +649,6 @@ int mkpath(char *path, struct passwd *userInfo) - errno != EEXIST)) { - syslog(LOG_ERR, "%s: Couldn't create directory: %s because: %d-%s", logPrefix, path, errno, strerror(errno)); - return (-1); -- } else { -- if (chown(path, userInfo->pw_uid, userInfo->pw_gid) == -1) { -- syslog(LOG_INFO, "%s: Couldn't change ownership of: %s", logPrefix, path); -- } - } - } else if (!S_ISDIR(sb.st_mode)) { - return (-1); -@@ -654,34 +660,49 @@ int mkpath(char *path, struct passwd *userInfo) - return (0); - } - --static char* createNewSalt(const char *path, struct passwd *userInfo) -+static void createNewSalt(pam_handle_t *pamh, const char *path, struct passwd *userInfo) - { -- unlink(path);//in case the file already exists -+ const int pid = fork(); -+ if (pid == -1) { -+ pam_syslog(pamh, LOG_ERR, "%s: Couldn't fork to create salt file", logPrefix); -+ } else if (pid == 0) { -+ // Child process -+ if (drop_privileges(userInfo) < 0) { -+ syslog(LOG_ERR, "%s: could not set gid/uid/euid/egit for salt file creation", logPrefix); -+ exit(-1); -+ } - -- char *dir = strdup(path); -- dir[strlen(dir) - 14] = '\0';//remove kdewallet.salt -- mkpath(dir, userInfo);//create the path in case it does not exists -- free(dir); -+ unlink(path);//in case the file already exists - -- char *salt = gcry_random_bytes(KWALLET_PAM_SALTSIZE, GCRY_STRONG_RANDOM); -- FILE *fd = fopen(path, "w"); -+ char *dir = strdup(path); -+ dir[strlen(dir) - 14] = '\0';//remove kdewallet.salt -+ mkpath(dir); //create the path in case it does not exists -+ free(dir); - -- //If the file can't be created -- if (fd == NULL) { -- syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno)); -- return NULL; -- } -+ char *salt = gcry_random_bytes(KWALLET_PAM_SALTSIZE, GCRY_STRONG_RANDOM); -+ FILE *fd = fopen(path, "w"); - -- fwrite(salt, KWALLET_PAM_SALTSIZE, 1, fd); -- fclose(fd); -+ //If the file can't be created -+ if (fd == NULL) { -+ syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno)); -+ exit(-2); -+ } - -- if (chown(path, userInfo->pw_uid, userInfo->pw_gid) == -1) { -- syslog(LOG_ERR, "%s: Couldn't change ownership of the created salt file", logPrefix); -- } -+ fwrite(salt, KWALLET_PAM_SALTSIZE, 1, fd); -+ fclose(fd); - -- return salt; -+ exit(0); // success -+ } else { -+ // pam process, just wait for child to finish -+ int status; -+ waitpid(pid, &status, 0); -+ if (status != 0) { -+ pam_syslog(pamh, LOG_ERR, "%s: Couldn't create salt file", logPrefix); -+ } -+ } - } --int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key) -+ -+int kwallet_hash(pam_handle_t *pamh, const char *passphrase, struct passwd *userInfo, char *key) - { - if (!gcry_check_version("1.5.0")) { - syslog(LOG_ERR, "%s-kwalletd: libcrypt version is too old", logPrefix); -@@ -700,19 +721,19 @@ int kwallet_hash(const char *passphrase, struct passwd *userInfo, char *key) - struct stat info; - char *salt = NULL; - if (stat(path, &info) != 0 || info.st_size == 0) { -- salt = createNewSalt(path, userInfo); -- } else { -- FILE *fd = fopen(path, "r"); -- if (fd == NULL) { -- syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno)); -- free(path); -- return 1; -- } -- salt = (char*) malloc(KWALLET_PAM_SALTSIZE); -- memset(salt, '\0', KWALLET_PAM_SALTSIZE); -- fread(salt, KWALLET_PAM_SALTSIZE, 1, fd); -- fclose(fd); -+ createNewSalt(pamh, path, userInfo); - } -+ -+ FILE *fd = fopen(path, "r"); -+ if (fd == NULL) { -+ syslog(LOG_ERR, "%s: Couldn't open file: %s because: %d-%s", logPrefix, path, errno, strerror(errno)); -+ free(path); -+ return 1; -+ } -+ salt = (char*) malloc(KWALLET_PAM_SALTSIZE); -+ memset(salt, '\0', KWALLET_PAM_SALTSIZE); -+ fread(salt, KWALLET_PAM_SALTSIZE, 1, fd); -+ fclose(fd); - free(path); - - if (salt == NULL) { --- -cgit v0.11.2 - diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch deleted file mode 100644 index 2f88e0c3ceae..000000000000 --- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-2.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 01d4143fda5bddb6dca37b23304dc239a5fb38b5 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Tue, 1 May 2018 12:32:24 +0200 -Subject: Move socket creation to unprivileged codepath - -We don't need to be creating the socket as root, and doing so, -specially having a chown is problematic security wise. ---- - pam_kwallet.c | 77 ++++++++++++++++++++++++++++------------------------------- - 1 file changed, 36 insertions(+), 41 deletions(-) - -diff --git a/pam_kwallet.c b/pam_kwallet.c -index 083c9aa..b9c984a 100644 ---- a/pam_kwallet.c -+++ b/pam_kwallet.c -@@ -372,13 +372,13 @@ static int drop_privileges(struct passwd *userInfo) - return 0; - } - --static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], int envSocket) -+static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket) - { - //In the child pam_syslog does not work, using syslog directly - int x = 2; - //Close fd that are not of interest of kwallet - for (; x < 64; ++x) { -- if (x != toWalletPipe[0] && x != envSocket) { -+ if (x != toWalletPipe[0]) { - close (x); - } - } -@@ -392,6 +392,39 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW - goto cleanup; - } - -+ int envSocket; -+ if ((envSocket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) { -+ pam_syslog(pamh, LOG_ERR, "%s: couldn't create socket", logPrefix); -+ return; -+ } -+ -+ struct sockaddr_un local; -+ local.sun_family = AF_UNIX; -+ -+ if (strlen(fullSocket) > sizeof(local.sun_path)) { -+ pam_syslog(pamh, LOG_ERR, "%s: socket path %s too long to open", -+ logPrefix, fullSocket); -+ free(fullSocket); -+ return; -+ } -+ strcpy(local.sun_path, fullSocket); -+ free(fullSocket); -+ fullSocket = NULL; -+ unlink(local.sun_path);//Just in case it exists from a previous login -+ -+ pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, local.sun_path); -+ -+ size_t len = strlen(local.sun_path) + sizeof(local.sun_family); -+ if (bind(envSocket, (struct sockaddr *)&local, len) == -1) { -+ pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't bind to local file\n", logPrefix); -+ return; -+ } -+ -+ if (listen(envSocket, 5) == -1) { -+ pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix); -+ return; -+ } -+ - // Fork twice to daemonize kwallet - setsid(); - pid_t pid = fork(); -@@ -452,12 +485,6 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha - pam_syslog(pamh, LOG_ERR, "%s: Couldn't create pipes", logPrefix); - } - -- int envSocket; -- if ((envSocket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) { -- pam_syslog(pamh, LOG_ERR, "%s: couldn't create socket", logPrefix); -- return; -- } -- - #ifdef KWALLET5 - const char *socketPrefix = "kwallet5"; - #else -@@ -493,38 +520,6 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha - return; - } - -- struct sockaddr_un local; -- local.sun_family = AF_UNIX; -- -- if (strlen(fullSocket) > sizeof(local.sun_path)) { -- pam_syslog(pamh, LOG_ERR, "%s: socket path %s too long to open", -- logPrefix, fullSocket); -- free(fullSocket); -- return; -- } -- strcpy(local.sun_path, fullSocket); -- free(fullSocket); -- fullSocket = NULL; -- unlink(local.sun_path);//Just in case it exists from a previous login -- -- pam_syslog(pamh, LOG_INFO, "%s: final socket path: %s", logPrefix, local.sun_path); -- -- size_t len = strlen(local.sun_path) + sizeof(local.sun_family); -- if (bind(envSocket, (struct sockaddr *)&local, len) == -1) { -- pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't bind to local file\n", logPrefix); -- return; -- } -- -- if (listen(envSocket, 5) == -1) { -- pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix); -- return; -- } -- -- if (chown(local.sun_path, userInfo->pw_uid, userInfo->pw_gid) == -1) { -- pam_syslog(pamh, LOG_INFO, "%s: Couldn't change ownership of the socket", logPrefix); -- return; -- } -- - pid_t pid; - int status; - switch (pid = fork ()) { -@@ -534,7 +529,7 @@ static void start_kwallet(pam_handle_t *pamh, struct passwd *userInfo, const cha - - //Child fork, will contain kwalletd - case 0: -- execute_kwallet(pamh, userInfo, toWalletPipe, envSocket); -+ execute_kwallet(pamh, userInfo, toWalletPipe, fullSocket); - /* Should never be reached */ - break; - --- -cgit v0.11.2 - diff --git a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch deleted file mode 100644 index de882e454536..000000000000 --- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.11.5-CVE-2018-10380-3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8da1a47035fc92bc1496059583772bc4bd6e8ba6 Mon Sep 17 00:00:00 2001 -From: Maximiliano Curia -Date: Fri, 4 May 2018 22:06:06 +0200 -Subject: Avoid giving an stderr to kwallet - -Summary: -The fixes for CVE-2018-10380 introduced a regression for most users not -using kde, and some for kde sessions. In particular the reorder of the -close calls and creating a new socket caused that the socket is always -assigned the file descriptor 2, aka stderr. - -BUG: 393856 - -Test Plan: It works - -Reviewers: #plasma, aacid - -Reviewed By: aacid - -Subscribers: asturmlechner, rdieter, davidedmundson, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D12702 ---- - pam_kwallet.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/pam_kwallet.c b/pam_kwallet.c -index b9c984a..661ed8d 100644 ---- a/pam_kwallet.c -+++ b/pam_kwallet.c -@@ -375,7 +375,8 @@ static int drop_privileges(struct passwd *userInfo) - static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket) - { - //In the child pam_syslog does not work, using syslog directly -- int x = 2; -+ //keep stderr open so socket doesn't returns us that fd -+ int x = 3; - //Close fd that are not of interest of kwallet - for (; x < 64; ++x) { - if (x != toWalletPipe[0]) { -@@ -424,6 +425,8 @@ static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toW - pam_syslog(pamh, LOG_INFO, "%s-kwalletd: Couldn't listen in socket\n", logPrefix); - return; - } -+ //finally close stderr -+ close(2); - - // Fork twice to daemonize kwallet - setsid(); --- -cgit v0.11.2 - diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.11.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.11.5-r1.ebuild deleted file mode 100644 index ac225e97e670..000000000000 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.11.5-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="KWallet PAM module to not enter password again" -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - dev-libs/libgcrypt:0= - virtual/pam -" -RDEPEND="${DEPEND} - net-misc/socat -" - -PATCHES=( "${FILESDIR}"/${P}-CVE-2018-10380-{1,2,3}.patch ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" - -DKWALLET4=0 - ) - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." - elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" -} diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest index 57fd6a1039a3..f82af24433b6 100644 --- a/kde-plasma/kwayland-integration/Manifest +++ b/kde-plasma/kwayland-integration/Manifest @@ -1,2 +1 @@ -DIST kwayland-integration-5.11.5.tar.xz 19080 BLAKE2B 3f1bf365f4886398fee77da4a1716232cceb691746ed6f313d6bb48f46d5813eacfb32381b9cf3665cfb7706a04b863d3545be4ddb5749176ac25055e5d643ea SHA512 246ff96d30d6a212aedbc9e7a5680e20bedfcc398591f670b0c96f68127aab547e21537aa11f2db68c505845c7897ce8be657b3430b420033100a774bcf6c1af DIST kwayland-integration-5.12.5.tar.xz 18580 BLAKE2B a40a33e09af47fcc036167a4d7228a7a160b0e7fa6a2520afbef1cdaf707b96a7cbda52c0a4486bb44d4dd9129834fe48bb582fe31adc0b3d01e73d364eb94f3 SHA512 6fab883acaf5bd7dc5d1cf4e5eda78240b358e3e4aec8c0ec53f9e5b20db613df04cb9547dc5a977811421a121a623a121dbeda183ce2f9a415a781275b98de0 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.11.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.11.5.ebuild deleted file mode 100644 index c6abb17c4d7f..000000000000 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.11.5.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" -HOMEPAGE="https://cgit.kde.org/kwayland-integration.git" - -LICENSE="LGPL-2.1" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 91e9c2ee6f10..9ecb36878617 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,2 +1 @@ -DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2 DIST kwin-5.12.5.tar.xz 4981704 BLAKE2B 0631d7cd1f387ef63512601be39fcc280ad3dd751fa0ac8836da969fe526b68a95e81027d1943d8f0679a78ae9e9e062f4d292482497ba19227997a5d746a35e SHA512 9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22 diff --git a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch deleted file mode 100644 index 1b7c61455783..000000000000 --- a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cd544890ced4192d07467c89e23adbb62d8cea5c Mon Sep 17 00:00:00 2001 -From: Milian Wolff -Date: Mon, 18 Dec 2017 11:40:35 +0100 -Subject: Fix build with CMake 3.10 - -Looks like a classic false-positive, but this makes the compile -pass for me without making the code harder to read: - -AutoMoc error -------------- - "/ssd/milian/projects/kf5/src/kde/workspace/kwin/kcmkwin/kwinscripts/main.cpp" -The file contains a K_PLUGIN_FACTORY macro, but does not include "main.moc"! -Consider to - - add #include "main.moc" - - enable SKIP_AUTOMOC for this file - -So we just add the include and then get rid of the duplicate -definition of the plugin factory and the problem is resolved. ---- - kcmkwin/kwinscripts/main.cpp | 2 ++ - kcmkwin/kwinscripts/module.cpp | 2 -- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp -index f5ee04b..baa5175 100644 ---- a/kcmkwin/kwinscripts/main.cpp -+++ b/kcmkwin/kwinscripts/main.cpp -@@ -22,3 +22,5 @@ - - K_PLUGIN_FACTORY(KcmKWinScriptsFactory, - registerPlugin("kwin-scripts");) -+ -+#include "main.moc" -diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp -index a0d698e..ccf7d41 100644 ---- a/kcmkwin/kwinscripts/module.cpp -+++ b/kcmkwin/kwinscripts/module.cpp -@@ -40,8 +40,6 @@ - - #include "version.h" - --K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory) -- - Module::Module(QWidget *parent, const QVariantList &args) : - KCModule(parent, args), - ui(new Ui::Module), --- -cgit v0.11.2 - diff --git a/kde-plasma/kwin/kwin-5.11.5.ebuild b/kde-plasma/kwin/kwin-5.11.5.ebuild deleted file mode 100644 index d18de789f3a5..000000000000 --- a/kde-plasma/kwin/kwin-5.11.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="optional" -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE window manager" -LICENSE="GPL-2+" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="gles2 multimedia" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem X) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_plasma_dep breeze) - $(add_plasma_dep kdecoration) - $(add_plasma_dep kscreenlocker) - $(add_qt_dep qtcore) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'gles2=') - $(add_qt_dep qtscript) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - >=dev-libs/libinput-1.5 - >=dev-libs/wayland-1.2 - media-libs/fontconfig - media-libs/freetype - media-libs/libepoxy - media-libs/mesa[egl,gbm,gles2?,wayland] - virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=x11-libs/libxkbcommon-0.7.0 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - $(add_qt_dep qtvirtualkeyboard) - multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') ) - ! Enable AppStream software metadata support - Add support for gtk+2-based applications using legacy xembed systray icons via libappindicator. - Add support for gtk+3-based applications using legacy xembed systray icons via libappindicator. Use ibus input method via app-i18n/ibus - Add support for applications using legacy xembed systray icons. Enable mouse KCM Enable applets that use app-i18n/scim Enable touchpad KCM diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.11.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.11.5.ebuild deleted file mode 100644 index 1eacbe7f1116..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.11.5.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma desktop" -KEYWORDS="amd64 ~arm x86" -IUSE="appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad" - -COMMON_DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpeople) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_frameworks_dep sonnet) - $(add_plasma_dep kwin) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - appstream? ( dev-libs/appstream[qt5] ) - fontconfig? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - ibus? ( - $(add_qt_dep qtx11extras) - app-i18n/ibus - dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - pulseaudio? ( - dev-libs/glib:2 - media-libs/libcanberra - media-sound/pulseaudio - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) - touchpad? ( x11-drivers/xf86-input-synaptics ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-proto/xproto - fontconfig? ( x11-libs/libXrender ) - mouse? ( x11-drivers/xf86-input-evdev ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep qqc2-desktop-style) - $(add_plasma_dep breeze) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep oxygen) - $(add_qt_dep qtgraphicaleffects) - sys-apps/accountsservice - sys-apps/util-linux - x11-apps/setxkbmap - legacy-systray? ( - gtk2? ( dev-libs/libappindicator:2 ) - gtk3? ( dev-libs/libappindicator:3 ) - qt4? ( dev-libs/sni-qt ) - ) - pulseaudio? ( $(add_plasma_dep plasma-pa ) ) - qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) - !kde-apps/kcontrol - ! -Date: Wed, 31 Jan 2018 14:28:17 +0000 -Subject: [PATCH 1/2] Sanitise notification HTML - -Summary: -Qt labels support a HTML subset, using a completely internal parser in -QTextDocument. - -The Notification spec support an even smaller subset of notification -elements. - -It's important to strip out irrelevant tags that could potentially load -remote information without user interaction, such as img -src or even ("messageIn"); -+ QTest::addColumn("expectedOut"); -+ -+ QTest::newRow("basic no HTML") << "I am a notification" << "I am a notification"; -+ QTest::newRow("whitespace") << " I am a notification " << "I am a notification"; -+ -+ QTest::newRow("basic html") << "I am the notification" << "I am the notification"; -+ QTest::newRow("nested html") << "I am the notification" << "I am the notification"; -+ -+ QTest::newRow("no extra tags") << "I am the notification" << "I am the notification"; -+ QTest::newRow("no extra attrs") << "I am the notification" << "I am the notification"; -+ -+ QTest::newRow("newlines") << "I am\nthe\nnotification" << "I am
the
notification"; -+ QTest::newRow("multinewlines") << "I am\n\nthe\n\n\nnotification" << "I am
the
notification"; -+ -+ QTest::newRow("amp") << "me&you" << "me&you"; -+ QTest::newRow("double escape") << "foo & <bar>" << "foo & <bar>"; -+ -+ QTest::newRow("quotes") << "'foo'" << "'foo'";//as label can't handle this normally valid entity -+ -+ QTest::newRow("image normal") << "This is \"cheese\"/ and more text" << "This is \"cheese\"/ and more text"; -+ -+ //this input is technically wrong, so the output is also wrong, but QTextHtmlParser does the "right" thing -+ QTest::newRow("image normal no close") << "This is \"cheese\" and more text" << "This is \"cheese\" and more text"; -+ -+ QTest::newRow("image remote URL") << "This is \"cheese\" and more text" << "This is \"cheese\"/ and more text"; -+ -+ //more bad formatted options. To some extent actual output doesn't matter. Garbage in, garbabe out. -+ //the important thing is that it doesn't contain anything that could be parsed as the remote URL -+ QTest::newRow("image remote URL no close") << "This is \" alt=\"cheese\"> and more text" << "This is \"cheese\" and more text"; -+ QTest::newRow("image remote URL double open") << "This is <\" and more text" << "This is "; -+ QTest::newRow("image remote URL no entitiy close") << "This is \"cheese\" and more text" << "This is "; -+ -+ QTest::newRow("link") << "This is a link and more text" << "This is a link and more text"; -+} -+ -+void NotificationTest::parse() -+{ -+ QFETCH(QString, messageIn); -+ QFETCH(QString, expectedOut); -+ -+ const QString out = NotificationSanitizer::parse(messageIn); -+ expectedOut = "" + expectedOut + "\n"; -+ QCOMPARE(out, expectedOut); -+} -+ -+ -+QTEST_GUILESS_MAIN(NotificationTest) -+ -+#include "notifications_test.moc" -diff --git a/dataengines/notifications/notificationsanitizer.cpp b/dataengines/notifications/notificationsanitizer.cpp -new file mode 100644 -index 00000000..5410132c ---- /dev/null -+++ b/dataengines/notifications/notificationsanitizer.cpp -@@ -0,0 +1,106 @@ -+/* -+ * Copyright (C) 2017 David Edmundson -+ * -+ * This program is free software you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public License -+ * along with this library; see the file COPYING.LIB. If not, write to -+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+*/ -+ -+#include "notificationsanitizer.h" -+ -+#include -+#include -+#include -+#include -+#include -+ -+QString NotificationSanitizer::parse(const QString &text) -+{ -+ // replace all \ns with
-+ QString t = text; -+ -+ t.replace(QLatin1String("\n"), QStringLiteral("
")); -+ // Now remove all inner whitespace (\ns are already
s) -+ t = t.simplified(); -+ // Finally, check if we don't have multiple
s following, -+ // can happen for example when "\n \n" is sent, this replaces -+ // all
s in succsession with just one -+ t.replace(QRegularExpression(QStringLiteral("
\\s*
(\\s|
)*")), QLatin1String("
")); -+ // This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off -+ // text where it finds a stray ampersand. -+ // Only &{apos, quot, gt, lt, amp}; as well as { character references will be allowed -+ t.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&")); -+ -+ QXmlStreamReader r(QStringLiteral("") + t + QStringLiteral("")); -+ QString result; -+ QXmlStreamWriter out(&result); -+ -+ const QVector allowedTags = {"b", "i", "u", "img", "a", "html", "br"}; -+ -+ out.writeStartDocument(); -+ while (!r.atEnd()) { -+ r.readNext(); -+ -+ if (r.tokenType() == QXmlStreamReader::StartElement) { -+ const QString name = r.name().toString(); -+ if (!allowedTags.contains(name)) { -+ continue; -+ } -+ out.writeStartElement(name); -+ if (name == QLatin1String("img")) { -+ auto src = r.attributes().value("src").toString(); -+ auto alt = r.attributes().value("alt").toString(); -+ -+ const QUrl url(src); -+ if (url.isLocalFile()) { -+ out.writeAttribute(QStringLiteral("src"), src); -+ } else { -+ //image denied for security reasons! Do not copy the image src here! -+ } -+ -+ out.writeAttribute(QStringLiteral("alt"), alt); -+ } -+ if (name == QLatin1String("a")) { -+ out.writeAttribute(QStringLiteral("href"), r.attributes().value("href").toString()); -+ } -+ } -+ -+ if (r.tokenType() == QXmlStreamReader::EndElement) { -+ const QString name = r.name().toString(); -+ if (!allowedTags.contains(name)) { -+ continue; -+ } -+ out.writeEndElement(); -+ } -+ -+ if (r.tokenType() == QXmlStreamReader::Characters) { -+ const auto text = r.text().toString(); -+ out.writeCharacters(text); //this auto escapes chars -> HTML entities -+ } -+ } -+ out.writeEndDocument(); -+ -+ if (r.hasError()) { -+ qWarning() << "Notification to send to backend contains invalid XML: " -+ << r.errorString() << "line" << r.lineNumber() -+ << "col" << r.columnNumber(); -+ } -+ -+ // The Text.StyledText format handles only html3.2 stuff and ' is html4 stuff -+ // so we need to replace it here otherwise it will not render at all. -+ result = result.replace(QLatin1String("'"), QChar('\'')); -+ -+ -+ return result; -+} -diff --git a/dataengines/notifications/notificationsanitizer.h b/dataengines/notifications/notificationsanitizer.h -new file mode 100644 -index 00000000..561a84b7 ---- /dev/null -+++ b/dataengines/notifications/notificationsanitizer.h -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2017 David Edmundson -+ * -+ * This program is free software you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public License -+ * along with this library; see the file COPYING.LIB. If not, write to -+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. -+*/ -+ -+#include -+ -+namespace NotificationSanitizer -+{ -+ /* -+ * This turns generic random text of either plain text of any degree of faux-HTML into HTML allowed -+ * in the notification spec namely: -+ * a, img, b, i, u and br -+ * All other tags and attributes are stripped -+ * Whitespace is stripped and converted to
-+ * Double newlines are compressed -+ * -+ * Image src is only copied when referring to a local file -+ */ -+ QString parse(const QString &in); -+} -diff --git a/dataengines/notifications/notificationsengine.cpp b/dataengines/notifications/notificationsengine.cpp -index 72338aeb..caf310e5 100644 ---- a/dataengines/notifications/notificationsengine.cpp -+++ b/dataengines/notifications/notificationsengine.cpp -@@ -20,6 +20,7 @@ - #include "notificationsengine.h" - #include "notificationservice.h" - #include "notificationsadaptor.h" -+#include "notificationsanitizer.h" - - #include - #include -@@ -281,23 +282,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id, - - const QString source = QStringLiteral("notification %1").arg(id); - -- // First trim whitespace from beginning and end -- bodyFinal = bodyFinal.trimmed(); -- // Now replace all \ns with
-- bodyFinal = bodyFinal.replace(QLatin1String("\n"), QLatin1String("
")); -- // Now remove all inner whitespace (\ns are already
s -- bodyFinal = bodyFinal.simplified(); -- // Finally, check if we don't have multiple
s following, -- // can happen for example when "\n \n" is sent, this replaces -- // all
s in succsession with just one -- bodyFinal.replace(QRegularExpression(QStringLiteral("
\\s*
(\\s|
)*")), QLatin1String("
")); -- // This fancy RegExp escapes every occurence of & since QtQuick Text will blatantly cut off -- // text where it finds a stray ampersand. -- // Only &{apos, quot, gt, lt, amp}; as well as { character references will be allowed -- bodyFinal.replace(QRegularExpression(QStringLiteral("&(?!(?:apos|quot|[gl]t|amp);|#)")), QLatin1String("&")); -- // The Text.StyledText format handles only html3.2 stuff and ' is html4 stuff -- // so we need to replace it here otherwise it will not render at all. -- bodyFinal.replace(QLatin1String("'"), QChar('\'')); -+ bodyFinal = NotificationSanitizer::parse(bodyFinal); - - Plasma::DataEngine::Data notificationData; - notificationData.insert(QStringLiteral("id"), QString::number(id)); --- -2.13.6 - -From cb791b571aed1ea6976e0a6906df3e35dea657ef Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik -Date: Mon, 5 Feb 2018 13:53:17 +0100 -Subject: [PATCH 2/2] [Notifications] Fix grouping - -Sanitize the body before doing anything else. -Cleanup grouping logic. - -Differential Revision: https://phabricator.kde.org/D10315 ---- - dataengines/notifications/notificationsengine.cpp | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/dataengines/notifications/notificationsengine.cpp b/dataengines/notifications/notificationsengine.cpp -index caf310e5..bc48deed 100644 ---- a/dataengines/notifications/notificationsengine.cpp -+++ b/dataengines/notifications/notificationsengine.cpp -@@ -217,7 +217,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id, - qDebug() << "Currrent active notifications:" << m_activeNotifications; - qDebug() << "Guessing partOf as:" << partOf; - qDebug() << " New Notification: " << summary << body << timeout << "& Part of:" << partOf; -- QString bodyFinal = body; -+ QString bodyFinal = NotificationSanitizer::parse(body); - QString summaryFinal = summary; - - if (partOf > 0) { -@@ -225,13 +225,13 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id, - Plasma::DataContainer *container = containerForSource(source); - if (container) { - // append the body text -- QString _body = container->data()[QStringLiteral("body")].toString(); -- if (_body != body) { -- _body.append("\n").append(body); -- } else { -- _body = body; -+ const QString previousBody = container->data()[QStringLiteral("body")].toString(); -+ if (previousBody != bodyFinal) { -+ // FIXME: This will just append the entire old XML document to another one, leading to: -+ // old
new -+ // It works but is not very clean. -+ bodyFinal = previousBody + QStringLiteral("
") + bodyFinal; - } -- bodyFinal = _body; - - replaces_id = partOf; - -@@ -267,7 +267,7 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id, - - const int AVERAGE_WORD_LENGTH = 6; - const int WORD_PER_MINUTE = 250; -- int count = summary.length() + body.length(); -+ int count = summary.length() + body.length() - strlen(""); - - // -1 is "server default", 0 is persistent with "server default" display time, - // anything more should honor the setting -@@ -282,8 +282,6 @@ uint NotificationsEngine::Notify(const QString &app_name, uint replaces_id, - - const QString source = QStringLiteral("notification %1").arg(id); - -- bodyFinal = NotificationSanitizer::parse(bodyFinal); -- - Plasma::DataEngine::Data notificationData; - notificationData.insert(QStringLiteral("id"), QString::number(id)); - notificationData.insert(QStringLiteral("eventId"), eventId); --- -2.13.6 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch deleted file mode 100644 index 621687c59d24..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.11.5-CVE-2018-6791.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f32002ce50edc3891f1fa41173132c820b917d57 Mon Sep 17 00:00:00 2001 -From: Marco Martin -Date: Mon, 5 Feb 2018 13:12:51 +0100 -Subject: [PATCH] Make sure device paths are quoted - -in the case a vfat removable device has $() or `` in its label, -such as $(touch foo) the quoted command may get executed, -leaving an attack vector. Use KMacroExpander::expandMacrosShellQuote -to make sure everything is quoted and not interpreted as a command - -BUG:389815 ---- - soliduiserver/deviceserviceaction.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp -index f49c967a..738b27c8 100644 ---- a/soliduiserver/deviceserviceaction.cpp -+++ b/soliduiserver/deviceserviceaction.cpp -@@ -158,7 +158,7 @@ void DelayedExecutor::delayedExecute(const QString &udi) - - QString exec = m_service.exec(); - MacroExpander mx(device); -- mx.expandMacros(exec); -+ mx.expandMacrosShellQuote(exec); - - KRun::runCommand(exec, QString(), m_service.icon(), 0); - deleteLater(); --- -2.13.6 - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild deleted file mode 100644 index 02ce7d9a59d7..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.11.5-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd" - -REQUIRED_USE="gps? ( geolocation )" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kjsembed) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( $(add_frameworks_dep kholidays) ) - geolocation? ( $(add_frameworks_dep networkmanager-qt) ) - gps? ( sci-geosciences/gpsd ) - prison? ( $(add_frameworks_dep prison) ) - qalculate? ( sci-libs/libqalculate:= ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kded) - $(add_frameworks_dep kdesu) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep ksysguard) - $(add_plasma_dep milou) - $(add_plasma_dep plasma-integration) - $(add_qt_dep qdbus) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtpaths) - $(add_qt_dep qtquickcontrols 'widgets') - app-text/iso-codes - x11-apps/mkfontdir - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xset - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !dev-libs/xembed-sni-proxy - !kde-plasma/freespacenotifier:4 - !kde-plasma/libtaskmanager:4 - !kde-plasma/kcminit:4 - !kde-plasma/kdebase-startkde:4 - !kde-plasma/klipper:4 - !kde-plasma/krunner:4 - !kde-plasma/ksmserver:4 - !kde-plasma/ksplash:4 - !kde-plasma/plasma-workspace:4 -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - x11-proto/xproto -" - -PATCHES=( - "${FILESDIR}/${PN}-5.4-startkde-script.patch" - "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" - "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" - "${FILESDIR}/${P}-CVE-2018-6790.patch" - "${FILESDIR}/${P}-CVE-2018-6791.patch" -) - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - - sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ - -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package appstream AppStreamQt) - $(cmake-utils_use_find_package calendar KF5Holidays) - $(cmake-utils_use_find_package geolocation KF5NetworkManagerQt) - $(cmake-utils_use_find_package prison KF5Prison) - $(cmake-utils_use_find_package qalculate Qalculate) - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - ) - - use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - # startup and shutdown scripts - insinto /etc/plasma/startup - doins "${FILESDIR}/10-agent-startup.sh" - - insinto /etc/plasma/shutdown - doins "${FILESDIR}/10-agent-shutdown.sh" -} - -pkg_postinst () { - kde5_pkg_postinst - - echo - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and" - elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh" - echo -} diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest index 367db5a114b2..56d66329246a 100644 --- a/kde-plasma/plymouth-kcm/Manifest +++ b/kde-plasma/plymouth-kcm/Manifest @@ -1,2 +1 @@ -DIST plymouth-kcm-5.11.5.tar.xz 39368 BLAKE2B da61b6e32c1a73a4bd5e138c4e5720feb1648091ccf9e28583b40f30ccad20ff6dd8096996c93224accd151d5f9f4298756ff2bec37c73176f2e3159ed3f7627 SHA512 c30ca55c8647b3c32f1266519a7b005f9d2b2eb0b7064c12ea1780b85ff43662dc6be8ed46e2730be84eec96d809b7cf01385a2d38c52769f469bb355c983ed2 DIST plymouth-kcm-5.12.5.tar.xz 38968 BLAKE2B 5707e49bcf9a03cc1546523075dc8c60dd00277c92866350babb36bbceff34b9612369d034c6983db0622821a6eb0025bedd0be7cd0412be010ca4e486a2a9af SHA512 67c630182eaf891bf4b28c9889f76b40c61525a992d3f80985f69ecdf831d9869456ff59b0c3f0cb9581b1f2412a56d907e9af3a8beaee3b1966ab64254b8c69 diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.5.ebuild deleted file mode 100644 index 50b8077c8776..000000000000 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.11.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -BOGUS=1 -inherit kde5 - -DESCRIPTION="KDE Plasma control module for Plymouth" -HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git" - -LICENSE="GPL-2+" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtquickcontrols) - $(add_qt_dep qtwidgets) - sys-boot/plymouth -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest index 78f2595b1400..514a4a95e0a0 100644 --- a/kde-plasma/polkit-kde-agent/Manifest +++ b/kde-plasma/polkit-kde-agent/Manifest @@ -1,2 +1 @@ -DIST polkit-kde-agent-1-5.11.5.tar.xz 44320 BLAKE2B c1e0add72af02cb34f61a07038580f9b1de5e2b45c0a47f01eaea1cb0a96ddfb071fd56f293cb59d66620ecd3dcb8868f0c4b63a40ed46de4326f78b8314d37b SHA512 63a6696fa5961c4757b9ee13db8d9de67d0ff8c15f72448c05f2728fc57f19717adfe09aba38d7990bbaf3bd67a3674300397fd2f988f0d27b5e13b22902966f DIST polkit-kde-agent-1-5.12.5.tar.xz 41624 BLAKE2B 6f9e105afa00715064765087084f3b3d5fb8c0c78ccce6466ebc59e7a40b11ea9be36c8f165c86bee1af3071b26fd3d0e6db0ab3cd3579b61d93ac5ab1146e79 SHA512 fba769258b3c461bef83d8f978e6033119bbe5479b8efc349d2fd48955e5d9fa73fa928867fa08110941f01e27ada438b375005083b84a2be9bda6589b999562 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.5.ebuild deleted file mode 100644 index e324bf4c42d2..000000000000 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.11.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KMNAME="${PN}-1" -inherit kde5 - -DESCRIPTION="PolKit agent module for KDE Plasma" -HOMEPAGE="https://www.kde.org" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - >=sys-auth/polkit-qt-0.112.0[qt5(+)] -" -RDEPEND="${DEPEND} - !sys-auth/polkit-kde-agent:4[-minimal(-)] - !sys-auth/polkit-kde-agent:5 -" diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest index 100be94101e0..95a8c98d776e 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,2 +1 @@ -DIST powerdevil-5.11.5.tar.xz 392664 BLAKE2B c348dd3258a9724f0f4b79dd20e7bc4b96d6e1a062322c07b6f86c20c36319b723b9ab1fcb622b7e55001ab79db24e91b1c8f7baa5b84706bb3fab79835ba445 SHA512 8d3658b5cfe53fbe43880f6ca2346edcfb715975798b20d2059267b4daa47511fe9fb17a5b9882c21b75f80a57763a434373607a79594684fb044aae39cd0fb3 DIST powerdevil-5.12.5.tar.xz 382664 BLAKE2B f94788e91455dcf17340f1b3041f15db218481360e5d0979d0a785acedd74378ea195610a9b01457f06259176db998e328c2d05cb67d706d456b671bf6a110e4 SHA512 e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117 diff --git a/kde-plasma/powerdevil/powerdevil-5.11.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.11.5.ebuild deleted file mode 100644 index 1e0ae01914d5..000000000000 --- a/kde-plasma/powerdevil/powerdevil-5.11.5.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="true" -inherit kde5 - -DESCRIPTION="Power management for KDE Plasma Shell" -HOMEPAGE="https://cgit.kde.org/powerdevil.git" -KEYWORDS="amd64 ~arm x86" -IUSE="consolekit +wireless" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth policykit) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_plasma_dep libkscreen) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - virtual/libudev:= - x11-libs/libxcb - wireless? ( - $(add_frameworks_dep bluez-qt) - $(add_frameworks_dep networkmanager-qt) - ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) - >=sys-power/upower-0.9.23 - consolekit? ( - >=sys-auth/consolekit-1.0.1 - sys-auth/polkit-pkla-compat - sys-power/pm-utils - ) - !kde-plasma/powerdevil:4 - !kde-plasma/systemsettings:4[handbook] -" - -src_configure() { - local mycmakeargs=( - -DWITH_DDCUTIL=OFF - $(cmake-utils_use_find_package wireless KF5BluezQt) - $(cmake-utils_use_find_package wireless KF5NetworkManagerQt) - ) - - kde5_src_configure -} - -src_install() { - kde5_src_install - - if use consolekit ; then - insinto /etc/polkit-1/localauthority/10-vendor.d/ - doins "${FILESDIR}"/10-org.freedesktop.upower.pkla - doins "${FILESDIR}"/20-org.freedesktop.consolekit.system.stop-multiple-users.pkla - doins "${FILESDIR}"/30-org.freedesktop.consolekit.system.restart-multiple-users.pkla - doins "${FILESDIR}"/40-org.freedesktop.consolekit.system.suspend-multiple-users.pkla - doins "${FILESDIR}"/50-org.freedesktop.consolekit.system.hibernate-multiple-users.pkla - fi -} diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest index e73a245d706f..df93d89f408f 100644 --- a/kde-plasma/sddm-kcm/Manifest +++ b/kde-plasma/sddm-kcm/Manifest @@ -1,2 +1 @@ -DIST sddm-kcm-5.11.5.tar.xz 62788 BLAKE2B 2329b2891a4d3334b06b1083b594bb04abaa38fb83dcc2ce0971d717c5f169043743e8ac5cbf8fcf57f42d300aef521669d30f2b4989d94540d43bd5388fc53f SHA512 7ea9ba1ee71e28f7afc7eedd40030b50fd22ecfc21447972c8f154ad1289a80f25dc5bdd00c01e8ac70b968d720734538f9172f92648b205614bc70ee556408c DIST sddm-kcm-5.12.5.tar.xz 60164 BLAKE2B 87bb31f9b057c944d91ab49d848fbb20f72a6843e6a151d309d0d9d039956b662f059551929ff81cdcace084553c7bf699f843649024c3ff653aec2462880b82 SHA512 a2b03c35d0234764a76a1bcf525cac68a91678c952731a2aa929d596f6454135d347af5985f8dceb8834ef6fe9e91380349be073457a53ed43c9ec4e0278d262 diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.11.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.11.5.ebuild deleted file mode 100644 index b05ac72c1594..000000000000 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.11.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="KDE Plasma control module for SDDM" -HOMEPAGE="https://cgit.kde.org/sddm-kcm.git" - -LICENSE="GPL-2+" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libX11 - x11-libs/libXcursor -" -DEPEND="${COMMON_DEPEND} - x11-libs/libXfixes -" -RDEPEND="${COMMON_DEPEND} - $(add_plasma_dep kde-cli-tools) - x11-misc/sddm - !kde-misc/sddm-kcm -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest index 3c2ea03a96a2..998cbda96a5c 100644 --- a/kde-plasma/systemsettings/Manifest +++ b/kde-plasma/systemsettings/Manifest @@ -1,2 +1 @@ -DIST systemsettings-5.11.5.tar.xz 180592 BLAKE2B 49c79d63f1da81e5699a929de9ea66a7955d57b53516eb289bc70e1b907f6d5f4629d01f3507e722b484d7363108a143e3a64073b043e9c82a74383f07b135aa SHA512 d9cfe14d5dc023e203b43bad20d9fcf8449f4f945600c9b9ed4a3367cb5384b88e77e8f206448a4915cf88734ab6f03dbab55f5586a17d1984e46947e684150d DIST systemsettings-5.12.5.tar.xz 172136 BLAKE2B 7ed9f5909e202a7be792502abc816430db8921335753c8631a9486eb2c95ea1d0c56646a709a25541e0f8edc0d63325c7d829535cd4032454bd8234dac1f4892 SHA512 c08170379d776724d2bb3d0426483b841f4e491c0c410ac7e258f9c43461791102ab5209674e50ce716f01ad528d1e4d942e13d16caf67b9c53e21905ff716c9 diff --git a/kde-plasma/systemsettings/systemsettings-5.11.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.11.5.ebuild deleted file mode 100644 index 4371d1436653..000000000000 --- a/kde-plasma/systemsettings/systemsettings-5.11.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="System settings utility" -KEYWORDS="amd64 ~arm x86" -IUSE="classic gtk" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - classic? ( $(add_frameworks_dep khtml) ) -" -RDEPEND="${DEPEND} - !kde-plasma/systemsettings:4 - $(add_frameworks_dep kirigami) - gtk? ( $(add_plasma_dep kde-gtk-config) ) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package classic KF5KHtml) - ) - - kde5_src_configure -} diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest index cd215485108b..06c5290e11fd 100644 --- a/kde-plasma/user-manager/Manifest +++ b/kde-plasma/user-manager/Manifest @@ -1,2 +1 @@ -DIST user-manager-5.11.5.tar.xz 548208 BLAKE2B 92bd23929537bf3a5d6bfc73d04c0aec40029188acfce0859ecf0feb476695c3bcc8ff3b1dd71eed4b7592482e18e8661f54d6f8591da5cd63d9d472d37486c3 SHA512 9c4ae28282bc1ccfc1cc0c817fc89c80185e0e9d756186d920d91d177492de1bf3420cab93e823658614c9e637c8cfeadfde8c093f50097331371efea763cdc6 DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e diff --git a/kde-plasma/user-manager/user-manager-5.11.5.ebuild b/kde-plasma/user-manager/user-manager-5.11.5.ebuild deleted file mode 100644 index fcce1e236c5e..000000000000 --- a/kde-plasma/user-manager/user-manager-5.11.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Simple system settings module to manage the users of your system" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - >=dev-libs/libpwquality-1.3.0 -" -RDEPEND="${DEPEND}" -- 2.26.2