From 91677b075dc3191b847eb9af194cc40c3b66e750 Mon Sep 17 00:00:00 2001
From: Christian Ruppert <idl0r@gentoo.org>
Date: Wed, 31 Aug 2016 21:01:05 +0200
Subject: net-analyzer/nagstamon: Revbump, fixes
 https://github.com/HenriWahl/Nagstamon/issues/296

Package-Manager: portage-2.3.0
---
 .../nagstamon/files/nagstamon-2.0-EWMH.patch       | 38 +++++++++++++++
 net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild     | 46 +++++++++++++++++
 net-analyzer/nagstamon/nagstamon-2.0.ebuild        | 57 ----------------------
 3 files changed, 84 insertions(+), 57 deletions(-)
 create mode 100644 net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
 create mode 100644 net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
 delete mode 100644 net-analyzer/nagstamon/nagstamon-2.0.ebuild

(limited to 'net-analyzer')

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-r1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
new file mode 100644
index 000000000000..7337ca27dfa5
--- /dev/null
+++ b/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit eutils python-r1 distutils-r1
+
+MY_PN="Nagstamon"
+MY_P="${MY_PN}-${PV/_}"
+
+DESCRIPTION="status monitor for the desktop"
+HOMEPAGE="http://nagstamon.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# TODO: secretstorage
+# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib
+RDEPEND="dev-python/PyQt5[gui,multimedia,svg,widgets]
+	dev-python/beautifulsoup:4
+	dev-python/dbus-python
+	dev-python/keyring
+	dev-python/requests
+	dev-python/psutil
+	dev-python/setuptools"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+PATCHES="${FILESDIR}/${P}-setup.patch
+	${FILESDIR}/${P}-EWMH.patch"
+
+src_prepare() {
+	default_src_prepare
+
+	mv ${PN}.py ${PN} || die
+
+#	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
+	rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die
+}
diff --git a/net-analyzer/nagstamon/nagstamon-2.0.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.ebuild
deleted file mode 100644
index 851bca1c6f73..000000000000
--- a/net-analyzer/nagstamon/nagstamon-2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit eutils python-r1 distutils-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_}"
-
-DESCRIPTION="status monitor for the desktop"
-HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: secretstorage
-# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib
-RDEPEND="dev-python/PyQt5[gui,multimedia,svg,widgets]
-	dev-python/beautifulsoup:4
-	dev-python/dbus-python
-	dev-python/keyring
-	dev-python/requests
-	dev-python/psutil
-	dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES="${FILESDIR}/${P}-setup.patch"
-
-src_prepare() {
-	default_src_prepare
-
-	mv ${PN}.py ${PN} || die
-
-#	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
-}
-- 
cgit v1.2.3-65-gdbad