Version bump to 0.9.7.1

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

4 files changed, 29 insertions, 29 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/Manifest b/net-analyzer/nagstamon/Manifest
index e7660972097f..5ef1df3b2f3d 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,10 +1,23 @@
+-----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-0.9.6.1-system-beautifulsoup.patch 817 RMD160 8cf14b31e71c9f56efe672e3175d607767c41850 SHA1 8aa35357dd6048bd0557ede33eb03c03d3de59fe SHA256 671ec6664bdd9dd2f585278581aa51b8b6373239f9c5e845638a83910d21c58e
 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.6.1.tar.gz 365786 RMD160 7b2d64f3af319cf0251124ec3cd0555191d977c2 SHA1 b6144b36ab2df8aa385555a51c009ea23ef8bb4b SHA256 18efbe457072b1152040491f31ef4bdf87488ac9f629e0235b3c2cac2846511b
+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.6.1-r1.ebuild 1824 RMD160 b99660448d91ac59fd64729273956e0d86f1ff0a SHA1 36fa548757fc4f28489618bfe5d74f6e43ca52dd SHA256 dfec0083e453b451ba10acd22f0f764e1b78ffd785a91d1a91655aca066a5a2a
-MISC ChangeLog 4294 RMD160 f39433a3525906a7026e4109c2ea42c6d3381571 SHA1 d1895c7e502a683d87f601e02706d5a13e00bb90 SHA256 065ee625672ed90f66edd90fc7a4fbe94eb3405cf3a7775da2d314f722bc6fdb
+EBUILD nagstamon-0.9.7.1.ebuild 1789 RMD160 d0ee282da23309ce1c58a27820111f61524f4523 SHA1 e316477d8b3ace86001e0e1019bf78b69fa810c7 SHA256 9c409cb815540870feac3acf791c7d5ad47329f3f5f78b2588bb9c52f2574c66
+MISC ChangeLog 4521 RMD160 2913b82ab0771b41c52532e9ccb0131c1e2fb08d SHA1 bd69e17e2be9b0351580438162b406bf41c58db4 SHA256 4b773cded89ebd352b30d732d028126dfc3c34a31e8c47058c7d1bbf00cf7cb3
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJN53HfAAoJEMOx0zmdw4Z1VbQH/jG5xVrpHUgN7J0w+gLqenH7
+RakxcKsjT25ZRe9Wv5ZHxH3Ymgn6TUTd09BBt2cvsRMHlAlUw1Xdpegmz1bnSqvI
+ORmga+u6SzO8brNISiVPd2DOiqswDYf8zSsxZog10pHVPe0ohvnPoe9YzgpgiPlD
+B9pFqvNqXWtDGkCOIJGk4/7UZGhYaW8CycKmg11SPSKxmNWlOmDQ+7JEcQ7FZC8h
+SgHnQrCvOvARonsUW/HCAXEF9TVD3deWn5kaopSAe8CM5bnek2XwIRvyMw7QAIwd
+BiGG/3q/3dXkwKhXjkGvVMNmrc00FJOzcgCG61AARTQWAs7rqOkxWMRBHqy+Pn4=
+=3miq
+-----END PGP SIGNATURE-----
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