diff options
Diffstat (limited to 'kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild')
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild index 9fe89d1fc11..bd00fd298f5 100644 --- a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |