fixed bug #355913 (date not showing in the calendar's 'when' field)

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

4 files changed, 127 insertions, 15 deletions

diff --git a/net-misc/googlecl/ChangeLog b/net-misc/googlecl/ChangeLog
index be46c1d130f4..904868808955 100644
--- a/net-misc/googlecl/ChangeLog
+++ b/net-misc/googlecl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/googlecl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/googlecl/ChangeLog,v 1.8 2011/01/28 17:14:10 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/googlecl/ChangeLog,v 1.9 2011/02/23 07:54:33 wired Exp $
+
+*googlecl-0.9.12-r1 (23 Feb 2011)
+
+  23 Feb 2011; Alex Alexander <wired@gentoo.org> +googlecl-0.9.12-r1.ebuild,
+  +files/googlecl-0.9.12-calendar_dates.patch:
+  fixed bug #355913 (date not showing in the calendar's 'when' field)
 
 *googlecl-0.9.12 (28 Jan 2011)
 
diff --git a/net-misc/googlecl/Manifest b/net-misc/googlecl/Manifest
index 2f16ec7d4c77..e3f5b50ae8ba 100644
--- a/net-misc/googlecl/Manifest
+++ b/net-misc/googlecl/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX googlecl-0.9.12-calendar_dates.patch 2767 RMD160 5921743823a7987b739af0b99d7b37cf5afd9d80 SHA1 3985d88582336b35e810dc223fdf5de6def03305 SHA256 5f44aa92b872c9546984a0fd14f5c62b4a6c2d4b4ea201145085be7f43cbb9f3
 DIST googlecl-0.9.11.tar.gz 63638 RMD160 bf59a47ea6e883ede3e38da6252721770482841f SHA1 ac4dc09a5ae88d5ecb89bf960ab25fb6cabf89f5 SHA256 d09d386c545abf458fdcc89a13d614017092c8b84db378f593e8223438f3e741
 DIST googlecl-0.9.12.tar.gz 84266 RMD160 924baf8b4a40723a2ee4cf31dc2eab856b53c013 SHA1 a823b7324073760e9dc19d93d5a3e3074b1b2d5e SHA256 1aac3069b7b8d51c2d0ac0f1c1c81c3bb2c4bef373bf7837b7ae13f537f844a6
 EBUILD googlecl-0.9.11.ebuild 703 RMD160 c9ffdec98d7ff8b634f71eb60a8a444f0a2d763f SHA1 4667830bd0f171f8d2eb14b909ad10e8d3eeca32 SHA256 75a1928ed9cabde94ee65ba1e5d630641efc8fb30395679bf3e14b1ca053929f
+EBUILD googlecl-0.9.12-r1.ebuild 857 RMD160 bfafebbf62fc48d9d818640e15ac06c8b0712a82 SHA1 157d1b0f03538f09a9e5a38e4e447d47c9c51296 SHA256 785b12410d637311901ce2910c25a11ac616775f8e34d03aa83bd07960b9bb56
 EBUILD googlecl-0.9.12.ebuild 703 RMD160 5e2a872b2095435812382403a3e122509e696d77 SHA1 721082391126292561a858d52e41544fa6c9f972 SHA256 e7867c1eff5b541611fd7f0149154c0b51b681e8d64975e7d3d72cff342f133b
-MISC ChangeLog 1443 RMD160 0cabf22a90da02d066e14276a03989b2f076f03e SHA1 fc2bda2d11284c7563e0905e24d1a7f65ddea748 SHA256 f91c65678c5085efa6ab745af6421f4f1f5c1e15d8eb3d8351e2a23a32835635
+MISC ChangeLog 1673 RMD160 b4230ed1436868ca7c36df7c94fb4214ee292b41 SHA1 67e84212f7f6fcbfd80a4b413eab69dc5d429728 SHA256 7faa28cd29fec55460af6607e5751eff72658046f7e1e4acee724d588c94acd5
 MISC metadata.xml 255 RMD160 55d76cb4c854b53723cb2e447f289f5c661dc389 SHA1 5a237e00dc1c7c8a2b4c565c3884b060b805927f SHA256 ad624d5a908e1afc5bbe5ae20dc33b31f218a6c648fc960e149d6d1aa0c4c9bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNQvl6AAoJEDZF8K7rm0r6FPYP/1KtBwVtBl/hsyNQeWFBjId7
