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

[Jonathan Callen]

commit:     a1597f541406ec0d462b04fb4b2130b6535a261b
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 25 23:39:21 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 21:50:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a1597f54

[kde-base/activitymanager] Gone in 4.8, merged into kactivities

---
 .../activitymanager/activitymanager-9999.ebuild    |   29 --------------------
 kde-base/kactivities/kactivities-9999.ebuild       |    2 +
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/kde-base/activitymanager/activitymanager-9999.ebuild b/kde-base/activitymanager/activitymanager-9999.ebuild
deleted file mode 100644
index 193152f..0000000
--- a/kde-base/activitymanager/activitymanager-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KMNAME="kde-runtime"
-inherit kde4-meta
-
-DESCRIPTION="Activity manager"
-KEYWORDS=""
-IUSE="debug semantic-desktop"
-
-DEPEND="$(add_kdebase_dep kdelibs 'semantic-desktop=')"
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY="
-	nepomuk/
-"
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		# $(cmake-utils_use_with zeitgeist QtZeitgeist)
-		-DWITH_QtZeitgeist=NO
-	)
-	kde4-meta_src_configure
-}

diff --git a/kde-base/kactivities/kactivities-9999.ebuild b/kde-base/kactivities/kactivities-9999.ebuild
index 82cab21..4bc4ec5 100644
--- a/kde-base/kactivities/kactivities-9999.ebuild
+++ b/kde-base/kactivities/kactivities-9999.ebuild
@@ -16,3 +16,5 @@ RESTRICT="test"
 
 # Split out from kdelibs in 4.7.1-r2
 add_blocker kdelibs 4.7.1-r1
+# Moved here in 4.8
+add_blocker activitymanager