Version bump, #269947

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 32 insertions, 24 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index da8cec5b9f1c..2f30892b91b6 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagstamon
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.3 2008/12/09 18:25:02 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.4 2009/05/15 16:14:45 dertobi123 Exp $
+
+*nagstamon-0.7.0 (15 May 2009)
+
+  15 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/nagstamon-0.6.2-sharedir.patch,
+  +files/nagstamon-0.7.0-sharedir.patch, -nagstamon-0.6.2-r1.ebuild,
+  +nagstamon-0.7.0.ebuild:
+  Version bump, #269947
 
 *nagstamon-0.6.2-r1 (09 Dec 2008)
 
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 1be6701bc544..e51407becdee 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,6 +1,6 @@
-AUX nagstamon-0.6.2-sharedir.patch 716 RMD160 483f4d4f781097147e14f4e6286748c4bec692b0 SHA1 6a766f6637137c6d04e6ab98be2caa45eee170d4 SHA256 85a6860a08c72f749068ac17873c0d4d5edbcb277aeacdf2849174b8ceba7a3a
+AUX nagstamon-0.7.0-sharedir.patch 713 RMD160 0698e65d587227cd0e350d69ee4600ecf5acc8a7 SHA1 bce8d929a7196e824427f6c7bc8fbc695827a40b SHA256 0640a3c77ffca4c8e8ca48aba5eb4a9592129a4bb88cff622a6c83a9600b3e95
 AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
-DIST nagstamon_0.6.2.zip 63719 RMD160 cc8d3e7b5afa355543cf8159cdd1e006626f1611 SHA1 ce753b01fca4ab1fd15609023fef9b27b1e3f2a4 SHA256 129c9bb329b5f8d4681977efce85fc9d6f6a8b3094a567f085e61f981a842c60
-EBUILD nagstamon-0.6.2-r1.ebuild 1085 RMD160 8fd663bd07238a34520ee2c058ea6f386efb3bf3 SHA1 b56fc8237dc826ba9f5ad5811828416f5ce3bb88 SHA256 cc8543e915b9d9038a04997f7d11ea99509ead4db6c9b74d6db461b5897b4b2d
-MISC ChangeLog 941 RMD160 1ff5e2f34b4567bcbdad2e01119867793bb7dba8 SHA1 489d8286590cc09e426a58fde1b8f28b6bd91a80 SHA256 ab68ab2cfd7804c2c51cdd8c233f3ca58e363d96898505db42387022ad6515cb
+DIST nagstamon_0.7.0.zip 68895 RMD160 ca24f3f9d785b2ff1df1d23c2dbce3bc84d9d2e7 SHA1 218e8bb358a77e76c5373311003ff4aad0071ace SHA256 5003befdb083a20e83b8e8292881d57202f70064f16eef4ad7a124a4517c2fe0
+EBUILD nagstamon-0.7.0.ebuild 1089 RMD160 a8c063fbc91c4ee41a25ba9610216a571159ccaa SHA1 ac7385cbc7b963b8680f0bbf914c4db19a76b070 SHA256 5a30d30927653a75a8d5901027f6f52eefd3a394d4b22b7291573c18ffb867c7
+MISC ChangeLog 1191 RMD160 a6c0336255f5e1a548ecab8e746729cc85023fb8 SHA1 1b487b1665bd7efcf49f0b3c324c6661926fba45 SHA256 98ae2258e52aa2cc7fc8a2fa0e2c2e5e2cf7a5222300a07810e6e16db6824fc7
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.6.2-sharedir.patch b/net-analyzer/nagstamon/files/nagstamon-0.6.2-sharedir.patch
deleted file mode 100644
index 541fc34a5e06..000000000000
--- a/net-analyzer/nagstamon/files/nagstamon-0.6.2-sharedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- nagstamon.py.orig	2008-11-24 20:07:57.000000000 +0100
-+++ nagstamon.py	2008-11-24 20:23:09.000000000 +0100
-@@ -457,10 +457,9 @@
-         self.copyright = "© 2008 Henri Wahl\nh.wahl@ifw-dresden.de"
-         self.comments = "Nagios status monitor for your desktop"
-         
--        # get resources directory from environment variable created by /usr/bin/nagstamon stub
--        # otherwise use actual directory
-+        # Set path for resources/ directory
-         if __name__ == "__main__":
--            self.resources = os.path.normcase(os.getcwd() + "/resources")
-+            self.resources = "/usr/share/nagstamon/resources"
-         else:
-             self.resources = os.environ["nagstamon_resources"]
- 
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.7.0-sharedir.patch b/net-analyzer/nagstamon/files/nagstamon-0.7.0-sharedir.patch
new file mode 100644
index 000000000000..3dd2deb1be02
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.7.0-sharedir.patch
@@ -0,0 +1,15 @@
+--- nagstamon.py.orig	2009-05-15 18:07:31.873689350 +0200
++++ nagstamon.py	2009-05-15 18:08:32.130689362 +0200
+@@ -497,9 +497,9 @@
+         self.website = "http://nagstamon.sourceforge.net/"
+         self.copyright = "©2009 Henri Wahl\nh.wahl@ifw-dresden.de"
+         self.comments = "Nagios status monitor for your desktop"
+-        
+-        # get resources directory from current directory
+-        self.resources = os.path.normcase(os.getcwd() + "/resources")
++
++        # Set path for resources/ directory
++        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.6.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-0.7.0.ebuild
index cca72e774a36..3ec2191aae61 100644
--- a/net-analyzer/nagstamon/nagstamon-0.6.2-r1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.7.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.6.2-r1.ebuild,v 1.1 2008/12/09 18:25:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.7.0.ebuild,v 1.1 2009/05/15 16:14:45 dertobi123 Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ RDEPEND=">=dev-lang/python-2.4
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-sharedir.patch"
+	epatch "${FILESDIR}/${PN}-0.7.0-sharedir.patch"
 }
 
 src_install() {