Version bump. Cleanup

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

9 files changed, 32 insertions, 325 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 4486fadd2592..88b32f507afe 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/nagstamon
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.42 2013/08/28 10:27:38 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.43 2014/04/03 20:48:37 idl0r Exp $
+
+*nagstamon-0.9.12_p20140402 (03 Apr 2014)
+
+  03 Apr 2014; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.9.ebuild,
+  -nagstamon-0.9.9-r1.ebuild, -nagstamon-0.9.10_p20130222.ebuild,
+  +nagstamon-0.9.12_p20140402.ebuild,
+  -files/nagstamon-0.9.9-icinga_results_limitations.patch,
+  -files/nagstamon-0.9.9-resources.patch,
+  -files/nagstamon-0.9.10_p20130222.patch, files/nagstamon.desktop:
+  Version bump. Cleanup
 
   28 Aug 2013; Agostino Sarubbo <ago@gentoo.org> nagstamon-0.9.11_rc1.ebuild:
   Stable for x86, wrt bug #476538
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 31544cb298c5..7c05e7be6fd5 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,34 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX nagstamon-0.9.10_p20130222.patch 2779 SHA256 aa3a788fb557de7440600052f04a788ee203b21e4357f81c859e6e4ad44ae32e SHA512 ad925c01b5bac78c3cdbaefbb8536ef3d3bde11a5b339f54c376c4a322e2112ff2fb892ce4ef2e753d5d52b8d18abbaf36eb8aed9a021ab78d8c95382fc91d1d WHIRLPOOL 74e27bc50fa93ba6f87b9890c9d6c9d5fed1bd7fe3307ff251227ad40297952e32928fd5184734384f926303946e5b200ef31c5ad0b8b3a7740c0b6edb8dfe88
 AUX nagstamon-0.9.11_rc1-resources.patch 441 SHA256 7cf53ac60d4aa40bac93f6ab64af8ca30aae5bfea5d79302753c82a8f2f3358b SHA512 fc6566c2ed492ab34b638d8fe81c88d8dcb35400cb77d170e4b4152cd7226a23da17ab07607bfec64a076d800d528aa30a6a4d015ce9dc4eed50ab3eff54f41c WHIRLPOOL 6a4192a60c747bebdb8c1427c1e6e052558c77783154c0ee620a576ee7d9331007ff2076d2c77ad2c6b74a0aa1e9d6058b092e9a59e1aedaed1a16f0c77bdd01
