git » pyqt5.git » commit c8f140b

diff --git a/PKGBUILD b/PKGBUILD
index cd9ab1f..fb2aa31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,61 +6,50 @@
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt5
-pkgname=('python-pyqt5' 'python2-pyqt5')
+pkgname=('python-pyqt5')
+pkgdesc="A set of Python bindings for the Qt5 toolkit"
 pkgver=5.15.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://riverbankcomputing.com/software/pyqt/intro"
 license=('GPL')
-makedepends=('sip5' 'pyqt-builder' 'python2-sip-pyqt5' 'sip' 'python-opengl' 'python2-opengl' 'python2-enum34'
-             'python2-dbus' 'python-dbus' 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-speech' 'qt5-svg'
+groups=(pyqt5)
+depends=('python-pyqt5-sip' 'qt5-base')
+optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+            'python-dbus: for python-dbus mainloop support'
+            'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+            'qt5-tools: QtHelp, QtDesigner'
+            'qt5-svg: QtSvg'
+            'qt5-webkit: QtWebKit, QtWebKitWidgets'
+            'qt5-xmlpatterns: QtXmlPatterns'
+            'qt5-declarative: QtQml, qmlplugin'
+            'qt5-serialport: QtSerialPort'
+            'qt5-websockets: QtWebSockets'
+            'qt5-connectivity: QtNfc, QtBluetooth'
+            'qt5-x11extras: QtX11Extras'
+            'qt5-networkauth: QtNetworkAuth'
+            'qt5-remoteobjects: QtRemoteObjects'
+            'qt5-speech: QtTextToSpeech'
+            'qt5-quick3d: QtQuick3D')
+provides=(qt5-python-bindings)
+makedepends=('sip5' 'pyqt-builder' 'python-opengl' 'python-dbus'
+             'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-speech' 'qt5-svg'
              'qt5-webkit' 'qt5-websockets' 'qt5-x11extras' 'qt5-networkauth' 'qt5-xmlpatterns' 'qt5-remoteobjects' 'qt5-quick3d')
 conflicts=('pyqt5-common')
 source=("https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$pkgver.tar.gz")
 sha256sums=('d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1')
 
-prepare() {
-  cp -a PyQt5-$pkgver{,-py2}
-}
-
 build() {
-  cd "$srcdir"/PyQt5-$pkgver
+  cd PyQt5-$pkgver
   sip-build \
     --confirm-license \
     --no-make \
     --api-dir /usr/share/qt/qsci/api/python
   cd build
   make
-
-  cd "$srcdir"/PyQt5-$pkgver-py2
-  python2 configure.py \
-    --confirm-license \
-    --sip='/usr/bin/sip'
-  make
 }
 
 package_python-pyqt5(){
-  pkgdesc="A set of Python bindings for the Qt5 toolkit"
-  groups=(pyqt5)
-  depends=('python-pyqt5-sip' 'qt5-base')
-  optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort'
-              'qt5-websockets: QtWebSockets'
-              'qt5-connectivity: QtNfc, QtBluetooth'
-              'qt5-x11extras: QtX11Extras'
-              'qt5-networkauth: QtNetworkAuth'
-              'qt5-remoteobjects: QtRemoteObjects'
-              'qt5-speech: QtTextToSpeech'
-              'qt5-quick3d: QtQuick3D')
-  provides=(qt5-python-bindings)
-
   cd PyQt5-$pkgver/build
   make INSTALL_ROOT="$pkgdir" install -j1
 
@@ -71,43 +60,3 @@ package_python-pyqt5(){
   python -m compileall -d / "$pkgdir"/usr/lib
   python -O -m compileall -d / "$pkgdir"/usr/lib
 }
-
-package_python2-pyqt5(){
-  pkgdesc="A set of Python 2 bindings for the Qt5 toolkit"
-  depends=('python2-sip-pyqt5' 'qt5-base' 'python2-enum34')
-  optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'python-dbus: for python-dbus mainloop support'
-              'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
-              'qt5-tools: QtHelp, QtDesigner'
-              'qt5-svg: QtSvg'
-              'qt5-webkit: QtWebKit, QtWebKitWidgets'
-              'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin'
-              'qt5-serialport: QtSerialPort'
-              'qt5-websockets: QtWebSockets'
-              'qt5-connectivity: QtNfc, QtBluetooth'
-              'qt5-x11extras: QtX11Extras'
-              'qt5-networkauth: QtNetworkAuth'
-              'qt5-remoteobjects: QtRemoteObjects'
-              'qt5-speech: QtTextToSpeech'
-              'qt5-quick3d: QtQuick3D')
-
-  cd PyQt5-$pkgver-py2
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="$pkgdir" INSTALL_ROOT="$pkgdir" install -j1
-
-  # Remove unused py3 version of uic modules:
-  rm -r "$pkgdir"/usr/lib/python*/site-packages/PyQt5/uic/port_v3
-
-  # compile Python bytecode
-  python2 -m compileall -d / "$pkgdir"/usr/lib
-  python2 -O -m compileall -d / "$pkgdir"/usr/lib
-
-  # Fix conflicts with python-pyqt5
-  mv "$pkgdir"/usr/bin/{,python2-}pyuic5
-  mv "$pkgdir"/usr/bin/{,python2-}pylupdate5
-  mv "$pkgdir"/usr/bin/{,python2-}pyrcc5
-
-  rm "$pkgdir"/usr/lib/qt/plugins/designer/libpyqt5.so
-  rm "$pkgdir"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
-}