Added a patch to fix doctests with Python 2.7 (bug #327931)

(Portage version: 2.1.8.3/cvs/Linux x86_64)

9 files changed, 38 insertions, 3 deletions

diff --git a/dev-python/icalendar/ChangeLog b/dev-python/icalendar/ChangeLog
index 4a497570c531..7fc4666f7aad 100644
--- a/dev-python/icalendar/ChangeLog
+++ b/dev-python/icalendar/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-python/icalendar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/ChangeLog,v 1.8 2010/04/25 18:00:04 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/ChangeLog,v 1.9 2010/08/04 11:49:33 nixphoeni Exp $
+
+  04 Aug 2010; Joe Sapp <nixphoeni@gentoo.org>
+  -files/01_all_UIDGenerator-fix.patch,
+  -files/02_all_vDatetime-tzinfo-fix.patch,
+  -files/03_all_duration-fix.patch,
+  -files/04_all_date-type-test-in-vDDDTypes.patch,
+  -files/05_all_utf8-multi-octet-fix.patch,
+  -files/06_all_test.py-use-set.patch,
+  +files/2.1_p20100409/01_all_UIDGenerator-fix.patch,
+  +files/2.1_p20100409/02_all_vDatetime-tzinfo-fix.patch,
+  +files/2.1_p20100409/03_all_duration-fix.patch,
+  +files/2.1_p20100409/04_all_date-type-test-in-vDDDTypes.patch,
+  +files/2.1_p20100409/05_all_utf8-multi-octet-fix.patch,
+  +files/2.1_p20100409/06_all_test.py-use-set.patch,
+  +files/2.1_p20100409/07_all_vGeo.from_ical-test-fix.patch,
+  icalendar-2.1_p20100409.ebuild:
+  Reorganized patch directories for future expansion;
+  added a patch to fix doctests with Python 2.7 (bug #327931)
 
   25 Apr 2010; Joe Sapp <nixphoeni@gentoo.org>
   -files/icalendar-2.0.1-UIDGenerator-fix.patch,
diff --git a/dev-python/icalendar/files/01_all_UIDGenerator-fix.patch b/dev-python/icalendar/files/2.1_p20100409/01_all_UIDGenerator-fix.patch
index 4f2b78dc9133..4f2b78dc9133 100644
--- a/dev-python/icalendar/files/01_all_UIDGenerator-fix.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/01_all_UIDGenerator-fix.patch
diff --git a/dev-python/icalendar/files/02_all_vDatetime-tzinfo-fix.patch b/dev-python/icalendar/files/2.1_p20100409/02_all_vDatetime-tzinfo-fix.patch
index 7f06b4f68c9e..7f06b4f68c9e 100644
--- a/dev-python/icalendar/files/02_all_vDatetime-tzinfo-fix.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/02_all_vDatetime-tzinfo-fix.patch
diff --git a/dev-python/icalendar/files/03_all_duration-fix.patch b/dev-python/icalendar/files/2.1_p20100409/03_all_duration-fix.patch
index d6d857a342d1..d6d857a342d1 100644
--- a/dev-python/icalendar/files/03_all_duration-fix.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/03_all_duration-fix.patch
diff --git a/dev-python/icalendar/files/04_all_date-type-test-in-vDDDTypes.patch b/dev-python/icalendar/files/2.1_p20100409/04_all_date-type-test-in-vDDDTypes.patch
index 799576f2f944..799576f2f944 100644
--- a/dev-python/icalendar/files/04_all_date-type-test-in-vDDDTypes.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/04_all_date-type-test-in-vDDDTypes.patch
diff --git a/dev-python/icalendar/files/05_all_utf8-multi-octet-fix.patch b/dev-python/icalendar/files/2.1_p20100409/05_all_utf8-multi-octet-fix.patch
index e0ac0cf3671e..e0ac0cf3671e 100644
--- a/dev-python/icalendar/files/05_all_utf8-multi-octet-fix.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/05_all_utf8-multi-octet-fix.patch
diff --git a/dev-python/icalendar/files/06_all_test.py-use-set.patch b/dev-python/icalendar/files/2.1_p20100409/06_all_test.py-use-set.patch
index cef265e3b34d..cef265e3b34d 100644
--- a/dev-python/icalendar/files/06_all_test.py-use-set.patch
+++ b/dev-python/icalendar/files/2.1_p20100409/06_all_test.py-use-set.patch
diff --git a/dev-python/icalendar/files/2.1_p20100409/07_all_vGeo.from_ical-test-fix.patch b/dev-python/icalendar/files/2.1_p20100409/07_all_vGeo.from_ical-test-fix.patch
new file mode 100644
index 000000000000..0195e63da31c
--- /dev/null
+++ b/dev-python/icalendar/files/2.1_p20100409/07_all_vGeo.from_ical-test-fix.patch
@@ -0,0 +1,17 @@
+This fixes doctests with Python 2.7.  With improved float handling,
+float('37.86013') == 37.86013.  This seems to be the only way to
+handle this test across Python versions.
+===================================================================
+--- src/icalendar/prop.py	2010-08-03 21:19:06.000000000 -0400
++++ src/icalendar/prop.py	2010-08-03 21:20:48.000000000 -0400
+@@ -1196,8 +1196,8 @@
+     '1.2;3.0'
+ 
+     >>> g = vGeo.from_ical('37.386013;-122.082932')
+-    >>> g
+-    (37.386012999999998, -122.082932)
++    >>> g == (float('37.386013'), float('-122.082932'))
++    True
+ 
+     >>> vGeo(g).ical()
+     '37.386013;-122.082932'
diff --git a/dev-python/icalendar/icalendar-2.1_p20100409.ebuild b/dev-python/icalendar/icalendar-2.1_p20100409.ebuild
index c5ce435e86e0..90bbb3f79a06 100644
--- a/dev-python/icalendar/icalendar-2.1_p20100409.ebuild
+++ b/dev-python/icalendar/icalendar-2.1_p20100409.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-2.1_p20100409.ebuild,v 1.2 2010/04/26 15:11:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/icalendar-2.1_p20100409.ebuild,v 1.3 2010/08/04 11:49:33 nixphoeni Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -27,7 +27,7 @@ RESTRICT_PYTHON_ABIS="3.*"
 DOCS="CHANGES.txt CREDITS.txt doc/* HISTORY.txt README.txt TODO.txt"
 
 src_prepare() {
-	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${PV}"
 	distutils_src_prepare
 }