gentoo resync : 05.04.2019

5 files changed, 113 insertions, 28 deletions

diff --git a/kde-misc/plasma-applet-network-monitor/Manifest b/kde-misc/plasma-applet-network-monitor/Manifest
index 7ca7b360446c..f694f7b926d2 100644
--- a/kde-misc/plasma-applet-network-monitor/Manifest
+++ b/kde-misc/plasma-applet-network-monitor/Manifest
@@ -1,3 +1,5 @@
+AUX plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch 1926 BLAKE2B 57b63c36080095aa439c47437d3d3289c68ed8692e72863fac14800acc54fb3998ab38844ebd5e2102d410259b804497305f849c36d18b3b7e8082d2c4ec7551 SHA512 2b89d63bd3cf4d53f4a1d8d8730304d7516c4ff874fd4fab26dc41c4cba24a3202ef7a52b0cf8ab15280ff521b34b7a230191bc2c91e1d32faa12d81fc9fcee8
+AUX plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch 804 BLAKE2B 6c70e88e532eeb6f93e9534aabde1b9b0b755ff0aea555eaed876a7e02d652ab4b90c817ea9dfcd096db0407f6b8589885daf6072fbd09d7a57aa9c82526bf17 SHA512 a23e6a6198762e09f8b5f403e9e65ad2796833a77a38adfb5cc66fd39361dd183120b73d053da88c8e848090f90c05df8d4c175620fff4eb7d3b9c03ae5b38ac
 DIST plasma-applet-network-monitor-1.7.3.tar.gz 40970 BLAKE2B f87a2def4a763c507ce65c42143d5e631c950a7cfdd59bfebeb4f225919feedcd3e9855ee1a48c83dfc7d572efe43fc81e5f2a8e4ffddc3d7e440de36552ff8b SHA512 61bd78e05c3557cfab4977a58db8c80f857d3c84627b794e10e003ceff7e3fd1e15d77761af90cb38ee02a45ed9404629a3c571776a43b7af07c07d8d120ed37
-EBUILD plasma-applet-network-monitor-1.7.3.ebuild 654 BLAKE2B 950ee413c456dc98515b6be3822a2d4055c1f485500040bad703960122c3346d278216934d1169fa5408d168fe803c6e1cef6541cc4fd77a137d5f51e5e8ad74 SHA512 fa3506fd226799e604ae5b6f5b5760ef205b0c687c04ae5a70950b7c9372ae7ddd30cc63d55570161dcd73ecbfd734f0df69a8ade326595dc39f7003721fd80e
+EBUILD plasma-applet-network-monitor-1.7.3-r1.ebuild 584 BLAKE2B 6018fe66827c8c2d2da0180cbaca40bd7e2729f76f0432ef601a144f502d9c91c6eea8a8a2cfccb5b60773e104e45f833f62c8401ff33b59a6f6d3cba578f661 SHA512 088dd1e194938df83291ae52ef8b84f8a19c77ed58c005b3a817542501a973ff9bc77f6c8e54dd8776dd44267f21e5d3de8c0f99b8bb6b183d3021e0d30c55d6
 MISC metadata.xml 352 BLAKE2B fb3f480206952a33e48b73c56c4047447c39e19c6cc8fb19bb50f16181315795c336d7f406194236cf02496c998b0f547325b4f8d8623e9d4a2d510f2f10b298 SHA512 4dd9fec8f19ba1504507761660e8e81a28fe8445d9259f6ddaf34e66d31da1060aae6637a39c86558d38c83553feebe3cea34a76cf7e5c22773f85762eed60a9
