Version bump to 0.9.7.1

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

3 files changed, 12 insertions, 25 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index c3d60516484e..c3e077264046 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2011/05/15 15:04:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.20 2011/06/02 11:19:53 idl0r Exp $
+
+*nagstamon-0.9.7.1 (02 Jun 2011)
+
+  02 Jun 2011; Christian Ruppert <idl0r@gentoo.org>
+  -nagstamon-0.9.6.1-r1.ebuild, +nagstamon-0.9.7.1.ebuild,
+  -files/nagstamon-0.9.6.1-system-beautifulsoup.patch:
+  Version bump to 0.9.7.1
 
   15 May 2011; Christian Ruppert <idl0r@gentoo.org>
   files/nagstamon-0.9.6.1-system-beautifulsoup.patch:
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.6.1-system-beautifulsoup.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.6.1-system-beautifulsoup.patch
deleted file mode 100644
index ba060f5d3d60..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.9.6.1-system-beautifulsoup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Nagstamon/Server/Generic.py.old	2011-05-10 14:04:44.910969389 +0200
-+++ Nagstamon/Server/Generic.py	2011-05-10 14:05:00.682457071 +0200
-@@ -13,7 +13,9 @@ import traceback
- import base64
- import re
- 
--from Nagstamon.BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
-+from BeautifulSoup import BeautifulSoup
-+from BeautifulSoup import BeautifulStoneSoup
-+
- from Nagstamon.Actions import HostIsFilteredOutByRE, ServiceIsFilteredOutByRE, not_empty
- from Nagstamon.Objects import *
- 
-@@ -916,4 +918,4 @@ class GenericServer(object):
-         debug_string =  " ".join((head + ":",  str(datetime.datetime.now()), server, host, service, debug))     
-         # give debug info to debug loop for thread-save log-file writing
-         self.debug_queue.put(debug_string)
--        
-\ No newline at end of file
-+        
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.6.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild
index 3d1d478d6aec..9053919d8b45 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.6.1-r1.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.6.1-r1.ebuild,v 1.2 2011/05/10 12:13:02 idl0r Exp $
+# $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 $
 
 EAPI="3"
 
@@ -28,11 +28,11 @@ RDEPEND="dev-python/pygtk
 	dev-python/beautifulsoup
 	gnome? ( || ( dev-python/gnome-python-extras dev-python/egg-python ) )"
 
-S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/Nagstamon"
 
 src_prepare() {
-	epatch "${FILESDIR}/nagstamon-0.9.5-resources.patch"
-	epatch "${FILESDIR}/${P}-system-beautifulsoup.patch"
+	epatch "${FILESDIR}/${PN}-0.9.5-resources.patch"
 
 	python_convert_shebangs 2 nagstamon.py