commit: 444c3bf64cdf8373cd0c8021b4bca9a1dbfaf9d5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 21 22:11:05 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 26 20:28:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=444c3bf6
kde-plasma: 5.14.90: EAPI-7 bump Package-Manager: Portage-2.3.57, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/bluedevil/bluedevil-5.14.90.ebuild | 12 +++--------- kde-plasma/breeze-grub/breeze-grub-5.14.90.ebuild | 16 ++++------------ kde-plasma/breeze-gtk/breeze-gtk-5.14.90.ebuild | 4 ++-- .../breeze-plymouth/breeze-plymouth-5.14.90.ebuild | 9 ++++----- kde-plasma/breeze/breeze-5.14.90.ebuild | 2 +- kde-plasma/discover/discover-5.14.90.ebuild | 2 +- kde-plasma/drkonqi/drkonqi-5.14.90.ebuild | 3 +-- .../kactivitymanagerd-5.14.90.ebuild | 3 +-- .../kde-cli-tools/kde-cli-tools-5.14.90.ebuild | 2 +- .../kde-gtk-config/kde-gtk-config-5.14.90.ebuild | 3 +-- kde-plasma/kdecoration/kdecoration-5.14.90.ebuild | 2 +- .../kdeplasma-addons/kdeplasma-addons-5.14.90.ebuild | 3 +-- kde-plasma/kgamma/kgamma-5.14.90.ebuild | 2 +- kde-plasma/khotkeys/khotkeys-5.14.90.ebuild | 12 +++++------- kde-plasma/kinfocenter/kinfocenter-5.14.90.ebuild | 11 ++++------- kde-plasma/kmenuedit/kmenuedit-5.14.90.ebuild | 9 +++------ kde-plasma/kscreen/kscreen-5.14.90.ebuild | 3 +-- .../kscreenlocker/kscreenlocker-5.14.90.ebuild | 20 +++++++++----------- kde-plasma/ksshaskpass/ksshaskpass-5.14.90.ebuild | 7 ++----- kde-plasma/ksysguard/ksysguard-5.14.90.ebuild | 8 +++----- kde-plasma/kwallet-pam/kwallet-pam-5.14.90.ebuild | 2 +- .../kwayland-integration-5.14.90.ebuild | 2 +- kde-plasma/kwin/kwin-5.14.90.ebuild | 6 ++---- kde-plasma/kwrited/kwrited-5.14.90.ebuild | 6 ++---- kde-plasma/libkscreen/libkscreen-5.14.90.ebuild | 6 ++---- kde-plasma/libksysguard/libksysguard-5.14.90.ebuild | 9 +++------ .../libkworkspace/libkworkspace-5.14.90.ebuild | 3 +-- kde-plasma/milou/milou-5.14.90.ebuild | 6 ++---- kde-plasma/oxygen/oxygen-5.14.90.ebuild | 9 ++++----- .../plasma-browser-integration-5.14.90.ebuild | 2 +- .../plasma-desktop/plasma-desktop-5.14.90.ebuild | 7 +------ .../plasma-integration-5.14.90.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-5.14.90.ebuild | 3 +-- kde-plasma/plasma-pa/plasma-pa-5.14.90.ebuild | 3 +-- kde-plasma/plasma-sdk/plasma-sdk-5.14.90.ebuild | 3 +-- kde-plasma/plasma-vault/plasma-vault-5.14.90.ebuild | 2 +- .../plasma-workspace-wallpapers-5.14.90.ebuild | 5 ++--- .../plasma-workspace/plasma-workspace-5.14.90.ebuild | 11 +---------- kde-plasma/plymouth-kcm/plymouth-kcm-5.14.90.ebuild | 2 +- .../polkit-kde-agent/polkit-kde-agent-5.14.90.ebuild | 2 +- kde-plasma/powerdevil/powerdevil-5.14.90.ebuild | 4 +--- kde-plasma/sddm-kcm/sddm-kcm-5.14.90.ebuild | 3 +-- .../systemsettings/systemsettings-5.14.90.ebuild | 3 +-- kde-plasma/user-manager/user-manager-5.14.90.ebuild | 2 +- .../xdg-desktop-portal-kde-5.14.90.ebuild | 2 +- .../xembed-sni-proxy/xembed-sni-proxy-5.14.90.ebuild | 2 +- 46 files changed, 85 insertions(+), 155 deletions(-) diff --git a/kde-plasma/bluedevil/bluedevil-5.14.90.ebuild b/kde-plasma/bluedevil/bluedevil-5.14.90.ebuild index 73fee1340a..aae548eb57 100644 --- a/kde-plasma/bluedevil/bluedevil-5.14.90.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/bluedevil.git"; KEYWORDS="~amd64 ~arm ~x86" IUSE="" -COMMON_DEPEND=" +DEPEND=" $(add_frameworks_dep bluez-qt) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -29,12 +29,6 @@ COMMON_DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -DEPEND="${COMMON_DEPEND} - x11-misc/shared-mime-info -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${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/breeze-grub-5.14.90.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.14.90.ebuild index ba5367062b..dabb7d6ad5 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.14.90.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_AUTODEPS="false" KDE_DEBUG="false" @@ -12,17 +12,9 @@ LICENSE="GPL-3+" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -src_prepare() { - default -} - -src_configure() { - : -} - -src_compile() { - : -} +src_prepare() { default; } +src_configure() { :; } +src_compile() { :; } src_install() { insinto /usr/share/grub/themes diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.14.90.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.14.90.ebuild index 0d1e077417..dce2075500 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.14.90.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{5,6,7} ) inherit kde5 python-any-r1 @@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -DEPEND="${PYTHON_DEPS} +BDEPEND="${PYTHON_DEPS} $(add_plasma_dep breeze) $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') dev-ruby/sass diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.90.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.90.ebuild index 05ddd00e8e..799cddf5a6 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.90.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_AUTODEPS="false" inherit kde5 @@ -11,10 +11,9 @@ LICENSE="GPL-2+ GPL-3+" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -RDEPEND="sys-boot/plymouth" -DEPEND="${RDEPEND} - $(add_frameworks_dep extra-cmake-modules) -" +BDEPEND="$(add_frameworks_dep extra-cmake-modules)" +DEPEND="sys-boot/plymouth" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/breeze/breeze-5.14.90.ebuild b/kde-plasma/breeze/breeze-5.14.90.ebuild index ad49ffc960..f94b9f2596 100644 --- a/kde-plasma/breeze/breeze-5.14.90.ebuild +++ b/kde-plasma/breeze/breeze-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 diff --git a/kde-plasma/discover/discover-5.14.90.ebuild b/kde-plasma/discover/discover-5.14.90.ebuild index d144f6a2b2..fe7845f02c 100644 --- a/kde-plasma/discover/discover-5.14.90.ebuild +++ b/kde-plasma/discover/discover-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional" inherit kde5 diff --git a/kde-plasma/drkonqi/drkonqi-5.14.90.ebuild b/kde-plasma/drkonqi/drkonqi-5.14.90.ebuild index 0e4420a052..8dbc6989fc 100644 --- a/kde-plasma/drkonqi/drkonqi-5.14.90.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -36,7 +36,6 @@ DEPEND="${COMMON_DEPEND} $(add_qt_dep qtconcurrent) " RDEPEND="${COMMON_DEPEND} - !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 " diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.90.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.90.ebuild index ff13d6ca80..63d219b8c1 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.90.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -31,5 +31,4 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} !<kde-frameworks/kactivities-4.13.3-r2:4 - !kde-plasma/kactivitymanagerd:4 " diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.90.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.90.ebuild index 80a59a522f..8120714b96 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.90.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="optional" diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.90.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.90.ebuild index 1b8010dcde..fc191b3a9e 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.90.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" @@ -33,7 +33,6 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) - !kde-plasma/kde-gtk-config:4 " src_configure() { diff --git a/kde-plasma/kdecoration/kdecoration-5.14.90.ebuild b/kde-plasma/kdecoration/kdecoration-5.14.90.ebuild index 5c1e09f431..7b81686244 100644 --- a/kde-plasma/kdecoration/kdecoration-5.14.90.ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.90.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.90.ebuild index 5fca0fcb6c..a2549646ad 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.90.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -45,7 +45,6 @@ RDEPEND="${DEPEND} $(add_plasma_dep plasma-workspace) $(add_qt_dep qtquickcontrols) $(add_qt_dep qtquickcontrols2) - !kde-plasma/kdeplasma-addons:4 " src_configure() { diff --git a/kde-plasma/kgamma/kgamma-5.14.90.ebuild b/kde-plasma/kgamma/kgamma-5.14.90.ebuild index 0ec32aa811..6e295efedc 100644 --- a/kde-plasma/kgamma/kgamma-5.14.90.ebuild +++ b/kde-plasma/kgamma/kgamma-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" KMNAME="${PN}5" diff --git a/kde-plasma/khotkeys/khotkeys-5.14.90.ebuild b/kde-plasma/khotkeys/khotkeys-5.14.90.ebuild index bbdd1a2d65..ca03ba12ac 100644 --- a/kde-plasma/khotkeys/khotkeys-5.14.90.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="true" inherit kde5 @@ -33,14 +33,12 @@ COMMON_DEPEND=" 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-base/xorg-proto x11-libs/libxcb x11-libs/libXtst " +RDEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kded) + $(add_plasma_dep kde-cli-tools) +" diff --git a/kde-plasma/kinfocenter/kinfocenter-5.14.90.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.14.90.ebuild index 7283b5819c..e27e62b267 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.14.90.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="true" inherit kde5 @@ -55,8 +55,6 @@ RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) $(add_qt_dep qtquickcontrols2) !kde-apps/kcontrol:4 - !kde-misc/about-distro - !kde-plasma/kinfocenter:4 " src_configure() { @@ -90,11 +88,10 @@ pkg_postinst() { kde5_pkg_postinst if [[ -z "${REPLACING_VERSIONS}" ]]; then - if ! has_version "net-fs/nfs-utils"; then + has_version "net-fs/nfs-utils" || \ elog "Installing net-fs/nfs-utils will enable the NFS information module." - fi - if ! has_version "net-fs/samba"; then + + has_version "net-fs/samba" || \ elog "Installing net-fs/samba will enable the Samba status information module." - fi fi } diff --git a/kde-plasma/kmenuedit/kmenuedit-5.14.90.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.14.90.ebuild index 594c6adf0b..ea3e476186 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.14.90.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/kmenuedit.git"; KEYWORDS="~amd64 ~arm ~x86" IUSE="+hotkeys" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -31,12 +31,9 @@ COMMON_DEPEND=" $(add_qt_dep qtxml) hotkeys? ( $(add_plasma_dep khotkeys) ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_frameworks_dep kinit) " -RDEPEND="${COMMON_DEPEND} - !kde-plasma/kmenuedit:4 -" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kscreen/kscreen-5.14.90.ebuild b/kde-plasma/kscreen/kscreen-5.14.90.ebuild index 00a0714bc0..b0d257e5e6 100644 --- a/kde-plasma/kscreen/kscreen-5.14.90.ebuild +++ b/kde-plasma/kscreen/kscreen-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional" inherit kde5 @@ -33,7 +33,6 @@ DEPEND=" RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) $(add_qt_dep qtgraphicaleffects) - !kde-plasma/kscreen:4 " # bug #580440, last checked 5.6.3 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.90.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.90.ebuild index 67cc582043..7c403e5a55 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.90.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" @@ -13,7 +13,7 @@ IUSE="consolekit +pam seccomp" REQUIRED_USE="seccomp? ( pam )" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep kcmutils) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -45,13 +45,9 @@ COMMON_DEPEND=" pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} x11-base/xorg-proto " -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/kcheckpass-4.11.22-r1:4 - !kde-plasma/kdebase-pam:0 -" PDEPEND=" $(add_plasma_dep kde-cli-tools) " @@ -61,8 +57,10 @@ RESTRICT+=" test" src_prepare() { kde5_src_prepare - use test || sed -i \ - -e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die + if ! use test; then + sed -e "/add_subdirectory(autotests)/ s/^/#/" \ + -i greeter/CMakeLists.txt || die + fi } src_test() { @@ -90,7 +88,7 @@ src_install() { use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np if ! use pam; then - chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die - chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die + chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die + chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die fi } diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.14.90.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.14.90.ebuild index ebf909cacf..dc9bad4320 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.14.90.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -17,10 +17,7 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_qt_dep qtwidgets) " -RDEPEND=" - ${DEPEND} - !kde-plasma/ksshaskpass:4 -" +RDEPEND="${DEPEND}" src_install() { kde5_src_install diff --git a/kde-plasma/ksysguard/ksysguard-5.14.90.ebuild b/kde-plasma/ksysguard/ksysguard-5.14.90.ebuild index 9e4106a07d..dc21acd63e 100644 --- a/kde-plasma/ksysguard/ksysguard-5.14.90.ebuild +++ b/kde-plasma/ksysguard/ksysguard-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -12,7 +12,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="lm_sensors" DEPEND=" - $(add_plasma_dep libksysguard '-minimal(-)') $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -28,15 +27,14 @@ DEPEND=" $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) + $(add_plasma_dep libksysguard '-minimal(-)') $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) lm_sensors? ( sys-apps/lm_sensors:= ) " -RDEPEND="${DEPEND} - !kde-plasma/ksysguard:4 -" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.14.90.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.14.90.ebuild index a3318b9c7b..101c088233 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.14.90.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.14.90.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.14.90.ebuild index 84eea10a2b..5ef07b8658 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.14.90.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="true" inherit kde5 diff --git a/kde-plasma/kwin/kwin-5.14.90.ebuild b/kde-plasma/kwin/kwin-5.14.90.ebuild index cfd36c06b8..85a1d4a84c 100644 --- a/kde-plasma/kwin/kwin-5.14.90.ebuild +++ b/kde-plasma/kwin/kwin-5.14.90.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="optional" KDE_TEST="optional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="KDE window manager" +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" LICENSE="GPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="caps gles2 multimedia" @@ -74,8 +74,6 @@ RDEPEND="${COMMON_DEPEND} $(add_qt_dep qtquickcontrols2) $(add_qt_dep qtvirtualkeyboard) multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') ) - !kde-plasma/kwin:4 - !kde-plasma/systemsettings:4 " DEPEND="${COMMON_DEPEND} $(add_qt_dep designer) diff --git a/kde-plasma/kwrited/kwrited-5.14.90.ebuild b/kde-plasma/kwrited/kwrited-5.14.90.ebuild index c0f34d667f..8dc34e639b 100644 --- a/kde-plasma/kwrited/kwrited-5.14.90.ebuild +++ b/kde-plasma/kwrited/kwrited-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -18,6 +18,4 @@ DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -RDEPEND="${DEPEND} - !kde-plasma/kwrited:4 -" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/libkscreen/libkscreen-5.14.90.ebuild b/kde-plasma/libkscreen/libkscreen-5.14.90.ebuild index 251cb60bf6..175530ee8c 100644 --- a/kde-plasma/libkscreen/libkscreen-5.14.90.ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_QTHELP="true" KDE_TEST="forceoptional" @@ -20,9 +20,7 @@ DEPEND=" $(add_qt_dep qtx11extras) x11-libs/libxcb " -RDEPEND="${DEPEND} - !x11-libs/libkscreen:5 -" +RDEPEND="${DEPEND}" # requires running session RESTRICT+=" test" diff --git a/kde-plasma/libksysguard/libksysguard-5.14.90.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.90.ebuild index f9d5d6175d..81e50754ed 100644 --- a/kde-plasma/libksysguard/libksysguard-5.14.90.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="true" VIRTUALX_REQUIRED="test" @@ -12,7 +12,7 @@ LICENSE="LGPL-2+" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="minimal webengine X" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep kauth) $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) @@ -33,10 +33,7 @@ COMMON_DEPEND=" x11-libs/libXres ) " -RDEPEND="${COMMON_DEPEND} - !kde-plasma/ksysguard:4 -" -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_frameworks_dep kiconthemes) !minimal? ( $(add_frameworks_dep plasma) ) X? ( x11-base/xorg-proto ) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.14.90.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.14.90.ebuild index 55e509fd04..3dfe68f80a 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.14.90.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="true" KMNAME="plasma-workspace" @@ -28,7 +28,6 @@ DEPEND="${COMMON_DEPEND} $(add_plasma_dep kwin) " RDEPEND="${COMMON_DEPEND} - !kde-plasma/libkworkspace:4 !<kde-plasma/plasma-workspace-5.14.2:5 " diff --git a/kde-plasma/milou/milou-5.14.90.ebuild b/kde-plasma/milou/milou-5.14.90.ebuild index a07cff567f..7662755476 100644 --- a/kde-plasma/milou/milou-5.14.90.ebuild +++ b/kde-plasma/milou/milou-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="forceoptional-recursive" inherit kde5 @@ -25,6 +25,4 @@ DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -RDEPEND="${DEPEND} - !kde-plasma/milou:4 -" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/oxygen/oxygen-5.14.90.ebuild b/kde-plasma/oxygen/oxygen-5.14.90.ebuild index c1c4116f67..68dfdc03ea 100644 --- a/kde-plasma/oxygen/oxygen-5.14.90.ebuild +++ b/kde-plasma/oxygen/oxygen-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -10,7 +10,7 @@ HOMEPAGE="https://cgit.kde.org/oxygen.git"; KEYWORDS="~amd64 ~arm ~x86" IUSE="wayland" -COMMON_DEPEND=" +RDEPEND=" $(add_frameworks_dep frameworkintegration) $(add_frameworks_dep kcmutils) $(add_frameworks_dep kcompletion) @@ -30,12 +30,11 @@ COMMON_DEPEND=" x11-libs/libxcb wayland? ( $(add_frameworks_dep kwayland) ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_frameworks_dep kservice) " -RDEPEND="${COMMON_DEPEND} +PDEPEND=" $(add_plasma_dep kde-cli-tools) - !kde-plasma/kdebase-cursors:4 " src_configure() { diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.90.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.90.ebuild index 40116d1cdb..2abcee341e 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.90.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.90.ebuild index adfb5f0894..3e844f81cf 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.90.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="true" @@ -112,11 +112,6 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] - !kde-misc/kcm-touchpad - !kde-plasma/plasma-desktop:4 - !kde-plasma/plasma-workspace:4 - !kde-plasma/solid-actions-kcm:4 - !kde-plasma/systemsettings:4 " src_configure() { diff --git a/kde-plasma/plasma-integration/plasma-integration-5.14.90.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.14.90.ebuild index 7dd9472990..b28163426a 100644 --- a/kde-plasma/plasma-integration/plasma-integration-5.14.90.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 VIRTUALX_REQUIRED="test" inherit kde5 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.90.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.90.ebuild index e7e493f43b..2d896c53ed 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.14.90.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="true" inherit kde5 @@ -51,7 +51,6 @@ DEPEND=" " RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) - !kde-plasma/plasma-nm:4 " src_configure() { diff --git a/kde-plasma/plasma-pa/plasma-pa-5.14.90.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.14.90.ebuild index 42aace8869..c3cad11b8c 100644 --- a/kde-plasma/plasma-pa/plasma-pa-5.14.90.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -23,7 +23,6 @@ DEPEND=" media-libs/libcanberra media-sound/pulseaudio " - RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" ) diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.14.90.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.14.90.ebuild index 6435381c22..a90ef7ddbe 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.14.90.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_TEST="optional" VIRTUALX_REQUIRED="test" @@ -34,6 +34,5 @@ DEPEND=" $(add_qt_dep qtxml) " RDEPEND="${DEPEND} - !dev-util/plasmate $(add_frameworks_dep kirigami) " diff --git a/kde-plasma/plasma-vault/plasma-vault-5.14.90.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.14.90.ebuild index fa87d69ead..a0012981be 100644 --- a/kde-plasma/plasma-vault/plasma-vault-5.14.90.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.90.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.90.ebuild index a2c4404144..4ec2de5bac 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.90.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_AUTODEPS="false" KDE_DEBUG="false" @@ -11,8 +11,7 @@ DESCRIPTION="Additional wallpapers for the Plasma workspace" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" IUSE="" -DEPEND=" +BDEPEND=" $(add_frameworks_dep extra-cmake-modules) $(add_qt_dep qtcore) " -RDEPEND="" diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.90.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.90.ebuild index a9456ffc6f..8b0cc4b038 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.90.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" KDE_TEST="forceoptional" @@ -108,16 +108,7 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) - !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-desktop-5.14.80:5 - !kde-plasma/plasma-workspace:4 " PDEPEND=" $(add_plasma_dep kde-cli-tools) diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.90.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.90.ebuild index 181fd57c71..173968f02f 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.90.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 BOGUS=1 inherit kde5 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.90.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.90.ebuild index da5e23e636..8893938bca 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.90.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KMNAME="${PN}-1" inherit kde5 diff --git a/kde-plasma/powerdevil/powerdevil-5.14.90.ebuild b/kde-plasma/powerdevil/powerdevil-5.14.90.ebuild index 8a279ddbd8..4932949d55 100644 --- a/kde-plasma/powerdevil/powerdevil-5.14.90.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="true" inherit kde5 @@ -48,8 +48,6 @@ DEPEND=" RDEPEND="${DEPEND} $(add_plasma_dep kde-cli-tools) >=sys-power/upower-0.9.23 - !kde-plasma/powerdevil:4 - !kde-plasma/systemsettings:4[handbook] " src_configure() { diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.14.90.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.14.90.ebuild index 91d4cb64a2..89fc331dc4 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.14.90.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 @@ -35,7 +35,6 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) x11-misc/sddm - !kde-misc/sddm-kcm " DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/systemsettings/systemsettings-5.14.90.ebuild b/kde-plasma/systemsettings/systemsettings-5.14.90.ebuild index d40f3c882b..20ff6226db 100644 --- a/kde-plasma/systemsettings/systemsettings-5.14.90.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -39,7 +39,6 @@ DEPEND=" classic? ( $(add_frameworks_dep khtml) ) " RDEPEND="${DEPEND} - !kde-plasma/systemsettings:4 $(add_frameworks_dep kirigami) gtk? ( $(add_plasma_dep kde-gtk-config) ) " diff --git a/kde-plasma/user-manager/user-manager-5.14.90.ebuild b/kde-plasma/user-manager/user-manager-5.14.90.ebuild index 719b8b033d..140f6f4c07 100644 --- a/kde-plasma/user-manager/user-manager-5.14.90.ebuild +++ b/kde-plasma/user-manager/user-manager-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit kde5 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.90.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.90.ebuild index 9faea4e6fc..23af1a456f 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.90.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 VIRTUALX_REQUIRED="test" inherit kde5 diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.90.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.90.ebuild index fa5dd7a7d1..9b2a7e4bff 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.90.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.90.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 KDE_AUTODEPS="false" KMNAME="plasma-workspace"
