commit: d53d0578994202b70f7953f360376ba48ecbeb73
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 12:01:18 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 12:01:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53d0578
kde-base/kactivities -> kde-frameworks/kactivities
kde-apps/konqueror/konqueror-16.04.3-r1.ebuild | 2 +-
kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild | 4 ++--
kde-base/kactivities/Manifest | 1 -
kde-base/kactivities/metadata.xml | 8 --------
kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild | 2 +-
kde-frameworks/kactivities/Manifest | 1 +
.../kactivities/kactivities-4.13.3-r2.ebuild | 0
kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild | 6 +++---
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.5.ebuild | 4 ++--
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild | 4 ++--
kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild | 4 ++--
kde-plasma/kwin/kwin-4.11.22.ebuild | 2 +-
kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild | 2 +-
kde-plasma/powerdevil/powerdevil-4.11.22.ebuild | 2 +-
profiles/updates/4Q-2016 | 1 +
15 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
index 04ee20e..bccdc2d 100644
--- a/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
DEPEND="
$(add_kdeapps_dep libkonq)
filemanager? (
- $(add_kdebase_dep kactivities '' 4.13)
+ kde-frameworks/kactivities:4
media-libs/phonon[qt4]
x11-libs/libXrender
)
diff --git a/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
b/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
index 535f01b..29ac4de 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
@@ -15,9 +15,9 @@ KEYWORDS="amd64 ~arm x86"
IUSE="debug"
DEPEND="
- $(add_kdebase_dep kactivities '' 4.13)
+ kde-frameworks/kactivities:4
"
RDEPEND="${DEPEND}"
-RESTRICT=test
# bug 443748
+RESTRICT=test
diff --git a/kde-base/kactivities/Manifest b/kde-base/kactivities/Manifest
deleted file mode 100644
index b2cc30c..00000000
--- a/kde-base/kactivities/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/kactivities/metadata.xml
b/kde-base/kactivities/metadata.xml
deleted file mode 100644
index 2fdbf33..00000000
--- a/kde-base/kactivities/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>[email protected]</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
index 3ab7940..c8e048c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
COMMONDEPEND="
dev-libs/libdbusmenu-qt
>=dev-qt/qtcore-4.8.4-r3:4
- $(add_kdebase_dep kactivities)
+ kde-frameworks/kactivities:4
kde-plasma/kephal:4
kde-plasma/ksysguard:4
kde-plasma/libkworkspace:4
diff --git a/kde-frameworks/kactivities/Manifest
b/kde-frameworks/kactivities/Manifest
index 03bd155..d63e161 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1,3 @@
+DIST kactivities-4.13.3.tar.xz 87476 SHA256
c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a SHA512
1d248ae6045a7ae8d54ce5355100cd76be954c2a57be3abaab968d8ff2693d09aa9b1d0242266de4eedf6005bedfde38df69a84a9a5a0b16606fe958159b31bc
WHIRLPOOL
0056402e851cda3c5930ed2440d259b9b23750f9356e9598e4ef17c6be38265bc4ebfeb43ac568636ff92399e3f560afa547977ad24f54f4eb4fad4df283cc0d
DIST kactivities-5.26.0.tar.xz 60844 SHA256
e1b85b999fd36470e1c0fe84ec09d7473ce3bb603826f37b0bd652576f8ccc32 SHA512
f490f590f040bd6b9ed6a7883c0c0d9928b68dfc9874338ab18695433fb728031d3c10435057e79f486a044a78a0fc824c3461c61c89e66de8e4c30f9c9000da
WHIRLPOOL
ec6169087c64d2524cd6abb2efc02f81c19d017abf4f60d748feecc9aebbfc88c016561dc5ee3fbc9d073c86846ddcb858d20fe75e625d996c70c7667922a240
DIST kactivities-5.28.0.tar.xz 61220 SHA256
eba9db7aecd916df45803c566fa2b11f377d2f497cfdfbc6a263a1eb18a65198 SHA512
416502e6bbf5305e2218e2750f827fe0776a4f5f36fd833c9ebdcdcf30015b001bc7842432519e7148fafcd94e2004b99fcbf676d1765b70981dc158a1a9ccd1
WHIRLPOOL
db6ea6d75461505fe9e5d00c35751de782557efeb4d0cf46c399ee1628d0c530f88df20bdabb9616f94da03f8bb6208613a1ef058ed61294c1d6feee0295d807
diff --git a/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
b/kde-frameworks/kactivities/kactivities-4.13.3-r2.ebuild
similarity index 100%
rename from kde-base/kactivities/kactivities-4.13.3-r2.ebuild
rename to kde-frameworks/kactivities/kactivities-4.13.3-r2.ebuild
diff --git a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild
b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild
index 4b2289a..e7c6f08 100644
--- a/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild
+++ b/kde-misc/plasmoid-workflow/plasmoid-workflow-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ EAPI=5
KDE_LINGUAS="de el en es fr pt"
inherit kde4-base
-DESCRIPTION="Plasmoid that integrates Activities, Virtual Desktops and Tasks
Functionalities in one component"
+DESCRIPTION="Integrates Activities, Virtual Desktops and Tasks in one
component"
HOMEPAGE="http://kde-look.org/content/show.php/?content=147428";
SRC_URI="http://www.opentoolsandspace.org/Art/WorkFlow/0.4.x/${P}.tar.gz";
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
IUSE=""
DEPEND="
- $(add_kdebase_dep kactivities)
+ kde-frameworks/kactivities:4
kde-plasma/libkworkspace:4
$(add_kdebase_dep plasma-workspace)
"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.5.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.5.ebuild
index bdd3674..0bfcc77 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.7.5.ebuild
@@ -30,8 +30,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.54
"
RDEPEND="${COMMON_DEPEND}
- !<kde-base/kactivities-4.13.3-r2:4
- !kde-plasma/kactivitymanagerd:4
+ !<kde-frameworks/kactivities-4.13.3-r2:4
!<kde-frameworks/kactivities-5.20.0
+ !kde-plasma/kactivitymanagerd:4
!<kde-plasma/plasma-desktop-5.6.1
"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild
index 2101992..624827e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.3.ebuild
@@ -30,8 +30,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.54
"
RDEPEND="${COMMON_DEPEND}
- !<kde-base/kactivities-4.13.3-r2:4
- !kde-plasma/kactivitymanagerd:4
+ !<kde-frameworks/kactivities-4.13.3-r2:4
!<kde-frameworks/kactivities-5.20.0
+ !kde-plasma/kactivitymanagerd:4
!<kde-plasma/plasma-desktop-5.6.1
"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
index 2101992..624827e 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.8.4.ebuild
@@ -30,8 +30,8 @@ DEPEND="${COMMON_DEPEND}
>=dev-libs/boost-1.54
"
RDEPEND="${COMMON_DEPEND}
- !<kde-base/kactivities-4.13.3-r2:4
- !kde-plasma/kactivitymanagerd:4
+ !<kde-frameworks/kactivities-4.13.3-r2:4
!<kde-frameworks/kactivities-5.20.0
+ !kde-plasma/kactivitymanagerd:4
!<kde-plasma/plasma-desktop-5.6.1
"
diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index 1884ea8..5e9fc97 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="debug gles opengl wayland"
COMMONDEPEND="
- $(add_kdebase_dep kactivities)
+ kde-frameworks/kactivities:4
$(add_kdebase_dep kdelibs opengl)
kde-plasma/kephal:4
kde-plasma/libkworkspace:4
diff --git a/kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild
b/kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild
index 504ce9d..e56ec35 100644
--- a/kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild
+++ b/kde-plasma/libtaskmanager/libtaskmanager-4.11.22.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
- $(add_kdebase_dep kactivities)
+ kde-frameworks/kactivities:4
kde-plasma/kephal:4
kde-plasma/ksysguard:4
kde-plasma/libkworkspace:4
diff --git a/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
index dadadaf..82557a4 100644
--- a/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-4.11.22.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="debug +pm-utils"
DEPEND="
- $(add_kdebase_dep kactivities)
+ kde-frameworks/kactivities:4
kde-plasma/libkworkspace:4
!aqua? (
x11-libs/libX11
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index e221492..f02dc21 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -49,3 +49,4 @@ move kde-base/klipper kde-plasma/klipper
move kde-base/ksmserver kde-plasma/ksmserver
move kde-base/krunner kde-plasma/krunner
move kde-base/kdebase-pam kde-plasma/kdebase-pam
+move kde-base/kactivities kde-frameworks/kactivities
