summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-04-20 23:19:25 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-04-20 23:19:29 +1000
commit547e9fde71cd4d55a116db65e96b92a41bf1d23e (patch)
tree22e3aa2e9a9f195294c00f6feaa06b7d67152eec
parent8b2bcaab300bfce466e551c6f9d2d740df8e03cf (diff)
downloadkde-547e9fde71cd4d55a116db65e96b92a41bf1d23e.tar.gz
kde-547e9fde71cd4d55a116db65e96b92a41bf1d23e.tar.bz2
kde-547e9fde71cd4d55a116db65e96b92a41bf1d23e.zip
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
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-5.6.49.9999.ebuild5
-rw-r--r--kde-plasma/kinfocenter/kinfocenter-9999.ebuild5
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 12a10e115c9..ce145380891 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 12a10e115c9..ce145380891 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