summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-nm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-09-16 22:05:01 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-09-16 22:05:01 +0100
commitcc4618c9ba3d974948ebf340b542d8cb01db2f55 (patch)
tree125ee67bb9e0d548771cf7b61d04bb1f0dc57687 /kde-plasma/plasma-nm
parent677b7ba5c317778df2ad7e70df94b9b7eec4adbc (diff)
gentoo resync : 16.09.2021
Diffstat (limited to 'kde-plasma/plasma-nm')
-rw-r--r--kde-plasma/plasma-nm/Manifest7
-rw-r--r--kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch30
-rw-r--r--kde-plasma/plasma-nm/metadata.xml2
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild83
-rw-r--r--kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild2
5 files changed, 4 insertions, 120 deletions
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index e60dfe25af74..167168ebd227 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,3 @@
-AUX plasma-nm-5.21.5-missing-include.patch 930 BLAKE2B e73b80967df714f8b9a5afbddef8e5951d02c553b70d2b7a40f7162db5fdf2ab16930ceef649818fc3afa658989eb6caf6e0f4eb91476aa88581307545f1740e SHA512 2f67d123a5280303ddd8c904828da6c2b8aa6b8c6fb06853d55d47050255d154b5731703c70208802ced0e03ffdbe85d292636cb686f0f70777903c7c5bc1ed2
-DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa
DIST plasma-nm-5.22.5.tar.xz 898960 BLAKE2B 0285425f4ed474c38e3a72b8b6654ba17e957921db0372bc24a9ce4fe226186cb687e5ec91836f7bbb1cb2fb9f4da1287efca41cd7b11673e2086477024f4578 SHA512 802b908c61214e77162f09289d9e9c1d3c9d39b77799d71b3c4802245f2920c29065b793a83a483a9e9df004e113bcb06fa864c456b6950ba3a4d8eaf4ec4b94
-EBUILD plasma-nm-5.21.5.ebuild 2333 BLAKE2B 79c1df7a5e2f57323c73e9ea432093a05918f93956ad4ff3b13d308d04f62648ae8a34f8884fef890a786ba2183134eb4667e8e2ef979b51488bbadff4823b48 SHA512 04a6eb5b20bab5ee3372f2b0cc9d0ba21731119e70704ffc6cc6865af3ddef64621a69f49e25f0d01961511c9d4fde86e4501e35ebc4f612fbdd842051c6a7e1
-EBUILD plasma-nm-5.22.5.ebuild 2289 BLAKE2B d406a5bbf13e29e8a9e8d36aa13a83cfdeaa6208e6752c684c7fe6382269f4e1a693819ef8eb1cad8649be70238c55f48cafe3a1913bf0b866bc47cbfda383c2 SHA512 3c99d3778321ab5544459640e7f9d453c1de5b988643ebd46320399924dda1ad300640ce2a7b79606a0128a214b4c20792227342b7ab09acc278c55ca42a0790
-MISC metadata.xml 547 BLAKE2B 494a59e4527773e8075dc3f9d4b2b62eb193d66225764644fca3071b4b3bab4bc8c0ad0628a8dee16c89ac023d54ba051af594b4302b2d8f82e5ffe91bb6dc9b SHA512 cba9726aa3cf865d115bac78be3cd43c05e98dbaf56cfeda7f68191c875385b3d5f48228a8a405808b458baf7f50688ce5617968d1551139dc1141f5eca29277
+EBUILD plasma-nm-5.22.5.ebuild 2286 BLAKE2B 17c6f20d72197b717aa6f7e05141d0557ece68320e239a4d38cd9a3ddf19c7b534b6a568d56c63735b201e0cb38071b33276542c867c368e2efe604028266c55 SHA512 bd8e74df71a77a42abf1b1860ead8327d70e487c6fe6ed2ee115ad51fbeb44ca7ae31c5974b7d50cab97098cfb14e8c43b33023e9dc3cdd81c34c72fea330286
+MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch
deleted file mode 100644
index db8f98b072b7..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8d1720ac924c8453f80ac560470d9d92bdd94b07 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Tue, 4 May 2021 20:49:29 +0200
-Subject: [PATCH] Add missing QQueue include
-
-Used since 64dc6234b6980172bb53084c16a0e4e693d6011a. I suppose it's
-implicitly pulled in some cases, but for me the build fails with
-"networkmodel.h:126:56: error: field 'm_updateQueue' has incomplete
-type 'QQueue<QPair<NetworkModel::ModelChangeType, NetworkModelItem*> >'".
-
-(cherry picked from commit 2bccd7c3bc3aa12ddd1886b14041f1448c634a69)
----
- libs/models/networkmodel.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h
-index ebe6db52..749cb919 100644
---- a/libs/models/networkmodel.h
-+++ b/libs/models/networkmodel.h
-@@ -22,6 +22,7 @@
- #define PLASMA_NM_NETWORK_MODEL_H
-
- #include <QAbstractListModel>
-+#include <QQueue>
-
- #include "networkitemslist.h"
-
---
-GitLab
-
diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml
index a163d7b85720..4cc596c40725 100644
--- a/kde-plasma/plasma-nm/metadata.xml
+++ b/kde-plasma/plasma-nm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>kde@gentoo.org</email>
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
deleted file mode 100644
index 8e934494dfe4..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
- >=app-crypt/qca-2.3.0:2
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
- >=kde-frameworks/plasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- net-misc/networkmanager[teamd=]
- modemmanager? (
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/modemmanager-qt-${KFMIN}:5
- net-misc/mobile-broadband-provider-info
- )
- openconnect? (
- >=dev-qt/qtxml-${QTMIN}:5
- net-vpn/networkmanager-openconnect
- net-vpn/openconnect:=
- )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-include.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
- $(cmake_use_find_package modemmanager KF5ModemManagerQt)
- $(cmake_use_find_package openconnect OpenConnect)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
-
- if ! has_version "kde-plasma/plasma-workspace:5"; then
- elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
- elog "However, the networkmanagement KCM can be called from either systemsettings"
- elog "or manually: $ kcmshell5 kcm_networkmanagement"
- fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
index 04e172aad5cd..794a92fb3ec3 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.22.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
LICENSE="GPL-2 LGPL-2.1"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
IUSE="modemmanager openconnect teamd"
DEPEND="