-AUX nagstamon-0.9.9-icinga_results_limitations.patch 1653 SHA256 a6b89f77ae7506b924571befd0649bad2da930bd04c2cd92d279cf7ed9415961 SHA512 9993151d3241e602155f5e22a62a3a984aa1971f4f9c567b6e539a8e1990bd00265e653155b8be96bc0660cd2e3eaf64cdfc993c6f83c51e5f0c4cae1ea2be53 WHIRLPOOL c6a0330e370ddee19a957ab3bb547bd91ce6e13df9919aa5882d702d4d6dfb7b073d9fc1fae436380a6a7293a7f218a06e2a67eaedf806f2d67b353f1a3925fd
-AUX nagstamon-0.9.9-resources.patch 1594 SHA256 c6069b9d9e863e1b6a751aa87c9ea9733ff438d7c79dc6f7b85dc5c8a9382da0 SHA512 592cb5f1d19ddec0949d133211d635500638b510d8e3d4c95c431ebb8830f56b5a2862f5d04321d9d416a6ec268a2d138c6cc9729a0091ea9310765131c86abd WHIRLPOOL c4602ec6e6675243ba879ea8f447fdafa8e6b88a37f5f19d9a1c51971b6415b3f47df739a06ef54b30633545daa3420d768f6b4148a30fbca4512a84893d9065
-AUX nagstamon.desktop 302 SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035 SHA512 03809e8ce65200ca21e400720d5336c8bcd4ccd25f4bf839272aadf31de0ae010c5277a10807378a2b6f42de549a54abbe327fb8f99b80f6c5cd3ebc94082179 WHIRLPOOL b2ded7aab5fd1beebcada8579e4ca093e03b04054b6cb918981e3f18d7e1d20f1e877b7c4be8a427ea16827bd5e0d8630d3f17d2e67116d7973a631990be2511
+AUX nagstamon.desktop 284 SHA256 f339017716aebaca3f75b0ff395809823d8ac0c0c48803874104bf73fc0c33fb SHA512 1ac7315d89967135de804ccf4c4dd78e28a6018e72bd4ca2274aa81fde8978d93542cf5ad96a58b44e0f1efd4d397b1c42dcc339a3f32b0b33346804162da60e WHIRLPOOL ff2cbafaff167e5e36ebea64f3c66c07f67909c593d31a13482dad1cf6f8a5ca6071d00b82c43cdd4f23ca5927bbf136b4d143ff30d8ffc6271783c45e007559
 DIST Nagstamon-0.9.11rc1-20130729.tar.gz 399264 SHA256 feecfab9aa1f91599ccc9c1a948aee20ee65f6fb7852c3ef47a3849d053e0011 SHA512 5b1cf20059d3f3145743e25732a5a93969dd96328c0404efbc7cb540bd596d8d2b307b00c3a2435a047da4ea64f2b03f204be1cb90da60bb42df8fc25831c24d WHIRLPOOL 0eeb334afdd39de3409ff47710d2d4d8301ecf77c53b75a366105d69fea760c79f79b0147c4808525874cd82058a78a2ad1d28a7b3af48111192ba141639ee0b
-DIST nagstamon_0.9.10-p20130222.tar.gz 405330 SHA256 16a55711e1e3d2bc321f08aef9c4fee33c496df915f871ca5581f0000419c00f SHA512 3675ca96b232cb133d7372620c5016daaaf41496ec6146531362876bf129064f042ffbf13f9e4ff3592685e442f8ae4ad0d845612edcef8239b61cb0498c8f09 WHIRLPOOL 28c3345c0685f7b9e01df7077ecdb8e7457d2c8c99c2d3c58067e14441c45dbea568bcafbfd4b6b39875ca969bc7afe2b279f7537c4a0219965c303d36674db3
-DIST nagstamon_0.9.9.tar.gz 387268 SHA256 97bf2d5694b9844312123638679aa5ec3528a2c2ca9cf9567a050ddb239e2843 SHA512 c08e2427a7cb1067d70f3b5d958d4ba1302ea3cf5a0853620d47c33fae158f5aaebe86d2ad7cc98e7bb2ed85bf7575ae142917eb5c34717ecb3c6ca69556cf0a WHIRLPOOL 3750dd407887e0d0d250090afbb25232c97b8f67d49fdea6f9d9a5895701fdb5389c292bd08e36913ea54f7acad3a500e0b0d7bec33195354f35ceed98a33e80
-EBUILD nagstamon-0.9.10_p20130222.ebuild 1773 SHA256 7d3fcbf31120649c4bdba0a94ae134000b2f9041ae224e67552736b887b9e83f SHA512 1d64033ede5f8cf489642a18f2c638b14b13e75ceba38c5de54389c7a1bfaf46c607ed6d9c5221d0220526a52872246be5b7bb8a77a7be962642210b3a3a9fa3 WHIRLPOOL f521f113798fa688f5b2555d71c79aaaa2b84c295c910b5f8dcdbc72a25aedee162eb981919065efca2c71139bb06c836bf1e3a8888ad55eb56e44afe0927588
+DIST nagstamon-0.9.12_p20140402.tar.bz2 378893 SHA256 e34ed71cf4634c3f31166810ed482639466572c4fff8cde1e1cbcf428c3588aa SHA512 fb9d287081c9f40eb8de522c0c9bcf052df14977c0489683f32f4ec99eb4d78543b26b9595d1b021fc82847b5b25a51ad07ff2e84d78bca1ddcf4fffc3885dc9 WHIRLPOOL f4a412e091213b26622a6cd8ac0825b813cd3fcb71c312cf953753ba50ad8b43c41398d3a149b4b899016bd9d886543cc75fddc8e2d89e0a1f77825c9e07d375
 EBUILD nagstamon-0.9.11_rc1.ebuild 1799 SHA256 7739baa4eda90b583d91e3ddc787494b7ebf47f474921bafbdaac02a2811df9d SHA512 6ea1d76b284621774b25dc4ecf3408681eb60be78130da0d7afbc8fa9da1614eade76b20a63bcaa8372bea5949b6a9810ea9bceab90a174a4332b2863b967cc8 WHIRLPOOL c7e4221ee1a52ff208c266500094abef42c0ff91a1de949bed3bd8525a18517394438943cf0f0d57ce54e3440570ce4b3600e969a87ff645817284ff516d7c05
