dev-python/pyicu: Version bump. Now compiles against icu-49.

4 files changed, 10 insertions, 141 deletions

diff --git a/dev-python/pyicu/ChangeLog b/dev-python/pyicu/ChangeLog
index 55f8abd56..53ddf25f4 100644
--- a/dev-python/pyicu/ChangeLog
+++ b/dev-python/pyicu/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-python/pyicu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pyicu-1.4 (26 May 2012)
+
+  26 May 2012; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  -files/r191-tzinfo.patch, -pyicu-1.3.ebuild, +pyicu-1.4.ebuild:
+  Version bump. Now compiles against icu-49.
+
   18 Dec 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
   pyicu-1.3.ebuild:
   Minor fixes and style improvements
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 571c32ec9..38ebeb48f 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,4 @@
-AUX r191-tzinfo.patch 4065 RMD160 8fea85a9c422490e31b954b9eee816124e6ffd97 SHA1 b4fc7c92fc891502522f59b2834a12337b03aede SHA256 3baab5c977bf2fc3f2c92ddb255a40f7752896f773e7d8aff38791fe6017a6e5
-DIST PyICU-1.3.tar.gz 208713 RMD160 9fe2972d3f4f9fc434e44e66423ad50001161f70 SHA1 b377c587d01a4e7e036336a42ddbfcf93f1ecf00 SHA256 8c97e9cbef321ace9f388f67eb20e662b3fe5900d675dc535e1a930cf154303e
-EBUILD pyicu-1.3.ebuild 1583 RMD160 773e60c81ff922232d4dc437e0af323fffca8068 SHA1 2353897498fa8bb3aee05afa695f45ba207c1bb9 SHA256 656ae035e59ecac0c18feb0c667e240e0ff607d60ddf4af0d2b307e43065c476
-MISC ChangeLog 1722 RMD160 15283818a4642fe7fa02851f65a40ab2ff2851cc SHA1 6fec44443765510746b90c3f9bdfae7fcad893db SHA256 a901c30d50539b3cd265dac31f51119a2a0394984b5bd4efc2bed12df5d81016
+DIST PyICU-1.4.tar.gz 209539 RMD160 2b5e2570f478838d3abb0fd8a8885174c42c8c12 SHA1 70ea51543d5e684b1466d3cf6d3c7a6ee115ed4e SHA256 69737464b763c547ab237fc8f77dabad2f11fa23337a0cb4404c211e2a5f53de
+EBUILD pyicu-1.4.ebuild 1506 RMD160 38033f7591c8790134231e97b2e49363c76e0d57 SHA1 8df655c4e5d465583ba91ea8ed02bdf4477dfeac SHA256 43f5608ca16948c178c8d95bd8bbcf4fd99c345c2cc81541675b66c0ed975fb9
+MISC ChangeLog 1924 RMD160 ce8d9ff90e60dac289e7c0c9d8f031f72aa0bb1f SHA1 e4e72ab7e471c27a529584d6cde0ea6099dc299b SHA256 e9ade4dc4eeab6b6783bf28aa64605a572d48f24027456bbc810070750fb3be6
 MISC metadata.xml 499 RMD160 af4f88a565517083006955a9b06ccdb2ebc82c3c SHA1 b21eb17caffeabee4fa966b2205562680615eee5 SHA256 fc8bc8371e734428b86d929279626a1b8445625299a2a477dd54806ab7ac5f6b
