Fix import in some setups (upstream bug #623336, bug #329171 by Jbal). Thanks a lot to Tom-Steve Watzke for backporting upstream patch.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 205 insertions, 1 deletions

diff --git a/gnome-extra/hamster-applet/ChangeLog b/gnome-extra/hamster-applet/ChangeLog
index b62590282a11..a1aea391f9b7 100644
--- a/gnome-extra/hamster-applet/ChangeLog
+++ b/gnome-extra/hamster-applet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/hamster-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.27 2010/07/06 13:01:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.28 2010/07/21 17:57:57 pacho Exp $
+
+*hamster-applet-2.30.2-r1 (21 Jul 2010)
+
+  21 Jul 2010; Pacho Ramos <pacho@gentoo.org>
+  +hamster-applet-2.30.2-r1.ebuild,
+  +files/hamster-applet-2.30.2-fix-import.patch:
+  Fix import in some setups (upstream bug #623336, bug #329171 by Jbal).
+  Thanks a lot to Tom-Steve Watzke for backporting upstream patch.
 
   06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   hamster-applet-2.28.2.ebuild, hamster-applet-2.30.2.ebuild:
diff --git a/gnome-extra/hamster-applet/files/hamster-applet-2.30.2-fix-import.patch b/gnome-extra/hamster-applet/files/hamster-applet-2.30.2-fix-import.patch
new file mode 100644
index 000000000000..c8d3c32b56a8
--- /dev/null
+++ b/gnome-extra/hamster-applet/files/hamster-applet-2.30.2-fix-import.patch
@@ -0,0 +1,134 @@
+diff -Naur ./src/hamster/widgets/activityentry.py ./src/hamster/widgets/activityentry.py
+--- ./src/hamster/widgets/activityentry.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/activityentry.py	2010-07-21 13:12:15.000000000 +0200
+@@ -20,10 +20,10 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster.configuration import runtime
++from ..configuration import runtime
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration
++from .. import stuff
++from ..stuff import format_duration
+ 
+ class ActivityEntry(gtk.Entry):
+     __gsignals__ = {
+diff -Naur ./src/hamster/widgets/dateinput.py ./src/hamster/widgets/dateinput.py
+--- ./src/hamster/widgets/dateinput.py	2010-06-04 18:53:24.000000000 +0200
++++ ./src/hamster/widgets/dateinput.py	2010-07-21 13:00:49.000000000 +0200
+@@ -17,7 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-from .hamster.stuff import format_duration
++from ..stuff import format_duration
+ import gtk
+ import datetime as dt
+ import calendar
+diff -Naur ./src/hamster/widgets/dayline.py ./src/hamster/widgets/dayline.py
+--- ./src/hamster/widgets/dayline.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/dayline.py	2010-07-21 13:02:06.000000000 +0200
+@@ -20,8 +20,9 @@
+ import gtk
+ import gobject
+ 
+-from .hamster import stuff
+-from .hamster import graphics
++from .. import stuff
++from .. import graphics
++from ..configuration import conf
+ 
+ import time
+ import datetime as dt
+diff -Naur ./src/hamster/widgets/facttree.py ./src/hamster/widgets/facttree.py
+--- ./src/hamster/widgets/facttree.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/facttree.py	2010-07-21 13:02:43.000000000 +0200
+@@ -20,9 +20,9 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration, format_activity
+-from tags import Tag
++from .. import stuff
++from ..stuff import format_duration, format_activity
++from .tags import Tag
+ 
+ import pango
+ 
+diff -Naur ./src/hamster/widgets/__init__.py ./src/hamster/widgets/__init__.py
+--- ./src/hamster/widgets/__init__.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/__init__.py	2010-07-21 12:59:34.000000000 +0200
+@@ -21,21 +21,21 @@
+ import gtk, pango
+ 
+ # import our children
+-from activityentry import ActivityEntry
+-from dateinput import DateInput
+-from timeinput import TimeInput
++from .activityentry import ActivityEntry
++from .dateinput import DateInput
++from .timeinput import TimeInput
+ 
+-from timechart import TimeChart
++from .timechart import TimeChart
+ 
+-from dayline import DayLine
++from .dayline import DayLine
+ 
+-from tags import Tag
+-from tags import TagBox
+-from tags import TagsEntry
++from .tags import Tag
++from .tags import TagBox
++from .tags import TagsEntry
+ 
+-from reportchooserdialog import ReportChooserDialog
++from .reportchooserdialog import ReportChooserDialog
+ 
+-from facttree import FactTree
++from .facttree import FactTree
+ 
+ # handy wrappers
+ def add_hint(entry, hint):
+diff -Naur ./src/hamster/widgets/tags.py ./src/hamster/widgets/tags.py
+--- ./src/hamster/widgets/tags.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/tags.py	2010-07-21 13:18:47.000000000 +0200
+@@ -21,9 +21,9 @@
+ import pango, cairo
+ from math import pi
+ 
+-from .hamster import graphics
++from .. import graphics
+ 
+-from .hamster.configuration import runtime
++from ..configuration import runtime
+ 
+ class TagsEntry(gtk.Entry):
+     __gsignals__ = {
+diff -Naur ./src/hamster/widgets/timechart.py ./src/hamster/widgets/timechart.py
+--- ./src/hamster/widgets/timechart.py	2010-06-22 11:59:09.000000000 +0200
++++ ./src/hamster/widgets/timechart.py	2010-07-21 13:16:51.000000000 +0200
+@@ -20,7 +20,7 @@
+ import os  # for locale
+ import gtk, pango
+ 
+-from .hamster import graphics
++from .. import graphics
+ 
+ import time, datetime as dt
+ import calendar
+diff -Naur ./src/hamster/widgets/timeinput.py ./src/hamster/widgets/timeinput.py
+--- ./src/hamster/widgets/timeinput.py	2010-06-04 18:53:24.000000000 +0200
++++ ./src/hamster/widgets/timeinput.py	2010-07-21 13:14:28.000000000 +0200
+@@ -17,7 +17,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with Project Hamster.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-from .hamster.stuff import format_duration
++from ..stuff import format_duration
+ import gtk
+ from gtk import keysyms
+ import datetime as dt
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild
new file mode 100644
index 000000000000..e07d412ccea8
--- /dev/null
+++ b/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild,v 1.1 2010/07/21 17:57:57 pacho Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+SCROLLKEEPER_UPDATE="no"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="Time tracking for the masses, in a GNOME applet"
+HOMEPAGE="http://projecthamster.wordpress.com/"
+
+# license on homepage is out-of-date, was changed to GPL-2 on 2008-04-16
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="eds libnotify"
+
+RDEPEND=">=dev-lang/python-2.5[sqlite]
+	dev-python/gconf-python
+	dev-python/libgnome-python
+	dev-python/gnome-applets-python
+	dev-python/dbus-python
+	dev-python/pyxdg
+	eds? ( dev-python/evolution-python )
+	libnotify? ( dev-python/notify-python )
+	>=dev-python/pygobject-2.14
+	>=dev-python/pygtk-2.12
+	>=x11-libs/gtk+-2.12
+	x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	>=dev-util/intltool-0.40
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix import in some setups, upstream bug #623336, bug #329171
+	epatch "${FILESDIR}/${PN}-2.30.2-fix-import.patch"
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	python_need_rebuild
+	python_mod_optimize $(python_get_sitedir)/hamster
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/hamster
+}