commit: ccf420ccbdd2442fc3095e9e8dcfbd76fe942c84
Author: Stas Cymbalov <dummyunit <AT> gmail <DOT> com>
AuthorDate: Sun Mar 19 17:35:54 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 18:59:58 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=ccf420cc
Adjust for kde-base/kactivities pkgmove
kde-apps/dolphin/dolphin-4.14.3-r1.ebuild | 2 +-
kde-apps/gwenview/gwenview-4.14.3.ebuild | 2 +-
kde-apps/kate/kate-4.14.3.ebuild | 4 ++--
kde-apps/plasma-runtime/plasma-runtime-4.14.3.ebuild | 4 ++--
{kde-base => kde-frameworks}/kactivities/kactivities-4.13.3-r2.ebuild | 0
{kde-base => kde-frameworks}/kactivities/metadata.xml | 0
kde-plasma/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild | 3 +--
7 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
index e160ed4..6f907ac 100644
--- a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug semantic-desktop thumbnail"
DEPEND="
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_kdeframeworks_dep kactivities '' 4.13)
$(add_kdeapps_dep libkonq)
media-libs/phonon[qt4]
x11-libs/libXrender
diff --git a/kde-apps/gwenview/gwenview-4.14.3.ebuild
b/kde-apps/gwenview/gwenview-4.14.3.ebuild
index 5436ce2..7971c00 100644
--- a/kde-apps/gwenview/gwenview-4.14.3.ebuild
+++ b/kde-apps/gwenview/gwenview-4.14.3.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
DEPEND="
$(add_kdeapps_dep libkdcraw)
$(add_kdeapps_dep libkonq)
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_kdeframeworks_dep kactivities '' 4.13)
media-gfx/exiv2:=
media-libs/lcms:2
media-libs/libpng:0=
diff --git a/kde-apps/kate/kate-4.14.3.ebuild b/kde-apps/kate/kate-4.14.3.ebuild
index 00f5e05..ecab60c 100644
--- a/kde-apps/kate/kate-4.14.3.ebuild
+++ b/kde-apps/kate/kate-4.14.3.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
KMNAME="kate"
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 kde4-meta
+inherit python-single-r1 kde4-meta kde4-functions-extra
DESCRIPTION="Kate is an MDI texteditor"
HOMEPAGE="https://www.kde.org/applications/utilities/kate
http://kate-editor.org";
@@ -17,7 +17,7 @@ IUSE="debug python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_kdeframeworks_dep kactivities '' 4.13)
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qjson
diff --git a/kde-apps/plasma-runtime/plasma-runtime-4.14.3.ebuild
b/kde-apps/plasma-runtime/plasma-runtime-4.14.3.ebuild
index 3e40b61..326418a 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-4.14.3.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-4.14.3.ebuild
@@ -7,14 +7,14 @@ EAPI=5
KMNAME="kde-runtime"
KMMODULE="plasma"
DECLARATIVE_REQUIRED="always"
-inherit kde4-meta
+inherit kde4-meta kde4-functions-extra
DESCRIPTION="Script engine and package tool for plasma"
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
- $(add_kdebase_dep kactivities '' 4.13)
+ $(add_kdeframeworks_dep kactivities '' 4.13)
$(add_kdebase_dep kdelibs 'crypt')
"
RDEPEND="${DEPEND}"
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-base/kactivities/metadata.xml
b/kde-frameworks/kactivities/metadata.xml
similarity index 100%
rename from kde-base/kactivities/metadata.xml
rename to kde-frameworks/kactivities/metadata.xml
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
b/kde-plasma/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
index 4e50578..61c041f 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
@@ -12,8 +12,7 @@ KEYWORDS="amd64 ~arm x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
- !<kde-base/kactivities-4.13.3-r1
- !kde-frameworks/kactivities
+ !<kde-frameworks/kactivities-4.13.3-r1
"
S=${WORKDIR}/${KMNAME}-${PV}