-EBUILD nagstamon-0.9.9-r1.ebuild 1807 SHA256 aeffc69f89e1524a6fc9a7b04e7b65044bbc649ec82e785f5d16997db691ca1f SHA512 82e898f79be758499239d1ec6ecfecbdc5d942ca0302cda4d13e7ed6246d28a2dfcee7d00ee975895f9a07ec25c800c193b0ecc4ad00e7ab44741fa33e8e70d2 WHIRLPOOL d10d6bc15bb2aaadfa4c6586f48ea391a5201d56a565064ed344924f3407ff2c670ccb081df830d2f0938abf3080ad01bc1d6bf131e01dc1c3c9604c42b0bfa7
-EBUILD nagstamon-0.9.9.ebuild 1746 SHA256 089561a4453a7401d752d9797dd7ce7c7efad9050105b8106d54a02bdb8651c8 SHA512 5b07dec62da04f3b3d4cd62a8d1165fe259be37e1741f91d496f185824432399d59e7222defcebf790713b20c8e6b48b68d7f152ee2b55c241c00ba049a2977b WHIRLPOOL 21710469a6d865619f0b4e548e5a6e3847f46e0d842fbbff70cfd57f71a61b22933aaf47546d3dd7671757d1f8ca520949865528b248252dc691e3d467b13347
-MISC ChangeLog 7620 SHA256 a439d5f4f3ec86a8a5189b74de3c8569adc5dee9ce51f2dde744172ca1492c79 SHA512 9d10f9a72a809a1cb2f3019bab11533552117bc3681bd7131a0e81c2c2167bf1f25e8395d2c86475b593b21726a46b9607c81159686b9bf673130f9257f6a7cb WHIRLPOOL 92be10d5154a5999060be517575eb0ca56d435592da3f99427647c27d573861d19e16bd682a327dcb99f53fcfb8c8109eee859e4231461aa8e341ba5b20aad82
+EBUILD nagstamon-0.9.12_p20140402.ebuild 1808 SHA256 34e06d40c2e2e442677d0062980e4172aae207fbe418c877e3e9bd3d9c8f9968 SHA512 90e2dec44da95bcd8766d124604c6c416ee0e4f856a25fcc9e4e4129ce0b781172b6487525636f6740bc243ad7d27a13cc2f02a3dd4d8527ceb8efd7db1abfc9 WHIRLPOOL 280e7cd2d11147e5bcc13c245236cabe933655ef4cd029dc5f2ef1897be00c6bd7cbb6a43b8858882a5fdbcc842a7223093fa8f7839969ef58a854b803164336
+MISC ChangeLog 8040 SHA256 6827311cbdced1e157f0c5119fd6311b283213ce50e9ed71fab8ce012ef9e2ac SHA512 e352bf6d40ae1ceaad9b554a37db0ca1ebd5e6faccbf59aed31d81b305b8b1239e46a3c20cde50f4c5e54cc5091101b9651bff11dc85e0507535c934c20fc260 WHIRLPOOL e74a75b6dde153d5ef22548504d20f962b8a3bdb6893f66e1ff60fe7fb92f2829b8c8a3cc0b3b777430ce3c0ce50abed5e3f1225aada6d6ed0972d6e4ad5547c
 MISC metadata.xml 265 SHA256 5862fedb203791f215a21669c93e952afb5118962bc8d1ba4114305cde746084 SHA512 89cd4e9182dacecb21d1e24da00ea7d10b4e236fa432ca26341fb9ed4d96f90acf392b68809d2b4a8b2e944cad5bc32ec40826ee8105a7af489571e5b8400c35 WHIRLPOOL 79c559365aac4f8ce4c270b2d2362df345155a8524be6d4d8319bbb032045b0331d664b953c4ab01bfafed235f0209e0244dd4dee1256749511abd24afc49ffc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSHdCcAAoJELp701BxlEWf1ScP/0IiqVjTEPAQc1GdkGsASmZK
