dev-python/pyicu: Version bump to 1.2

svn path=/sunrise/; revision=12304

6 files changed, 34 insertions, 297 deletions

diff --git a/dev-python/pyicu/ChangeLog b/dev-python/pyicu/ChangeLog
index adcea747d..15ac8a128 100644
--- a/dev-python/pyicu/ChangeLog
+++ b/dev-python/pyicu/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*pyicu-1.2 (05 Aug 2011)
+
+  05 Aug 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
+  +files/linux3.patch, -pyicu-1.1-r1.ebuild, +pyicu-1.2.ebuild,
+  -files/estyleEnums.patch, -files/parseArgsConstChar.patch:
+  Version bump.
+
 *pyicu-1.1-r1 (29 May 2011)
 
   29 May 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 3cbfa7ec7..16d1763f4 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,6 +1,5 @@
-AUX estyleEnums.patch 3626 RMD160 d6a540e90d273fcb664aea572d698a4d73d534a7 SHA1 f167cdf90ab5cb6864191f28461eb1d99de11616 SHA256 f0dd4743e6b04d1b8f28b1eb6f3e7b9e0ad9d772ef7778ab71004e279cbafd26
-AUX parseArgsConstChar.patch 6676 RMD160 f4e13f90f838bcf83dd27f5cfd59c13db1b77386 SHA1 a4537a767e9903559b23043635da5f0b432461b3 SHA256 429087b2971f241a75c160fcfe9e82243cf793dc54e6ac3259bbb08f884dc696
-DIST PyICU-1.1.tar.gz 102194 RMD160 4beb62af133f7b6ae46db0ad497a91b4e1c954ec SHA1 19fd27123d55b2c4fc82d81b88fa3e2e8f9c34bf SHA256 986f625f210439400343c6fd299af380c1fd018d5884720801331be850e2b7e2
-EBUILD pyicu-1.1-r1.ebuild 1119 RMD160 7e96849671dad18c93d54672fc641f71ae672c18 SHA1 a60abafe22e54164b32b24a079f16a53354cf345 SHA256 a51ee6a1ac303b417345cde1e1a8c782592447427bfd677d384dc598b924584c
-MISC ChangeLog 1057 RMD160 2a66df96ae42c26135db8f63495f6f3a20c91098 SHA1 765111c58e1160f06713aa36cc3b5116bb4a75e7 SHA256 ff5944c6a0f7e98f8e2cde92a8887909f9ff5c52cc04078b126e2f2c9dcd322b
+AUX linux3.patch 594 RMD160 f7adf461921179267e0ec4f78af4951f9500f1df SHA1 10e730af55b7f37c8569ff98ad838888c25383d2 SHA256 4b5d00d7c2285726827422b493a08cba0b6fd8ea4e6b08c553b720294e4b8251
+DIST PyICU-1.2.tar.gz 160930 RMD160 26503fcca94a46e819fad77e84a9864e125d6c0a SHA1 6ee139e9045e25535c0a442e506351652e804f9e SHA256 1a54e9a2d9c7285973d28151a3b6b6a2807a07df86eee32c9d00704402ed728a
+EBUILD pyicu-1.2.ebuild 1074 RMD160 10efcb16991cd149acead39b23a23499159af809 SHA1 bd87cc231a00691cecbb1f27d22c778347191a8c SHA256 91ccd77972233eb13bb08ec427e0783bd6fb21b5a3aca4b99272859f1753956a
+MISC ChangeLog 1289 RMD160 f82146422827ec2f095d1d1584e937b5babd641a SHA1 9b42193e400610d7f7361b0d7d887c6b588ede89 SHA256 cebf672007c673222c1aa263286812601675122c08b2927e0ddf29bf2e6c05d1
 MISC metadata.xml 521 RMD160 ef6b751ab41a1385a3c52781a3e8fc74a6891316 SHA1 c309e2f7732bd1e397b00e3a44d602e7c7c49d62 SHA256 2f19b7aec8532c2f67de98f8b3d4634b4d8091f999797450bf9580a3db707b82
