Remove old version. Remove dev-python/gnome-python-extras dep, bug 372173.

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

4 files changed, 7 insertions, 85 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 2b7f22f02d75..f506ad87dbe4 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.21 2011/06/02 14:04:13 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.22 2011/07/03 18:50:45 idl0r Exp $
+
+  03 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.5.ebuild,
+  nagstamon-0.9.7.1.ebuild, -files/nagstamon-0.9.0-sharedir.patch:
+  Remove old version. Remove dev-python/gnome-python-extras dep, bug 372173.
 
   02 Jun 2011; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Take over nagstamon
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch
deleted file mode 100644
index 21819d552cf1..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Nagstamon/nagstamonGUI.py.orig	2009-08-23 11:42:37.786041271 +0200
-+++ Nagstamon/nagstamonGUI.py	2009-08-23 11:44:12.554036746 +0200
-@@ -59,7 +59,7 @@
-         self.comments = "Nagios status monitor for your desktop"
-         
-         # get resources directory from current directory - only if not being set before by pkg_resources
--        if self.Resources == "": self.Resources = os.path.normcase(os.getcwd() + "/resources")
-+        if self.Resources == "": self.Resources = "/usr/share/nagstamon/resources"
-             
-         # get and store local username for use with acknowledge + downtime actions
-         if platform.system() == "Windows":
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.5.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.5.ebuild
deleted file mode 100644
index 881382c51ba2..000000000000
--- a/net-analyzer/nagstamon/nagstamon-0.9.5.ebuild
+++ /dev/null
@@ -1,71 +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/nagstamon/nagstamon-0.9.5.ebuild,v 1.1 2011/04/26 00:05:14 idl0r 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
-	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/nagstamon-0.9.5-resources.patch"
-
-	python_convert_shebangs 2 nagstamon.py
-}
-
-src_install() {
-	# setup.py is broken
-	cd Nagstamon/
-
-	doman resources/nagstamon.1 || die
-	rm resources/{LICENSE,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
-
-		insinto /usr/share/applications
-		doins "${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.7.1.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild
index 9053919d8b45..31da6a8b3f24 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild,v 1.1 2011/06/02 11:19:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild,v 1.2 2011/07/03 18:50:45 idl0r Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ DEPEND=""
 RDEPEND="dev-python/pygtk
 	dev-python/lxml
 	dev-python/beautifulsoup
-	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
+	gnome? ( dev-python/egg-python )"
 
 #S="${WORKDIR}/${MY_P}"
 S="${WORKDIR}/Nagstamon"