Cleanup

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

9 files changed, 27 insertions, 214 deletions

diff --git a/net-analyzer/nagios-check_ipmi_sensor/ChangeLog b/net-analyzer/nagios-check_ipmi_sensor/ChangeLog
index 5335d8f467b3..b54b339cbefe 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/ChangeLog
+++ b/net-analyzer/nagios-check_ipmi_sensor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-check_ipmi_sensor
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/ChangeLog,v 1.12 2012/08/19 16:50:27 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/ChangeLog,v 1.13 2012/10/30 20:18:06 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org>
+  -nagios-check_ipmi_sensor-1.3.ebuild, -nagios-check_ipmi_sensor-2.2.ebuild,
+  -nagios-check_ipmi_sensor-2.3.ebuild:
+  Cleanup
 
   19 Aug 2012; Christian Ruppert <idl0r@gentoo.org>
   nagios-check_ipmi_sensor-3.1.ebuild:
diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest
index 1ebd85e1c7c9..d01024e92330 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/Manifest
+++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST check_ipmi_sensor_v1.3.tar.gz 19009 SHA256 934e7df23d0e6a0e3916a9b328b39c6d382c16798627fd334e48c08fa77de01e
-DIST check_ipmi_sensor_v2.2.tar.gz 17266 SHA256 0d32da4910ffe2475136a19b5536cf699c0840bde1c9b48005ab1c157aefcd03 SHA512 97d066f1ca108ce6ecbf512964bc9e1fc13accbf9e6933670dbc81852bb7755294df66f5952a97004b4b3cfc9ee6ad313f01030eebe1a429872738a26f199bee WHIRLPOOL 798b0dc63daa763208e7c9096f9010725569417cdd791549c4d8c1d1db142555963914928eb049de18c2531f1e0fda8642c7e75d33d6614a0c1134ebfa94d537
-DIST check_ipmi_sensor_v2.3.tar.gz 18378 SHA256 b9a2d2a7a8e99f805d6449253bc20ff391357120d1ef69336c9e365455ec9f68
 DIST check_ipmi_sensor_v3.1.tar.gz 19135 SHA256 ca029bc2be34fbe56c49c681dc8bef7bae02a7a2b38644cb909912f7256e1151 SHA512 b6af98af23ebff361cf2f94ff6c4b083ff175532c1f65b785d6b928db896a6109437f64bb7a93688f20574f0b92485e40d3d0aa4785113703527574b9c28b079 WHIRLPOOL 55868ea709da81ef73854a99d51bc3258fd0dc4dae0cf360c3d65c9c9272a8ddfc086bca59258077b209788e2f34fbbcee917e3bbeffaf8e557dc63a586f1fbd
