Version bump

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

4 files changed, 60 insertions, 16 deletions

diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index 5cba447b0e81..aca3fa44fcfe 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagstamon
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.27 2012/01/28 14:46:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.28 2012/04/22 18:27:19 idl0r Exp $
+
+*nagstamon-0.9.9 (22 Apr 2012)
+
+  22 Apr 2012; Christian Ruppert <idl0r@gentoo.org> -nagstamon-0.9.7.1.ebuild,
+  +nagstamon-0.9.9.ebuild, +files/nagstamon-0.9.9-resources.patch:
+  Version bump
 
   28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> nagstamon-0.9.8.ebuild:
   x86 stable wrt bug #400423
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index 474bc6515e83..8f7fe7110857 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX nagstamon-0.9.5-resources.patch 844 RMD160 0d5bacf97600221dcde421fb631ea94753b44031 SHA1 581a9a0c4ffa5be06674146ddc1a5bc8829f5e10 SHA256 130fc539f6e46e368327efbe9c0f3a07cc5db18e4c9546a46d81de552c31ede5
+AUX nagstamon-0.9.9-resources.patch 1594 RMD160 467c78025e6e8d127108c1ebc9ed0fbb2e2415c5 SHA1 c522a62763106faa443ff13f28a411bfc1cb1636 SHA256 c6069b9d9e863e1b6a751aa87c9ea9733ff438d7c79dc6f7b85dc5c8a9382da0
 AUX nagstamon.desktop 302 RMD160 2fb15e01f92eb80f8ec07238015c528720ac781d SHA1 166d4cd8a550e1427ef266b32a44dbb57fe0670b SHA256 409c7d223818a121172faf6733e0e2d9ba5c23caa374769fdc787dab106bf035
-DIST nagstamon_0.9.7.1.tar.gz 376267 RMD160 3c3c93b9133a39b239f2e1882904641e80bfab06 SHA1 d606c7f4ae121283a3f542d2d3a47b61b39bbaa2 SHA256 1bfdebea1553fba64f7e541222ae5a16856bf0cb3e3c861f0a43f99fe09523eb
 DIST nagstamon_0.9.8.tar.gz 382861 RMD160 069715f02ade45e0c9efe37045b8bf9d4483845d SHA1 6721f6b41dc26327e7fe89087e32580703b565dd SHA256 f0977d2ca5e2e13e3bfa17d8db83431770fc53e293b7076408d9308588802a6f
-EBUILD nagstamon-0.9.7.1.ebuild 1753 RMD160 0d2ecd00f39dd5287e7ebf0fb99bb57371c4699a SHA1 20af22b40dfb3620a85bdd271e3a1929c43facc9 SHA256 bece1ed5c1188a42cf61417442326c8025fc390be53e9e4e9923e6c2cd79ffbd
+DIST nagstamon_0.9.9.tar.gz 387268 RMD160 b7fada57e368db9ea7adef7cad5f9455040a5c64 SHA1 e0db68bd5ca795129ff815a49327b6a37e13c509 SHA256 97bf2d5694b9844312123638679aa5ec3528a2c2ca9cf9567a050ddb239e2843
 EBUILD nagstamon-0.9.8.ebuild 1752 RMD160 c172589c8effe6a990338cd0dc3c6ebcea02bae5 SHA1 9db1646226a697468e892d5e6b6ec69f93aa938c SHA256 2576807b7d0a2617ff7196c3f113a559282c35727db7fd35673160f9c107c625
