commit: 2cec649eac7b03b2dd5e71a3df8d7a48b5ac5931 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Jun 19 10:47:15 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jun 19 10:50:27 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2cec649e
kde-plasma/kinfocenter: simplify opengl handling Package-Manager: portage-2.3.0_rc1 kde-plasma/kinfocenter/kinfocenter-5.6.95.ebuild | 20 +++++++------------- .../kinfocenter/kinfocenter-5.7.49.9999.ebuild | 20 +++++++------------- kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 20 +++++++------------- kde-plasma/kinfocenter/metadata.xml | 2 +- 4 files changed, 22 insertions(+), 40 deletions(-) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.6.95.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.6.95.ebuild index 447df16..f4f8af2 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.6.95.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.6.95.ebuild @@ -11,9 +11,9 @@ 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="~amd64 ~x86" -IUSE="egl gles ieee1394 +opengl +pci samba nfs wayland" +IUSE="egl gles2 ieee1394 +opengl +pci samba nfs wayland" -REQUIRED_USE="egl? ( || ( gles opengl ) )" +REQUIRED_USE="egl? ( || ( gles2 opengl ) )" COMMON_DEPEND=" $(add_frameworks_dep kcmutils) @@ -34,21 +34,15 @@ COMMON_DEPEND=" $(add_frameworks_dep solid) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'opengl(+)') + $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) x11-libs/libX11 - gles? ( - $(add_qt_dep qtgui 'gles2') - || ( - media-libs/mesa[egl,gles1] - media-libs/mesa[egl,gles2] - ) - ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( - virtual/glu - virtual/opengl + $(add_qt_dep qtgui 'gles2=') + media-libs/mesa[egl?,gles2?] + !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) @@ -67,7 +61,7 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package gles OpenGLES) + $(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) diff --git a/kde-plasma/kinfocenter/kinfocenter-5.7.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.7.49.9999.ebuild index 576858a..044ed69 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.7.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.7.49.9999.ebuild @@ -11,9 +11,9 @@ 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" +IUSE="egl gles2 ieee1394 +opengl +pci samba nfs wayland" -REQUIRED_USE="egl? ( || ( gles opengl ) )" +REQUIRED_USE="egl? ( || ( gles2 opengl ) )" COMMON_DEPEND=" $(add_frameworks_dep kcmutils) @@ -34,21 +34,15 @@ COMMON_DEPEND=" $(add_frameworks_dep solid) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'opengl(+)') + $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) x11-libs/libX11 - gles? ( - $(add_qt_dep qtgui 'gles2') - || ( - media-libs/mesa[egl,gles1] - media-libs/mesa[egl,gles2] - ) - ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( - virtual/glu - virtual/opengl + $(add_qt_dep qtgui 'gles2=') + media-libs/mesa[egl?,gles2?] + !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) @@ -67,7 +61,7 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package gles OpenGLES) + $(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) diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 576858a..044ed69 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -11,9 +11,9 @@ 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" +IUSE="egl gles2 ieee1394 +opengl +pci samba nfs wayland" -REQUIRED_USE="egl? ( || ( gles opengl ) )" +REQUIRED_USE="egl? ( || ( gles2 opengl ) )" COMMON_DEPEND=" $(add_frameworks_dep kcmutils) @@ -34,21 +34,15 @@ COMMON_DEPEND=" $(add_frameworks_dep solid) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui 'opengl(+)') + $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) x11-libs/libX11 - gles? ( - $(add_qt_dep qtgui 'gles2') - || ( - media-libs/mesa[egl,gles1] - media-libs/mesa[egl,gles2] - ) - ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( - virtual/glu - virtual/opengl + $(add_qt_dep qtgui 'gles2=') + media-libs/mesa[egl?,gles2?] + !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) @@ -67,7 +61,7 @@ RDEPEND="${COMMON_DEPEND} src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package egl EGL) - $(cmake-utils_use_find_package gles OpenGLES) + $(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) diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml index 0f7bb73..a7b6bc1 100644 --- a/kde-plasma/kinfocenter/metadata.xml +++ b/kde-plasma/kinfocenter/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="egl">Retrieve information about OpenGL via EGL</flag> - <flag name="gles">Show OpenGL ES information in kinfocenter</flag> + <flag name="gles2">Show OpenGL ES information in kinfocenter</flag> <flag name="nfs">Show information about NFS mounts, shares and log entries</flag> <flag name="pci">Show advanced PCI information</flag> <flag name="samba">Show information about Samba mounts, shares and log entries</flag>
