Fix #506452 issues

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 107 insertions, 1 deletions

diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index e91d143..387d159 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,6 @@
+AUX PyQt4-4.10.3-sip_4_15_5_compat.patch 5005 SHA256 3f205037802d8f2bd99f19f3b018b9dc79b4055174d41271241e1f2da3b59270 SHA512 05ba8caba59a4be9fe4fffcd01e926c6117d36bb0f0ceed2d4e0327748a62f74a81fdf24b594d28f9ea02e63505d2fc6efef63a3c39c9fd78f769c823cee2834 WHIRLPOOL 2c2d4c5bb60a5a8ac3893810fea1d41c3b84c921acb6a98987ecb396a7dea553ea604db1934fef1bf090d176a505e1cc38eefe155443549037f954008735b758
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
-EBUILD PyQt4-4.10.3-r4.ebuild 6031 SHA256 453932475ac26bcb270af30fd951102463358cf18ac95c33365053298bf3a226 SHA512 ab4304fb18189f6410e85ec5911fca161afb7503f36c98fab203491dea3de5e063fdd738fb4cc1b381b8f72168b1c823c6e07081decc6833a4eb78994f8e1bad WHIRLPOOL a3331291f47dbd547430eb772e94d9810b6ae8bbd1ef58062ffd77683516f0818dfb970ddcea475253fdbdb74c665097a820fdd32d77af0f62991a4bfbbd05e4
+EBUILD PyQt4-4.10.3-r4.ebuild 6136 SHA256 8270b600fd5f364cd86b803c934f0c234892baafc66aa5c2420ad5c1be4736fa SHA512 dcbb314a1fb26508335c7d3e735c947ecc985e78c07c59f2b1ab8f09ae6185db20adae49b34de8a3756afba3607e13d474989e7a042742ce3516a6346f97739b WHIRLPOOL f729394467054bf53f007b460b2895a6727f2ce0375d47cbfcb29986d7b09424da8d4a7496a7c628fc7966832760f18fb05fff00898c0703cba80020d8886b09
 MISC ChangeLog 34292 SHA256 6917bb71bd9f2a9ea7f0ea5b63922924bfe6f4f4dc0382ae2051b0bf36802f42 SHA512 76e22a28f43a882a7002a11046e45d3ee7efb81800ec48d271ea943eba96f04c3d3cf5441461d7b520ec6c852298a3186a38982fd00395c65901b04d4ddebcb6 WHIRLPOOL d634fce36da5b5e8553719f595a2c46d6a837efd321bb0059dd7aa3ce9e934313787d64c2d9021f5c6e6512892c84362194f1c80d9d9dfae22511694e234310c
 MISC metadata.xml 1226 SHA256 546a210961a96d0a0872aa993643899a2becaf81a6c90f6eeb7cdab789f8e2f7 SHA512 f7cbfc11447e1ec407fce921e9dcc44a6a49f013fdce380d43845e15ea45ea88963f8c0a672fa77eeb1b3f2271477c0c740d81ec4c0061cf5f5b2e9d053ca035 WHIRLPOOL fd601eb093c494fcf0730d858a44f30e36403d1f9e046f5671c6ede591d617015ff05c4d8d014be767334daa81497e1bafc0960db50c1380d683324a884f62dc
diff --git a/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
index 53984b7..287464e 100644
--- a/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.10.3-r4.ebuild
@@ -76,6 +76,9 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	# Support qreal on arm architecture (bug 322349).
 	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+	if has_version '>=dev-python/sip-4.15.5' ; then
+		epatch "${FILESDIR}/${P}-sip_4_15_5_compat.patch"
+	fi
 
 	# Allow building against KDE's phonon (bug 433944 and others).
 	sed -i \