-EBUILD nagios-check_ipmi_sensor-1.3.ebuild 796 SHA256 d26c80b5faa4dbbe33857b05986cc54fb223e29b8cddb5012babc9d087f18a7c SHA512 ca433cd292464cd45983d9c47a0c94eae0190994420d869f5fb8dd210189b2aeb7d13d2b6570d5c90ce50811072f8dff2d56c8e1275942f06c11641ad5c62be0 WHIRLPOOL 92b521b33a3567aeaf902ea3174682f13215ea074b0bfae8f1d56c3e8a98ab70218e65dff80eb63926af7c4ce2f713cc027d5a7339088e60e6a19c40c7e96dac
-EBUILD nagios-check_ipmi_sensor-2.2.ebuild 802 SHA256 003e6216aa79e9912b7e981b56c4d423d45f175631c5d98a08b1ba090cb3d652 SHA512 7a2d9561259630d1ac9a7950deb800eea3121561fd1d6d28ff55ceafde7a4883bd1198949b234913606d95b475533c2c2d24e5394f87284d72032b15bdff469d WHIRLPOOL a2cbbda1e0e708c367d305412ec8311cc2b9f0e9823e4fecf24d929233bea0bc17bb35a8bf0c01edcf6041ec2670bb8781471396b5a7bfdf0b09cbda0d128427
-EBUILD nagios-check_ipmi_sensor-2.3.ebuild 822 SHA256 57c88fe232f220c67682c4dad2cbf9b0b8aaee4bad028721749f14c2cd38e6d3 SHA512 d34536874b474c7e22712334c8cb35c60b4e6d939c9ad47499a516f2c6bd7a875b81a8fa9c9afa0a25d6ebe94e200f0d9e8e541bc38dae4ec3e816d8dc5a6d41 WHIRLPOOL 0e1d91ff30ae29dfa904cb59bb77714357bd23ce10310c844902cbc0ea7fa7dc59c2b451b439eaff7de5382742ca12e299885f69f4686585e862edd98472d8ab
 EBUILD nagios-check_ipmi_sensor-3.1.ebuild 788 SHA256 64e1caf2fc5f769141f15ed6348bae211021cd6b9f47bd84991da1efeac8233c SHA512 40b470c4dcb7bea2e5bd0d8996fefe6dd562de4ad50f383e5475bb77fc965d2002ec1e8e4274d2bf7444360e4afd3d349dc8fc63a3b1a9027d84a48285ae3c27 WHIRLPOOL 8bfb91f3ce2514162445ba14dd818a953bed9d3fd633ebbc37d0c95b7ee83a7c9dd2f2e69e900f65a699d0e40562c5c6545285fe7242ea06b6ec577645913c64
