Fix dependencies (including bug #247268), add patch for recurrent calendar

entries (bug #185475). Port to EAPI 3 and various QA fixes.

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

7 files changed, 168 insertions, 26 deletions

diff --git a/app-pda/libopensync-plugin-google-calendar/ChangeLog b/app-pda/libopensync-plugin-google-calendar/ChangeLog
index 2c651380ad4e..a9f327826bcb 100644
--- a/app-pda/libopensync-plugin-google-calendar/ChangeLog
+++ b/app-pda/libopensync-plugin-google-calendar/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-pda/libopensync-plugin-google-calendar
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/ChangeLog,v 1.10 2009/11/15 23:45:00 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/ChangeLog,v 1.11 2011/02/21 11:11:46 dirtyepic Exp $
+
+  21 Feb 2011; Ryan Hill <dirtyepic@gentoo.org>
+  libopensync-plugin-google-calendar-0.22.ebuild,
+  +files/libopensync-plugin-google-calendar-0.22-recurrent.patch,
+  libopensync-plugin-google-calendar-0.36.ebuild,
+  libopensync-plugin-google-calendar-9999.ebuild, metadata.xml:
+  Fix dependencies (including bug #247268), add patch for recurrent calendar
+  entries (bug #185475). Port to EAPI 3 and various QA fixes.
 
   15 Nov 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -libopensync-plugin-google-calendar-0.21.ebuild,
diff --git a/app-pda/libopensync-plugin-google-calendar/Manifest b/app-pda/libopensync-plugin-google-calendar/Manifest
index 726336dc9473..c3fa955038ee 100644
--- a/app-pda/libopensync-plugin-google-calendar/Manifest
+++ b/app-pda/libopensync-plugin-google-calendar/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libopensync-plugin-google-calendar-0.22-recurrent.patch 2820 RMD160 dce201fcdf3911164be84aa4940ea704552e7cc2 SHA1 45240a95ce7ab446f6d9a2ecd6561368d8f71477 SHA256 2ad8827215c6a513f3770d0e09d7fb1209d1b187b4497b34d2987b53407d17f2
 DIST libopensync-plugin-google-calendar-0.22.tar.bz2 435568 RMD160 cb018af3c5bc69729cc1900897dac7bc3ecdfc3b SHA1 b06c96dd01ad9270f02c1bba30b3f6939caa17a7 SHA256 cc82e8b932c884586c66870873544f945822bddcad16608a9d5ea7d86598adb4
 DIST libopensync-plugin-google-calendar-0.36.tar.bz2 33133 RMD160 ecbd4e9d43f377b9b976fe78caf37d0d32a9127e SHA1 5d427443c93b5855c1fddb7c6dba481508ae9f80 SHA256 df3b64322b5f7e0e67317e58b46e9884837a771c69d9513dfb16dafeaeaaa2bb
-EBUILD libopensync-plugin-google-calendar-0.22.ebuild 705 RMD160 d6c9fd196e3b62293ea047448bc409563c65e745 SHA1 7784d5ff2bcc4602dc3036cc3d9acfcff51dee24 SHA256 6eb8d1cb1fd85978e1c34babc52fbfd39e6961aa962231000445bd8eec7dfb29
-EBUILD libopensync-plugin-google-calendar-0.36.ebuild 605 RMD160 83d5a51f02fa5682e25230026e5e20af6b3e709e SHA1 80e7abf5517a0e7b972ff764eb2d42ad6dbabf8a SHA256 185fa41e38a7c60a2c71e060dda25c62ec561f86e6ac6a3b37de291462e4bda9
-EBUILD libopensync-plugin-google-calendar-9999.ebuild 615 RMD160 826b264432729d388a5055da74bdaa4497a2b553 SHA1 13657a303c57304d8e500c2a33206d7490f186b3 SHA256 163ce467e228eea26e6ef14c051b533d0f08869ba09a4ff5aa2fcae29699349a
-MISC ChangeLog 2274 RMD160 7173936ec2e2e9f16b8d11909d9f6bdf6dfa231c SHA1 d40641fd9cd534352b84a3f2c7877cf3d8fb5ce1 SHA256 408cc04f7f4c2cbb0e8d933208fb4e07fdaba9e4d9d546aacc2c21aa7d6fe1b9
-MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
+EBUILD libopensync-plugin-google-calendar-0.22.ebuild 941 RMD160 6caa8134ccb1feab49270aaf8cb24259ed32a4e3 SHA1 56201d921c0c316326b67f027421640a2d02d585 SHA256 1e6f8ede0789b43a9e6dfb3e1178b9c79d66aeb15a066f458508b1093f7b40a1
+EBUILD libopensync-plugin-google-calendar-0.36.ebuild 909 RMD160 9b86d284f919269d357dd815d007b5a03acb8a3f SHA1 33598c1668535cae8d60b67a4d007efaa6128fe6 SHA256 532fee48179dc43e0d00142ddd92ceb93acb134cc948f125dac2fcf478d8b9e6
+EBUILD libopensync-plugin-google-calendar-9999.ebuild 791 RMD160 bc84ebc68e0fbae4a3f2a306c23f0ec152d2da7f SHA1 8e965c557ae393540839e892abc72f700241ae1b SHA256 4d88573907e0ba000a281409fb447f6ef8d0892234b1ae4654aeaf70cac9b3c9
+MISC ChangeLog 2698 RMD160 8b2cc65e3db38ddb8cfe33954667bc6b80e70a99 SHA1 4fb6d5ed9038cc708200303547c1678447bb2a2f SHA256 7dbdd23ca3835003ee015596f6d300aad0185595e5177e2076af6013dfa8f57a
+MISC metadata.xml 299 RMD160 9f1d64e50df31424e0ac8303ca4ebb419713522e SHA1 1fb7bb2c8af3e1f5da826f6b1c8249862d86861b SHA256 6f76eaf6e142eea681b446677130e10fa3505b0ce6eef1cb03b18a041b8f252b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAksAkoEACgkQ1fmVwcYIWAZcXACggSDcvTuBs/r2HX70bTTUpYha
-3PMAn0iYRCcfn+0T8eerqUSottCqkKJE
-=+cmg
+iEYEARECAAYFAk1iSdUACgkQiqiDRvmkBmILeACg7uDH0FFBlG0tHzCa7rTLS68V
+TgcAnAlLkSvV6FhgRyg1RyB+aCPahlER
+=Opwx
 -----END PGP SIGNATURE-----
diff --git a/app-pda/libopensync-plugin-google-calendar/files/libopensync-plugin-google-calendar-0.22-recurrent.patch b/app-pda/libopensync-plugin-google-calendar/files/libopensync-plugin-google-calendar-0.22-recurrent.patch
new file mode 100644
index 000000000000..63b1a6fd07fa
--- /dev/null
+++ b/app-pda/libopensync-plugin-google-calendar/files/libopensync-plugin-google-calendar-0.22-recurrent.patch
@@ -0,0 +1,85 @@
+http://bugs.gentoo.org/185475
+http://www.opensync.org/changeset/1898
+
+--- a/src/google-cal-helper.py
++++ b/src/google-cal-helper.py
+@@ -138,6 +138,41 @@ def xsdateToOsync(s):
+ 	sys.stderr.write("xs to osync: %s => %s\n" % (s, r))
+ 	return r
+ 
++GDEND_RE = re.compile("DTEND;[^:]*:(\S+)")
++def gdRecurToEnd(recur):
++	m = GDEND_RE.search(recur)
++	if m is None:
++		raise DateConversionError("failed to find end in \"%s\"" % recur)
++	start = m.group(1)
++	year = start[0:4]
++	month = start[4:6]
++	day = start[6:8]
++	hour = start[9:11]
++	min = start[11:13]
++	sec = start[13:15]
++	return "%s-%2s-%2sT%2s:%2s:%2s" % (year, month, day, hour, min, sec)
++
++GDSTART_RE = re.compile("DTSTART;[^:]*:(\S+)")
++def gdRecurToStart(recur):
++	m = GDSTART_RE.search(recur)
++	if m is None:
++		raise DateConversionError("failed to find start in \"%s\"" % recur)
++	start = m.group(1)
++	year = start[0:4]
++	month = start[4:6]
++	day = start[6:8]
++	hour = start[9:11]
++	min = start[11:13]
++	sec = start[13:15]
++	return "%s-%2s-%2sT%2s:%2s:%2s" % (year, month, day, hour, min, sec)
++
++GDRECUR_RE = re.compile("RRULE:(\S+)")
++def gdRecurToORecur(recur):
++	m = GDRECUR_RE.search(recur)
++	if m is None:
++		raise DateConversionError("failed to find rule in \"%s\"" % recur)
++	return m.group(1)
++
+ class GCalRequestError(Exception):
+ 	def __init__(self, response):
+ 		self.response = response
+@@ -159,13 +194,19 @@ class GCalEntry:
+ 		self.id = self.elementValue('atom:id/text()')
+ 		self.editUri = self.elementValue('atom:link[@rel="edit"]/@href')
+ 		self.content = self.elementValue('atom:content[@type="text"]/text()')
+-		self.dtstart = self.elementValue('gd:when/@startTime')
+-		self.dtend = self.elementValue('gd:when/@endTime')
++		self.dtrecur = self.elementValue('gd:recurrence/text()')
++		if self.dtrecur:
++			pass
++			self.dtstart = gdRecurToStart(self.dtrecur)
++			self.dtend = gdRecurToEnd(self.dtrecur)
++			self.dtrecur = gdRecurToORecur(self.dtrecur)
++		else:
++			self.dtstart = self.elementValue('gd:when/@startTime')
++			self.dtend = self.elementValue('gd:when/@endTime')
+ 
+ 		self.eventStatus = self.elementValue('gd:eventStatus/@value')
+ 		self.whereString = self.elementValue('gd:where/@valueString')
+ 
+-		#FIXME: Handle recurrency
+ 		#FIXME: Handle gd:eventStatus
+ 
+ 
+@@ -199,9 +240,13 @@ class GCalEntry:
+ 
+ 		self.addElementContent(doc, event, 'DateStarted', xsdateToOsync(self.dtstart))
+ 		self.addElementContent(doc, event, 'DateEnd', xsdateToOsync(self.dtend))
++		if self.dtrecur:
++			self.addElementContent(doc, event, 'RecurrenceRule',
++			                       self.dtrecur)
++
+ 		self.addElementContent(doc, event, 'Location', self.whereString)
+ 
+-		#TODO: UID, editUri, dtstart, dtend, recurrency, eventStatus
++		#TODO: UID, editUri, dtstart, dtend, eventStatus
+ 		return doc.toxml(encoding='utf-8')
+ 
+ 	def dumpGdata(self):
diff --git a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild
index 119a6b832571..9c7702cfdc5a 100644
--- a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild
+++ b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild
@@ -1,10 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild,v 1.1 2007/03/28 20:18:19 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.22.ebuild,v 1.2 2011/02/21 11:11:46 dirtyepic Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils python
 
 DESCRIPTION="OpenSync Google Calendar Plugin"
 HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${P}.tar.bz2"
+SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
@@ -16,7 +22,17 @@ DEPEND="=app-pda/libopensync-${PV}*
 RDEPEND="${DEPEND}
 	dev-python/pyxml"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-recurrent.patch
+	python_convert_shebangs 2 src/google-cal-helper.py
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog COPYING NEWS README
+	dodoc README
+	find "${D}" -name '*.la' -exec rm -f {} + || die
 }
diff --git a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild
index 7333154976e4..b94bc00d5aa4 100644
--- a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild
+++ b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild,v 1.2 2009/03/20 12:57:32 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-0.36.ebuild,v 1.3 2011/02/21 11:11:46 dirtyepic Exp $
 
-inherit cmake-utils
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+
+inherit cmake-utils python
 
 DESCRIPTION="OpenSync Google Calendar Plugin"
 HOMEPAGE="http://www.opensync.org/"
@@ -14,6 +18,23 @@ LICENSE="GPL-2"
 IUSE=""
 
 DEPEND="=app-pda/libopensync-${PV}*
+	dev-libs/glib:2
+	dev-libs/libxml2
 	dev-python/httplib2"
 RDEPEND="${DEPEND}
 	dev-python/pyxml"
+
+DOCS="README"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs 2 src/google-cal-helper.py
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild
index 0cbf5afeaca7..80470a7cf58a 100644
--- a/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild
+++ b/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild,v 1.1 2007/11/26 20:16:44 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-google-calendar/libopensync-plugin-google-calendar-9999.ebuild,v 1.2 2011/02/21 11:11:46 dirtyepic Exp $
+
+EAPI="3"
 
 inherit cmake-utils subversion
 
@@ -10,12 +12,21 @@ SRC_URI=""
 
 ESVN_REPO_URI="http://svn.opensync.org/plugins/google-calendar"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
 DEPEND="=app-pda/libopensync-${PV}*
-	dev-python/httplib2"
-RDEPEND="${DEPEND}
-	dev-python/pyxml"
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=net-libs/libgcal-0.9.6"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS README"
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/app-pda/libopensync-plugin-google-calendar/metadata.xml b/app-pda/libopensync-plugin-google-calendar/metadata.xml
index 0d934d06b5d0..2025e2b89d0d 100644
--- a/app-pda/libopensync-plugin-google-calendar/metadata.xml
+++ b/app-pda/libopensync-plugin-google-calendar/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>pda</herd>
 	<maintainer>
-		<email>peper@gentoo.org</email>
-		<name>Piotr Jaroszyński</name>
+		<email>dirtyepic@gentoo.org</email>
+		<name>Ryan Hill</name>
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>