diff --git a/dev-python/pyicu/files/estyleEnums.patch b/dev-python/pyicu/files/estyleEnums.patch
deleted file mode 100644
index 747e18995..000000000
--- a/dev-python/pyicu/files/estyleEnums.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Make PyICU compile against ICU 4.8RC1.
-
-Fixes https://bugzilla.osafoundation.org/show_bug.cgi?id=13022
-
-Based on 'svn diff -c 177 http://svn.osafoundation.org/pyicu/trunk'
-but removed patch for CHANGES file, as that wouldn't apply out of
-order.
-
-Index: format.cpp
-===================================================================
---- format.cpp	(revision 176)
-+++ format.cpp	(revision 177)
-@@ -31,6 +31,10 @@
- #include "dateformat.h"
- #include "numberformat.h"
- 
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    DECLARE_CONSTANTS_TYPE(UTimeUnitFormatStyle);
-+#endif
-+
- /* FieldPosition */
- 
- class t_fieldposition : public _wrapper {
-@@ -728,7 +732,11 @@
- static int t_timeunitformat_init(t_timeunitformat *self,
-                                  PyObject *args, PyObject *kwds)
- {
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    UTimeUnitFormatStyle style;
-+#else
-     TimeUnitFormat::EStyle style;
-+#endif
-     Locale *locale;
- 
-     switch (PyTuple_Size(args)) {
-@@ -1659,8 +1667,13 @@
- 
-     INSTALL_STATIC_INT(FieldPosition, DONT_CARE);
- 
--#if U_ICU_VERSION_HEX >= 0x04020000
-+#if U_ICU_VERSION_HEX >= 0x04020000 && U_ICU_VERSION_HEX < 0x04080000
-     INSTALL_STATIC_INT(TimeUnitFormat, kFull);
-     INSTALL_STATIC_INT(TimeUnitFormat, kAbbreviate);
- #endif
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    INSTALL_CONSTANTS_TYPE(UTimeUnitFormatStyle, m);
-+    INSTALL_ENUM(UTimeUnitFormatStyle, "FULL", UTMUTFMT_FULL_STYLE);
-+    INSTALL_ENUM(UTimeUnitFormatStyle, "ABBREVIATED", UTMUTFMT_ABBREVIATED_STYLE);
-+#endif
- }
-Index: numberformat.cpp
-===================================================================
---- numberformat.cpp	(revision 176)
-+++ numberformat.cpp	(revision 177)
-@@ -30,6 +30,10 @@
- #include "numberformat.h"
- #include "macros.h"
- 
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    DECLARE_CONSTANTS_TYPE(UCurrencySpacing);
-+#endif
-+
- /* DecimalFormatSymbols */
- 
- class t_decimalformatsymbols : public _wrapper {
-@@ -494,7 +498,11 @@
- 
- static PyObject *t_decimalformatsymbols_getPatternForCurrencySpacing(t_decimalformatsymbols *self, PyObject *args)
- {
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    UCurrencySpacing type;
-+#else
-     DecimalFormatSymbols::ECurrencySpacing type;
-+#endif
-     UBool beforeCurrency;
- 
-     if (!parseArgs(args, "ib", &type, &beforeCurrency))
-@@ -510,7 +518,11 @@
- static PyObject *t_decimalformatsymbols_setPatternForCurrencySpacing(t_decimalformatsymbols *self, PyObject *args)
- {
-     UnicodeString *u, _u;
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    UCurrencySpacing type;
-+#else
-     DecimalFormatSymbols::ECurrencySpacing type;
-+#endif
-     UBool beforeCurrency;
- 
-     if (!parseArgs(args, "ibS", &type, &beforeCurrency, &u, &_u))
-@@ -2278,12 +2290,18 @@
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kNaNSymbol);
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kSignificantDigitSymbol);
- 
--#if U_ICU_VERSION_HEX >= 0x04020000
-+#if U_ICU_VERSION_HEX >= 0x04020000 && U_ICU_VERSION_HEX < 0x04080000
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kCurrencyMatch);
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kSurroundingMatch);
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kInsert);
-     INSTALL_STATIC_INT(DecimalFormatSymbols, kCurrencySpacingCount);
- #endif
-+#if U_ICU_VERSION_HEX >= 0x04080000
-+    INSTALL_CONSTANTS_TYPE(UCurrencySpacing, m);
-+    INSTALL_ENUM(UCurrencySpacing, "MATCH", UNUM_CURRENCY_MATCH);
-+    INSTALL_ENUM(UCurrencySpacing, "SURROUNDING_MATCH", UNUM_CURRENCY_SURROUNDING_MATCH);
-+    INSTALL_ENUM(UCurrencySpacing, "INSERT", UNUM_CURRENCY_INSERT);
-+#endif
- 
-     INSTALL_STATIC_INT(NumberFormat, kIntegerField);
-     INSTALL_STATIC_INT(NumberFormat, kFractionField);
diff --git a/dev-python/pyicu/files/linux3.patch b/dev-python/pyicu/files/linux3.patch
new file mode 100644
index 000000000..80b076e13
--- /dev/null
+++ b/dev-python/pyicu/files/linux3.patch
@@ -0,0 +1,22 @@
+Treat all linux platforms the same.
+Workaround while we wait for Python upstream to decide on their solution.
+
+2011-08-06 Martin von Gagern
+
+References:
+http://bugs.python.org/issue12326
+
+Index: PyICU-1.2/setup.py
+===================================================================
+--- PyICU-1.2.orig/setup.py
++++ PyICU-1.2/setup.py
+@@ -41,6 +41,9 @@ LIBRARIES = {
+     'sunos5': ['icui18n', 'icuuc', 'icudata'],
+ }
+ 
++if sys.platform.startswith('linux'):
++    sys.platform = 'linux2'
++
+ if 'PYICU_INCLUDES' in os.environ:
+     _includes = os.environ['PYICU_INCLUDES'].split(os.pathsep)
+ else:
diff --git a/dev-python/pyicu/files/parseArgsConstChar.patch b/dev-python/pyicu/files/parseArgsConstChar.patch
deleted file mode 100644
index 6f963edf4..000000000
--- a/dev-python/pyicu/files/parseArgsConstChar.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Treat string literals as const char* instead of char*.
-
-PyICU had a lot of implicit conversions from string constant to char*,
-which could cause huge lists of compiler messages like this:
-
-warning: deprecated conversion from string constant to ‘char*’
-
-This patch attempts to fix as many of these as possible inside the
-PyICU codebase. Some cannot be fixed, because the cooresponding
-problem is in Python headers. This is known as Python issue #6952.
-
-2011-02-11 Martin von Gagern
-
-References:
-http://bugs.gentoo.org/237888
-http://bugs.python.org/issue6952
-
-Index: PyICU-1.1/common.cpp
-===================================================================
---- PyICU-1.1.orig/common.cpp
-+++ PyICU-1.1/common.cpp
-@@ -178,7 +178,8 @@ EXPORT PyObject *PyUnicode_FromUnicodeSt
- }
- 
- EXPORT UnicodeString &PyString_AsUnicodeString(PyObject *object,
--                                               char *encoding, char *mode,
-+                                               const char *encoding,
-+                                               const char *mode,
-                                                UnicodeString &string)
- {
-     UErrorCode status = U_ZERO_ERROR;
-@@ -206,7 +207,7 @@ EXPORT UnicodeString &PyString_AsUnicode
- 
-     if (U_FAILURE(status))
-     {
--        char *reasonName;
-+        const char *reasonName;
- 
-         switch (stop.reason) {
-           case UCNV_UNASSIGNED:
-@@ -241,7 +242,8 @@ EXPORT UnicodeString &PyString_AsUnicode
- }
- 
- EXPORT UnicodeString &PyObject_AsUnicodeString(PyObject *object,
--                                               char *encoding, char *mode,
-+                                               const char *encoding,
-+                                               const char *mode,
-                                                UnicodeString &string)
- {
-     if (PyUnicode_Check(object))
-@@ -672,7 +674,7 @@ static UBool *toUBoolArray(PyObject *arg
- 
- #ifdef _MSC_VER
- 
--int __parseArgs(PyObject *args, char *types, ...)
-+int __parseArgs(PyObject *args, const char *types, ...)
- {
-     int count = ((PyTupleObject *)(args))->ob_size;
-     va_list list;
-@@ -682,7 +684,7 @@ int __parseArgs(PyObject *args, char *ty
-     return _parseArgs(((PyTupleObject *)(args))->ob_item, count, types, list);
- }
- 
--int __parseArg(PyObject *arg, char *types, ...)
-+int __parseArg(PyObject *arg, const char *types, ...)
- {
-     va_list list;
- 
-@@ -692,14 +694,14 @@ int __parseArg(PyObject *arg, char *type
- }
- 
- 
--int _parseArgs(PyObject **args, int count, char *types, va_list list)
-+int _parseArgs(PyObject **args, int count, const char *types, va_list list)
- {
-     if (count != strlen(types))
-         return -1;
- 
- #else
- 
--int _parseArgs(PyObject **args, int count, char *types, ...)
-+int _parseArgs(PyObject **args, int count, const char *types, ...)
- {
-     va_list list;
- 
-@@ -1121,7 +1123,7 @@ int _parseArgs(PyObject **args, int coun
-     return 0;
- }
- 
--PyObject *PyErr_SetArgsError(PyObject *self, char *name, PyObject *args)
-+PyObject *PyErr_SetArgsError(PyObject *self, const char *name, PyObject *args)
- {
-     if (!PyErr_Occurred())
-     {
-@@ -1135,7 +1137,7 @@ PyObject *PyErr_SetArgsError(PyObject *s
-     return NULL;
- }
- 
--PyObject *PyErr_SetArgsError(PyTypeObject *type, char *name, PyObject *args)
-+PyObject *PyErr_SetArgsError(PyTypeObject *type, const char *name, PyObject *args)
- {
-     if (!PyErr_Occurred())
-     {
-Index: PyICU-1.1/common.h
-===================================================================
---- PyICU-1.1.orig/common.h
-+++ PyICU-1.1/common.h
-@@ -191,10 +191,12 @@ EXPORT PyObject *PyUnicode_FromUnicodeSt
- EXPORT PyObject *PyUnicode_FromUnicodeString(const UChar *chars, int size);
- 
- EXPORT UnicodeString &PyString_AsUnicodeString(PyObject *object,
--                                               char *encoding, char *mode,
-+                                               const char *encoding,
-+                                               const char *mode,
-                                                UnicodeString &string);
- EXPORT UnicodeString &PyObject_AsUnicodeString(PyObject *object,
--                                               char *encoding, char *mode,
-+                                               const char *encoding,
-+                                               const char *mode,
-                                                UnicodeString &string);
- EXPORT UnicodeString &PyObject_AsUnicodeString(PyObject *object,
-                                                UnicodeString &string);
-@@ -208,10 +210,10 @@ int abstract_init(PyObject *self, PyObje
- #define parseArgs __parseArgs
- #define parseArg __parseArg
- 
--int __parseArgs(PyObject *args, char *types, ...);
--int __parseArg(PyObject *arg, char *types, ...);
-+int __parseArgs(PyObject *args, const char *types, ...);
-+int __parseArg(PyObject *arg, const char *types, ...);
- 
--int _parseArgs(PyObject **args, int count, char *types, va_list list);
-+int _parseArgs(PyObject **args, int count, const char *types, va_list list);
- 
- #else
- 
-@@ -222,7 +224,7 @@ int _parseArgs(PyObject **args, int coun
- #define parseArg(arg, types, rest...) \
-     _parseArgs(&(arg), 1, types, ##rest)
- 
--int _parseArgs(PyObject **args, int count, char *types, ...);
-+int _parseArgs(PyObject **args, int count, const char *types, ...);
- 
- #endif
- 
-@@ -240,7 +242,7 @@ Formattable *toFormattableArray(PyObject
- UObject **pl2cpa(PyObject *arg, int *len, classid id, PyTypeObject *type);
- PyObject *cpa2pl(UObject **array, int len, PyObject *(*wrap)(UObject *, int));
- 
--PyObject *PyErr_SetArgsError(PyObject *self, char *name, PyObject *args);
--PyObject *PyErr_SetArgsError(PyTypeObject *type, char *name, PyObject *args);
-+PyObject *PyErr_SetArgsError(PyObject *self, const char *name, PyObject *args);
-+PyObject *PyErr_SetArgsError(PyTypeObject *type, const char *name, PyObject *args);
- 
- #endif /* _common_h */
-Index: PyICU-1.1/errors.cpp
-===================================================================
---- PyICU-1.1.orig/errors.cpp
-+++ PyICU-1.1/errors.cpp
-@@ -26,7 +26,7 @@
- 
- #include "errors.h"
- 
--static void _setMsg(PyObject *messages, UErrorCode code, char *msg)
-+static void _setMsg(PyObject *messages, UErrorCode code, const char *msg)
- {
-     PyObject *pycode = PyInt_FromLong((long) code);
-     PyObject *pymsg = PyString_FromString(msg);
-Index: PyICU-1.1/bases.cpp
-===================================================================
---- PyICU-1.1.orig/bases.cpp
-+++ PyICU-1.1/bases.cpp
-@@ -532,7 +532,7 @@ static int t_unicodestring_init(t_unicod
- {
-     UnicodeString *u, _u;
-     PyObject *obj;
--    char *encoding, *mode;
-+    const char *encoding, *mode;
-     int32_t start, length;
-     int i;
- 
diff --git a/dev-python/pyicu/pyicu-1.1-r1.ebuild b/dev-python/pyicu/pyicu-1.2.ebuild
index 80af7f9a9..b7b0c2fc9 100644
--- a/dev-python/pyicu/pyicu-1.1-r1.ebuild
+++ b/dev-python/pyicu/pyicu-1.2.ebuild
@@ -29,8 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS="CHANGES CREDITS README"
 PATCHES=(
-	"${FILESDIR}/parseArgsConstChar.patch"
-	"${FILESDIR}/estyleEnums.patch"
+	"${FILESDIR}/linux3.patch"
 )
 
 src_prepare() {