From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50BDF139084 for ; Thu, 15 Dec 2016 10:10:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D733E0C34; Thu, 15 Dec 2016 10:10:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6507DE0C34 for ; Thu, 15 Dec 2016 10:10:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC77333E142 for ; Thu, 15 Dec 2016 10:10:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A55AF24B0 for ; Thu, 15 Dec 2016 10:10:36 +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: <1481796623.346d491ad022eb613ce0a0360c1a4282f12b0c56.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwayland/qtwayland-5.7.1.ebuild X-VCS-Directories: dev-qt/qtwayland/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 346d491ad022eb613ce0a0360c1a4282f12b0c56 X-VCS-Branch: master Date: Thu, 15 Dec 2016 10:10:36 +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: 5910370c-ec9b-4e88-ad54-c1d52b3b00d2 X-Archives-Hash: 49004796075d2fe1f78992926a1af1b2 commit: 346d491ad022eb613ce0a0360c1a4282f12b0c56 Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 15 10:09:53 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 15 10:10:23 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346d491a dev-qt/qtwayland: remove wayland-compositor USE flag in 5.7.1 QtWaylandCompositor is now built unconditionally since qtwayland commit 00fba62ce3e5bd00ba5e8ab6f5b7a71bdb93c6a1. Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qtwayland/qtwayland-5.7.1.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild index 026b7a5..7d6f488 100644 --- a/dev-qt/qtwayland/qtwayland-5.7.1.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.7.1.ebuild @@ -11,15 +11,15 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" fi -IUSE="egl wayland-compositor xcomposite" +IUSE="egl xcomposite" DEPEND=" >=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-${PV} + ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV}[egl=] media-libs/mesa[egl?] >=x11-libs/libxkbcommon-0.2.0 - wayland-compositor? ( ~dev-qt/qtdeclarative-${PV} ) xcomposite? ( x11-libs/libX11 x11-libs/libXcomposite @@ -28,10 +28,6 @@ DEPEND=" RDEPEND="${DEPEND}" src_configure() { - if use wayland-compositor; then - echo "CONFIG += wayland-compositor" >> "${QT5_BUILD_DIR}"/.qmake.cache - fi - qt_use_compile_test xcomposite qt5-build_src_configure