From 0050d05ced1f55867738b067f2107dfa8839e952 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 1/2] 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 ed15ca21cb9b39c7d2cd85ca2b142cc8989f09da 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 2/2] python-PyQt5: drop package

---
 srcpkgs/python-PyQt5-connectivity |   1 -
 srcpkgs/python-PyQt5-dbus         |   1 -
 srcpkgs/python-PyQt5-devel        |   1 -
 srcpkgs/python-PyQt5-devel-tools  |   1 -
 srcpkgs/python-PyQt5-location     |   1 -
 srcpkgs/python-PyQt5-multimedia   |   1 -
 srcpkgs/python-PyQt5-networkauth  |   1 -
 srcpkgs/python-PyQt5-opengl       |   1 -
 srcpkgs/python-PyQt5-quick        |   1 -
 srcpkgs/python-PyQt5-sensors      |   1 -
 srcpkgs/python-PyQt5-serialport   |   1 -
 srcpkgs/python-PyQt5-sql          |   1 -
 srcpkgs/python-PyQt5-svg          |   1 -
 srcpkgs/python-PyQt5-tools        |   1 -
 srcpkgs/python-PyQt5-webchannel   |   1 -
 srcpkgs/python-PyQt5-webkit       |   1 -
 srcpkgs/python-PyQt5-websockets   |   1 -
 srcpkgs/python-PyQt5-x11extras    |   1 -
 srcpkgs/python-PyQt5-xmlpatterns  |   1 -
 srcpkgs/python-PyQt5/template     | 250 ------------------------------
 srcpkgs/python-PyQt5/update       |   1 -
 21 files changed, 270 deletions(-)
 delete mode 120000 srcpkgs/python-PyQt5-connectivity
 delete mode 120000 srcpkgs/python-PyQt5-dbus
 delete mode 120000 srcpkgs/python-PyQt5-devel
 delete mode 120000 srcpkgs/python-PyQt5-devel-tools
 delete mode 120000 srcpkgs/python-PyQt5-location
 delete mode 120000 srcpkgs/python-PyQt5-multimedia
 delete mode 120000 srcpkgs/python-PyQt5-networkauth
 delete mode 120000 srcpkgs/python-PyQt5-opengl
 delete mode 120000 srcpkgs/python-PyQt5-quick
 delete mode 120000 srcpkgs/python-PyQt5-sensors
 delete mode 120000 srcpkgs/python-PyQt5-serialport
 delete mode 120000 srcpkgs/python-PyQt5-sql
 delete mode 120000 srcpkgs/python-PyQt5-svg
 delete mode 120000 srcpkgs/python-PyQt5-tools
 delete mode 120000 srcpkgs/python-PyQt5-webchannel
 delete mode 120000 srcpkgs/python-PyQt5-webkit
 delete mode 120000 srcpkgs/python-PyQt5-websockets
 delete mode 120000 srcpkgs/python-PyQt5-x11extras
 delete mode 120000 srcpkgs/python-PyQt5-xmlpatterns
 delete mode 100644 srcpkgs/python-PyQt5/template
 delete mode 100644 srcpkgs/python-PyQt5/update

diff --git a/srcpkgs/python-PyQt5-connectivity b/srcpkgs/python-PyQt5-connectivity
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-connectivity
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-dbus b/srcpkgs/python-PyQt5-dbus
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-dbus
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-devel b/srcpkgs/python-PyQt5-devel
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-devel-tools b/srcpkgs/python-PyQt5-devel-tools
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-devel-tools
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-location b/srcpkgs/python-PyQt5-location
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-location
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-multimedia b/srcpkgs/python-PyQt5-multimedia
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-multimedia
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-networkauth b/srcpkgs/python-PyQt5-networkauth
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-networkauth
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-opengl b/srcpkgs/python-PyQt5-opengl
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-opengl
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-quick b/srcpkgs/python-PyQt5-quick
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-quick
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-sensors b/srcpkgs/python-PyQt5-sensors
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-sensors
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-serialport b/srcpkgs/python-PyQt5-serialport
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-serialport
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-sql b/srcpkgs/python-PyQt5-sql
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-sql
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-svg b/srcpkgs/python-PyQt5-svg
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-svg
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-tools b/srcpkgs/python-PyQt5-tools
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-tools
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-webchannel b/srcpkgs/python-PyQt5-webchannel
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-webchannel
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-webkit b/srcpkgs/python-PyQt5-webkit
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-webkit
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-websockets b/srcpkgs/python-PyQt5-websockets
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-websockets
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-x11extras b/srcpkgs/python-PyQt5-x11extras
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-x11extras
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
diff --git a/srcpkgs/python-PyQt5-xmlpatterns b/srcpkgs/python-PyQt5-xmlpatterns
deleted file mode 120000
index 7e24798936c..00000000000
--- a/srcpkgs/python-PyQt5-xmlpatterns
+++ /dev/null
@@ -1 +0,0 @@
-python-PyQt5
\ No newline at end of file
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"