commit: 0702ca55d9c25ea25bdf6b5aca4840b2c493c231
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan 9 12:43:28 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 15:16:58 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0702ca55
kde-plasma/plasma-desktop: Block conflicting kdeplasma-addons
kimpanel was moved per 01fce13e7240fb8c266bd36931249a6d519b7f8a
Package-Manager: portage-2.2.26
kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
index e29fe94..d9bfc1b 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild
@@ -13,8 +13,6 @@ KEYWORDS=""
IUSE="+evdev +fontconfig gtk2 gtk3 legacy-systray pulseaudio +qt4 touchpad"
COMMON_DEPEND="
- $(add_plasma_dep kwin)
- $(add_plasma_dep plasma-workspace)
$(add_frameworks_dep attica)
$(add_frameworks_dep baloo)
$(add_frameworks_dep kactivities)
@@ -54,6 +52,8 @@ COMMON_DEPEND="
$(add_frameworks_dep plasma)
$(add_frameworks_dep solid)
$(add_frameworks_dep sonnet)
+ $(add_plasma_dep kwin)
+ $(add_plasma_dep plasma-workspace)
dev-qt/qtconcurrent:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
@@ -108,6 +108,7 @@ RDEPEND="${COMMON_DEPEND}
!kde-misc/kcm_touchpad
!kde-misc/kcm-touchpad
!kde-plasma/kcm-touchpad
+ !<kde-plasma/kdeplasma-addons-5.5.50
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