-Pfeulog8uhk1dOvfCCyY5Wh+b1Vjjw7kI4gvOuUMwwn6+g7XT6PpNE6OBFAedOkX
-NQmWBbM+efHkUzEwYJmuz2rdNYWAoSgXY0k/Y0KR1SXSYNy4VaKqB6bhu4cz+TFV
-fRRH2Tz2t7Zy+dgFyI9HGiRQInoZGRGRo4tpaRdqMKyic2PBYGmz8yha+A040WVQ
-NAOx5MDEVnmf6RrTntBOW0cMivWQd93iZ8fGwKZOehtZ7LUeSBGHeAX5f/jBoL5X
-746hqXJqfc7wHpStxThhPOGv9gBOMwF4I1pSj9mLobGiqKRUEq/eqFWOZxuSMjB3
-Ym2vEX7fBvGEyxDQFUoEXk71hC0F+AQ7RCBFjY9/S8oLPPfk5va4KkWZCjW12cxz
-DFPVCiK1RAhsRE94Nj2I/SqnU+/qxz/AHk+6OJ1E5Z4VmcWH5B2RIRMaj8fyg9vK
-iU0DiAofxZ++LPYz0DUpL3+pN/n0J+euV9i3U7joStl2Swl+7gud9qSshd33BzQA
-ErXjqT2fWZGi9wo5A6Q8k+KU5UUM3rc46d2IlYWukhwIkFp6/P7GculMTqXJfZE9
-EmTojgFx5omWCblUBkJWlJTau0fhjQDtpczAaP/ZfBYPqGWIPc9Klohf34ZyvRmK
-N4PKqjs86YR72RBaSxaS
-=OP5t
+iQIcBAEBCAAGBQJNZL1vAAoJEDZF8K7rm0r6YAgP/RLwoM87PW6qaO/0Z6vlqLEG
+fbbE+2VV0WywZkGJ3lyXIf5wDf2X1JtghOg/9MaU7ojHg+0WSdQdnTISBb9RLKwJ
+NGQUliJqvuXU2tjHcoXkMmfFaUMlGxW84JwwmJc0utiqdrsXpYv3A4TxvwQoIO0P
+syjkHHFfHBqVPHpC2YEpp8P/XXf67v6rWO3zqMxlBRHiTMgVn34zk2cjH761RrVe
+0QTn8GIlStfPml6nyPB+UkBf2OeDeKrM0P/BF4nUIlSJtitpTlHyatxf2iKQmcRr
+4aBCLzFjRTqD5GyJtPtpYrEIftisi8Qzov/goxQib3+BwXrr65ODSl5qND0v2HId
+lGHFiUou/P9BEK3sZCiQFWShq8+5EkwgXC/dUx+iVgFXLeCAVxhvojT1ynSfRomj
++ijdqh+5bthcsGlSdZMOOB1bQPUuixoVKu7p+VZhU6srp9mbe+lCATIeIwVX3QhR
+ZWBzoDhdXJnpmrFqXkA+6/RAzubC3XtVUm0yZeE8h9sBki4nHZgyZGuue5XSaTJO
+DQNvjRLaXHGqLAenT0CE9VfkuFXv17a2ykkCn8xxaKHP49EexvDQdilhorGZktxO
+d8oNM+xQk2c5HvVQTPAy8f/5bThiE1zPet7SQFvSXt5YpKkwK4K8u0SFT8A/neTM
+dztTIb27OaiXh+VWLIxm
+=fKbs
 -----END PGP SIGNATURE-----
diff --git a/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch b/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
new file mode 100644
index 000000000000..83897bb69550
--- /dev/null
+++ b/net-misc/googlecl/files/googlecl-0.9.12-calendar_dates.patch
@@ -0,0 +1,64 @@
+fix "when" field in calendar not showing dates
+
+http://bugs.gentoo.org/show_bug.cgi?id=355913
+http://code.google.com/p/googlecl/issues/detail?id=358
+
+Index: googlecl/base.py
+===================================================================
+--- src/googlecl/base.py	(revision 527)
++++ src/googlecl/base.py	(working copy)
+@@ -673,10 +673,12 @@
+     except ValueError, err:
+       LOG.debug(err.args[0] + ' (Did not add value for field ' + attr + ')')
+     except AttributeError, err:
++      LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
+       try:
+         # Last ditch effort to blindly grab the attribute
+         val = getattr(wrapped_entry.entry, attr).text or missing_field_value
+       except AttributeError:
++        LOG.debug(err.args[0] + ' (value for field ' + attr + ')')
+         val = missing_field_value
+     # Apparently, atom(?) doesn't always return a Unicode type when there are
+     # non-latin characters, so force everything to Unicode.
+Index: googlecl/calendar/__init__.py
+===================================================================
+--- src/googlecl/calendar/__init__.py	(revision 527)
++++ src/googlecl/calendar/__init__.py	(working copy)
+@@ -235,12 +235,22 @@
+ 
+ 
+ class CalendarEntryToStringWrapper(googlecl.base.BaseEntryToStringWrapper):
++  def __init__(self, entry, config):
++    """Initialize a CalendarEntry wrapper.
++
++    Args:
++      entry: CalendarEntry to interpret to strings.
++      config: Configuration parser. Needed for some values.
++    """
++    googlecl.base.BaseEntryToStringWrapper.__init__(self, entry)
++    self.config_parser = config
++
+   @property
+   def when(self):
+     """When event takes place."""
+     start_date, end_date, freq = get_datetimes(self.entry)
+-    print_format = googlecl.CONFIG.lazy_get(SECTION_HEADER,
+-                                            'date_print_format')
++    print_format = self.config_parser.lazy_get(SECTION_HEADER,
++                                                      'date_print_format')
+     start_text = time.strftime(print_format, start_date)
+     end_text = time.strftime(print_format, end_date)
+     value = start_text + ' - ' + end_text
+@@ -277,9 +287,9 @@
+ 
+     for entry in single_events:
+       print googlecl.base.compile_entry_string(
+-                                            CalendarEntryToStringWrapper(entry),
+-                                            options.fields.split(','),
+-                                            delimiter=options.delimiter)
++                            CalendarEntryToStringWrapper(entry, client.config),
++                            options.fields.split(','),
++                            delimiter=options.delimiter)
+ 
+ 
+ #===============================================================================
diff --git a/net-misc/googlecl/googlecl-0.9.12-r1.ebuild b/net-misc/googlecl/googlecl-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..09b624d28970
--- /dev/null
+++ b/net-misc/googlecl/googlecl-0.9.12-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/googlecl/googlecl-0.9.12-r1.ebuild,v 1.1 2011/02/23 07:54:33 wired Exp $
+
+EAPI=3
+PYTHON_DEPEND="2:2.5:2.7"
+
+inherit distutils eutils
+
+DESCRIPTION="Command line tools for the Google Data APIs"
+HOMEPAGE="http://code.google.com/p/googlecl/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	dev-python/gdata
+"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# fix 'when' field not showing dates, bug #355913
+	epatch "${FILESDIR}"/"${P}"-calendar_dates.patch
+
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc changelog || die "dodoc failed"
+	doman man/*.1 || die "doman failed"
+}