[PR PATCH] Drop python 2 pyqt5

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages drop-python-2-pyqt5
https://github.com/void-linux/void-packages/pull/25150

Drop python 2 pyqt5


A patch file from https://github.com/void-linux/void-packages/pull/25150.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-drop-python-2-pyqt5-25150.patch --]
[-- Type: text/x-diff, Size: 14146 bytes --]

From 0d5e3f994bff3915681b6e73044a947f901915e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Sep 2020 19:41:25 +0700
Subject: [PATCH 1/4] python-PyQt5-webengine: drop package

Last user: calibre moved to Python 3
---
 srcpkgs/python-PyQt5-webengine/template | 44 -------------------------
 srcpkgs/python-PyQt5-webengine/update   |  1 -
 2 files changed, 45 deletions(-)
 delete mode 100644 srcpkgs/python-PyQt5-webengine/template
 delete mode 100644 srcpkgs/python-PyQt5-webengine/update

diff --git a/srcpkgs/python-PyQt5-webengine/template b/srcpkgs/python-PyQt5-webengine/template
deleted file mode 100644
index 257a9e1387b..00000000000
--- a/srcpkgs/python-PyQt5-webengine/template
+++ /dev/null
@@ -1,44 +0,0 @@
-# Template file for 'python-PyQt5-webengine'
-pkgname=python-PyQt5-webengine
-version=5.15.0
-revision=1
-wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python python-PyQt5"
-makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
- qt5-webengine-devel python-devel python-PyQt5-devel"
-depends="python-PyQt5>=${version}_1 python-PyQt5-webchannel>=${version}_1"
-short_desc="Python2 bindings for the Qt5 toolkit - webengine module"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
-homepage="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
-distfiles="${PYPI_SITE}/P/PyQtWebEngine/PyQtWebEngine-${version}.tar.gz"
-checksum=670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75
-lib32disabled=yes
-nocross="configure script is broken for cross builds"
-
-case "$XBPS_TARGET_MACHINE" in
-	ppc64le*) ;;
-	ppc*) broken="no webengine for big endian ppc";;
-	arm*) broken="depends on qt5-webengine";;
-esac
-
-post_extract() {
-	rm -rf pyuic/uic/port_v3
-}
-
-do_configure() {
-	python2 configure.py \
-		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}"
-		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-	rm -rf ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/python-PyQt5-webengine/update b/srcpkgs/python-PyQt5-webengine/update
deleted file mode 100644
index 4e03873e2a7..00000000000
--- a/srcpkgs/python-PyQt5-webengine/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="PyQtWebEngine_gpl"

From 9476526e32b583cb8e3cb42c62fad16b669fe4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Sep 2020 20:02:01 +0700
Subject: [PATCH 2/4] krita: build with python3-PyQt5-devel

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index a3f5f8fbe16..df43b5b37b5 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,7 +1,7 @@
 # Template file for 'krita'
 pkgname=krita
 version=4.3.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config python3
@@ -12,7 +12,7 @@ makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
  boost-devel gsl-devel tiff-devel libjpeg-turbo-devel libraw-devel fftw-devel
  opencolorio-devel eigen exiv2-devel libXi-devel libopenexr-devel libgomp-devel
  poppler-qt5-devel giflib-devel python3-devel python3-sip-devel python3-PyQt5
- python-PyQt5-devel quazip-devel libheif-devel"
+ python3-PyQt5-devel quazip-devel libheif-devel"
 short_desc="Painting and image editing program"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"

From 169e15405fbc36ea059e3a324c491ddb1a1c9a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Sep 2020 20:03:47 +0700
Subject: [PATCH 3/4] python-Pillow: depends on python-tkinter

Since we're going to drop python-PyQt5
---
 srcpkgs/python-Pillow/INSTALL.msg                | 2 --
 srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg | 2 --
 srcpkgs/python-Pillow/template                   | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/python-Pillow/INSTALL.msg
 delete mode 100644 srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg

diff --git a/srcpkgs/python-Pillow/INSTALL.msg b/srcpkgs/python-Pillow/INSTALL.msg
deleted file mode 100644
index 256e374e98e..00000000000
--- a/srcpkgs/python-Pillow/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-To use the Tk image interface install python-tkinter.
-To use the Qt image interface install python-PyQt5.
diff --git a/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg b/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg
deleted file mode 100644
index 8ce8ed66afd..00000000000
--- a/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-To use the Tk image interface install python3-tkinter.
-To use the Qt image interface install python3-PyQt5.
diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index 1e36fc16e19..072f37b611b 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,13 +1,13 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
 version=6.2.2
