Fix existing activities edition, bug #455536 by Wayne

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 98 insertions, 139 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/Manifest b/gnome-extra/hamster-applet/Manifest
index aad30f53b996..d9890c22c979 100644
--- a/gnome-extra/hamster-applet/Manifest
+++ b/gnome-extra/hamster-applet/Manifest
@@ -1,5 +1,16 @@
-AUX hamster-applet-2.30.2-fix-import.patch 4497 SHA256 2dc208db53e735a653fb02d229c132f88142ed9b5ff0f16cbe6b76d8b73f7632 SHA512 1b5ac834b3b5de2b75da119897d07d98b461f06680326c41f68024c5e3c0d20b038597a381f967bff2bfdf6e8c116d85dcdf973d4bf8b573286a88057a3d5b28 WHIRLPOOL 45ef47d4c890b078ce2a9a1b4d1b91d9325fee17f566acad474d69a67822c295bbf608a74f460d5661dcdbd51b2c054a756f8fed1172c0d715f1108ec1793c63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX hamster-applet-2.32.1-fix-edit.patch 629 SHA256 a50573ab8fa8ddadbe9198b613910b693af359920d0703c06f0b8976b8816104 SHA512 13235878aafb771da559ba41104b2701fd33cb925e9ae8900f936ed1c1d2dceec6f871b98b6c90be20632c42baf9bade9803de08c49b7eba81b4970c177bce29 WHIRLPOOL 80dc8ba13294ea34b46af07c4497433bcb63d12a23ac0a09ce8a4ee5eace06266dc030eacad7b1cf5fa352303fb3de0924e24b02785e6e49818e44a2c50ccb46
 DIST hamster-applet-2.32.1.tar.bz2 454738 SHA256 98302221efd4ccd4a2446d2cda15b795a0b23850f562935a3dd61afe3e2cd0aa SHA512 fbd5d94ee026eb1813958015587e232449a275063976b3d5c489a2b076da63f9eff40c94ff41b29b30de97e67a753ee61d939c26aa36b2499203a9fbd6b81c93 WHIRLPOOL 1e1f7cf507f5dc75b309cd73c71ff262679f96e097cb2000b7a73a8da0b95465a25935697e88ed3c21342cf29f2782b41fab660d4ec493b66c5230de946caba5
+EBUILD hamster-applet-2.32.1-r1.ebuild 1680 SHA256 1dcbd85d30f13b01e8b27a533dbbbe101fdc474e7d8c3c384206e6e08782a0bf SHA512 563ec55c142823d9642d8183939372894728c056a6c046c40ff59bc2252c56bb1dc8618350cd2bbbcc22b7a93fbe6523c8929d0d9c863af01b4d04a21fa664e5 WHIRLPOOL e8bd5d06d831696d647c12cc1ccd58681bcf70e3b2d775ef74970a15c23b64425b0b2e7d079697d36f026a844f8c54a9c75e6ee8bc2f7ca22b4abef4d423bffb
 EBUILD hamster-applet-2.32.1.ebuild 1821 SHA256 dea36df55a023dda5311a0cbe82ad5b5be56eaebd51d2d84c8761f3409f6c872 SHA512 1615677ef6caf1cadcc2e69ec130e8da2df6921a101022e4654590eb29db9136eb8080e59ffcfc5d9063b2856fd1c8a0fcc1cfa226b095bc668142731c959d15 WHIRLPOOL 930177704a67564bb12622450c538ea123b9ae9d73a448a771ce9ead6bd371a1622e559517324d3b3fb53fbeff29a4288ed1eb412168ce486a6eaccfedf82c8a
-MISC ChangeLog 8133 SHA256 89e47fe9b4415a3919406d9c4cc1e36c7750f521a42bd21ffba4f4945de09f79 SHA512 43d739fb1b6bc5de25318c3c454448c5baf3983c2915abf24accc42c16f0f824cbc2025e74cb98cb11f55644189fdd4b35b7dfbd17876bb3ed22bab7cb05222a WHIRLPOOL 805001e6e0c1b65faaec7f10f0769125a89c58dfa9a55672e8279c71a62b68c97dce4afa74f0cc659de8a54b752433a1a0d651a084c3cce18e747c69be8c6ffb
+MISC ChangeLog 8407 SHA256 ffb3de697f1232ae2450c99acd83df43605380d75cfeae9d324429cc73cd6618 SHA512 1e823eec214f325251f78f09102d268670b98636f740ca8382b1ec55afa1ddfcbc74adb0d12546c87e749b019b4646825ad6290f09b12e39fc03c93d50495a2e WHIRLPOOL 3b962aa682eabbdb361e6a807205fa877a8ce6a9636148a12b40e23b349e9eaa6dbd4dd1a2c27d2e3fdb89a939373f76e5c7320f5f25fa374865047688109157
 MISC metadata.xml 356 SHA256 d1b867ff5d8db648194a023f5b919ebaf9ef8f5878c9c6f4883c36c72393f6c6 SHA512 0d94a2d6b427853afc9f4b0c532345e68fccc740dea08c41aed946f2b220b2079f45df8d421385288e4ff50368c1cf8565b3f97e4bcc6e6f46c501f99273c08a WHIRLPOOL da8f822f4015a7be90ca4ae5d169a32b0fb1d533de1fd5fe9e3f82e2e4e126aa331d31c41c815209ce971787ae33f68a60903639197295eeb1610ebd9c67a887
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEikcUACgkQCaWpQKGI+9R3DQCdEkxPgI//tUEGhLrgV8tnb4M0
+hFUAnjenv87V/KES/OQQ403tXo/ZnaEu
+=Fadd
+-----END PGP SIGNATURE-----
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}
+}