Cleanup

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

3 files changed, 5 insertions, 94 deletions

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/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}
-}