-MISC ChangeLog 367 SHA256 9bc12261380a85713bcfe0dcf4230fb95bde5712abf7e7249bbb2e46e1d24ea3 SHA512 18de1207ac7602acb624601ee10230f7c6771b7564b9c42008f0618d4674123cd09743edc263cb00e8d56f844d0db309ec6273276e3aee8d10592654a93b7d0a WHIRLPOOL 46da4cceb49e5bfab2d4dd3ee2d83e4cbcb42f3c307b50e622eca9cd3a634958352ef8f2267bb74d71a10182023cef89b2edb5c20c6f382b61eea7da51727e9d
+MISC ChangeLog 548 SHA256 2ea6562d8becf00c04edfe83f5e891c591af24dc9deca810a650f24b3bcbdb70 SHA512 324937b51492eb778994d341ea0ff545217e76bc592b3533204f25c6630ba88f0d2862088c375e04b89e6ccdc7b70db5ec1d38469788bcb2a805217133fa02d9 WHIRLPOOL f3e7d54288679ecf24e1c631481a03d4d2271aefcccb36a07815a4ee52822a85e9896c34043d4b2d1846f1a2e54248fcb217e1c3d2413c3d71d28f6f4aa1f772
 MISC metadata.xml 429 SHA256 0f979644be693783b24ef6bef9b2fd55165c8cc306d36c7d4c5391185c351ecd SHA512 a55dc2ffe889efd7993638f1ae4ea5278cfb8d3b12ef66a37d94a652f4520dd6f0e48390eb018ccbb91bd8388a1ad4b70cdca175e48f3ec9bcaac551fdb64f41 WHIRLPOOL ac49b6d78d515cbe22f662ef7d120aeeedd56331c354fa192ae2e041fa76e61f50bee4f80a76b025c02bd06254408e5c993b0efed783e445a318bdaa14febb12
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQMRlcAAoJEMOx0zmdw4Z1aREH/1/QmUgCG7ajc2zA84U3h32M
-/nDDpWXGTHGn9umfm51VusaJU/TLOZvrb5uClLQHBgUS8ibqKt1zrcKyUASiUw0s
-Q4MtMm4yBES0ReGBrC9Xh2feIRnOQWh9BReP2w5eUFuZZEyGymtsgPGxk05LJ4C/
-c1VQFropTRGfeT9gzik+dSZpbjYNWWj3QygYMgeDHQ9tVIrfhh0eN9AkJlTObkTr
-FPjsQKb1z9H44/65fI6iwY4N20JQBcC8S+AG6iFgUxZ9S8K7ZHidufucKUNBQnCz
-wGdn76dJq9rBy0bljySxkZvNNp2Ipj8+36y930/o6SVCLJebkH4n9jJhFIoYsDU=
-=mGQU
+iQEcBAEBCAAGBQJQkDX/AAoJEMOx0zmdw4Z1U1MIAJumHtqdr0hmj92eY7CyPyNu
+3d4ocpKzXJubE56+zPlpwHtXYGc57EQzhrKaTDXRs4aHpxe5++yh8eHsimPFkqe+
+A2QbSvVMZOS1DH/jyvBMQpy9Kj2o9pQXxu4F+9stQFVLaqgL/TnEsd48UzYtDCJS
+05l0IZkCrd18vI/NBK6NNWD2ZRlw4dcaSQNGMzg/hfU7v1vaMAgnIfuzFc62Oira
+9GYcGDF3QOPd2CbF0NLEF+Z2xONMsK86dpjPX9CAFXrxyBS1lgVSgo0DIZrXSQ0M
+Fe6k6lCbCFLQE/r6pVNTnDxioEAcl0MTqxgtTCN60sOFYY63YzEjL5gZwIgg3Do=
+=I5QO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-1.3.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-1.3.ebuild
deleted file mode 100644
index 3a37d110e2ac..000000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-1.3.ebuild,v 1.4 2011/06/16 17:00:08 idl0r Exp $
-
-EAPI=3
-
-inherit multilib
-
-MY_P="${PN#nagios-}_v${PV}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!=net-analyzer/nagios-check_ipmi_sensor-2*
-	sys-apps/gawk
-	sys-apps/ipmitool"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe check_ipmi_sensor || die
-
-	dodoc changelog.txt
-}
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.2.ebuild
deleted file mode 100644
index 84bbb778128e..000000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.2.ebuild,v 1.5 2011/11/10 17:32:17 phajdan.jr Exp $
-
-EAPI=3
-
-inherit multilib
-
-MY_P="${PN#nagios-}_v${PV}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!=net-analyzer/nagios-check_ipmi_sensor-1*
-	sys-apps/gawk
-	sys-libs/freeipmi"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe check_ipmi_sensor || die
-
-	dodoc changelog.txt
-}
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.3.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.3.ebuild
deleted file mode 100644
index d3862c720a14..000000000000
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-2.3.ebuild,v 1.1 2011/09/10 08:54:55 idl0r Exp $
-
-EAPI=3
-
-inherit multilib
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN#nagios-}_v${MY_PV}"
-
-DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga"
-HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/"
-SRC_URI="http://www.thomas-krenn.com/en/oss/ipmi-plugin/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!=net-analyzer/nagios-check_ipmi_sensor-1*
-	sys-apps/gawk
-	sys-libs/freeipmi"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	exeinto /usr/$(get_libdir)/nagios/plugins
-	doexe check_ipmi_sensor || die
-
-	dodoc changelog.txt
-}
diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 67c16a548707..8b04832c7fc8 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.33 2012/09/05 08:05:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.34 2012/10/30 20:20:02 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.8.ebuild,
+  -files/nagstamon-0.9.5-resources.patch:
+  Cleanup
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> nagstamon-0.9.8.ebuild,
   nagstamon-0.9.9.ebuild:
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 1916693fa43d..6932819ea0ff 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nagstamon-0.9.5-resources.patch 844 SHA256 130fc539f6e46e368327efbe9c0f3a07cc5db18e4c9546a46d81de552c31ede5 SHA512 bd200cdbb1c38b8115393c85b645668a56861fd1eb9837fcefae3c1dc1652b052e015b0cb46513197754af2bc46655ffecb6053ecff5774e71b4bf940778557e WHIRLPOOL 487d8f913aa1f7dbbf11e993d220e392348ed37cb36c91ace2005932b169e61b12222f397cdb743bfcf37ec7500e77ed9dd3e2043e78714cfe6dabce5c70fdb5
 AUX nagstamon-0.9.9-resources.patch 1594 SHA256 c6069b9d9e863e1b6a751aa87c9ea9733ff438d7c79dc6f7b85dc5c8a9382da0 SHA512 592cb5f1d19ddec0949d133211d635500638b510d8e3d4c95c431ebb8830f56b5a2862f5d04321d9d416a6ec268a2d138c6cc9729a0091ea9310765131c86abd WHIRLPOOL c4602ec6e6675243ba879ea8f447fdafa8e6b88a37f5f19d9a1c51971b6415b3f47df739a06ef54b30633545daa3420d768f6b4148a30fbca4512a84893d9065
 AUX nagstamon.desktop 302 SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035 SHA512 03809e8ce65200ca21e400720d5336c8bcd4ccd25f4bf839272aadf31de0ae010c5277a10807378a2b6f42de549a54abbe327fb8f99b80f6c5cd3ebc94082179 WHIRLPOOL b2ded7aab5fd1beebcada8579e4ca093e03b04054b6cb918981e3f18d7e1d20f1e877b7c4be8a427ea16827bd5e0d8630d3f17d2e67116d7973a631990be2511
