summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2016-10-20 09:50:34 +0200
committerChristian Ruppert <idl0r@gentoo.org>2016-10-20 09:51:04 +0200
commitd456352a852692a372d6e277b091e2635f90dabe (patch)
tree56eaf74552e5d766cd00980eea827cee587929a1 /net-analyzer/nagstamon
parentapp-admin/vault: add logrotate config (diff)
downloadgentoo-d456352a852692a372d6e277b091e2635f90dabe.tar.gz
gentoo-d456352a852692a372d6e277b091e2635f90dabe.tar.bz2
gentoo-d456352a852692a372d6e277b091e2635f90dabe.zip
net-analyzer/nagstamon: Version bump
Package-Manager: portage-2.3.2
Diffstat (limited to 'net-analyzer/nagstamon')
-rw-r--r--net-analyzer/nagstamon/Manifest2
-rw-r--r--net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch38
-rw-r--r--net-analyzer/nagstamon/nagstamon-2.0.1.ebuild (renamed from net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild)3
3 files changed, 2 insertions, 41 deletions
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index e7e9204ca3f..d4aa70190a2 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,3 +1,3 @@
DIST Nagstamon-1.0.1.tar.gz 455110 SHA256 e60a2b1fef842deb8377ace02df6791f3dcc5683d9dae4323de3f5f1f8a9893b SHA512 040f3ac03c4945b25345f36d4749903238e05001f40f2777afe5277588aababb24212b538890c4b0ff0e1edef9a950804deb93fb2111bc25c8a773a84b69c353 WHIRLPOOL 8d040c7bb1573451ec0bb7439f0795b8ec6003d292429d3a96a07bb68d0617b23838677c93183d22a9cea10620152b51a3e7d4940642560986d5890f98b13822
-DIST Nagstamon-2.0.tar.gz 532668 SHA256 ff2172d467be6c9c68913aed05978949330ac7d069581b81c050eb4f90ff6443 SHA512 c8190a38b6a215dbfe07281b54d9effe2d79eb4c3219a868852514d921798b0097575423d7f7116ee1d49a949f0e9760ac536cb7aebfe49fa1676033670a71bd WHIRLPOOL 7c3652ff3773e5a09c460d43ba490239efa46be5e4fa63fd0f8194e65f05832877aade5d504a080f98023e1d17be5fbacfeeafcf49ad633b4bf2285d2d8cf8db
+DIST Nagstamon-2.0.1.tar.gz 535814 SHA256 3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 WHIRLPOOL fb1ab6f9c3ccef81f4d62f238bf998d98186ff24d44e2a41554a13f82a783e8a14a1ac21d046f179ef62347dd252cb34d818d032c0ef78d7f742fd45acbec033
DIST Nagstamon-b7a91e68ca93ead4e5cfef22e2226c1ff9c7b52c.tar.gz 7021698 SHA256 0f3a6552d033ce91a5070ddb7570ce83c99f74b4e13f8e504f6d3fafc7b3f6a3 SHA512 f24d561127d6ae82acd084fbc4d7eeec6a31f0d37b123e42565347cd8eb2e8cac4f6c9ed77c50f8d16cc7f94fdf771404397ac7f847e7a7a094a7bb53c3fadab WHIRLPOOL 45d03e134687a7716a148d4cbff716cc8e933aef51eb9cdc46403f08243cc66afeb431eac2e1f18c8f0683ca4d5cf2bf8f9fd677f4d4df0f6e55a7b26b7ddda0
diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
deleted file mode 100644
index f7e62bcbe01..00000000000
--- a/net-analyzer/nagstamon/files/nagstamon-2.0-EWMH.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.1.ebuild
index 7337ca27dfa..5f0b32d1412 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
@@ -33,8 +33,7 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_PN}"
-PATCHES="${FILESDIR}/${P}-setup.patch
- ${FILESDIR}/${P}-EWMH.patch"
+PATCHES="${FILESDIR}/${PN}-2.0-setup.patch"
src_prepare() {
default_src_prepare