From 104f488f0ea9c65231e4ae68912248f267b2e153 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Thu, 10 Sep 2015 09:15:05 +0300
Subject: [PATCH] python-qt:added py2 support

---
 .../language/python/python-qt5/actions.py     | 21 +++++++++-
 .../language/python/python-qt5/pspec.xml      | 38 +++++++++++++++----
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/programming/language/python/python-qt5/actions.py b/programming/language/python/python-qt5/actions.py
index d7cc3734ac..58b511d84d 100644
--- a/programming/language/python/python-qt5/actions.py
+++ b/programming/language/python/python-qt5/actions.py
@@ -13,6 +13,7 @@ from pisi.actionsapi import get
 WorkDir="PyQt-gpl-%s" % get.srcVERSION()
 
 def setup():
+    shelltools.copytree("%s/PyQt-gpl-5.4.2" % get.workDIR(), "%s/Py2Qt-gpl-5.4.2" % get.workDIR())
     pythonmodules.run("configure.py  --confirm-license \
                                      --assume-shared \
                                      --no-timestamp \
@@ -22,16 +23,32 @@ def setup():
                                      --destdir='/usr/lib/python3.4/site-packages/' \
                                      --sip-incdir='/usr/include/python3.4m' \
                                      CFLAGS='%s' CXXFLAGS='%s'" % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3")
-                                     
+
+    shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR())
+    shelltools.system("python configure.py  --confirm-license \
+                                     --assume-shared \
+                                     --no-timestamp \
+                                     --qsci-api \
+                                     --destdir='/usr/lib/python2.7/site-packages/' \
+                                     --sip-incdir='/usr/include/python2.7' \
+                                     --sip /usr/bin/sip \
+                                     --qmake='/usr/lib/qt5/bin/qmake'")
     shelltools.system("find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'")
 
 def build():
     autotools.make()
+    shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR())
+    autotools.make()
 
 def install():
     autotools.rawInstall("-C pyrcc DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
     autotools.rawInstall("-C pylupdate DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
     autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
+    pisitools.rename("/usr/bin/pyuic5", "py3uic5")
+
+    shelltools.cd("%s/Py2Qt-gpl-5.4.2" % get.workDIR())
+    autotools.rawInstall("DESTDIR=%(DESTDIR)s INSTALL_ROOT=%(DESTDIR)s" % {'DESTDIR':get.installDIR()})
+    pisitools.rename("/usr/bin/pyuic5", "pyuic5")
+
     pisitools.dohtml("doc/html/*")
     pisitools.dodoc("NEWS", "README","LICENSE*")
-
diff --git a/programming/language/python/python-qt5/pspec.xml b/programming/language/python/python-qt5/pspec.xml
index 9cf891e27f..5fe4b4c370 100644
--- a/programming/language/python/python-qt5/pspec.xml
+++ b/programming/language/python/python-qt5/pspec.xml
@@ -1,6 +1,6 @@
 <PISI>
     <Source>
-        <Name>python3-qt5</Name>
+        <Name>python-qt5</Name>
         <Homepage>http://www.riverbankcomputing.co.uk/software/pyqt</Homepage>
         <Packager>
             <Name>Ayhan Yalçınsoy</Name>
@@ -37,28 +37,31 @@
     </Source>
 
     <Package>
-        <Name>python3-qt5-common</Name>
+        <Name>python-qt5-common</Name>
         <Summary>Common files shared between python-qt5 and python3-qt5</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
+            <Dependency>python</Dependency>
             <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-declarative</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/pylupdate5</Path>
             <Path fileType="executable">/usr/bin/pyrcc5</Path>
             <Path fileType="data">/usr/share/qt5/qsci/api</Path>
             <Path fileType="data">/usr/share/sip/PyQt5</Path>
+            <Path fileType="library">/usr/lib/qt5/plugins/PyQt5/libpyqt5qmlplugin.so</Path>
+            <Path fileType="library">/usr/lib/qt5/plugins/designer/libpyqt5.so</Path>
         </Files>
     </Package>
 
     <Package>
-        <Name>python3-qt5</Name>
-        <Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
+        <Name>python-qt5</Name>
+        <Summary>A set of Python 2.x bindings for the Qt 5.x Toolkit</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
             <Dependency>dbus</Dependency>
-            <Dependency>python3</Dependency>
-            <Dependency release="current">python3-qt5-common</Dependency>
+            <Dependency release="current">python-qt5-common</Dependency>
             <Dependency>qt5-base</Dependency>
             <Dependency>qt5-declarative</Dependency>
             <Dependency>qt5-sensors</Dependency>
@@ -70,8 +73,29 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/pyuic5</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>python3-qt5</Name>
+        <Summary>A set of Python 3.x bindings for the Qt 5.x Toolkit</Summary>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+            <Dependency>dbus</Dependency>
+            <Dependency release="current">python-qt5-common</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>qt5-sensors</Dependency>
+            <Dependency>qt5-serialport</Dependency>
+            <Dependency>qt5-svg</Dependency>
+            <Dependency>qt5-webkit</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>qt5-xmlpatterns</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin/py3uic5</Path>
             <Path fileType="library">/usr/lib/python3.4/site-packages</Path>
-            <Path fileType="library">/usr/lib/qt5/plugins</Path>
         </Files>
     </Package>