net-analyzer/nagstamon: Revbump, fixes https://github.com/HenriWahl/Nagstamon/issues/296

Package-Manager: portage-2.3.0

2 files changed, 40 insertions, 13 deletions

diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
new file mode 100644
index 000000000000..f7e62bcbe01e
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
@@ -0,0 +1,38 @@
+From 8ea1a9336b6239ead43ea7c4b767052e10745fe8 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Wed, 31 Aug 2016 20:19:20 +0200
+Subject: [PATCH] Initialize EWMH as soon as possible, #296
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ Nagstamon/QUI/__init__.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
+index 930cb68..d41b786 100644
+--- a/Nagstamon/QUI/__init__.py
++++ b/Nagstamon/QUI/__init__.py
+@@ -898,6 +898,10 @@ class StatusWindow(QWidget):
+         # immediately hide to avoid flicker on Windows and OSX
+         self.hide()
+
++        # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux
++        if not platform.system() in NON_LINUX:
++            self.ewmh = EWMH()
++
+         # avoid quitting when using Qt.Tool flag and closing settings dialog
+         APP.setQuitOnLastWindowClosed(False)
+
+@@ -1080,10 +1084,6 @@ class StatusWindow(QWidget):
+         # start with priority 0 = lowest
+         self.worker_thread.start(0)
+
+-        # ewmh.py in thirdparty directory needed to keep floating statusbar on all desktops in Linux
+-        if not platform.system() in NON_LINUX:
+-            self.ewmh = EWMH()
+-
+         # finally show up
+         self.set_mode()
+
+--
+2.7.3
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.ebuild b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
index 851bca1c6f73..7337ca27dfa5 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
-PATCHES="${FILESDIR}/${P}-setup.patch"
+PATCHES="${FILESDIR}/${P}-setup.patch
+	${FILESDIR}/${P}-EWMH.patch"
 
 src_prepare() {
 	default_src_prepare
@@ -43,15 +44,3 @@ src_prepare() {
 #	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
 	rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die
 }
-
-pkg_preinst() {
-	if has_version "<net-analyzer/nagstamon-2.0"; then
-		OLD_NAGSTAMON_VERSION=yup
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${OLD_NAGSTAMON_VERSION}" ]; then
-		ewarn "WARNING: It is recommend to move your old Nagstamon 1.x ~/.nagstamon/ away and start from scratch!"
-	fi
-}