Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/
Date: Sat, 15 Jan 2022 15:06:20
Message-Id: 1642257355.fe74bb654693c0a0c23f730fefea943f9cbd6730.asturm@gentoo
1 commit: fe74bb654693c0a0c23f730fefea943f9cbd6730
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 15 14:35:47 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 15 14:35:55 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe74bb65
7
8 kde-plasma/kinfocenter: Drop IUSE=opengl, add new optfeature
9
10 Upstream commit 874d5d2fd646e0658c4ad76768948545bdb5b10c
11
12 Package-Manager: Portage-3.0.30, Repoman-3.0.3
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 15 ++-------------
16 1 file changed, 2 insertions(+), 13 deletions(-)
17
18 diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
19 index b26782b61c..12c7f80351 100644
20 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
21 +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
22 @@ -16,9 +16,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
23 LICENSE="GPL-2" # TODO: CHECK
24 SLOT="5"
25 KEYWORDS=""
26 -IUSE="gles2-only ieee1394 +opengl +pci usb +X"
27 -
28 -REQUIRED_USE="opengl? ( X )"
29 +IUSE="gles2-only ieee1394 +pci usb X"
30
31 DEPEND="
32 >=dev-qt/qtdbus-${QTMIN}:5
33 @@ -38,10 +36,6 @@ DEPEND="
34 >=kde-frameworks/solid-${KFMIN}:5
35 gles2-only? ( media-libs/mesa[gles2] )
36 ieee1394? ( sys-libs/libraw1394 )
37 - opengl? (
38 - media-libs/libglvnd[X?]
39 - !gles2-only? ( media-libs/glu )
40 - )
41 pci? ( sys-apps/pciutils )
42 usb? ( virtual/libusb:1 )
43 X? ( x11-libs/libX11 )
44 @@ -61,12 +55,6 @@ src_configure() {
45 $(cmake_use_find_package X X11)
46 )
47
48 - if has_version "dev-qt/qtgui[gles2-only]"; then
49 - mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
50 - else
51 - mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
52 - fi
53 -
54 ecm_src_configure
55 }
56
57 @@ -89,5 +77,6 @@ pkg_postinst() {
58 optfeature "advanced CPU information module" sys-apps/util-linux
59 fi
60 optfeature "Wayland information module" app-misc/wayland-utils
61 + optfeature "OpenGL information module" x11-apps/mesa-progs
62 ecm_pkg_postinst
63 }