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

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 16 insertions, 97 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/Manifest b/net-analyzer/nagstamon/Manifest
index 126728d58e7a..49352bbcd198 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nagstamon-0.9.0-sharedir.patch 659 RMD160 08d8455865dae06277ec818dd9beae61eff6a809 SHA1 858ddf7684912bc307011da637fe2441f67e494c SHA256 611b277d4ece607268480d16455158f1023778d6989b6e2a129d570b473a1f41
 AUX nagstamon-0.9.5-resources.patch 844 RMD160 0d5bacf97600221dcde421fb631ea94753b44031 SHA1 581a9a0c4ffa5be06674146ddc1a5bc8829f5e10 SHA256 130fc539f6e46e368327efbe9c0f3a07cc5db18e4c9546a46d81de552c31ede5
 AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
-DIST nagstamon_0.9.5.tar.gz 334271 RMD160 398e722e098ce997a49670422ccca0781f9208af SHA1 a42e06384663b52dc9054f9a80ada5d814b3bac2 SHA256 3a09e405a9c568b52123fb3e125e204b87904af4cdecdb64041f3475b9b19fd5
 DIST nagstamon_0.9.7.1.tar.gz 376267 RMD160 3c3c93b9133a39b239f2e1882904641e80bfab06 SHA1 d606c7f4ae121283a3f542d2d3a47b61b39bbaa2 SHA256 1bfdebea1553fba64f7e541222ae5a16856bf0cb3e3c861f0a43f99fe09523eb
-EBUILD nagstamon-0.9.5.ebuild 1685 RMD160 d9eddfbea8d9c1aba9eaa6788f6973a4ad4dfae0 SHA1 e875b9e1a1849e29aded038aea0b049eb4ecb509 SHA256 78d7bf154b3653e660090450cf28e08852973c49eec920471252db66fdcf3ba3
-EBUILD nagstamon-0.9.7.1.ebuild 1789 RMD160 d0ee282da23309ce1c58a27820111f61524f4523 SHA1 e316477d8b3ace86001e0e1019bf78b69fa810c7 SHA256 9c409cb815540870feac3acf791c7d5ad47329f3f5f78b2588bb9c52f2574c66
-MISC ChangeLog 4610 RMD160 9e6b1f8894597b268e7093b7054a14e55d29ac4d SHA1 202f88b2fef2e78261825b71f4fbc847df4ba8d8 SHA256 1ed135d6e93311d76aaa642c3fcc487d0f5ef5876ff0a05ab33c9883134a062c
+EBUILD nagstamon-0.9.7.1.ebuild 1751 RMD160 ded93c1ea22cbdc4f03cab37cf59ac359d685190 SHA1 87c32182c66c27f12bb27ede6de3927ce26dda7b SHA256 0da9fd28eae06ddd955140e3ae3c25fa40bcaea17e06a72a22086227da75fc4f
+MISC ChangeLog 4832 RMD160 747bc544e2938e6e8232c339e56233738a57c539 SHA1 b1011f4575399dea593aef628529da63c46c015c SHA256 67242e48e1d634f38d08e7f9378ce24928da3ee8784b664dd6b11616e1232b46
 MISC metadata.xml 256 RMD160 a9866d0206ae3ba79a340a0ba3da4e6ce647178a SHA1 f8fc497bf652c0c09adafc4c73063ad3324b167a SHA256 8cb5968a456099b1b9f42527a85ea941efe82c475c1be80262bd4a27d0385c46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJN55hjAAoJEMOx0zmdw4Z1Y2oH/1moILfVMBzScEPYcK1HPhQ+
-v+4gELIBWZYYEuE1Rbs17XkAQcydWpxstIyhOjXpPvDnNgc/b12ebLN84jXcS1/a
-fCXxeXYkzEHHuNSi2CzOhQncCiljACs8HtkvF4IC9AE02ITZwqXtEUisRFpu6MGp
-m5l/n72evD+0ZoD7g8s+mtybde66f70EgMtpKGOVaOUcGOglCzajJQz2jWAAwJxe
-qqPThpqOr3jPj9negjpYPdHiDoXuLeUApuKB+UMJ6tSvbsKKpi2cdKk7X/PwPfT1
-hALxjGHyYl5fDBbVRPOqCCpdwr0yD3Tn579NSyE3VQl+EtuwOr5BXeDg+aZse28=
-=GXjV
+iQEcBAEBCAAGBQJOELoLAAoJEMOx0zmdw4Z1Tn0H/jWmyuYLDuCVjVdX3mi7l8pZ
+uwKFhoajU+FSgNfRCoU4/4MHk53ERQmRJBfVlJj5ZFfqObezlTIH79QI7UlCxpBp
+xQymLmPT8F1Eh304rwJXbnbKQSESQFih8nNFckR4FmyErNFpPfHV/UB/xhMJpJiB
+f6PxI1dTkl3Ec/tb0i9KHmqW4ENm9ogoZzdKDv03ZI1xEKB7spzbzwN1D5Gl2Nq/
+W4aAZK+ZmWsOHjGZIVhLFDcEIuHoilv8UYNHw7gCsmedsUnif868TPczKA2KZShS
+vtV2FXMZfxjNVsBd+6pTeM7DxGzw8fxyHKVVc5JCVQZVVfgItdH3lkjdvTm/UZY=
+=NZKU
 -----END PGP SIGNATURE-----
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"