3 files changed, 12 insertions, 18 deletions
diff --git a/kde-base/kactivities/kactivities-4.12.49.9999.ebuild b/kde-base/kactivities/kactivities-4.12.49.9999.ebuild
index 8408fd1800d..473e81fea9a 100644
--- a/kde-base/kactivities/kactivities-4.12.49.9999.ebuild
+++ b/kde-base/kactivities/kactivities-4.12.49.9999.ebuild
@@ -12,12 +12,10 @@ KEYWORDS=""
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-base/kactivities/kactivities-4.12.97.ebuild b/kde-base/kactivities/kactivities-4.12.97.ebuild
index 790b79d077c..85c641242a3 100644
--- a/kde-base/kactivities/kactivities-4.12.97.ebuild
+++ b/kde-base/kactivities/kactivities-4.12.97.ebuild
@@ -13,12 +13,10 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-base/kactivities/kactivities-4.13.49.9999.ebuild b/kde-base/kactivities/kactivities-4.13.49.9999.ebuild
index abe59e111fe..0e628abd6d3 100644
--- a/kde-base/kactivities/kactivities-4.13.49.9999.ebuild
+++ b/kde-base/kactivities/kactivities-4.13.49.9999.ebuild
@@ -13,12 +13,10 @@ KEYWORDS=""
 IUSE="semantic-desktop"
 
 DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop?')"
-RDEPEND="${DEPEND}"
-
-# Split out from kdelibs in 4.7.1-r2
-add_blocker kdelibs 4.7.1-r1
-# Moved here in 4.8
-add_blocker activitymanager
+RDEPEND="
+	${DEPEND}
+	!kde-base/activitymanager
+"
 
 src_configure() {
 	local mycmakeargs=(