diff --git a/dev-python/pyicu/files/r191-tzinfo.patch b/dev-python/pyicu/files/r191-tzinfo.patch
deleted file mode 100644
index dabb0d7f5..000000000
--- a/dev-python/pyicu/files/r191-tzinfo.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-r191 | vajda | 2011-11-14 02:48:28 +0100 (Mo, 14 Nov 2011) | 2 lines
-  - fixed bug with default tzinfo set on ICUtzinfo type (bug 13038)
-See https://bugzilla.osafoundation.org/show_bug.cgi?id=13038
-
-svn diff -c 191 http://svn.osafoundation.org/pyicu/trunk/
-Index: tzinfo.h
-===================================================================
---- tzinfo.h	(revision 190)
-+++ tzinfo.h	(revision 191)
-@@ -24,8 +24,6 @@
- #ifndef _tzinfo_h
- #define _tzinfo_h
- 
--extern PyTypeObject TZInfoType;
--
- void _init_tzinfo(PyObject *m);
- 
- #endif /* _tzinfo_h */
-Index: CHANGES
-===================================================================
---- CHANGES	(revision 190)
-+++ CHANGES	(revision 191)
-@@ -1,6 +1,11 @@
- 
- For bug <NUM>, see http://bugzilla.osafoundation.org/show_bug.cgi?id=<NUM>
- 
-+Version 1.3 ->
-+------------------
-+  - fixed bug with default tzinfo set on ICUtzinfo type (bug 13038)
-+  - 
-+
- Version 1.2 -> 1.3
- ------------------
-   - fixed bug 13031
-Index: common.cpp
-===================================================================
---- common.cpp	(revision 190)
-+++ common.cpp	(revision 191)
-@@ -33,6 +33,7 @@
- 
- static PyObject *utcoffset_NAME;
- static PyObject *toordinal_NAME;
-+static PyObject *getDefault_NAME;
- 
- 
- typedef struct {
-@@ -355,7 +356,7 @@
-                 PyObject *m = PyImport_ImportModule("icu");
-                 PyObject *cls = PyObject_GetAttrString(m, "ICUtzinfo");
- 
--                tzinfo = PyObject_GetAttrString(cls, "default");
-+                tzinfo = PyObject_CallMethodObjArgs(cls, getDefault_NAME, NULL);
-                 Py_DECREF(cls);
-                 Py_DECREF(m);
- 
-@@ -1241,4 +1242,5 @@
- 
-     utcoffset_NAME = PyString_FromString("utcoffset");
-     toordinal_NAME = PyString_FromString("toordinal");
-+    getDefault_NAME = PyString_FromString("getDefault");
- }
-Index: setup.py
-===================================================================
---- setup.py	(revision 190)
-+++ setup.py	(revision 191)
-@@ -25,6 +25,15 @@
-     'sunos5': ['-DPYICU_VER="%s"' %(VERSION)],
- }
- 
-+# added to CFLAGS when setup is invoked with --debug
-+DEBUG_CFLAGS = {
-+    'darwin': ['-O0', '-g', '-DDEBUG'],
-+    'linux': ['-O0', '-g', '-DDEBUG'],
-+    'freebsd7': ['-O0', '-g', '-DDEBUG'],
-+    'win32': ['/Od', '/DDEBUG'],
-+    'sunos5': ['-DDEBUG'],
-+}
-+
- LFLAGS = {
-     'darwin': ['-L/usr/local/lib'],
-     'linux': [],
-@@ -55,6 +64,12 @@
- else:
-     _cflags = CFLAGS[platform]
- 
-+if '--debug' in sys.argv:
-+    if 'PYICU_DEBUG_CFLAGS' in os.environ:
-+        _cflags += os.environ['PYICU_DEBUG_CFLAGS'].split(os.pathsep)
-+    else:
-+        _cflags += DEBUG_CFLAGS[platform]
-+
- if 'PYICU_LFLAGS' in os.environ:
-     _lflags = os.environ['PYICU_LFLAGS'].split(os.pathsep)
- else:
-Index: tzinfo.cpp
-===================================================================
---- tzinfo.cpp	(revision 190)
-+++ tzinfo.cpp	(revision 191)
-@@ -122,7 +122,6 @@
-     0,                                  /* tp_setattro */
-     0,                                  /* tp_as_buffer */
-     (Py_TPFLAGS_DEFAULT |
--     Py_TPFLAGS_HEAPTYPE |
-      Py_TPFLAGS_BASETYPE),              /* tp_flags */
-     "",                                 /* tp_doc */
-     0,                                  /* tp_traverse */
-@@ -445,7 +444,6 @@
- 
-             Py_XDECREF((PyObject *) _default);
-             _default = (t_tzinfo *) tzinfo;
--            PyObject_SetAttrString((PyObject *)&TZInfoType, "default", tzinfo);
- 
-             Py_RETURN_NONE;
-         }
-@@ -488,7 +486,6 @@
- 
-     Py_INCREF(arg);
-     _default = (t_tzinfo *) arg;
--    PyDict_SetItemString(TZInfoType.tp_dict, "default", arg);
- 
-     if (prev)
-         return prev;
-@@ -719,10 +716,7 @@
-                 PyObject_Call((PyObject *) &FloatingTZType, args, NULL);
- 
-             if (floating && PyObject_TypeCheck(floating, &FloatingTZType))
--            {
-                 _floating = (t_tzinfo *) floating;
--                PyDict_SetItemString(TZInfoType.tp_dict, "floating", floating);
--            }
-             else
-                 Py_XDECREF(floating);
-             Py_DECREF(args);
diff --git a/dev-python/pyicu/pyicu-1.3.ebuild b/dev-python/pyicu/pyicu-1.4.ebuild
index d3b8dc9ab..ecc89ac37 100644
--- a/dev-python/pyicu/pyicu-1.3.ebuild
+++ b/dev-python/pyicu/pyicu-1.4.ebuild
@@ -29,9 +29,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGES CREDITS"
-PATCHES=(
-	"${FILESDIR}/r191-tzinfo.patch" # epydoc will fail without this
-)
 
 src_prepare() {
 	base_src_prepare