From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- kde-plasma/plasma-nm/Manifest | 7 +- .../files/plasma-nm-5.13.5-iconchange.patch | 33 ---------- kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild | 77 ---------------------- kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild | 2 +- kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild | 74 +++++++++++++++++++++ 5 files changed, 78 insertions(+), 115 deletions(-) delete mode 100644 kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch delete mode 100644 kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild create mode 100644 kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild (limited to 'kde-plasma/plasma-nm') diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index fc5f89c6acad..a9792f1f6460 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,6 +1,5 @@ -AUX plasma-nm-5.13.5-iconchange.patch 1138 BLAKE2B 58c30cb23cd8b76be1c7582695a0a770b44791cbdd3b90600cc9703b1a9a7ee3ca12fce1557a7b2818a210bb3b93c725d81b9213016a52d77f63db87e7eeb54a SHA512 1df04d32bd37c06b0ef7817ca7518cef288b84e130da4c62e76252f7338ddc13b5ffe8f005b49cd270d157598844bdc49b683a6cbf2c57a5254e32021201777d -DIST plasma-nm-5.13.5.tar.xz 705984 BLAKE2B 0a00bb3696ebc4ee5f26746cb1c1e9ef14e456abf448faf17d8ddb919f272354a88969ac54447ac626640d260c8bc1c4ffe3a578e3d2683c5efdf80d9b7d9a4b SHA512 13c0c5c27a5d01cf20093f314ff620658688fb10dfa052419b54f37e6de20fc947b120c7c9f3df5b3e8f3d92a1e701674c917456dbfb681c94e06a1da0456ead DIST plasma-nm-5.14.3.tar.xz 718288 BLAKE2B 6fc68e0bf8661519889bead3b816cd51159dd1f48fb4243e4e8adb2097d9297d33d8246947ac92170d0290855f8b80f344d1f456e24c1f2007fa5333b3fc7bea SHA512 6337c35407074c649645df447b0502fce853115514e28fd216be0738bb35c86c3ec8313780ef6d7e4df3836c44851d644a07190c2333a1bb583e612056bc22a2 -EBUILD plasma-nm-5.13.5-r1.ebuild 2074 BLAKE2B 8ed6d4ec6023c4b332b0a9aeb81e3b37f3d4c36272643e450baaa3693bf66ae4e772787105b957122dec16fd214dcf7764ebb6bc3be0355abefd086aac46f7fe SHA512 b7d2a15e12f5e72aaba5b7875bda292b38d1be129b37b2d5f40fbf613593e0be731e7db5ffff646d4f6463c2d0d189fc1c83ab33bf9d171303dad719b771b9f1 -EBUILD plasma-nm-5.14.3.ebuild 1988 BLAKE2B 713c3bc61990bd985d1f2681a0b2e1f7f90272fc1913a901003ab079ea05652e423cc5c49b4596ea8cea814fe0e45866b04fcd59570bd757fdae37c9723e2f01 SHA512 a52d8a25ed14d6f78e3fa1f2250ab086f37eb3b2b047c7bd55c78e311229eb1059e0097ee598f5bd5eb232804d28c72ad77845858076ffc133afc3b104957aff +DIST plasma-nm-5.14.4.tar.xz 720820 BLAKE2B 2d608da282990ecd3d0dd4ae50c9f930880a5bb07f2f095f38019ea59efff70925c938e71d282ce18ad4d7e5d30006cd9d54ca7f3bcda0ca9b929dc36579b83c SHA512 a0bf08c4d700b00a32209b76eed75d95dfdc2271308c16181d54a234f5b0b18636beff6172cba3c0398aa14eaab5c2ae14054cc3239a8388329e14e8ed044ec1 +EBUILD plasma-nm-5.14.3.ebuild 1986 BLAKE2B ef531c575d820a2ba42700797d85c9f332d6177ff8e98a1ea8e84d07e47cdba1bc959137daed51f2fe75243fc594373260a8ae3c55b7899820ecf1ac3e6b7488 SHA512 335999283e760276943c4f66712e87ab73b0bf5200f4fe0eaa015df34570ee0436f787fa67a139c8341afbebf19de6a19f1b5bd51af5ba2b456ca01b84871942 +EBUILD plasma-nm-5.14.4.ebuild 1988 BLAKE2B 713c3bc61990bd985d1f2681a0b2e1f7f90272fc1913a901003ab079ea05652e423cc5c49b4596ea8cea814fe0e45866b04fcd59570bd757fdae37c9723e2f01 SHA512 a52d8a25ed14d6f78e3fa1f2250ab086f37eb3b2b047c7bd55c78e311229eb1059e0097ee598f5bd5eb232804d28c72ad77845858076ffc133afc3b104957aff MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689 diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch deleted file mode 100644 index f44bbc34be9d..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.13.5-iconchange.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a71ca963f798ca405878305b5433550e6c267d87 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Thu, 13 Sep 2018 13:24:51 +0200 -Subject: Make sure we change icon on NM connectivity change - ---- - libs/declarative/connectionicon.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp -index b792f92..d4ff30a 100644 ---- a/libs/declarative/connectionicon.cpp -+++ b/libs/declarative/connectionicon.cpp -@@ -82,6 +82,7 @@ ConnectionIcon::ConnectionIcon(QObject* parent) - setStates(); - - connectivityChanged(); -+ setIcons(); - } - - ConnectionIcon::~ConnectionIcon() -@@ -174,8 +175,7 @@ void ConnectionIcon::carrierChanged(bool carrier) - void ConnectionIcon::connectivityChanged() - { - NetworkManager::Connectivity conn = NetworkManager::connectivity(); -- m_limited = (conn == NetworkManager::Portal || conn == NetworkManager::Limited); -- setIcons(); -+ setLimited(conn == NetworkManager::Portal || conn == NetworkManager::Limited); - } - - void ConnectionIcon::deviceAdded(const QString& device) --- -cgit v0.11.2 diff --git a/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild deleted file mode 100644 index efc32711dc80..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.13.5-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="KDE Plasma applet for NetworkManager" -LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep networkmanager-qt 'teamd=') - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - >=app-crypt/qca-2.1.1:2[qt5(+)] - net-misc/networkmanager[teamd=] - modemmanager? ( - $(add_frameworks_dep modemmanager-qt) - $(add_qt_dep qtxml) - net-misc/mobile-broadband-provider-info - ) - openconnect? ( - $(add_qt_dep qtxml) - net-misc/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) - !kde-plasma/plasma-nm:4 -" - -PATCHES=( "${FILESDIR}/${P}-iconchange.patch" ) - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt) - $(cmake-utils_use_find_package openconnect OpenConnect) - ) - - kde5_src_configure -} - -pkg_postinst() { - kde5_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.14.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild index 86195daf5637..37e82b1c36b7 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.14.3.ebuild @@ -7,7 +7,7 @@ inherit kde5 DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="modemmanager openconnect teamd" DEPEND=" diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild new file mode 100644 index 000000000000..86195daf5637 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-5.14.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +DESCRIPTION="KDE Plasma applet for NetworkManager" +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="modemmanager openconnect teamd" + +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep networkmanager-qt 'teamd=') + $(add_frameworks_dep plasma) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + >=app-crypt/qca-2.1.1:2[qt5(+)] + net-misc/networkmanager[teamd=] + modemmanager? ( + $(add_frameworks_dep modemmanager-qt) + $(add_qt_dep qtxml) + net-misc/mobile-broadband-provider-info + ) + openconnect? ( + $(add_qt_dep qtxml) + net-misc/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} + $(add_plasma_dep kde-cli-tools) + !kde-plasma/plasma-nm:4 +" + +src_configure() { + local mycmakeargs=( + -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) + $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt) + $(cmake-utils_use_find_package openconnect OpenConnect) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_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 +} -- cgit v1.2.3