Fix existing activities edition, bug #455536 by Wayne

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 85 insertions, 137 deletions

diff --git a/gnome-extra/hamster-applet/ChangeLog b/gnome-extra/hamster-applet/ChangeLog
index 5ad27ab5f03f..3ad83162625d 100644
--- a/gnome-extra/hamster-applet/ChangeLog
+++ b/gnome-extra/hamster-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/hamster-applet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.46 2012/08/29 05:03:09 leio Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/hamster-applet/ChangeLog,v 1.47 2013/02/18 20:40:36 pacho Exp $
+
+*hamster-applet-2.32.1-r1 (18 Feb 2013)
+
+  18 Feb 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/hamster-applet-2.32.1-fix-edit.patch, +hamster-applet-2.32.1-r1.ebuild,
+  -files/hamster-applet-2.30.2-fix-import.patch:
+  Fix existing activities edition, bug #455536 by Wayne
 
   29 Aug 2012; Mart Raudsepp <leio@gentoo.org> hamster-applet-2.32.1.ebuild:
   QA: Fix python[sqlite] depend to eclass method. This avoids portage trying to
@@ -227,4 +234,3 @@
   +files/hamster-applet-2.24.0-python25.patch, +metadata.xml,
   +hamster-applet-2.24.0.ebuild:
   initial ebuild, Shamelessly stolen from graaff's overlay.
-
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
deleted file mode 100644
index c8d3c32b56a8..000000000000
--- a/gnome-extra/hamster-applet/files/hamster-applet-2.30.2-fix-import.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-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/files/hamster-applet-2.32.1-fix-edit.patch b/gnome-extra/hamster-applet/files/hamster-applet-2.32.1-fix-edit.patch
new file mode 100644
index 000000000000..5a2a1fff1a71
--- /dev/null
+++ b/gnome-extra/hamster-applet/files/hamster-applet-2.32.1-fix-edit.patch
@@ -0,0 +1,13 @@
+diff -Nuar ./src/hamster/widgets/activityentry.py ./src/hamster/widgets/activityentry.py
+--- ./src/hamster/widgets/activityentry.py	2010-11-15 18:26:38.000000000 -0500
++++ ./src/hamster/widgets/activityentry.py	2013-02-04 20:27:39.606957036 -0500
+@@ -114,7 +114,7 @@
+         for activity in self.external_activities:
+             name = activity['name']
+             if activity['category']:
+-                name = "%s@%s" % name, activity['category']
++                name = "%s@%s" % (name, activity['category'])
+             external_names.add(name.lower())
+ 
+         return activity_name, activity_name in external_names
+
diff --git a/gnome-extra/hamster-applet/hamster-applet-2.32.1-r1.ebuild b/gnome-extra/hamster-applet/hamster-applet-2.32.1-r1.ebuild
new file mode 100644
index 000000000000..6b57ee1336bc
--- /dev/null
+++ b/gnome-extra/hamster-applet/hamster-applet-2.32.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 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.32.1-r1.ebuild,v 1.1 2013/02/18 20:40:36 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils gnome2 multilib python-single-r1 waf-utils
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eds libnotify"
+
+RDEPEND="dev-python/gconf-python
+	dev-python/libgnome-python
+	dev-python/libwnck-python
+	dev-python/gnome-applets-python
+	dev-python/gnome-desktop-python
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+	gnome-base/gnome-control-center
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/libXScrnSaver
+
+	eds? ( dev-python/evolution-python )
+	libnotify? ( dev-python/notify-python )
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=app-text/gnome-doc-utils-0.17.3"
+
+src_prepare() {
+	# Fix existing activities edition, bug #455536
+	epatch "${FILESDIR}/${P}-fix-edit.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	waf-utils_src_configure
+}
+
+src_compile() {
+	waf-utils_src_compile
+}
+
+src_install() {
+	waf-utils_src_install
+	python_fix_shebang "${ED}"usr/bin/*
+	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}/${PN}
+}