Fix BeautifulSoup import, bug 366703.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 37 insertions, 19 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index f13ea89342e6..32fa39c4d68d 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.17 2011/05/08 11:18:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.18 2011/05/10 12:10:40 idl0r Exp $
+
+*nagstamon-0.9.6.1-r1 (10 May 2011)
+
+  10 May 2011; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.6.1.ebuild,
+  +nagstamon-0.9.6.1-r1.ebuild,
+  +files/nagstamon-0.9.6.1-system-beautifulsoup.patch:
+  Fix BeautifulSoup import, bug 366703.
 
 *nagstamon-0.9.6.1 (08 May 2011)
 
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 27e9ccf56ff0..2ebad035e55e 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,23 +1,10 @@
------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 779 RMD160 cb26cdd6a22ffc1c2cd60db1ee1065d5fba76b02 SHA1 2958738e55f95631667c51abcca902c62251f6b6 SHA256 457369af6378345bf05e915e162a622f7dd0473ddce70cdd5ab2fc4ad055e6d7
 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
 EBUILD nagstamon-0.9.5.ebuild 1685 RMD160 d9eddfbea8d9c1aba9eaa6788f6973a4ad4dfae0 SHA1 e875b9e1a1849e29aded038aea0b049eb4ecb509 SHA256 78d7bf154b3653e660090450cf28e08852973c49eec920471252db66fdcf3ba3
-EBUILD nagstamon-0.9.6.1.ebuild 1687 RMD160 c42e55dff77fb3bc8f0a6bb2718617b243a3e475 SHA1 03bc37d22f3f37cf98b6a8d2fde95c9e1347b6f6 SHA256 a7f01e76a910bb7b75df2a0a1b722f4fed1f7db8fcaa195aabee5502a20740cc
-MISC ChangeLog 3833 RMD160 845a058bce30632e68deb75be24d259b279514ac SHA1 2c1b9cef6ad02f49eb3c3ab23003172fa15bac99 SHA256 7d88469910d100180ff39504411b7ec6b99c438fa267f2ab09aa4a81aede3726
+EBUILD nagstamon-0.9.6.1-r1.ebuild 1798 RMD160 a7c50dab3c702b808e812931ee2d6ef54f2a4880 SHA1 52ed32444e68c79b7227d03c4da1403e0f2fa88b SHA256 6380cc1947f4592671f5ed86a41c4a2b0299faf3ff9c8650db12d4b073562b68
+MISC ChangeLog 4077 RMD160 85fc93805bad60540103fe653b0129d44edb8b6d SHA1 ad293e15293d5e4125922e064055b068ad4edbeb SHA256 75b65ec49380687e5a001d063630a6257c6ead073fcd2c4dd5a55fe14b389d44
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCAAGBQJNxnwUAAoJEMOx0zmdw4Z1CcYIAIKUYNi9USpz7nHngD6uKtnE
-R/PQUqYyct3ChmQyurYydLmAEmJ/6h9gvPNq5qL+nPf3p7AcwTZj1nzpGeSikPHj
-LodEJNcI6+rNxl1otmQVA7kRkGcKbUM/G5aohizjpDfLeFhbbVKa4DG7Olt4qKPW
-Mefx2r1EdM6gvRx6oa64QkZUUYkh2TLuVL0K7tLhflVbG/NY8TZRqqq6pMGdKoV4
-pLEqlulw6c3RdbzxcvQ9OWM6eYembSVFE+/iX8BV4WGWt6OFZagbJZL6Isfb95Rm
-1QtwYzddTaIc4GXpRIJ3ey3vjv5/qPG7JQsanBRmjhcDoHXrkWMgqxkpZTJB8AE=
-=IyDl
------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
new file mode 100644
index 000000000000..a0f23b469730
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.6.1-system-beautifulsoup.patch
@@ -0,0 +1,20 @@
+--- 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
++import 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.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.6.1-r1.ebuild
index 44d6df6ff44a..f4bffbd6ee5b 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.6.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.6.1-r1.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.ebuild,v 1.1 2011/05/08 11:18:39 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.6.1-r1.ebuild,v 1.1 2011/05/10 12:10:40 idl0r Exp $
 
 EAPI="3"
 
@@ -31,8 +31,12 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/nagstamon-0.9.5-resources.patch"
+	epatch "${FILESDIR}/${P}-system-beautifulsoup.patch"
 
 	python_convert_shebangs 2 nagstamon.py
+
+	rm Nagstamon/resources/LICENSE
+	rm Nagstamon/BeautifulSoup.py
 }
 
 src_install() {
@@ -40,7 +44,7 @@ src_install() {
 	cd Nagstamon/
 
 	doman resources/nagstamon.1 || die
-	rm resources/{LICENSE,nagstamon.1}
+	rm resources/nagstamon.1
 
 	nagstamon_install() {
 		exeinto $(python_get_sitedir)/${MY_PN}