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 2E5B959CB4 for ; Wed, 20 Apr 2016 13:19:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96D4CE087E; Wed, 20 Apr 2016 13:19:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 29703E087E for ; Wed, 20 Apr 2016 13:19:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 17DEF34085D for ; Wed, 20 Apr 2016 13:19:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5010423E for ; Wed, 20 Apr 2016 13:19:38 +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: <1461158369.547e9fde71cd4d55a116db65e96b92a41bf1d23e.kensington@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.6.49.9999.ebuild kde-plasma/kinfocenter/kinfocenter-9999.ebuild X-VCS-Directories: kde-plasma/kinfocenter/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 547e9fde71cd4d55a116db65e96b92a41bf1d23e X-VCS-Branch: master Date: Wed, 20 Apr 2016 13:19:38 +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: fd916567-6848-4c66-9309-010b76c9ae2d X-Archives-Hash: 4fff58b12f1fb2dfd257319128b3ade0 commit: 547e9fde71cd4d55a116db65e96b92a41bf1d23e Author: Michael Palimaka gentoo org> AuthorDate: Wed Apr 20 13:19:25 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Apr 20 13:19:29 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=547e9fde kde-plasma/kinfocenter: remove X USE flag Building with USE="-X opengl" causes a build failure. Additionally, the X-Server information screen is not removed - it remains, but empty. Gentoo-bug: 580472 Package-Manager: portage-2.2.28 kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild | 5 ++--- kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild index 12a10e1..ce14538 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="A utility that provides information about a computer system" HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/" SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" KEYWORDS="" -IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X" +IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland" REQUIRED_USE="egl? ( || ( gles opengl ) )" @@ -36,6 +36,7 @@ COMMON_DEPEND=" $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui 'opengl(+)') $(add_qt_dep qtwidgets) + x11-libs/libX11 gles? ( $(add_qt_dep qtgui 'gles2') || ( @@ -52,7 +53,6 @@ COMMON_DEPEND=" pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( $(add_plasma_dep kwayland) ) - X? ( x11-libs/libX11 ) " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep plasma) @@ -72,7 +72,6 @@ src_configure() { $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland KF5Wayland) - $(cmake-utils_use_find_package X X11) ) kde5_src_configure diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 12a10e1..ce14538 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="A utility that provides information about a computer system" HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/" SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" KEYWORDS="" -IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland X" +IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland" REQUIRED_USE="egl? ( || ( gles opengl ) )" @@ -36,6 +36,7 @@ COMMON_DEPEND=" $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui 'opengl(+)') $(add_qt_dep qtwidgets) + x11-libs/libX11 gles? ( $(add_qt_dep qtgui 'gles2') || ( @@ -52,7 +53,6 @@ COMMON_DEPEND=" pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( $(add_plasma_dep kwayland) ) - X? ( x11-libs/libX11 ) " DEPEND="${COMMON_DEPEND} $(add_frameworks_dep plasma) @@ -72,7 +72,6 @@ src_configure() { $(cmake-utils_use_find_package opengl OpenGL) $(cmake-utils_use_find_package pci PCIUTILS) $(cmake-utils_use_find_package wayland KF5Wayland) - $(cmake-utils_use_find_package X X11) ) kde5_src_configure