Renamed existing patches

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 6 insertions, 53 deletions

diff --git a/dev-python/icalendar/ChangeLog b/dev-python/icalendar/ChangeLog
index 52a86bef62f8..4a497570c531 100644
--- a/dev-python/icalendar/ChangeLog
+++ b/dev-python/icalendar/ChangeLog
@@ -1,6 +1,11 @@
 # 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.7 2010/04/25 17:58:12 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/icalendar/ChangeLog,v 1.8 2010/04/25 18:00:04 nixphoeni Exp $
+
+  25 Apr 2010; Joe Sapp <nixphoeni@gentoo.org>
+  -files/icalendar-2.0.1-UIDGenerator-fix.patch,
+  -files/icalendar-2.1-vDatetime-tzinfo-fix.patch:
+  Renamed existing patches
 
 *icalendar-2.1_p20100409 (25 Apr 2010)
 
diff --git a/dev-python/icalendar/files/icalendar-2.0.1-UIDGenerator-fix.patch b/dev-python/icalendar/files/icalendar-2.0.1-UIDGenerator-fix.patch
deleted file mode 100644
index 4f2b78dc9133..000000000000
--- a/dev-python/icalendar/files/icalendar-2.0.1-UIDGenerator-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/icalendar/tools.py
-+++ src/icalendar/tools.py
-@@ -1,5 +1,6 @@
- from string import ascii_letters, digits
- import random
-+from datetime import datetime
-
- """
- This module contains non-essential tools for iCalendar. Pretty thin so far eh?
-@@ -42,9 +43,9 @@
-         datetime-uniquevalue at host. Like:
-         20050105T225746Z-HKtJMqUgdO0jDUwm at example.com
-         """
--        from PropertyValues import vText, vDatetime
-+        from icalendar.prop import vText, vDatetime
-         unique = unique or self.rnd_string()
--        return vText('%s-%s@%s' % (vDatetime.today().ical(), unique, host_name))
-+        return vText('%s-%s@%s' % (vDatetime(datetime.today()).ical(), unique, host_name))
-
-
- if __name__ == "__main__":
-
diff --git a/dev-python/icalendar/files/icalendar-2.1-vDatetime-tzinfo-fix.patch b/dev-python/icalendar/files/icalendar-2.1-vDatetime-tzinfo-fix.patch
deleted file mode 100644
index 7f06b4f68c9e..000000000000
--- a/dev-python/icalendar/files/icalendar-2.1-vDatetime-tzinfo-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From http://codespeak.net/pipermail/icalendar-dev/2009-July/000139.html:
-
-SUMMARY: The encoding mechanism of vDatetime handles tzinfo fields
-incorrectly (specifically with respect to daylight savings time).
-Attached is a simple patch that makes it work.
-
-DETAILS: Currently vDatetime.ical() tries to compute the utcoffset of
-the tzinfo, and then subtract that offset.  This approach is valid,
-but the computation of the utcoffset is wrong, because it's done relative
-to datetime.now() instead of the actual datetime object (self.dt)
-to be converted.  This is an issue for timezones whose utcoffset varies
-throughout the year, e.g., from daylight savings time.
-Replacing datetime.now() with self.dt would fix the code,
-but I opted to use the builtin 'asttimezone' method
-because it's slightly simpler.
-
-Submitted by Erik Demaine.
-===================================================================
---- src/icalendar/prop.py.orig	2009-12-14 08:43:50.000000000 -0500
-+++ src/icalendar/prop.py	2009-12-20 12:41:28.000000000 -0500
-@@ -309,8 +309,7 @@
- 
-     def ical(self):
-         if self.dt.tzinfo:
--            utc_time = self.dt - self.dt.tzinfo.utcoffset(datetime.now())
--            return utc_time.strftime("%Y%m%dT%H%M%SZ")
-+            return self.dt.astimezone (UTC).strftime("%Y%m%dT%H%M%SZ")
-         return self.dt.strftime("%Y%m%dT%H%M%S")
- 
-     def from_ical(ical):