diff --git a/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch
new file mode 100644
index 000000000000..c86932757a33
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-crashfix-startuptime.patch
@@ -0,0 +1,63 @@
+From 7aa094a156914aac5d1ac85967f9063bc6faa61e Mon Sep 17 00:00:00 2001
+From: Michail Vourlakos <mvourlakos@gmail.com>
+Date: Tue, 7 Feb 2017 22:03:29 +0200
+Subject: [PATCH] fix crash and imrove startup time
+
+--fix crash because the repeater can not catch up
+with the model changes during startup
+--this also improves a lot the start up loading as
+the visuals are painted only when the component
+has completed its initialization phase
+---
+ package/contents/ui/main.qml | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/package/contents/ui/main.qml b/package/contents/ui/main.qml
+index d781266..4ba4b5a 100644
+--- a/package/contents/ui/main.qml
++++ b/package/contents/ui/main.qml
+@@ -24,6 +24,7 @@ Item {
+     id: main
+     
+     // general settings
++    property bool inStart: true
+     property bool showLo: plasmoid.configuration.showLo
+     property bool showDdWrt: plasmoid.configuration.showDdWrt
+     property double updateInterval: plasmoid.configuration.updateInterval * 1000
+@@ -155,7 +156,8 @@ Item {
+     }
+     
+     Component.onCompleted: {
+-        reloadComponent()
++        reloadComponent();
++        inStart = false;
+     }
+     
+     function reloadComponent() {
+@@ -232,8 +234,15 @@ Item {
+         setItemSize()
+     }
+     
+-    onShowLoChanged: devicesChanged()
+-    onShowDdWrtChanged: devicesChanged()
++    onShowLoChanged: {
++        if (!inStart)
++            devicesChanged();
++    }
++    
++    onShowDdWrtChanged: {
++        if (!inStart)
++            devicesChanged();
++    }
+ 
+     GridLayout {
+         columns: gridColumns
+@@ -247,7 +256,7 @@ Item {
+         Layout.preferredHeight: height
+         
+         Repeater {
+-            model: networkDevicesModel
++            model: inStart ? 0 : networkDevicesModel
+             delegate: ActiveConnection {
+                 Layout.preferredWidth: itemWidth
+                 Layout.preferredHeight: itemHeight
diff --git a/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch
new file mode 100644
index 000000000000..094900aff4ba
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/files/plasma-applet-network-monitor-1.7.3-ddwrt-icon.patch
@@ -0,0 +1,22 @@
+From 70481c09ac1434ea1e72d89faeb5d9194463de4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20Przyby=C5=82?= <fademind@gmail.com>
+Date: Mon, 18 Apr 2016 20:55:22 +0200
+Subject: [PATCH] fix dd-wrt icon visible against qt5.6 changes
+
+---
+ package/contents/config/config.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package/contents/config/config.qml b/package/contents/config/config.qml
+index 5ebb5e6..b9e286a 100644
+--- a/package/contents/config/config.qml
++++ b/package/contents/config/config.qml
+@@ -19,7 +19,7 @@ ConfigModel {
+     }
+     ConfigCategory {
+          name: i18n('DD-WRT')
+-         icon: Qt.resolvedUrl('../images/dd-wrt.png')
++         icon: Qt.resolvedUrl('../images/dd-wrt.png').replace('file://', '')
+          source: 'config/ConfigDDWRT.qml'
+     }
+ }
diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..8c2d1ef1e5fb
--- /dev/null
+++ b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde5
+
+DESCRIPTION="Plasma 5 applet for monitoring active network connections"
+HOMEPAGE="https://store.kde.org/p/998914/
+https://github.com/kotelnik/plasma-applet-network-monitor"
+SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep plasma)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix-startuptime.patch"
+	"${FILESDIR}/${P}-ddwrt-icon.patch"
+)
diff --git a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild b/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild
deleted file mode 100644
index 45af2a060baa..000000000000
--- a/kde-misc/plasma-applet-network-monitor/plasma-applet-network-monitor-1.7.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma 5 applet for monitoring active network connections"
-HOMEPAGE="https://store.kde.org/content/show.php/Network+Monitor?content=169377
-https://github.com/kotelnik/plasma-applet-network-monitor"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
-	EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
-else
-	SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )