[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/

[Johannes Huber]

commit:     51b19ed10b4f106cf7092926fab496865ab571ea
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 13 13:09:17 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 13 13:09:17 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=51b19ed1

[kde-plasma/plasma-workspace] Revision bump, bug #539922

Disables build of kglobalaccel.

Package-Manager: portage-2.2.17

---
 ...workspace-5.2.9999.ebuild => plasma-workspace-5.2.0-r2.ebuild} | 8 ++++++--
 kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild      | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild
similarity index 95%
copy from kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
copy to kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild
index 8d43cbf..395bf98 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.0-r2.ebuild
@@ -5,10 +5,11 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
+FRAMEWORKS_MINIMAL="5.7"
 inherit kde5 multilib
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS=""
+KEYWORDS=" ~amd64"
 IUSE="dbus gps prison qalculate X"
 
 COMMON_DEPEND="
@@ -105,7 +106,7 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
        "${FILESDIR}/${PN}-startkde-script.patch"
-       "${FILESDIR}/${PN}-5.2.0-freeze.patch"
+       "${FILESDIR}/${P}-freeze.patch"
 )
 
 RESTRICT="test"
@@ -114,6 +115,9 @@ src_prepare() {
        kde5_src_prepare
 
        sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i 
startkde/startkde.cmake || die
+
+       # bug 539922, moved to frameworks
+       comment_add_subdirectory kglobalaccel
 }
 
 src_configure() {

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild 
b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
index 8d43cbf..2b07ce4 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.2.9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 VIRTUALX_REQUIRED="test"
+FRAMEWORKS_MINIMAL="5.7"
 inherit kde5 multilib
 
 DESCRIPTION="KDE Plasma workspace"
@@ -114,6 +115,9 @@ src_prepare() {
        kde5_src_prepare
 
        sed -e "s|\`qtpaths|\`/usr/$(get_libdir)/qt5/bin/qtpaths|" -i 
startkde/startkde.cmake || die
+
+       # bug 539922, moved to frameworks
+       comment_add_subdirectory kglobalaccel
 }
 
 src_configure() {