diff options
| -rw-r--r-- | gnome-extra/hamster-applet/ChangeLog | 10 | ||||
| -rw-r--r-- | gnome-extra/hamster-applet/Manifest | 14 | ||||
| -rw-r--r-- | gnome-extra/hamster-applet/files/hamster-applet-2.30.2-fix-import.patch | 134 | ||||
| -rw-r--r-- | gnome-extra/hamster-applet/hamster-applet-2.30.2-r1.ebuild | 62 |
4 files changed, 218 insertions, 2 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/Manifest b/gnome-extra/hamster-applet/Manifest index 507fc78510c0..713f290313fa 100644 --- a/gnome-extra/hamster-applet/Manifest +++ b/gnome-extra/hamster-applet/Manifest @@ -1,6 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX hamster-applet-2.24.0-gnomevfs.patch 744 RMD160 ad2da96b98822ddf16c7f9bce53f260a20c8928b SHA1 dc13b7280a4dbc3eeb70bf68115b11a180bd7128 SHA256 0571434947b125da75a9a62cb159136a60334c5250c49dbb777a4267de0f8f55 AUX hamster-applet-2.24.0-python25.patch 1959 RMD160 302d2fd687d35462b23ce7becb8f3019f6656905 SHA1 9530e3aee51a3d8494e17af3de0f65098d18d60f SHA256 55b7fbb935da813fea51905c61a23a4fcdbae9581a7ea97b194e6981b7cb9a55 AUX hamster-applet-2.26.2-pango-layout.patch 10015 RMD160 ab056ade8acef4aeb0e4dfef751cca3d06683639 SHA1 7dfef3c606af8bd67abc56210537912e2049b78b SHA256 9308fbff0f23986d67e486329f69d734f60c26dfaaacfe1a74287b167f8fbcc1 +AUX hamster-applet-2.30.2-fix-import.patch 4497 RMD160 2b93ace5d8ca64cf057179b196d0ec34fe2fd309 SHA1 3154d99b2738b5af5ea91be169b508d5163276f8 SHA256 2dc208db53e735a653fb02d229c132f88142ed9b5ff0f16cbe6b76d8b73f7632 DIST hamster-applet-2.24.3.tar.bz2 401534 RMD160 4c9c1a52e81b961de3a37916fc49a5c84a23a861 SHA1 6425b707c622d6f5c8f3caed4c7fc91d50aa2641 SHA256 f59f0647eab59b852402aeca208fba49aeda515cfbae504309f94a7c59784b22 DIST hamster-applet-2.26.3.tar.bz2 428731 RMD160 132ec4acf0b925efa387e7b0cff4e03e902f3754 SHA1 37d29cdfe34ff861e07bb78180facfbdc7d7f16f SHA256 c0b7e444b8981593723cc3ab3063450f2a96d5f295a4011ae9d37e28754a3f76 DIST hamster-applet-2.28.1.tar.bz2 517073 RMD160 535493dda5a32a64c96bd61663216884a3e3613c SHA1 9d2f8f98a700991997630ff4dbbbfb284627aa22 SHA256 ab9ae10380aeb0aea09e42fd5e7ebd7b09116c0608740b5fa9eda8433d9e31c9 @@ -10,6 +14,14 @@ EBUILD hamster-applet-2.24.3.ebuild 1375 RMD160 95b7fd4ca204721dd08ec858bc2e3121 EBUILD hamster-applet-2.26.3.ebuild 1543 RMD160 f6012f9b57e3dcc4fbb910ccedc9c017b64220ab SHA1 00cd0da79b4b6a889050534790d8a1c9dab3fb2d SHA256 34c8b3fd279a9b0a40469b038cd3f97af39174bfe9f054493f5d0dd7c9a8fb02 EBUILD hamster-applet-2.28.1.ebuild 1401 RMD160 baa01a0796ab8f9e04f54eb55c9940ac45b8eed4 SHA1 587595b60452a41818ed4d6b78e36ded14c02fed SHA256 7b31fdab8a89f95c4d79346e0278e12253141c2e588d762ca45677144aa13085 EBUILD hamster-applet-2.28.2.ebuild 1431 RMD160 783922467dfc0ce1856d6a058de0ca2dfa5eb67c SHA1 0f4cc07ac63b773cbd81e97bafbe34e0eacf0e32 SHA256 4de063ffdb7a9632b031d87eba12c3d994173cf82cc171a88baaeecf9f746550 +EBUILD hamster-applet-2.30.2-r1.ebuild 1567 RMD160 92220dd270e6a22b5ee0a5d02e5da3b7060d0e4f SHA1 74144831ed9c2df264b70f829732f0b01dadab27 SHA256 d556e103fa31d7d9f77bd477b8245240b0c39dbd5e0cb5151ad301d20994d4cc EBUILD hamster-applet-2.30.2.ebuild 1451 RMD160 6ead237477488c3967274d388d7bc531d07cc614 SHA1 47f83a9344c15539d18940571381b4a9ae3d97c6 SHA256 cebbdff61672dcd2446aa9b1aa902b6ec4ef9ec28c8f55e7be15f7c78207b200 -MISC ChangeLog 4891 RMD160 8c012a15867f4c332bae11968d140a2c7fc50ad3 SHA1 ec47d11c67246af642dfc3c7b0daa9eca5cef72a SHA256 45c4f449a0f08e84fd3ed83c1f143f100f69b6733c4771628fccda1bfa815144 +MISC ChangeLog 5200 RMD160 88d4d882395ed1e9ad32f87d92f57b4f4eb2ca26 SHA1 bbf55d779ef8264924311e82df97adf8d832a279 SHA256 0ec55954967265b399381265a716db5c09e4c5808a797e70b939c26ff3a13aa3 MISC metadata.xml 356 RMD160 6547f0bc2bc56bf2d45d562045db0430e5cc8c90 SHA1 cb8155da094785b94dfb43e2ae95f8061f4c26f4 SHA256 d1b867ff5d8db648194a023f5b919ebaf9ef8f5878c9c6f4883c36c72393f6c6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkxHNSsACgkQCaWpQKGI+9S9bACffkhiEoj0SlA5beZ32+IhFlfM +uM8AnijRA02Ly7UEq98BiOx/9glpu4cc +=+v+Y +-----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 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 +} |