-DIST nagstamon_0.9.8.tar.gz 382861 SHA256 f0977d2ca5e2e13e3bfa17d8db83431770fc53e293b7076408d9308588802a6f
 DIST nagstamon_0.9.9.tar.gz 387268 SHA256 97bf2d5694b9844312123638679aa5ec3528a2c2ca9cf9567a050ddb239e2843 SHA512 c08e2427a7cb1067d70f3b5d958d4ba1302ea3cf5a0853620d47c33fae158f5aaebe86d2ad7cc98e7bb2ed85bf7575ae142917eb5c34717ecb3c6ca69556cf0a WHIRLPOOL 3750dd407887e0d0d250090afbb25232c97b8f67d49fdea6f9d9a5895701fdb5389c292bd08e36913ea54f7acad3a500e0b0d7bec33195354f35ceed98a33e80
-EBUILD nagstamon-0.9.8.ebuild 1722 SHA256 1086741fc18816fdc4cd8ef9a42d8581a20dd6482d9c1d1a689e6142e2e23d2f SHA512 6c41ec50093bd1be15b149326fd4fe3fb948b7b982d30be26f20c7a1a1c35bfb69354488440ef7f7aa0f366bc3067b34c7460dc733b6db97d07e9538e8504206 WHIRLPOOL d4660e634ad13f04a79193dddaf9a7392919bfbcdd813ff20518ffcd56fd808d1c1feda803d814afa179d500c0c971b0c5cf163b76d5e1bff5808a64676cc30e
 EBUILD nagstamon-0.9.9.ebuild 1725 SHA256 27a676bbabf02a3c00ebdfa1262504e435deb8c6b2aadf58e66aaabe3bc88eb3 SHA512 4710433b63d6ebb1b3699c019db5129cb86644280cabe99099845cb31f57ed50c5f5056b7c7178f332707c95076cd24fa9e9d7a684eaf386bbd77a1bf0fb84f9 WHIRLPOOL 89df6e24ce8bd75ba4bebf2d6973fbb0fb620e1133321630c64d764d89fc87bf607ba119b636c9b61db4f663d621931af760c96d3d7508137c67fa9f1408d75e
