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 1DC10138334 for ; Sun, 24 Jun 2018 18:04:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16AC9E08E2; Sun, 24 Jun 2018 18:04:55 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42E5CE08BB for ; Sun, 24 Jun 2018 18:04:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9C935335CA3 for ; Sun, 24 Jun 2018 18:04:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A23BA2A1 for ; Sun, 24 Jun 2018 18:04:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1529863448.0007b895e8a0f2110ae9eaae587c7ac52457f744.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild kde-plasma/kinfocenter/kinfocenter-9999.ebuild X-VCS-Directories: kde-plasma/kinfocenter/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0007b895e8a0f2110ae9eaae587c7ac52457f744 X-VCS-Branch: master Date: Sun, 24 Jun 2018 18:04:50 +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: 5b9e094b-fe8c-440f-bde4-1bc11795e72d X-Archives-Hash: 4ef01885eb210af0a601b20329cf4fd7 commit: 0007b895e8a0f2110ae9eaae587c7ac52457f744 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 24 17:44:00 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 24 18:04:08 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0007b895 kde-plasma/kinfocenter: Fix cmake warning Reported-by: Francesco Turco fastmail.fm> Closes: https://bugs.gentoo.org/658980 Package-Manager: Portage-2.3.40, Repoman-2.3.9 kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild | 8 ++++++-- kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild | 8 ++++++-- kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild | 9 +++++++-- kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 8 ++++++-- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild index 8eb75e0e4e..e2bad37d44 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.12.49.9999.ebuild @@ -60,14 +60,18 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package gles2 OpenGLES) $(cmake-utils_use_find_package ieee1394 RAW1394) - $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland EGL) $(cmake-utils_use_find_package wayland KF5Wayland) ) + if has_version "dev-qt/qtgui[gles2]"; then + mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) ) + else + mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) ) + fi + kde5_src_configure } diff --git a/kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild index ff2f95c959..e0627f416e 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.13.1.ebuild @@ -60,14 +60,18 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package gles2 OpenGLES) $(cmake-utils_use_find_package ieee1394 RAW1394) - $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland EGL) $(cmake-utils_use_find_package wayland KF5Wayland) ) + if has_version "dev-qt/qtgui[gles2]"; then + mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) ) + else + mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) ) + fi + kde5_src_configure } diff --git a/kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild index 8eb75e0e4e..2b5190d6a5 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.13.49.9999.ebuild @@ -60,14 +60,19 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package gles2 OpenGLES) $(cmake-utils_use_find_package ieee1394 RAW1394) - $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland EGL) $(cmake-utils_use_find_package wayland KF5Wayland) ) + if has_version "dev-qt/qtgui[gles2]"; then + mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) ) + else + mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) ) + fi + ) + kde5_src_configure } diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 8eb75e0e4e..e2bad37d44 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -60,14 +60,18 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package gles2 OpenGLES) $(cmake-utils_use_find_package ieee1394 RAW1394) - $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland EGL) $(cmake-utils_use_find_package wayland KF5Wayland) ) + if has_version "dev-qt/qtgui[gles2]"; then + mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) ) + else + mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) ) + fi + kde5_src_configure }