diff --git a/dev-python/PyQt4/files/PyQt4-4.10.3-sip_4_15_5_compat.patch b/dev-python/PyQt4/files/PyQt4-4.10.3-sip_4_15_5_compat.patch
new file mode 100644
index 0000000..3eb0819
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.10.3-sip_4_15_5_compat.patch
@@ -0,0 +1,102 @@
+diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/phonon/backendcapabilities.sip PyQt-x11-gpl-4.10.3/sip/phonon/backendcapabilities.sip
+--- PyQt-x11-gpl-4.10.3.orig/sip/phonon/backendcapabilities.sip	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/sip/phonon/backendcapabilities.sip	2014-04-25 11:56:46.658038217 -0700
+@@ -39,7 +39,7 @@ namespace Phonon
+ #include <backendcapabilities.h>
+ %End
+ 
+-        class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
++        class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
+         {
+ %TypeHeaderCode
+ #include <backendcapabilities.h>
+diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qglobal.sip PyQt-x11-gpl-4.10.3/sip/QtCore/qglobal.sip
+--- PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qglobal.sip	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/sip/QtCore/qglobal.sip	2014-04-25 12:09:51.921693598 -0700
+@@ -304,7 +304,7 @@ typedef bool QBool /NoTypeName/;
+ %End
+ // Template definition for QFlags.
+ template<ENUM>
+-class QFlags /PyQt4Flags=0x1/
++class QFlags /PyQtFlags=0x1/
+ {
+ public:
+     QFlags(const QFlags &);
+diff -urpN PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qurl.sip PyQt-x11-gpl-4.10.3/sip/QtCore/qurl.sip
+--- PyQt-x11-gpl-4.10.3.orig/sip/QtCore/qurl.sip	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/sip/QtCore/qurl.sip	2014-04-25 12:20:20.135974918 -0700
+@@ -32,7 +32,7 @@
+ %If (Qt_5_0_0 -)
+ // Template definition for QUrlTwoFlags.
+ template<E1, E2>
+-class QUrlTwoFlags /PyQt4Flags=0x1/
++class QUrlTwoFlags /PyQtFlags=0x1/
+ {
+     // These are handled by the %ConvertToTypeCode.
+     //QUrlTwoFlags(E1);
+diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_chimera.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp
+--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_chimera.cpp	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_chimera.cpp	2014-04-25 12:24:55.825034480 -0700
+@@ -554,7 +554,7 @@ bool Chimera::parse_py_type(PyTypeObject
+ void Chimera::set_flag()
+ {
+     if (qpycore_is_pyqt4_class(_type))
+-        _is_flag = ((pyqt4ClassTypeDef *)_type)->qt4_flags & 0x01;
++        _is_flag = ((pyqt4ClassTypeDef *)_type)->flags & 0x01;
+ }
+ 
+ 
+diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_qobject_helpers.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_qobject_helpers.cpp
+--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_qobject_helpers.cpp	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_qobject_helpers.cpp	2014-04-25 12:28:25.954787869 -0700
+@@ -57,7 +57,7 @@ const QMetaObject *qpycore_qobject_metao
+         return QPYCORE_QMETAOBJECT(((pyqtWrapperType *)Py_TYPE(pySelf))->metaobject);
+ 
+     // Fall back to the static Qt meta-object.
+-    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)base)->qt4_static_metaobject);
++    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)base)->static_metaobject);
+ }
+ 
+ 
+@@ -324,7 +324,7 @@ PyObject *qpycore_qobject_staticmetaobje
+             return 0;
+         }
+ 
+-        mo = reinterpret_cast<const QMetaObject *>(p4ctd->qt4_static_metaobject);
++        mo = reinterpret_cast<const QMetaObject *>(p4ctd->static_metaobject);
+     }
+ 
+     return sipConvertFromType(const_cast<QMetaObject *>(mo), sipType_QMetaObject, 0);
+diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_types.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp
+--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_types.cpp	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_types.cpp	2014-04-25 12:28:46.191571288 -0700
+@@ -161,7 +161,7 @@ static int pyqtWrapperType_init(pyqtWrap
+     {
+         // Create a dynamic meta-object as its base wrapped type has a static
+         // Qt meta-object.
+-        if (pyqt_td->qt4_static_metaobject && create_dynamic_metaobject(self) < 0)
++        if (pyqt_td->static_metaobject && create_dynamic_metaobject(self) < 0)
+             return -1;
+     }
+ 
+@@ -815,7 +815,7 @@ static const QMetaObject *get_qmetaobjec
+         return QPYCORE_QMETAOBJECT(pyqt_wt->metaobject);
+ 
+     // It's a wrapped type.
+-    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)((sipWrapperType *)pyqt_wt)->type)->qt4_static_metaobject);
++    return reinterpret_cast<const QMetaObject *>(((pyqt4ClassTypeDef *)((sipWrapperType *)pyqt_wt)->type)->static_metaobject);
+ }
+ 
+ 
+diff -urpN PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_pyqtsignal.cpp PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp
+--- PyQt-x11-gpl-4.10.3.orig/qpy/QtCore/qpycore_pyqtsignal.cpp	2013-08-20 22:51:08.000000000 -0700
++++ PyQt-x11-gpl-4.10.3/qpy/QtCore/qpycore_pyqtsignal.cpp	2014-04-25 12:31:26.920852082 -0700
+@@ -574,7 +574,7 @@ void qpycore_set_signal_name(qpycore_pyq
+ int qpycore_get_lazy_attr(const sipTypeDef *td, PyObject *dict)
+ {
+     pyqt4ClassTypeDef *ctd = (pyqt4ClassTypeDef *)td;
+-    const pyqt4QtSignal *sigs = ctd->qt4_signals;
++    const pyqt4QtSignal *sigs = ctd->qt_signals;
+ 
+     // Handle the trvial case.
+     if (!sigs)