-MISC ChangeLog 6242 SHA256 c11c48d2029c37ed64fb02095cc010faf453d7b6ca623a8ae4a4325776ce6b1c SHA512 40ebe61c17c1b5589fede094415a946a2d70c329a49db584523f70db82738af44ce9133a31f97912ddf057d7ab463702b42044df23643a1e3417e293f77624ac WHIRLPOOL 086a4ec378e33cd0da412c8bfbc4c46866e3f0cf997db8e56d8d76bbb7b55957fc0cf4882fe4bba49cafc4bcf03c00534ff4636ecffaf8426ac99c8eee50abdb
+MISC ChangeLog 6373 SHA256 c35532e9473f2bfe4dd3bd2f25d0d23e386d14d9f17b9d905a691fc9f6b9f9c1 SHA512 e4bbf4f3d74c4e1236bdb1e944597f2573214929669b15289c964926b477b698722d0efdbab171a1ac466646db459243efe8200e19ca80cb9d373f80fe80885e WHIRLPOOL 0395817a999f584c8b93cb9b9d1418059d659b7df5f66de3ef54a5cc1981e4824465ddb88eb57700ec923540d711b80e4b6cf784b56a09b4cd09ea58e899fe57
 MISC metadata.xml 265 SHA256 5862fedb203791f215a21669c93e952afb5118962bc8d1ba4114305cde746084 SHA512 89cd4e9182dacecb21d1e24da00ea7d10b4e236fa432ca26341fb9ed4d96f90acf392b68809d2b4a8b2e944cad5bc32ec40826ee8105a7af489571e5b8400c35 WHIRLPOOL 79c559365aac4f8ce4c270b2d2362df345155a8524be6d4d8319bbb032045b0331d664b953c4ab01bfafed235f0209e0244dd4dee1256749511abd24afc49ffc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBHB8YACgkQgAnW8HDreRbc2QCggGrrXWNWMpY1eDYbB7OHc1Da
-ac4AoL8GRAzTIlJebrM1w2DM8EbG7J/K
-=wuMS
+iQEcBAEBCAAGBQJQkDZzAAoJEMOx0zmdw4Z1uBAIAKZTWBKw4zcdxBZcpM8mWYVN
+40UR6JDe5FMU+1ikXnL8H8k0J69IBv9wUGDWvF5nem2CpFV1lY3467My7ioRaiYZ
+RLoLoG3uK+xJKpw8zsLnZJ1szpopAggXpmrRonOyjHEzgpCtscGnwydiTMNRFDrt
+rGO7ImCBkFeyeO/5Ldl97XqC/HhC/Cei5c1qON6zgepeVACSH9rXlmVvG0cOoZVt
+Y2fybSAJjbQxZhL6cWZkkh3k+qM2VaJ0PPUmMq0+h9bJrc2f9MiSGRrOyKEX4wLG
+vlcu0oP/d36J6lhZxFwCZiDtQ5IqZxsvSKIwLip5r6RL3wAKmAljCcI08owmCj8=
+=Lh+J
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
deleted file mode 100644
index 8eef3a5be689..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.5-resources.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- nagstamon.py.old	2011-02-12 03:33:35.154930846 +0100
-+++ nagstamon.py	2011-02-12 03:34:08.100522965 +0100
-@@ -32,13 +32,8 @@ conf = Config()
- # check for old settings when upgrading from a nagstamon version < 0.8 and convert them
- conf.Convert_Conf_to_Multiple_Servers()
- 
--# try to get resources path if nagstamon got be installed by setup.py
--try:
--    import pkg_resources
--    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
--except Exception, err:
--    # set resources to "" in case there are no resources available from setup.py
--    Resources = ""
-+# set resources to "" in case there are no resources available from setup.py
-+Resources = "/usr/share/nagstamon/resources"
- 
- # Resources on MacOS X, environment variable _MEIPASS2 comes from pyinstaller packed executable
- # - does not really work at the moment
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.8.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.8.ebuild
deleted file mode 100644
index a12897d5f1db..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.8.ebuild,v 1.5 2012/09/05 08:05:21 jlec Exp $
-
-EAPI="3"
-
-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"
-
-DEPEND=""
-RDEPEND="dev-python/pygtk
-	dev-python/lxml
-	dev-python/beautifulsoup:python-2
-	gnome? ( dev-python/egg-python )"
-
-#S="${WORKDIR}/${MY_P}"
-S="${WORKDIR}/Nagstamon"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.5-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}
-}