[gentoo-commits] proj/kde:master commit in: kde-frameworks/kglobalaccel/

[Michael Palimaka]

commit:     643d608989f9042a6cffdf32cdd26caba07253d8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 12:02:24 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 12:03:13 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=643d6089

[kde-frameworks/kglobalaccel] Remove X USE flag wrt bug #540120.

This is caused by the runtime component being merged in.
KGlobalAccelImpl is defined by kglobalaccel_{mac,win,x11} so if none of those
configurations is present, build will fail.

Upstream commit: 172c2a7813d60a0bd6174fd39c72aa2e106aa2fd

Package-Manager: portage-2.2.14

---
 kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild 
b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
index 29bdfb5..36e7078 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Framework to handle global shortcuts"
 KEYWORDS=""
 LICENSE="LGPL-2+"
-IUSE="nls X"
+IUSE="nls"
 
 RDEPEND="
        $(add_frameworks_dep kconfig)
@@ -22,22 +22,11 @@ RDEPEND="
        dev-qt/qtdbus:5
        dev-qt/qtgui:5
        dev-qt/qtwidgets:5
-       X? (
-               dev-qt/qtx11extras:5
-               x11-libs/libxcb
-               x11-libs/xcb-util-keysyms
-       )
+       dev-qt/qtx11extras:5
+       x11-libs/libxcb
+       x11-libs/xcb-util-keysyms
        !<kde-plasma/plasma-workspace-5.2.0-r2
 "
 DEPEND="${RDEPEND}
        nls? ( dev-qt/linguist-tools:5 )
 "
-
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
-               $(cmake-utils_use_find_package X XCB)
-       )
-
-       kde5_src_configure
-}