summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Scherbaum <dertobi123@gentoo.org>2010-01-30 22:57:21 +0000
committerTobias Scherbaum <dertobi123@gentoo.org>2010-01-30 22:57:21 +0000
commit426b3ddeb458ce977be41c256142c471612bbdc0 (patch)
tree30cd39ceb6c9f0ddfefc51d474226bea5336dac8
parentLook for patches in WORKDIR too. (diff)
downloadgentoo-2-426b3ddeb458ce977be41c256142c471612bbdc0.tar.gz
gentoo-2-426b3ddeb458ce977be41c256142c471612bbdc0.tar.bz2
gentoo-2-426b3ddeb458ce977be41c256142c471612bbdc0.zip
Version bump, #302821. Thanks to Andreas Grundler
(Portage version: 2.2_rc62/cvs/Linux x86_64)
-rw-r--r--net-analyzer/nagstamon/ChangeLog12
-rw-r--r--net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch22
-rw-r--r--net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch (renamed from net-analyzer/nagstamon/files/nagstamon-0.8.2-sharedir.patch)0
-rw-r--r--net-analyzer/nagstamon/nagstamon-0.9.0.ebuild (renamed from net-analyzer/nagstamon/nagstamon-0.8.2.ebuild)5
4 files changed, 35 insertions, 4 deletions
diff --git a/net-analyzer/nagstamon/ChangeLog b/net-analyzer/nagstamon/ChangeLog
index a1f74624f692..2965f189c526 100644
--- a/net-analyzer/nagstamon/ChangeLog
+++ b/net-analyzer/nagstamon/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-analyzer/nagstamon
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.6 2009/08/26 16:27:54 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/ChangeLog,v 1.7 2010/01/30 22:57:20 dertobi123 Exp $
+
+*nagstamon-0.9.0 (30 Jan 2010)
+
+ 30 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+ -nagstamon-0.8.2.ebuild, -files/nagstamon-0.8.2-sharedir.patch,
+ +nagstamon-0.9.0.ebuild, +files/nagstamon-0.9.0-import.patch,
+ +files/nagstamon-0.9.0-sharedir.patch:
+ Version bump, #302821. Thanks to Andreas Grundler
*nagstamon-0.8.2 (26 Aug 2009)
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch
new file mode 100644
index 000000000000..d68327b4a5bb
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.0-import.patch
@@ -0,0 +1,22 @@
+--- Nagstamon/nagstamon.orig 2010-01-28 17:03:54.000000000 +0100
++++ Nagstamon/nagstamon 2010-01-29 23:52:24.957918656 +0100
+@@ -23,7 +23,7 @@
+ import gobject
+
+ # Initiate Config
+-from Nagstamon.nagstamonConfig import Config
++from nagstamonConfig import Config
+ conf = Config()
+
+ # check for old settings when upgrading from a nagstamon version < 0.8 and convert them
+@@ -38,8 +38,8 @@
+ Resources = ""
+
+ # initialize GUI and actions
+-from Nagstamon import nagstamonGUI
+-from Nagstamon import nagstamonActions
++import nagstamonGUI
++import nagstamonActions
+
+
+ ###### MAIN ##############
diff --git a/net-analyzer/nagstamon/files/nagstamon-0.8.2-sharedir.patch b/net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch
index 21819d552cf1..21819d552cf1 100644
--- a/net-analyzer/nagstamon/files/nagstamon-0.8.2-sharedir.patch
+++ b/net-analyzer/nagstamon/files/nagstamon-0.9.0-sharedir.patch
diff --git a/net-analyzer/nagstamon/nagstamon-0.8.2.ebuild b/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild
index a8fc8924f0bb..a7e347d4198b 100644
--- a/net-analyzer/nagstamon/nagstamon-0.8.2.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.8.2.ebuild,v 1.1 2009/08/26 16:27:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagstamon/nagstamon-0.9.0.ebuild,v 1.1 2010/01/30 22:57:20 dertobi123 Exp $
EAPI="2"
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${P}-sharedir.patch"
+ epatch "${FILESDIR}/${P}-import.patch"
}
src_install() {