Renamed existing patches

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 7 insertions, 56 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/Manifest b/dev-python/icalendar/Manifest
index 839cccb2187c..428c7f3eb887 100644
--- a/dev-python/icalendar/Manifest
+++ b/dev-python/icalendar/Manifest
@@ -4,12 +4,10 @@ AUX 03_all_duration-fix.patch 1486 RMD160 c540c5b7bce91a1fe4b9df50addb13d119b3b4
 AUX 04_all_date-type-test-in-vDDDTypes.patch 1034 RMD160 413c0a44985ba225d42c45cccf4d3b799d148447 SHA1 7f13c43f980d39a029b06fc5e82152442de1d723 SHA256 1d707c0b64a04a79bdcbb6a26596bd8217a71a872a4436f3105511ce0b59ccfb
 AUX 05_all_utf8-multi-octet-fix.patch 1013 RMD160 7fc786364d6302583776d78fe1a134d56c6a1170 SHA1 024ae30d0e97fd3f0c9c87081673d96949e8c8ca SHA256 bbe200075696f88119900423552cfcf3ab2d4b312433d60c29d234195ad74285
 AUX 06_all_test.py-use-set.patch 1372 RMD160 42a0cef15a8e18db583296f21bf51d3c3a3fe17e SHA1 1b7c41f8af7721a2e56615c40c53af422a3786ad SHA256 2ec2d2a8f9774de2c66b407f0fa88343fa49628441b0aaf3d404044ab3d2419c
-AUX icalendar-2.0.1-UIDGenerator-fix.patch 735 RMD160 a340b12c4342714f92c2e14a9d3850a4c62de059 SHA1 0a5159915cfb0c0bb687932d270b2690a1b53ba6 SHA256 da06c4912bb91c9c425ee5b6a225de81d40c52bba00680a67d4b4cd596518f5b
-AUX icalendar-2.1-vDatetime-tzinfo-fix.patch 1378 RMD160 7dfb616525f3f99015127659a832ab47f885e1ef SHA1 95c27325c97566b772527d9f026531f4c4f04d19 SHA256 184dc5255a1755c2265a1993b9458ecdaad5caebbd99c171dd4a4178547a3fdb
 DIST icalendar-2.0.1.tar.gz 73338 RMD160 e377c8591c0a014c0d84e5a8ebd072dd49839bf9 SHA1 aae1f3e67eceba9d06461f5eccdb7560194dc58f SHA256 2b0d6fbede8360bb8db13e72e25fd3c5de26ca7fb811be61ece7d29b947c9100
 DIST icalendar-2.1.tar.gz 73180 RMD160 a62548dcabe8657d0445e2b810ff6f3c49fdec0f SHA1 be1104db8853e3e0746a6f7bc3bb8103c79d5edb SHA256 7e0080cd5fbbdbe084087a5863c5419bbb889fcd3f5988f436c5b94b4fba4641
 EBUILD icalendar-2.0.1.ebuild 798 RMD160 eb29b2ae4e0c15a8e19b5885b69034013b8c9b86 SHA1 f8a9ab3e774ee430b0cfd633b193ef2be62a908c SHA256 8ae7eb7596eec51b52821893687769a03ba34fcd11187ddcb2d1f5b13baca9b3
 EBUILD icalendar-2.1-r1.ebuild 942 RMD160 f625aefdb7389f0e113f12e714ca1bccbbc08b98 SHA1 c58684ea01dfa12c8697ca6419e32d8e80c59a1a SHA256 8dbb6fc3fa18fdeaf15d88fb8355edb6a231d322acd196413eb89a532210385e
 EBUILD icalendar-2.1_p20100409.ebuild 979 RMD160 e07ebefd387e4d84e61d1a08417d784da0435eef SHA1 2a756a04cea67db3d37789c090f2ed510fb25fb4 SHA256 34a275755e43304af60ec469e62a5f99cb54c362a7b90eba0745781acd4b63b5
-MISC ChangeLog 1793 RMD160 03cde909c5437a485e5a98452fde0c264557ad0e SHA1 d6d2b31da0d7727ec279acf34ff18d729fecc0b4 SHA256 38acab0e3bbff72644f1eed016b7875d2f440f0a0576d07fa3d212f6d4663c6c
+MISC ChangeLog 1968 RMD160 76c33e4cdb4a73fb4e0dede5356e1baace29f0d1 SHA1 ef5011cb1e17fe520cab46b0819e870be5410a39 SHA256 3255a3b280024e6b2db1815e6e5fe42a21e47ae6ebce027f474b2566ab86638f
 MISC metadata.xml 227 RMD160 1894e37fc7a39800814a947626e65e25e1f42c95 SHA1 051cb5d5c36289036c5bbe516b53468f1939c1d4 SHA256 d8d77205406c986c326acafaca4af656e99982720ccd6461bb3e60ea897a600f
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):