From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A15371386F3 for ; Thu, 13 Aug 2015 14:14:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FBBCE07EC; Thu, 13 Aug 2015 14:14:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B0831419F for ; Thu, 13 Aug 2015 14:14:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0148F3409A4 for ; Thu, 13 Aug 2015 14:14:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39640124 for ; Thu, 13 Aug 2015 14:14:25 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1439475175.b0ba1ce3402787ea736d87373315b09c53fa64e6.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwin/kwin-9999.ebuild X-VCS-Directories: kde-plasma/kwin/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b0ba1ce3402787ea736d87373315b09c53fa64e6 X-VCS-Branch: master Date: Thu, 13 Aug 2015 14:14:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dd0a2df9-23a5-46c8-b94e-9bf44a8e114e X-Archives-Hash: ab9d2fdd0c14b6dfc9ca73e30c6df166 commit: b0ba1ce3402787ea736d87373315b09c53fa64e6 Author: Michael Palimaka gentoo org> AuthorDate: Thu Aug 13 14:12:55 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Aug 13 14:12:55 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b0ba1ce3 kde-plasma/kwin: remove wayland USE flag wrt bug #557428 Package-Manager: portage-2.2.20.1 kde-plasma/kwin/kwin-9999.ebuild | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index ff3d41b..8fa03f0 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="KDE window manager" LICENSE="GPL-2+" KEYWORDS="" -IUSE="gles2 wayland" +IUSE="gles2" COMMON_DEPEND=" $(add_frameworks_dep kactivities) @@ -38,29 +38,27 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_frameworks_dep plasma) $(add_plasma_dep kdecoration) + $(add_plasma_dep kwayland) + >=dev-libs/libinput-0.10 + >=dev-libs/wayland-1.2 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtmultimedia:5[gstreamer,qml] dev-qt/qtscript:5 + dev-qt/qtwayland:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras media-libs/libepoxy + virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.10 + >=x11-libs/libxkbcommon-0.4.1 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms - wayland? ( - $(add_plasma_dep kwayland) - dev-qt/qtwayland:5 - >=dev-libs/libinput-0.10 - >=dev-libs/wayland-1.2 - virtual/libudev:= - >=x11-libs/libxkbcommon-0.4.1 - ) " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) @@ -74,14 +72,3 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto test? ( x11-libs/xcb-util-wm ) " - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland) - $(cmake-utils_use_find_package wayland KF5Wayland) - $(cmake-utils_use_find_package wayland Libinput) - $(cmake-utils_use_find_package wayland UDev) - ) - - kde5_src_configure -}