- Fix i18n instead completely disable it.

- Fix runtime of gnome-time-tracker and hamster-standalone.
- Bump the PORTREVISION.

PR:		ports/150948
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>

11 files changed, 111 insertions, 55 deletions

diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index 428c23ef1ee..8753f0e7114 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	hamster-applet
 PORTVERSION=	2.30.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py
new file mode 100644
index 00000000000..3fe830abbf3
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_activityentry.py
@@ -0,0 +1,16 @@
+--- src/hamster/widgets/activityentry.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster/widgets/activityentry.py	2010-09-26 01:29:25.000000000 +0400
+@@ -20,10 +20,10 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster.configuration import runtime
++from hamster.configuration import runtime
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration
++from hamster import stuff
++from hamster.stuff import format_duration
+ 
+ class ActivityEntry(gtk.Entry):
+     __gsignals__ = {
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py
new file mode 100644
index 00000000000..97cba28904d
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dateinput.py
@@ -0,0 +1,11 @@
+--- src/hamster/widgets/dateinput.py	2010-06-04 20:53:24.000000000 +0400
++++ src/hamster/widgets/dateinput.py	2010-09-26 01:30:30.000000000 +0400
+@@ -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 hamster.stuff import format_duration
+ import gtk
+ import datetime as dt
+ import calendar
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py
new file mode 100644
index 00000000000..0070fa254bb
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_dayline.py
@@ -0,0 +1,13 @@
+--- src/hamster/widgets/dayline.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster/widgets/dayline.py	2010-09-26 01:31:11.000000000 +0400
+@@ -20,8 +20,8 @@
+ import gtk
+ import gobject
+ 
+-from .hamster import stuff
+-from .hamster import graphics
++from hamster import stuff
++from hamster import graphics
+ 
+ import time
+ import datetime as dt
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py
new file mode 100644
index 00000000000..a69168e5141
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_facttree.py
@@ -0,0 +1,13 @@
+--- src/hamster/widgets/facttree.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster/widgets/facttree.py	2010-09-26 01:31:57.000000000 +0400
+@@ -20,8 +20,8 @@
+ import gtk, gobject
+ import datetime as dt
+ 
+-from .hamster import stuff
+-from .hamster.stuff import format_duration, format_activity
++from hamster import stuff
++from hamster.stuff import format_duration, format_activity
+ from tags import Tag
+ 
+ import pango
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py
new file mode 100644
index 00000000000..aed44a1b737
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_tags.py
@@ -0,0 +1,14 @@
+--- src/hamster/widgets/tags.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster/widgets/tags.py	2010-09-26 01:32:32.000000000 +0400
+@@ -21,9 +21,9 @@
+ import pango, cairo
+ from math import pi
+ 
+-from .hamster import graphics
++from hamster import graphics
+ 
+-from .hamster.configuration import runtime
++from hamster.configuration import runtime
+ 
+ class TagsEntry(gtk.Entry):
+     __gsignals__ = {
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py
new file mode 100644
index 00000000000..7f5ee2e3b0f
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timechart.py
@@ -0,0 +1,11 @@
+--- src/hamster/widgets/timechart.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster/widgets/timechart.py	2010-09-26 01:33:04.000000000 +0400
+@@ -20,7 +20,7 @@
+ import os  # for locale
+ import gtk, pango
+ 
+-from .hamster import graphics
++from hamster import graphics
+ 
+ import time, datetime as dt
+ import calendar
diff --git a/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py
new file mode 100644
index 00000000000..c74a62b7fc5
--- /dev/null
+++ b/deskutils/hamster-applet/files/patch-src-hamster-widgets_timeinput.py
@@ -0,0 +1,11 @@
+--- src/hamster/widgets/timeinput.py	2010-06-04 20:53:24.000000000 +0400
++++ src/hamster/widgets/timeinput.py	2010-09-26 01:33:38.000000000 +0400
+@@ -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 hamster.stuff import format_duration
+ import gtk
+ from gtk import keysyms
+ import datetime as dt
diff --git a/deskutils/hamster-applet/files/patch-src_gnome-time-tracker b/deskutils/hamster-applet/files/patch-src_gnome-time-tracker
index 9f2489a5948..f12905f2ef6 100644
--- a/deskutils/hamster-applet/files/patch-src_gnome-time-tracker
+++ b/deskutils/hamster-applet/files/patch-src_gnome-time-tracker
@@ -1,22 +1,11 @@
---- src/gnome-time-tracker.orig	2010-06-24 16:14:42.000000000 -0500
-+++ src/gnome-time-tracker	2010-06-24 16:15:22.000000000 -0500
-@@ -524,13 +524,13 @@
-     from hamster import defs
+--- src/gnome-time-tracker	2010-06-22 13:59:09.000000000 +0400
++++ src/gnome-time-tracker	2010-09-26 01:52:16.000000000 +0400
+@@ -525,7 +525,7 @@
  
      # Setup i18n
--    locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
+     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 -    for module in (gettext, locale):
--        module.bindtextdomain('hamster-applet', locale_dir)
--        module.textdomain('hamster-applet')
-+#    locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-+#    for module in (gettext, locale):
-+#        module.bindtextdomain('hamster-applet', locale_dir)
-+#        module.textdomain('hamster-applet')
++    for module in (gettext,):
+         module.bindtextdomain('hamster-applet', locale_dir)
+         module.textdomain('hamster-applet')
  
--        if hasattr(module, 'bind_textdomain_codeset'):
--            module.bind_textdomain_codeset('hamster-applet','UTF-8')
-+#        if hasattr(module, 'bind_textdomain_codeset'):
-+#            module.bind_textdomain_codeset('hamster-applet','UTF-8')
- 
-     gtk.gdk.threads_init()
-     app = ProjectHamster()
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-applet.py b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
index 0bb718d095b..4bb6fb72f55 100644
--- a/deskutils/hamster-applet/files/patch-src_hamster-applet.py
+++ b/deskutils/hamster-applet/files/patch-src_hamster-applet.py
@@ -1,22 +1,11 @@
---- src/hamster-applet.py.orig	2010-01-29 17:37:34.000000000 +0800
-+++ src/hamster-applet.py	2010-01-29 17:38:21.000000000 +0800
-@@ -95,13 +95,13 @@ if __name__ == "__main__":
-         from hamster.configuration import runtime, dialogs
+--- src/hamster-applet.py	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster-applet.py	2010-09-26 01:52:33.000000000 +0400
+@@ -96,7 +96,7 @@
  
          # Setup i18n
--        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
+         locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 -        for module in (gettext, locale):
--            module.bindtextdomain('hamster-applet', locale_dir)
--            module.textdomain('hamster-applet')
-+#        locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-+#        for module in (gettext, locale):
-+#            module.bindtextdomain('hamster-applet', locale_dir)
-+#            module.textdomain('hamster-applet')
- 
--            if hasattr(module, 'bind_textdomain_codeset'):
--                module.bind_textdomain_codeset('hamster-applet','UTF-8')
-+#            if hasattr(module, 'bind_textdomain_codeset'):
-+#                module.bind_textdomain_codeset('hamster-applet','UTF-8')
- 
-         gtk.window_set_default_icon_name("hamster-applet")
++        for module in (gettext,):
+             module.bindtextdomain('hamster-applet', locale_dir)
+             module.textdomain('hamster-applet')
  
diff --git a/deskutils/hamster-applet/files/patch-src_hamster-standalone b/deskutils/hamster-applet/files/patch-src_hamster-standalone
index 126f2444bd4..193483c34cb 100644
--- a/deskutils/hamster-applet/files/patch-src_hamster-standalone
+++ b/deskutils/hamster-applet/files/patch-src_hamster-standalone
@@ -1,22 +1,11 @@
---- src/hamster-standalone.orig	2010-06-24 16:14:54.000000000 -0500
-+++ src/hamster-standalone	2010-06-24 16:15:43.000000000 -0500
-@@ -524,13 +524,13 @@
-     from hamster import defs
+--- src/hamster-standalone	2010-06-22 13:59:09.000000000 +0400
++++ src/hamster-standalone	2010-09-26 01:52:50.000000000 +0400
+@@ -525,7 +525,7 @@
  
      # Setup i18n
--    locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
+     locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
 -    for module in (gettext, locale):
--        module.bindtextdomain('hamster-applet', locale_dir)
--        module.textdomain('hamster-applet')
-+#    locale_dir = os.path.abspath(os.path.join(defs.DATA_DIR, "locale"))
-+#    for module in (gettext, locale):
-+#        module.bindtextdomain('hamster-applet', locale_dir)
-+#        module.textdomain('hamster-applet')
++    for module in (gettext,):
+         module.bindtextdomain('hamster-applet', locale_dir)
+         module.textdomain('hamster-applet')
  
--        if hasattr(module, 'bind_textdomain_codeset'):
--            module.bind_textdomain_codeset('hamster-applet','UTF-8')
-+#        if hasattr(module, 'bind_textdomain_codeset'):
-+#            module.bind_textdomain_codeset('hamster-applet','UTF-8')
- 
-     gtk.gdk.threads_init()
-     app = ProjectHamster()