-MISC ChangeLog 5416 RMD160 e5d581d2c3d134892af416c77c2eb3d3395538fb SHA1 b7dbc7b713da915d22f43005260b20a8de9430fb SHA256 81e6b887dbf82e166366aecdcf87a0d523223177af13951923cbff97e52352c0
+EBUILD nagstamon-0.9.9.ebuild 1752 RMD160 68fae8daf1208d7f2c4646b9934e61bdba27c649 SHA1 3ef66e94d8021405b0cb877449904860f115dd50 SHA256 adee7dace677a2905e48f81bb972591a4877c93c3b3ad1e4a490aacee5f91b25
+MISC ChangeLog 5605 RMD160 429db2d007bb3f91d9cb0c2f2d078b0338208509 SHA1 71e591ce644b310f1e5fad2c577591e344def634 SHA256 64e5273b0ca5e614795c812ef1606b9d5a011e3faa0a694ad7fd8702ce70d14a
 MISC metadata.xml 256 RMD160 a9866d0206ae3ba79a340a0ba3da4e6ce647178a SHA1 f8fc497bf652c0c09adafc4c73063ad3324b167a SHA256 8cb5968a456099b1b9f42527a85ea941efe82c475c1be80262bd4a27d0385c46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk8kClcACgkQuUQtlDBCeQJX1wCfbrh5zPWOMyH06SkKBkMrD+8/
-e5UAnikPduEn53nhye4SyIuFQvmGQaXY
-=Hcd1
+iQEcBAEBCAAGBQJPlE2MAAoJEMOx0zmdw4Z1NB4H/3R/6Zke0l7dN60bZfNpvRPF
+2NVBcjT1EokHVc51h/3f9fmizmtfe6RzYItNw0LG//S5Tc65f5xXgXOFn2zg5vgq
+S4uhoGNuo5G6SShyY6eGwYRx+25WYHEUH66+Hq5n5q1MszEXGvOqNfLgGCxrPg1h
+yb1e0EH9u81MFCcGr437/PkCGMkFfh5gK5YFSsruheuWQxLzECXL8o+sSNdbzewx
+gMbV032CIjE3+73HRsmtGFSuAfp/lM8p0tqUSHFQZbIR+CS94K4YCI3Sg+pVxN9W
+PDFW6X4e0aEOmawefVH1qn6HJsSr36uyguTBrwK16zlo2YPYFr587AVz/y+E9Fg=
+=pcli
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch
new file mode 100644
index 000000000000..c5f709f05690
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch
@@ -0,0 +1,33 @@
+diff --git a/nagstamon.py b/nagstamon.py
+index 5d61ef8..0a4db87 100755
+--- a/nagstamon.py
++++ b/nagstamon.py
+@@ -35,17 +35,17 @@ conf.Convert_Conf_to_Multiple_Servers()
+ conf.Convert_Conf_to_Custom_Actions()
+ 
+ # try to get resources path if nagstamon got be installed by setup.py
+-Resources = ""
+-try:
+-    import pkg_resources
+-    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
+-except Exception, err:
+-    # get resources directory from current directory - only if not being set before by pkg_resources
+-    if Resources == "":
+-        if os.path.exists(os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")):
+-            Resources = os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")
+-        else:
+-            Resources = os.path.normcase(os.getcwd() + os.sep + "resources")
++Resources = "/usr/share/nagstamon/resources"
++#try:
++#    import pkg_resources
++#    Resources = pkg_resources.resource_filename("Nagstamon", "resources")
++#except Exception, err:
++#    # get resources directory from current directory - only if not being set before by pkg_resources
++#    if Resources == "":
++#        if os.path.exists(os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")):
++#            Resources = os.path.normcase(os.getcwd() + os.sep + "Nagstamon" + os.sep + "resources")
++#        else:
++#            Resources = os.path.normcase(os.getcwd() + os.sep + "resources")
+ 
+ # initialize GUI and actions
+ # if modules are not available from central python install try the ones in the same directory
diff --git a/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
index 1b3e5a4ee28a..d293feb5c036 100644
--- a/net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4 2011/09/21 15:18:03 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.9.ebuild,v 1.1 2012/04/22 18:27:19 idl0r Exp $
 
-EAPI="3"
+EAPI="4"
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,20 +19,20 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome sound"
 
 DEPEND=""
 RDEPEND="dev-python/pygtk
 	dev-python/lxml
 	dev-python/beautifulsoup
-	gnome? ( dev-python/egg-python )"
+	gnome? ( dev-python/egg-python )
+	sound? ( media-sound/sox )"
 
-#S="${WORKDIR}/${MY_P}"
 S="${WORKDIR}/Nagstamon"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.5-resources.patch"
+	epatch "${FILESDIR}/${P}-resources.patch"
 
 	python_convert_shebangs 2 nagstamon.py