-revision=2
+revision=3
 wrksrc="Pillow-${version}"
 build_style=python2-module
 hostmakedepends="python-setuptools"
 makedepends="python-devel libjpeg-turbo-devel libopenjpeg2-devel
  tiff-devel freetype-devel lcms2-devel libwebp-devel libimagequant-devel"
-depends="python"
+depends="python python-tkinter"
 short_desc="Python Imaging Library (PIL) fork for Python2"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="custom:PIL"

From 8fead4d43742ea43a68e570d315f6a6f153feaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Sep 2020 20:05:40 +0700
Subject: [PATCH 4/4] python-PyQt5: drop package

---
 srcpkgs/python-PyQt5/template | 250 ----------------------------------
 srcpkgs/python-PyQt5/update   |   1 -
 2 files changed, 251 deletions(-)
 delete mode 100644 srcpkgs/python-PyQt5/template
 delete mode 100644 srcpkgs/python-PyQt5/update

diff --git a/srcpkgs/python-PyQt5/template b/srcpkgs/python-PyQt5/template
deleted file mode 100644
index 3848b368a05..00000000000
--- a/srcpkgs/python-PyQt5/template
+++ /dev/null
@@ -1,250 +0,0 @@
-# Template file for 'python-PyQt5'
-pkgname=python-PyQt5
-version=5.15.0
-revision=1
-_sipver=4.19.23
-wrksrc="PyQt5-${version}"
-hostmakedepends="pkg-config
- python-devel python-sip-devel python-dbus-devel qt5
- qt5-devel qt5-tools-devel qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
- qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
- qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
- qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel
- python-enum34"
-makedepends="${hostmakedepends/pkg-config/}"
-depends="python-sip-PyQt5>=${_sipver} python-enum34"
-short_desc="Python 2 bindings for the Qt5 toolkit"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-only"
-homepage="https://riverbankcomputing.com/software/pyqt/intro"
-distfiles="${PYPI_SITE}/P/PyQt5/PyQt5-${version}.tar.gz"
-checksum=c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9
-lib32disabled=yes
-
-post_extract() {
-	rm -rf pyuic/uic/port_v3
-}
-
-do_configure() {
-	local _sysroot= _configuration= qt_version
-	if [ "$CROSS_BUILD" ]; then
-		qt_version=$(qmake -query QT_VERSION)
-		_sysroot="--sysroot $XBPS_CROSS_BASE"
-		_configuration="--configuration $wrksrc/pyqt5_${XBPS_CROSS_TRIPLET}.cfg"
-		cat >pyqt5_${XBPS_CROSS_TRIPLET}.cfg <<EOF
-py_platform = linux
-py_inc_dir = %(sysroot)/usr/include/python%(py_major).%(py_minor)
-py_pyshlib = python%(py_major).%(py_minor).so
-pyqt_disabled_features = PyQt_Desktop_OpenGL
-
-qt_shared = True
-
-[Qt ${qt_version}]
-# _QOpenGLFunctions_ES2 doesn't work
-pyqt_modules = QtCore QtGui QtHelp QtMultimedia
- QtMultimediaWidgets QtNetwork QtOpenGL QtPrintSupport QtQml QtQuick
- QtSql QtSvg QtTest QtWebKit QtWebKitWidgets QtWidgets QtXml
- QtXmlPatterns QtDesigner QtDBus QtSensors QtSerialPort
- QtX11Extras QtBluetooth QtPositioning QtQuickWidgets QtWebSockets
- QtWebChannel QtLocation QtNfc QtNetworkAuth
-EOF
-	fi
-
-	python2 configure.py --confirm-license --assume-shared \
-		$_sysroot $_configuration \
-		QMAKE_CC="${CC}" QMAKE_CFLAGS="${CFLAGS}" \
-		QMAKE_CXX="${CXX}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
-		QMAKE_LFLAGS="${LDFLAGS}" QMAKE_STRIP=""
-
-	if [ "$CROSS_BUILD" ]; then
-		# Fix location of libraries
-		find . -name Makefile |
-		xargs sed -i -E "s|(/usr/lib/libQt5[^ ]+so)|${XBPS_CROSS_BASE}\1|g"
-	fi
-}
-
-do_build() {
-	make ${makejobs}
-}
-
-do_install() {
-	# install python-pyqt5
-	make DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
-	for f in pylupdate5 pyrcc5 pyuic5; do
-		sed -i 's,/usr/bin/python2.7,/usr/bin/python2,' ${DESTDIR}/usr/bin/${f}
-		mv ${DESTDIR}/usr/bin/{,python2-}${f}
-	done
-}
-
-python-PyQt5-devel-tools_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - development tools"
-	alternatives="
-	 pyqt5:pylupdate5:/usr/bin/python2-pylupdate5
-	 pyqt5:pyrcc5:/usr/bin/python2-pyrcc5
-	 pyqt5:pyuic5:/usr/bin/python2-pyuic5"
-	pkg_install() {
-		vmove usr/bin/python2-*
-		vmove ${py2_sitelib}/PyQt5/pylupdate.so
-		vmove ${py2_sitelib}/PyQt5/pylupdate_main.py
-		vmove ${py2_sitelib}/PyQt5/pyrcc.so
-		vmove ${py2_sitelib}/PyQt5/pyrcc_main.py
-	}
-}
-python-PyQt5-devel_package() {
-	depends="python-sip-devel python-PyQt5-${version}_${revision}"
-	short_desc+=" - development files"
-	conflicts="python3-PyQt5-devel>=0"
-	pkg_install() {
-		vmove usr/share/sip
-	}
-}
-python-PyQt5-dbus_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision} python-dbus"
-	short_desc+=" - dbus support"
-	pkg_install() {
-		vmove ${py2_sitelib}/dbus/mainloop/pyqt5.so
-	}
-}
-python-PyQt5-connectivity_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - connectivity module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtBluetooth.so
-		vmove ${py2_sitelib}/PyQt5/QtNfc.so
-	}
-}
-python-PyQt5-multimedia_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - multimedia module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtMultimedia.so
-		vmove ${py2_sitelib}/PyQt5/QtMultimediaWidgets.so
-	}
-}
-python-PyQt5-networkauth_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision} python-enum34"
-	short_desc+=" - networkauth module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtNetworkAuth.so
-	}
-}
-python-PyQt5-opengl_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - opengl module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtOpenGL.so
-		if [ -z "$CROSS_BUILD" ]; then
-			vmove ${py2_sitelib}/PyQt5/_QOpenGLFunctions_*.so
-		fi
-	}
-
-}
-python-PyQt5-location_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - location module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtLocation.so
-		vmove ${py2_sitelib}/PyQt5/QtPositioning.so
-	}
-}
-python-PyQt5-quick_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - quick module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtQml.so
-		vmove ${py2_sitelib}/PyQt5/QtQuick.so
-		vmove ${py2_sitelib}/PyQt5/QtQuickWidgets.so
-	}
-}
-python-PyQt5-sensors_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - sensors module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtSensors.so
-	}
-}
-python-PyQt5-serialport_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - serialport module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtSerialPort.so
-	}
-}
-python-PyQt5-sql_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - sql module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtSql.so
-	}
-}
-python-PyQt5-svg_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - svg module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtSvg.so
-	}
-}
-python-PyQt5-tools_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - designer, help modules"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtHelp.so
-		vmove ${py2_sitelib}/PyQt5/QtDesigner.so
-	}
-}
-python-PyQt5-webchannel_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - webchannel module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtWebChannel.so
-	}
-}
-python-PyQt5-webkit_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - webkit module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtWebKit.so
-		vmove ${py2_sitelib}/PyQt5/QtWebKitWidgets.so
-	}
-}
-python-PyQt5-websockets_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - websockets module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtWebSockets.so
-	}
-}
-python-PyQt5-x11extras_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - x11extras module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtX11Extras.so
-	}
-}
-python-PyQt5-xmlpatterns_package() {
-	lib32disabled=yes
-	depends="${sourcepkg}-${version}_${revision}"
-	short_desc+=" - xmlpatterns module"
-	pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/QtXmlPatterns.so
-	}
-}
diff --git a/srcpkgs/python-PyQt5/update b/srcpkgs/python-PyQt5/update
deleted file mode 100644
index a0fae38330c..00000000000
--- a/srcpkgs/python-PyQt5/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="PyQt5_gpl"