-v063fHVsgUVzF64hoTF7fZuG9I6Mcp1glpOG3BRP+HdwuxPf7tmwST9AfMub1O4l
-k47f7z/5CNfKjZRnNy1ytOQ/Z02t/kUJFgECr+2Hhvk3EPnVy/JzNawYxOwxo+pM
-ooIUcT9YaGo9IdfoaUXK2/Zy6ntpR8Ox4kgBjMlMWUuuhDTgovxinCeTMS2j+tGr
-tnSBHilLjbGYxzErWIK9l+ZArf8j0ONZhlbupSX9HEQEnv8vmkbmXzBOofudjhOo
-9MjYAxlroqmbZzEFd691AwbC4s/MQsOlxtoMmEvpDvaZzdPwgMky6YgJjXRJL8s8
-kIB4+hRuKH6mT+GMlr9YJ+Gh2JkxDYwYv8qURMNhbJamvbmwjPvDyJPtZhRYEQXq
-scXg1L85UIyBmF9vViiTBpCmdNoFDqWRDC0d3XAnfYzqwdBqjhyKCXgtD/vicRxF
-dAOnUNI+Vutwfuee4GLIx9Pv+NwGtIyoG/psUmPC8bdVoBJR5cL5SlFU40Edg4xA
-X/A1OymSBofimSQCyeyHeY/Qi6dIq7XaGDZeIH7XP6WlKxZZlNT/+9nI+U+GNZkt
-hOYRoLf8+MIeHG7cnB/6WR+2MYRnNC3OVqswk+pwG40MceXyuK/hSEQmJcZXe6JZ
-wX/fjRyo8vgPZev3MCaF
-=tBf/
+iQEcBAEBCAAGBQJTPckpAAoJEMOx0zmdw4Z1C/EIAJ8fBwZwlM6urB8fDRZTSPlE
+rX+fx8D8U6hCOKdIF1OMRl9/4jgGe+SqMF9cnhygFsnRL3VGhH+xlSz0xVgZlG6E
+SmOOL2md3BPtGTbe49ScxuBrrj66/ALwUa4YlpKo3TVddNuFwL/7kahyi77pdMow
+aT8Hp+TuSXg9GriNbw8MyTLcjDi3jgBWPao49mwV3YRfVxckkH+NrBR9q2VaafQP
+Rl/PwDzx9s8QaNIqz0peM/zZ27SiJFfuhdICX0MhEJXkYb7UicL/oFxx9Wz7codj
+qQ7RVmnAxJnBmd5bYKO9ArDfp5Vg9ujU+Hatv3WZS1MKprVfxRdt3tsnkul0IF8=
+=Uj4x
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.10_p20130222.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.10_p20130222.patch
deleted file mode 100644
index ca97c101d7cc..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.10_p20130222.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From a0c44eac2a152291e2ce04bb7c320da896c77af2 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Tue, 26 Feb 2013 22:59:21 +0100
-Subject: [PATCH] Fix BeautifulSoup import
-
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- Nagstamon/Nagstamon/Server/Ninja.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Nagstamon/Nagstamon/Server/Ninja.py b/Nagstamon/Nagstamon/Server/Ninja.py
-index dd53cbe..4cee123 100644
---- a/Nagstamon/Nagstamon/Server/Ninja.py
-+++ b/Nagstamon/Nagstamon/Server/Ninja.py
-@@ -13,7 +13,7 @@ import cookielib
- from Nagstamon import Actions
- from Nagstamon.Objects import *
- from Nagstamon.Server.Generic import GenericServer, not_empty
--from Nagstamon.BeautifulSoup import BeautifulSoup
-+from BeautifulSoup import BeautifulSoup
- 
- class NinjaServer(GenericServer):
-     """
--- 
-1.7.12.4
-
-diff --git a/Nagstamon/nagstamon.py b/Nagstamon/nagstamon.py
-index 2206db5..66da87e 100755
---- a/Nagstamon/nagstamon.py
-+++ b/Nagstamon/nagstamon.py
-@@ -33,40 +33,7 @@ conf.Convert_Conf_to_Multiple_Servers()
- conf.Convert_Conf_to_Custom_Actions()
- 
- # try to get resources path if nagstamon got be installed by setup.py
--Resources = ""
--try:
--    import pkg_resources
--    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
--except Exception, err:
--    # get resources directory from current directory - only if not being set before by pkg_resources
--    # try-excepts necessary for platforms like Windows .EXE
--    join = os.path.join
--    normcase = os.path.normcase
--    paths_to_check = [normcase(join(os.getcwd(), "Nagstamon", "resources")),
--            normcase(join(os.getcwd(), "resources"))]
--    try:
--        # if resources dir is not available in CWD, try the
--        # libs dir (site-packages) for the current Python
--        from distutils.sysconfig import get_python_lib
--        paths_to_check.append(normcase(join(get_python_lib(), "Nagstamon", "resources")))
--    except:
--        pass
--
--    #if we're still out of luck, maybe this was a user scheme install
--    try:
--        import site
--        site.getusersitepackages() #make sure USER_SITE is set
--        paths_to_check.append(normcase(join(site.USER_SITE, "Nagstamon", "resources")))
--    except:
--        pass
--
--    # add directory nagstamon.py where nagstamon.py resides for cases like 0install without installed pkg-resources
--    paths_to_check.append(os.sep.join(sys.argv[0].split(os.sep)[:-1] + ["Nagstamon", "resources"]))
--
--    for path in paths_to_check:
--        if os.path.exists(path):
--            Resources = path
--            break
-+Resources = "/usr/share/nagstamon/resources"
- 
- # initialize GUI and actions
- # if modules are not available from central python install try the ones in the same directory
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.9-icinga_results_limitations.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.9-icinga_results_limitations.patch
deleted file mode 100644
index 986ec51014b5..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.9-icinga_results_limitations.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 61928eea1075f22be24c4122c66ff7c2a1dcefae Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Mon, 25 Feb 2013 01:33:10 +0100
-Subject: [PATCH] Fix Icinga's default result limitations,
- https://github.com/HenriWahl/Nagstamon/issues/10
-
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- Nagstamon/Server/Generic.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Nagstamon/Server/Generic.py b/Nagstamon/Server/Generic.py
-index 0dfd1d6..cfe613d 100644
---- a/Nagstamon/Server/Generic.py
-+++ b/Nagstamon/Server/Generic.py
-@@ -434,9 +434,9 @@ class GenericServer(object):
-         # group them together
-         hostserviceprops = 0
-         # services (unknown, warning or critical?)
--        nagcgiurl_services = self.monitor_cgi_url + "/status.cgi?host=all&servicestatustypes=" + str(servicestatustypes) + "&serviceprops=" + str(hostserviceprops)
-+        nagcgiurl_services = self.monitor_cgi_url + "/status.cgi?host=all&limit=0&servicestatustypes=" + str(servicestatustypes) + "&serviceprops=" + str(hostserviceprops)
-         # hosts (up or down or unreachable)
--        nagcgiurl_hosts = self.monitor_cgi_url + "/status.cgi?hostgroup=all&style=hostdetail&hoststatustypes=" + str(hoststatustypes) + "&hostprops=" + str(hostserviceprops)
-+        nagcgiurl_hosts = self.monitor_cgi_url + "/status.cgi?hostgroup=all&limit=0&style=hostdetail&hoststatustypes=" + str(hoststatustypes) + "&hostprops=" + str(hostserviceprops)
-         # hosts - mostly the down ones
-         # unfortunately the hosts status page has a different structure so
-         # hosts must be analyzed separately
--- 
-1.7.12.4
-
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch
deleted file mode 100644
index c5f709f05690..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/nagstamon.py b/nagstamon.py
-index 5d61ef8..0a4db87 100755
---- a/nagstamon.py
-+++ b/nagstamon.py
-@@ -35,17 +35,17 @@ conf.Convert_Conf_to_Multiple_Servers()
- conf.Convert_Conf_to_Custom_Actions()
- 
- # try to get resources path if nagstamon got be installed by setup.py
--Resources = ""
--try:
--    import pkg_resources
--    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
--except Exception, err:
--    # get resources directory from current directory - only if not being set before by pkg_resources
--    if Resources == "":
--        if os.path.exists(os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")):
--            Resources = os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")
--        else:
--            Resources = os.path.normcase(os.getcwd() + os.sep + "resources")
-+Resources = "/usr/share/nagstamon/resources"
-+#try:
-+#    import pkg_resources
-+#    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
-+#except Exception, err:
-+#    # get resources directory from current directory - only if not being set before by pkg_resources
-+#    if Resources == "":
-+#        if os.path.exists(os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")):
-+#            Resources = os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")
-+#        else:
-+#            Resources = os.path.normcase(os.getcwd() + os.sep + "resources")
- 
- # initialize GUI and actions
- # if modules are not available from central python install try the ones in the same directory
diff --git a/net-analyzer/nagstamon/files/nagstamon.desktop b/net-analyzer/nagstamon/files/nagstamon.desktop
index 2875a72ac5ae..d853e1aae7ba 100644
--- a/net-analyzer/nagstamon/files/nagstamon.desktop
+++ b/net-analyzer/nagstamon/files/nagstamon.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=Nagstamon
 GenericName=Nagios status monitor
@@ -8,5 +7,5 @@ Comment=Quick status overview of your Nagios monitoring system
 Exec=nagstamon
 Icon=/usr/share/nagstamon/resources/nagstamon.png
 Terminal=false
-Categories=Application;System;
+Categories=Network;Monitor;
 StartupNotify=true
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.10_p20130222.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild
index aa0695ec43da..ff0c3347c6ef 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.10_p20130222.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.10_p20130222.ebuild,v 1.1 2013/02/27 20:44:10 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.12_p20140402.ebuild,v 1.1 2014/04/03 20:48:37 idl0r Exp $
 
 EAPI="5"
 
@@ -10,12 +10,12 @@ RESTRICT_PYTHON_ABIS="3.* *-jython"
 
 inherit eutils python
 
-MY_P="${PN}_${PV/_/-}"
 MY_PN="Nagstamon"
+#MY_P="${MY_PN}-${PV/_/}-20130729"
 
 DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box"
 HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -31,10 +31,10 @@ RDEPEND="dev-python/pygobject:2
 	gnome? ( dev-python/egg-python )
 	sound? ( media-sound/sox )"
 
-S="${WORKDIR}/Nagstamon"
+S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}.patch"
+	epatch "${FILESDIR}/nagstamon-0.9.11_rc1-resources.patch"
 
 	python_convert_shebangs 2 nagstamon.py
 
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.9-r1.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.9-r1.ebuild
deleted file mode 100644
index fdcd76c81989..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.9-r1.ebuild,v 1.4 2013/04/04 19:46:37 ago Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils python
-
-MY_P="${PN}_${PV/_/-}"
-MY_PN="Nagstamon"
-
-DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box"
-HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome sound"
-
-DEPEND=""
-RDEPEND="dev-python/pygtk
-	dev-python/lxml
-	dev-python/beautifulsoup:python-2
-	gnome-base/librsvg
-	gnome? ( dev-python/egg-python )
-	sound? ( media-sound/sox )"
-
-S="${WORKDIR}/Nagstamon"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-resources.patch"
-	epatch "${FILESDIR}/${P}-icinga_results_limitations.patch"
-
-	python_convert_shebangs 2 nagstamon.py
-
-	rm Nagstamon/resources/LICENSE
-	rm Nagstamon/BeautifulSoup.py
-}
-
-src_install() {
-	# setup.py is broken
-	cd Nagstamon/
-
-	doman resources/nagstamon.1 || die
-	rm resources/nagstamon.1
-
-	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${MY_PN}
-		doexe ../nagstamon.py || die
-		dosym $(python_get_sitedir)/${MY_PN}/${PN}.py /usr/bin/${PN} || die
-
-		insinto $(python_get_sitedir)/${MY_PN}
-		doins {GUI,Config,Objects,Custom,Actions}.py || die
-		touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
-		doins -r Server/ || die
-
-		insinto /usr/share/${PN}/resources
-		doins resources/* || die
-
-		domenu "${FILESDIR}"/${PN}.desktop || die
-	}
-
-	python_execute_function nagstamon_install
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}
-}
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
deleted file mode 100644
index 8b77d323a6cb..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild,v 1.6 2013/02/25 20:45:24 idl0r Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils python
-
-MY_P="${PN}_${PV/_/-}"
-MY_PN="Nagstamon"
-
-DESCRIPTION="Nagstamon is a Nagios status monitor for a systray and displays a realtime status of a Nagios box"
-HOMEPAGE="http://nagstamon.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome sound"
-
-DEPEND=""
-RDEPEND="dev-python/pygtk
-	dev-python/lxml
-	dev-python/beautifulsoup:python-2
-	gnome-base/librsvg
-	gnome? ( dev-python/egg-python )
-	sound? ( media-sound/sox )"
-
-S="${WORKDIR}/Nagstamon"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-resources.patch"
-
-	python_convert_shebangs 2 nagstamon.py
-
-	rm Nagstamon/resources/LICENSE
-	rm Nagstamon/BeautifulSoup.py
-}
-
-src_install() {
-	# setup.py is broken
-	cd Nagstamon/
-
-	doman resources/nagstamon.1 || die
-	rm resources/nagstamon.1
-
-	nagstamon_install() {
-		exeinto $(python_get_sitedir)/${MY_PN}
-		doexe ../nagstamon.py || die
-		dosym $(python_get_sitedir)/${MY_PN}/${PN}.py /usr/bin/${PN} || die
-
-		insinto $(python_get_sitedir)/${MY_PN}
-		doins {GUI,Config,Objects,Custom,Actions}.py || die
-		touch "${D}/$(python_get_sitedir)/${MY_PN}/__init__.py" || die
-		doins -r Server/ || die
-
-		insinto /usr/share/${PN}/resources
-		doins resources/* || die
-
-		domenu "${FILESDIR}"/${PN}.desktop || die
-	}
-
-	python_execute_function nagstamon_install
-}
-
-pkg_postinst() {
-	python_mod_optimize ${MY_PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MY_PN}
-}