[gentoo-commits] proj/kde:master commit in: kde-base/kactivities/

[Andreas Hüttel]

commit:     2ef4d6fef5e516f0f7a310867d6c0ee05c1a7f60
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 18:25:19 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 18:25:19 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2ef4d6fe

[kde-base/kactivities] clean up blockers

Package-Manager: portage-2.2.10

---
 kde-base/kactivities/kactivities-4.12.49.9999.ebuild | 10 ++++------
 kde-base/kactivities/kactivities-4.12.97.ebuild      | 10 ++++------
 kde-base/kactivities/kactivities-4.13.49.9999.ebuild | 10 ++++------
 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 8408fd1..473e81f 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 790b79d..85c6412 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 abe59e1..0e628ab 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=(