[gentoo-commits] repo/gentoo:master commit in: kde-base/kactivities/, kde-plasma/kactivities-workspace/, profiles/updates/, ...

[Johannes Huber]

commit:     6da1ba829e1e240c7c4fe467a22d23d275368154
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 19:16:50 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 20:21:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da1ba82

kde-base/kactivitymanagerd -> kde-plasma/kactivitymanagerd

 kde-base/kactivities/kactivities-4.13.3-r2.ebuild  |  2 +-
 kde-base/kactivitymanagerd/Manifest                |  1 -
 .../kactivitymanagerd-4.13.3-r1.ebuild             | 31 ----------------------
 kde-base/kactivitymanagerd/metadata.xml            |  8 ------
 .../kactivities-workspace-5.5.0.ebuild             |  2 +-
 .../kactivitymanagerd-5.5.0.ebuild                 |  2 +-
 .../kactivitymanagerd-5.6.5.ebuild                 |  2 +-
 .../kactivitymanagerd-5.7.0.ebuild                 |  2 +-
 profiles/updates/3Q-2016                           |  1 +
 9 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/kde-base/kactivities/kactivities-4.13.3-r2.ebuild b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
index 74e1d8b..071a9ef 100644
--- a/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
+++ b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	|| ( $(add_kdebase_dep kactivitymanagerd) <kde-frameworks/kactivities-5.20.0:5 kde-plasma/kactivitymanagerd:5 )
+	kde-plasma/kactivitymanagerd:5
 "
 
 src_configure() {

diff --git a/kde-base/kactivitymanagerd/Manifest b/kde-base/kactivitymanagerd/Manifest
deleted file mode 100644
index b2cc30c..0000000
--- a/kde-base/kactivitymanagerd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kactivities-4.13.3.tar.xz 87476 SHA256 c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a SHA512 1d248ae6045a7ae8d54ce5355100cd76be954c2a57be3abaab968d8ff2693d09aa9b1d0242266de4eedf6005bedfde38df69a84a9a5a0b16606fe958159b31bc WHIRLPOOL 0056402e851cda3c5930ed2440d259b9b23750f9356e9598e4ef17c6be38265bc4ebfeb43ac568636ff92399e3f560afa547977ad24f54f4eb4fad4df283cc0d

diff --git a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
deleted file mode 100644
index 992a0c5..0000000
--- a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kactivities"
-inherit kde4-base
-
-DESCRIPTION="KDE Activity Manager Daemon"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	!<kde-base/kactivities-4.13.3-r1
-	!kde-frameworks/kactivities
-"
-
-S=${WORKDIR}/${KMNAME}-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DWITH_NepomukCore=OFF
-	)
-	kde4-base_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/src/service/${PN}"
-}

diff --git a/kde-base/kactivitymanagerd/metadata.xml b/kde-base/kactivitymanagerd/metadata.xml
deleted file mode 100644
index 2fdbf33..0000000
--- a/kde-base/kactivitymanagerd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@g.o</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
index 39eabbc..a372553 100644
--- a/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
+++ b/kde-plasma/kactivities-workspace/kactivities-workspace-5.5.0.ebuild
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	!>kde-apps/kio-extras-15.12.50
 	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
-	!kde-base/kactivitymanagerd
+	!kde-plasma/kactivitymanagerd:4
 	!<kde-frameworks/kactivities-5.20.0
 	!>kde-plasma/plasma-desktop-5.5.90
 "

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild
index b035e44..dd2477f 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-base/kactivities-4.13.3-r1:4[-minimal(-)]
-	!kde-base/kactivitymanagerd
+	!kde-plasma/kactivitymanagerd:4
 	!<kde-frameworks/kactivities-5.20.0
 "
 PDEPEND="

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild
index 64795f0..da1090e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.6.5.ebuild
@@ -31,7 +31,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-base/kactivities-4.13.3-r2:4
-	!kde-base/kactivitymanagerd
+	!kde-plasma/kactivitymanagerd:4
 	!<kde-frameworks/kactivities-5.20.0
 	!<kde-plasma/plasma-desktop-5.6.1
 "

diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.0.ebuild
index 64795f0..da1090e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.0.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.0.ebuild
@@ -31,7 +31,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-base/kactivities-4.13.3-r2:4
-	!kde-base/kactivitymanagerd
+	!kde-plasma/kactivitymanagerd:4
 	!<kde-frameworks/kactivities-5.20.0
 	!<kde-plasma/plasma-desktop-5.6.1
 "

diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
new file mode 100644
index 0000000..23fa9f7
--- /dev/null
+++ b/profiles/updates/3Q-2016
@@ -0,0 +1 @@
+move kde-base/kactivitymanagerd kde-plasma/kactivitymanagerd