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: 1642258133.1d2bfdabd35bfb7f79b06bb830b7b26e4281a29e.asturm@gentoo
1 commit: 1d2bfdabd35bfb7f79b06bb830b7b26e4281a29e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 15 14:42:15 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 15 14:48:53 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1d2bfdab
7
8 kde-plasma/kinfocenter: Drop IUSE=pci and IUSE=X, add new optfeatures
9
10 Upstream commit
11 515dc22d8b499b57a8c9a8e9ac32d3712f30b46d
12 320f74133c666b6603c5cd03c7b6e4c4e99f0706
13
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 8 +++-----
18 kde-plasma/kinfocenter/metadata.xml | 1 -
19 2 files changed, 3 insertions(+), 6 deletions(-)
20
21 diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
22 index 12c7f80351..5d01c537ce 100644
23 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
24 +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
25 @@ -16,7 +16,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
26 LICENSE="GPL-2" # TODO: CHECK
27 SLOT="5"
28 KEYWORDS=""
29 -IUSE="gles2-only ieee1394 +pci usb X"
30 +IUSE="gles2-only ieee1394 usb"
31
32 DEPEND="
33 >=dev-qt/qtdbus-${QTMIN}:5
34 @@ -36,9 +36,7 @@ DEPEND="
35 >=kde-frameworks/solid-${KFMIN}:5
36 gles2-only? ( media-libs/mesa[gles2] )
37 ieee1394? ( sys-libs/libraw1394 )
38 - pci? ( sys-apps/pciutils )
39 usb? ( virtual/libusb:1 )
40 - X? ( x11-libs/libX11 )
41 "
42 RDEPEND="${DEPEND}
43 >=dev-qt/qtquickcontrols2-${QTMIN}:5
44 @@ -50,9 +48,7 @@ RDEPEND="${DEPEND}
45 src_configure() {
46 local mycmakeargs=(
47 $(cmake_use_find_package ieee1394 RAW1394)
48 - $(cmake_use_find_package pci PCIUTILS)
49 $(cmake_use_find_package usb USB1)
50 - $(cmake_use_find_package X X11)
51 )
52
53 ecm_src_configure
54 @@ -78,5 +74,7 @@ pkg_postinst() {
55 fi
56 optfeature "Wayland information module" app-misc/wayland-utils
57 optfeature "OpenGL information module" x11-apps/mesa-progs
58 + optfeature "PCI devices information module" sys-apps/pciutil
59 + optfeature "X Server information module" x11-apps/xdpyinfo
60 ecm_pkg_postinst
61 }
62
63 diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml
64 index 427a90d002..a7a67f3066 100644
65 --- a/kde-plasma/kinfocenter/metadata.xml
66 +++ b/kde-plasma/kinfocenter/metadata.xml
67 @@ -9,7 +9,6 @@
68 <bugs-to>https://bugs.kde.org/</bugs-to>
69 </upstream>
70 <use>
71 - <flag name="pci">Show advanced PCI information</flag>
72 <flag name="usb">Show USB device information</flag>
73 </use>
74 </pkgmetadata>