commit: dc3032279ef2611f64209685a68115905143cebf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 21:05:35 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 21:05:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc303227
kde-plasma/ksysguard: Drop IUSE="network", dev-libs/libnl:3 required
Upstream commit 8dce7285990a8930612d1d834a178ab714ecbd71
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/ksysguard/ksysguard-5.21.49.9999.ebuild | 12 ++++--------
kde-plasma/ksysguard/ksysguard-9999.ebuild | 12 ++++--------
kde-plasma/ksysguard/metadata.xml | 1 -
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.49.9999.ebuild
b/kde-plasma/ksysguard/ksysguard-5.21.49.9999.ebuild
index 6e38500645..e67ce126fc 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.49.9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.49.9999.ebuild
@@ -16,9 +16,10 @@ DESCRIPTION="Network-enabled task manager and system monitor"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="lm-sensors +network networkmanager"
+IUSE="lm-sensors networkmanager"
DEPEND="
+ dev-libs/libnl:3
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -40,13 +41,10 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=kde-plasma/libksysguard-${PVCUT}:5
+ net-libs/libpcap
+ sys-libs/libcap
virtual/libudev:=
lm-sensors? ( sys-apps/lm-sensors:= )
- network? (
- dev-libs/libnl:3
- net-libs/libpcap
- sys-libs/libcap
- )
networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
"
RDEPEND="${DEPEND}"
@@ -55,8 +53,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package lm-sensors Sensors)
$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
- $(cmake_use_find_package network libpcap)
- $(cmake_use_find_package network NL)
)
ecm_src_configure
diff --git a/kde-plasma/ksysguard/ksysguard-9999.ebuild
b/kde-plasma/ksysguard/ksysguard-9999.ebuild
index efeedc897a..7c2c55fe8e 100644
--- a/kde-plasma/ksysguard/ksysguard-9999.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-9999.ebuild
@@ -16,9 +16,10 @@ DESCRIPTION="Network-enabled task manager and system monitor"
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE="lm-sensors +network networkmanager"
+IUSE="lm-sensors networkmanager"
DEPEND="
+ dev-libs/libnl:3
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
@@ -40,13 +41,10 @@ DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
>=kde-plasma/libksysguard-${PVCUT}:5
+ net-libs/libpcap
+ sys-libs/libcap
virtual/libudev:=
lm-sensors? ( sys-apps/lm-sensors:= )
- network? (
- dev-libs/libnl:3
- net-libs/libpcap
- sys-libs/libcap
- )
networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
"
RDEPEND="${DEPEND}"
@@ -55,8 +53,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package lm-sensors Sensors)
$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
- $(cmake_use_find_package network libpcap)
- $(cmake_use_find_package network NL)
)
ecm_src_configure
diff --git a/kde-plasma/ksysguard/metadata.xml
b/kde-plasma/ksysguard/metadata.xml
index 4e1b25bdbe..5b911e5d92 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="network">Enable per-process network statistic
collection using <pkg>dev-libs/libnl</pkg></flag>
<flag name="networkmanager">Enable improved backend for Network
statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
</use>
</pkgmetadata>
