diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2012-04-22 18:27:19 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2012-04-22 18:27:19 +0000 |
| commit | 8563fb30f6ea3fa87141040376abe0a2cb767064 (patch) | |
| tree | e62b6dda4eec9cedc7ac56976404e79d2446dd5f /net-analyzer/nagstamon | |
| parent | Rename USE="ios" to USE="ipod" which is designed for controlling libgpod depe... (diff) | |
| download | gentoo-2-8563fb30f6ea3fa87141040376abe0a2cb767064.tar.gz gentoo-2-8563fb30f6ea3fa87141040376abe0a2cb767064.tar.bz2 gentoo-2-8563fb30f6ea3fa87141040376abe0a2cb767064.zip | |
Version bump
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/nagstamon')
| -rw-r--r-- | net-analyzer/nagstamon/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/nagstamon/files/nagstamon-0.9.9-resources.patch | 33 | ||||
| -rw-r--r-- | net-analyzer/nagstamon/nagstamon-0.9.9.ebuild (renamed from net-analyzer/nagstamon/nagstamon-0.9.7.1.ebuild) | 16 |
3 files changed, 48 insertions, 9 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/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 |