commit: b6a058c339fe99925a9a044eda4e0301ff4c1efc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 09:00:01 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 09:26:49 2019 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6a058c3
kde-plasma: Drop obsolete blockers
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.49.9999.ebuild | 7 ++-----
kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild | 7 ++-----
kde-plasma/kinfocenter/kinfocenter-5.16.49.9999.ebuild | 1 -
kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 1 -
kde-plasma/plasma-desktop/plasma-desktop-5.16.49.9999.ebuild | 3 ---
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 3 ---
kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.49.9999.ebuild | 5 +----
kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild | 5 +----
8 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.49.9999.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.49.9999.ebuild
index 9326eeb609..36e5f05a5e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.49.9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.49.9999.ebuild
@@ -10,7 +10,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
@@ -26,9 +26,6 @@ COMMON_DEPEND="
$(add_qt_dep qtsql 'sqlite')
$(add_qt_dep qtwidgets)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-frameworks/kactivities-4.13.3-r2:4
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
index 9326eeb609..36e5f05a5e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild
@@ -10,7 +10,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
KEYWORDS=""
IUSE=""
-COMMON_DEPEND="
+RDEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
@@ -26,9 +26,6 @@ COMMON_DEPEND="
$(add_qt_dep qtsql 'sqlite')
$(add_qt_dep qtwidgets)
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
dev-libs/boost
"
-RDEPEND="${COMMON_DEPEND}
- !<kde-frameworks/kactivities-4.13.3-r2:4
-"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.49.9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-5.16.49.9999.ebuild
index fc4be7fa25..7614a0c816 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.49.9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.49.9999.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
$(add_qt_dep qtquickcontrols2)
- !kde-apps/kcontrol:4
"
src_configure() {
diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
index fc4be7fa25..7614a0c816 100644
--- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
$(add_qt_dep qtquickcontrols2)
- !kde-apps/kcontrol:4
"
src_configure() {
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.16.49.9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-5.16.49.9999.ebuild
index 9e6bfa202d..a3a4e06344 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.16.49.9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.16.49.9999.ebuild
@@ -109,9 +109,6 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtquickcontrols2)
sys-apps/util-linux
x11-apps/setxkbmap
- !kde-apps/kcontrol
- !<kde-apps/kde4-l10n-17.08.1-r1
- !kde-apps/knetattach[handbook]
!<kde-plasma/kdeplasma-addons-5.15.80
"
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index 9e6bfa202d..a3a4e06344 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -109,9 +109,6 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtquickcontrols2)
sys-apps/util-linux
x11-apps/setxkbmap
- !kde-apps/kcontrol
- !<kde-apps/kde4-l10n-17.08.1-r1
- !kde-apps/knetattach[handbook]
!<kde-plasma/kdeplasma-addons-5.15.80
"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.49.9999.ebuild
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.49.9999.ebuild
index 3dd195a961..fa6a565c62 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.49.9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.49.9999.ebuild
@@ -24,7 +24,4 @@ DEPEND="
$(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
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
index 3dd195a961..fa6a565c62 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild
@@ -24,7 +24,4 @@ DEPEND="
$(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
-"
+RDEPEND="${DEPEND}"