* [PR PATCH] Drop python 2 pyqt5
@ 2020-09-28 13:09 sgn
2020-09-28 14:42 ` ericonr
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: sgn @ 2020-09-28 13:09 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
@ 2020-09-28 14:42 ` ericonr
2020-09-28 14:47 ` [PR PATCH] [Updated] " sgn
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-09-28 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25150#issuecomment-700051980
Comment:
I think this is still missing a lot of symlinks from `python-PyQt5`.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
2020-09-28 14:42 ` ericonr
@ 2020-09-28 14:47 ` sgn
2020-09-28 15:04 ` sgn
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-28 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 20397 bytes --]
From e7ccbf6d4b9c70d1e962b3757e7cf052d5df3204 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 8a1ebd1b48e4e788fbf31ebfba6ff4db28cca2e1 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 605a4603cc9970f8ceeb95308ac6bfcdaac9bf27 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 3b2cbf626a3095953aced024a7ba787316ec717f 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-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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
2020-09-28 14:42 ` ericonr
2020-09-28 14:47 ` [PR PATCH] [Updated] " sgn
@ 2020-09-28 15:04 ` sgn
2020-09-28 17:12 ` sgn
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-28 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 15716 bytes --]
From 8f7d0059cf71b4acc98eb031cb8e2f42fc2968ed 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 1/3] krita: build with python3-PyQt5-devel
---
srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch | 34 ++++++++++++++
srcpkgs/krita/patches/sip5.patch | 47 +++++++++++++++++++
srcpkgs/krita/template | 6 +--
3 files changed, 84 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch
create mode 100644 srcpkgs/krita/patches/sip5.patch
diff --git a/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch b/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch
new file mode 100644
index 00000000000..f9aa4e4a6f8
--- /dev/null
+++ b/srcpkgs/krita/patches/pyqt_sip_dir-sip5.patch
@@ -0,0 +1,34 @@
+From c3cba340cfca43f216522464de5fd6f3e060718b Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Sat, 4 Jul 2020 13:01:27 +0300
+Subject: [PATCH] Update pyqt_sip_dir for pyqt5 compiled with sip5
+
+---
+ https://github.com/KDE/krita/commit/c3cba340cfca43f216522464de5fd6f3e060718b
+ cmake/modules/FindPyQt5.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git cmake/modules/FindPyQt5.py cmake/modules/FindPyQt5.py
+index e0ef9d7bdb..e138ad3107 100644
+--- cmake/modules/FindPyQt5.py
++++ cmake/modules/FindPyQt5.py
+@@ -4,6 +4,7 @@
+
+ import sys
+ import os
++from distutils.sysconfig import get_python_lib
+
+ try:
+ # On Windows and Python 3.8+ python doesn't load module DLL's
+@@ -40,8 +41,9 @@
+ except ValueError:
+ pass
+
+-# FIXME This next line is just a little bit too crude.
+-pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
++pyqt_sip_dir = os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings")
++if not os.path.exists(pyqt_sip_dir): # Fallback for older PyQt5/SIP
++ pyqt_sip_dir = os.path.join(sys.prefix, "share", "sip", "PyQt5")
+ print("pyqt_sip_dir:%s" % pyqt_sip_dir)
+
+ print("pyqt_sip_flags:%s" % PyQt5.QtCore.PYQT_CONFIGURATION["sip_flags"])
diff --git a/srcpkgs/krita/patches/sip5.patch b/srcpkgs/krita/patches/sip5.patch
new file mode 100644
index 00000000000..f3143151a25
--- /dev/null
+++ b/srcpkgs/krita/patches/sip5.patch
@@ -0,0 +1,47 @@
+From 91b31ace2ef8bc0792cdef3aa351f6d835baf254 Mon Sep 17 00:00:00 2001
+From: Dmitry Shachnev <mitya57@gmail.com>
+Date: Fri, 24 Jul 2020 20:18:13 +0300
+Subject: [PATCH] Make FindSIP.py compatible with SIP v5
+
+---
+ cmake/modules/FindSIP.py | 30 +++++++++++++++++++++---------
+ 1 file changed, 21 insertions(+), 9 deletions(-)
+
+diff --git cmake/modules/FindSIP.py cmake/modules/FindSIP.py
+index ecb734f2cc..9fb032f8e5 100644
+--- cmake/modules/FindSIP.py
++++ cmake/modules/FindSIP.py
+@@ -4,12 +4,24 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+-import sys
+-import sipconfig
+-
+-sipcfg = sipconfig.Configuration()
+-print("sip_version:%06.0x" % sipcfg.sip_version)
+-print("sip_version_str:%s" % sipcfg.sip_version_str)
+-print("sip_bin:%s" % sipcfg.sip_bin)
+-print("default_sip_dir:%s" % sipcfg.default_sip_dir)
+-print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
++try:
++ import sipbuild
++except ImportError: # Code for SIP v4
++ import sipconfig
++
++ sipcfg = sipconfig.Configuration()
++ print("sip_version:%06.0x" % sipcfg.sip_version)
++ print("sip_version_str:%s" % sipcfg.sip_version_str)
++ print("sip_bin:%s" % sipcfg.sip_bin)
++ print("default_sip_dir:%s" % sipcfg.default_sip_dir)
++ print("sip_inc_dir:%s" % sipcfg.sip_inc_dir)
++else: # Code for SIP v5
++ print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
++ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
++
++ import shutil
++ print("sip_bin:%s" % shutil.which("sip5"))
++
++ from distutils.sysconfig import get_python_lib
++ python_modules_dir = get_python_lib(plat_specific=1)
++ print("default_sip_dir:%s" % python_modules_dir)
diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index a3f5f8fbe16..5891183d8c8 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,10 +1,10 @@
# 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
+hostmakedepends="extra-cmake-modules gettext pkg-config python3 sip5
qt5-qmake qt5-host-tools kcoreaddons"
makedepends="karchive-devel kconfig-devel kwidgetsaddons-devel kcompletion-devel
kcoreaddons-devel kguiaddons-devel ki18n-devel kitemmodels-devel kitemviews-devel
@@ -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 791e1494938bda592e0e1fb155da540980402dc3 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 2/3] 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 a3d850be74206526be19fe29de0ed596fd41ba2b 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 3/3] 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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (2 preceding siblings ...)
2020-09-28 15:04 ` sgn
@ 2020-09-28 17:12 ` sgn
2020-09-30 13:58 ` sgn
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-28 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 17912 bytes --]
From 89ddc68ee8d3e17641b0890e6778e0bafe9ac5b6 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 1/3] 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 79e6b894dfec7c83a8d723dc96c826f10724c6a1 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 2/3] 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 b702e3d406f7f7f23dd5aecb2611dc53d830a65e 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 3/3] 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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (3 preceding siblings ...)
2020-09-28 17:12 ` sgn
@ 2020-09-30 13:58 ` sgn
2020-09-30 14:00 ` [PR PATCH] [Updated] " sgn
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-30 13:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/25150#issuecomment-701408337
Comment:
Wait for #25181
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (4 preceding siblings ...)
2020-09-30 13:58 ` sgn
@ 2020-09-30 14:00 ` sgn
2020-09-30 14:14 ` sgn
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-30 14:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 16627 bytes --]
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"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (5 preceding siblings ...)
2020-09-30 14:00 ` [PR PATCH] [Updated] " sgn
@ 2020-09-30 14:14 ` sgn
2020-09-30 15:02 ` [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages sgn
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-30 14:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 115924 bytes --]
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 01/38] 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 02/38] 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"
From e5b354130735fa4ebf1339a9f7452ec30e997a35 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 22:17:26 +0700
Subject: [PATCH 03/38] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From b2be119dea2b1c5a1290ac8bddcf7552cfb0e4c4 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 22:19:02 +0700
Subject: [PATCH 04/38] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 7bc0d2e0f0e0ce3d39259ac696b5fdb34885326e 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 22:27:20 +0700
Subject: [PATCH 05/38] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From 550f11b92a6aedcb911da1c286a93900539973fe 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 22:35:47 +0700
Subject: [PATCH 06/38] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From de2e8aebd39e0d419e1b5a1804ac8ededaa176ad 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 22:36:41 +0700
Subject: [PATCH 07/38] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 39b7335ea9d3aa87a0a49c1158668d934b8ce2f5 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 22:40:45 +0700
Subject: [PATCH 08/38] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From 4957d65e89eb61809ab9adfaef87b7f6a873d799 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 22:41:28 +0700
Subject: [PATCH 09/38] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From 7bb1fe64e635cad113812f6c86c10aa871621b29 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 22:42:25 +0700
Subject: [PATCH 10/38] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 287d53b5bf6976be4384792a5cf60c115e05c5e4 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 22:43:42 +0700
Subject: [PATCH 11/38] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From a2f138e394321ac93ad3748117db17cb461cd94b 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 22:45:13 +0700
Subject: [PATCH 12/38] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From 23d16960819606cf3c00f7879d6e19142eac636c 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 22:49:05 +0700
Subject: [PATCH 13/38] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From a664ffd91863f57cb315026edf1d53ecfc4a4f92 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 22:58:18 +0700
Subject: [PATCH 14/38] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From dd6c34613fae764f02af888ec33dd1c0e8032852 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 23:01:19 +0700
Subject: [PATCH 15/38] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 192383e01a563ea46a545976340cb761a7978945 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 23:01:56 +0700
Subject: [PATCH 16/38] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..16bbe6b64b5
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/html5lib/html5lib-python"
+license="MIT"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From f8b1c744118c03acdd1e8d00d4ae58df797922b3 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 23:07:49 +0700
Subject: [PATCH 17/38] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..6ba2997de4c
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/gsnedders/python-webencodings"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
+checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
From bd9695e1ca53aab9cc112114697866a41953d691 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 23:08:58 +0700
Subject: [PATCH 18/38] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 647770f80fdb85caea966c8b6cd5a789037d64d8 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 23:10:42 +0700
Subject: [PATCH 19/38] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From a756adb025c79c919fbf136ba2ddf78d9b7ae8e1 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 23:12:46 +0700
Subject: [PATCH 20/38] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From afcecec0b2915168e7fe8e5e00a9fe10c5db76ff 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 23:15:25 +0700
Subject: [PATCH 21/38] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From 3bd1c486f07b045e59b26570620d556bb4156bad 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 23:15:52 +0700
Subject: [PATCH 22/38] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From 77581e0d0a5ab979036d49dcfc1460895c4766c6 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 23:16:45 +0700
Subject: [PATCH 23/38] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From a694a8b2698abb53a094af0a054c6d802867fbd3 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 23:18:15 +0700
Subject: [PATCH 24/38] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 8ba47cf7f01ff7fa81eff7cc3f564baef35fdd59 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 23:19:28 +0700
Subject: [PATCH 25/38] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..0c469431639
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="python-snappy"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 6010b987f9dc99625319a472b1f16bcb592e2b59 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 23:36:11 +0700
Subject: [PATCH 26/38] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From e5aee1dafb3cd10ae3f22aacdd8146a023aca51c 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 23:41:22 +0700
Subject: [PATCH 27/38] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From 3515e28859896b7f6f5897a97885ff5553fc6570 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 23:42:09 +0700
Subject: [PATCH 28/38] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..0b80d983549
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From 192bfd0c959a35bedc415c7a138d59231cbe8c6a 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 23:43:15 +0700
Subject: [PATCH 29/38] python-ruamel.yaml: drop package
---
srcpkgs/python-ruamel.yaml/template | 28 ----------------------------
srcpkgs/python3-ruamel.yaml | 1 -
srcpkgs/python3-ruamel.yaml/template | 23 +++++++++++++++++++++++
3 files changed, 23 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-ruamel.yaml/template
delete mode 120000 srcpkgs/python3-ruamel.yaml
create mode 100644 srcpkgs/python3-ruamel.yaml/template
diff --git a/srcpkgs/python-ruamel.yaml/template b/srcpkgs/python-ruamel.yaml/template
deleted file mode 100644
index f5ad8979ef0..00000000000
--- a/srcpkgs/python-ruamel.yaml/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-ruamel.yaml'
-pkgname=python-ruamel.yaml
-version=0.16.9
-revision=1
-wrksrc="ruamel.yaml-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="YAML parser/emitter in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://bitbucket.org/ruamel/yaml"
-changelog="https://bitbucket.org/ruamel/yaml/raw/default/CHANGES"
-distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz"
-checksum=ee3264b83c3309b4ae7978afa185da6a1d278e3abc9fb942f1a0b57c622092f8
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-ruamel.yaml_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-ruamel.yaml.clib"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-ruamel.yaml b/srcpkgs/python3-ruamel.yaml
deleted file mode 120000
index 6fd88536619..00000000000
--- a/srcpkgs/python3-ruamel.yaml
+++ /dev/null
@@ -1 +0,0 @@
-python-ruamel.yaml
\ No newline at end of file
diff --git a/srcpkgs/python3-ruamel.yaml/template b/srcpkgs/python3-ruamel.yaml/template
new file mode 100644
index 00000000000..23928648025
--- /dev/null
+++ b/srcpkgs/python3-ruamel.yaml/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-ruamel.yaml'
+pkgname=python3-ruamel.yaml
+version=0.16.9
+revision=2
+wrksrc="ruamel.yaml-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="YAML parser/emitter in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://bitbucket.org/ruamel/yaml"
+changelog="https://bitbucket.org/ruamel/yaml/raw/default/CHANGES"
+distfiles="${PYPI_SITE}/r/ruamel.yaml/ruamel.yaml-${version}.tar.gz"
+checksum=ee3264b83c3309b4ae7978afa185da6a1d278e3abc9fb942f1a0b57c622092f8
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 2ce03f994b966ce26325c34475f63bdf74cd59fd 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 23:52:31 +0700
Subject: [PATCH 30/38] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From c267005f3aea343bf1e8b04d96771da26a184524 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 23:55:16 +0700
Subject: [PATCH 31/38] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 20e4b2788bb0bb2e91d90a56c1d5792c9cecf4a8 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 23:55:53 +0700
Subject: [PATCH 32/38] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From 1f05b8e4fef27b7427e408c4e5f7e7f4e6f03ec2 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 23:56:08 +0700
Subject: [PATCH 33/38] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..57fd8bfe7c7
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/eliben/pyelftools"
+license="Public Domain"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From 02c8fb0605728fd84dc28c59732fc63764608c87 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 34/38] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 650347b2a4cc47080545958a86f35af8c4229a64 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 35/38] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 051d85984cc6d124e1313047142ba856f965e68d 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 36/38] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From 7808a8a904df12983786a6bcd7ddfc6d1c17bdc7 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 37/38] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From b8bf56ca5c2cb503c1a67cf07ded8f61f9156a38 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 38/38] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (6 preceding siblings ...)
2020-09-30 14:14 ` sgn
@ 2020-09-30 15:02 ` sgn
2020-09-30 15:23 ` sgn
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-30 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There is an updated 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 and related packages.
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: 117020 bytes --]
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 01/39] 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 02/39] 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"
From e5b354130735fa4ebf1339a9f7452ec30e997a35 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 22:17:26 +0700
Subject: [PATCH 03/39] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From b2be119dea2b1c5a1290ac8bddcf7552cfb0e4c4 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 22:19:02 +0700
Subject: [PATCH 04/39] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 7bc0d2e0f0e0ce3d39259ac696b5fdb34885326e 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 22:27:20 +0700
Subject: [PATCH 05/39] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From 550f11b92a6aedcb911da1c286a93900539973fe 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 22:35:47 +0700
Subject: [PATCH 06/39] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From de2e8aebd39e0d419e1b5a1804ac8ededaa176ad 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 22:36:41 +0700
Subject: [PATCH 07/39] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 39b7335ea9d3aa87a0a49c1158668d934b8ce2f5 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 22:40:45 +0700
Subject: [PATCH 08/39] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From 4957d65e89eb61809ab9adfaef87b7f6a873d799 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 22:41:28 +0700
Subject: [PATCH 09/39] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From 7bb1fe64e635cad113812f6c86c10aa871621b29 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 22:42:25 +0700
Subject: [PATCH 10/39] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 287d53b5bf6976be4384792a5cf60c115e05c5e4 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 22:43:42 +0700
Subject: [PATCH 11/39] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From a2f138e394321ac93ad3748117db17cb461cd94b 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 22:45:13 +0700
Subject: [PATCH 12/39] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From 23d16960819606cf3c00f7879d6e19142eac636c 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 22:49:05 +0700
Subject: [PATCH 13/39] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From a664ffd91863f57cb315026edf1d53ecfc4a4f92 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 22:58:18 +0700
Subject: [PATCH 14/39] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From dd6c34613fae764f02af888ec33dd1c0e8032852 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 23:01:19 +0700
Subject: [PATCH 15/39] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 192383e01a563ea46a545976340cb761a7978945 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 23:01:56 +0700
Subject: [PATCH 16/39] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..16bbe6b64b5
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/html5lib/html5lib-python"
+license="MIT"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From f8b1c744118c03acdd1e8d00d4ae58df797922b3 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 23:07:49 +0700
Subject: [PATCH 17/39] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..6ba2997de4c
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/gsnedders/python-webencodings"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
+checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
From bd9695e1ca53aab9cc112114697866a41953d691 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 23:08:58 +0700
Subject: [PATCH 18/39] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 647770f80fdb85caea966c8b6cd5a789037d64d8 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 23:10:42 +0700
Subject: [PATCH 19/39] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From a756adb025c79c919fbf136ba2ddf78d9b7ae8e1 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 23:12:46 +0700
Subject: [PATCH 20/39] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From afcecec0b2915168e7fe8e5e00a9fe10c5db76ff 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 23:15:25 +0700
Subject: [PATCH 21/39] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From 3bd1c486f07b045e59b26570620d556bb4156bad 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 23:15:52 +0700
Subject: [PATCH 22/39] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From 77581e0d0a5ab979036d49dcfc1460895c4766c6 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 23:16:45 +0700
Subject: [PATCH 23/39] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From a694a8b2698abb53a094af0a054c6d802867fbd3 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 23:18:15 +0700
Subject: [PATCH 24/39] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 8ba47cf7f01ff7fa81eff7cc3f564baef35fdd59 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 23:19:28 +0700
Subject: [PATCH 25/39] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..0c469431639
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="python-snappy"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 6010b987f9dc99625319a472b1f16bcb592e2b59 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 23:36:11 +0700
Subject: [PATCH 26/39] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From e5aee1dafb3cd10ae3f22aacdd8146a023aca51c 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 23:41:22 +0700
Subject: [PATCH 27/39] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From 3515e28859896b7f6f5897a97885ff5553fc6570 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 23:42:09 +0700
Subject: [PATCH 28/39] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..0b80d983549
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From fbd1743183b691f706361d50cc36f411d384d3f1 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 23:52:31 +0700
Subject: [PATCH 29/39] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From 82ed8974bbd16c1bc231ad5315dc082786d54dc2 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 23:55:16 +0700
Subject: [PATCH 30/39] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 8cc0b5b5f88f6dd61630bdb2038e96cbb53b79f6 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 23:55:53 +0700
Subject: [PATCH 31/39] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From f54a87561291fabfb6b36c05199442879eeedcac 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 23:56:08 +0700
Subject: [PATCH 32/39] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..57fd8bfe7c7
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/eliben/pyelftools"
+license="Public Domain"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From 4158f20d7b1e0eaedf732e6a808e5727d9198a8a 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 33/39] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 382251791bdd836571b8827ecb54f0aa24a2852f 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 34/39] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From bc0c447b500f07b8d707e9ebc20141b16eb52bde 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 35/39] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From ba6afa75cdc0cf59773a344831cbc1d1a497fac8 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 36/39] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From a9a29726251867bb81df6b6a40ecc6b7cead09b7 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 37/39] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
From 0ac7f0c918708e6b59dc4b9c0027c8adc61cd463 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: Wed, 30 Sep 2020 21:16:16 +0700
Subject: [PATCH 38/39] python3-pafy: drop noarch
Also drop python 2 transitional package.
---
srcpkgs/python3-pafy/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 8d3fafaf789..1165626f76e 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,8 +1,7 @@
# Template file for 'python3-pafy'
pkgname=python3-pafy
version=0.5.5
-revision=1
-archs=noarch
+revision=2
wrksrc="pafy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools youtube-dl"
@@ -13,9 +12,3 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/mps-youtube/pafy"
distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
checksum=3b878d319dc63be2f2a84aca5df4ee08baf7256d26e61c94d92b6165b965994f
-
-python-pafy_package() {
- depends="python3-pafy"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From a1ce872984b769091b73501bb965fa21fb693fd5 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: Wed, 30 Sep 2020 21:18:51 +0700
Subject: [PATCH 39/39] python-numexpr: drop package
---
srcpkgs/python-numexpr/template | 30 ------------------------------
srcpkgs/python3-numexpr | 1 -
srcpkgs/python3-numexpr/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-numexpr/template
delete mode 120000 srcpkgs/python3-numexpr
create mode 100644 srcpkgs/python3-numexpr/template
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
deleted file mode 100644
index baf91175a33..00000000000
--- a/srcpkgs/python-numexpr/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-numexpr'
-pkgname=python-numexpr
-version=2.7.0
-revision=2
-wrksrc="numexpr-${version}"
-build_style=python-module
-pycompile_module="numexpr"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Fast numerical expression evaluator for NumPy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/pydata/numexpr"
-distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-numexpr_package() {
- depends="python3-numpy"
- pycompile_module="numexpr"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-numexpr b/srcpkgs/python3-numexpr
deleted file mode 120000
index cab9d2a5293..00000000000
--- a/srcpkgs/python3-numexpr
+++ /dev/null
@@ -1 +0,0 @@
-python-numexpr
\ No newline at end of file
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
new file mode 100644
index 00000000000..066e9648dec
--- /dev/null
+++ b/srcpkgs/python3-numexpr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-numexpr'
+pkgname=python3-numexpr
+version=2.7.0
+revision=3
+wrksrc="numexpr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Fast numerical expression evaluator for NumPy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pydata/numexpr"
+distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
+
+post_install() {
+ vlicense LICENSE.txt
+}
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (7 preceding siblings ...)
2020-09-30 15:02 ` [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages sgn
@ 2020-09-30 15:23 ` sgn
2020-10-01 0:32 ` sgn
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-09-30 15:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There is an updated 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 and related packages.
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: 144113 bytes --]
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 01/51] 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 02/51] 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"
From e5b354130735fa4ebf1339a9f7452ec30e997a35 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 22:17:26 +0700
Subject: [PATCH 03/51] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From b2be119dea2b1c5a1290ac8bddcf7552cfb0e4c4 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 22:19:02 +0700
Subject: [PATCH 04/51] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 7bc0d2e0f0e0ce3d39259ac696b5fdb34885326e 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 22:27:20 +0700
Subject: [PATCH 05/51] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From 550f11b92a6aedcb911da1c286a93900539973fe 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 22:35:47 +0700
Subject: [PATCH 06/51] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From de2e8aebd39e0d419e1b5a1804ac8ededaa176ad 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 22:36:41 +0700
Subject: [PATCH 07/51] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 39b7335ea9d3aa87a0a49c1158668d934b8ce2f5 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 22:40:45 +0700
Subject: [PATCH 08/51] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From 4957d65e89eb61809ab9adfaef87b7f6a873d799 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 22:41:28 +0700
Subject: [PATCH 09/51] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From 7bb1fe64e635cad113812f6c86c10aa871621b29 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 22:42:25 +0700
Subject: [PATCH 10/51] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 287d53b5bf6976be4384792a5cf60c115e05c5e4 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 22:43:42 +0700
Subject: [PATCH 11/51] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From a2f138e394321ac93ad3748117db17cb461cd94b 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 22:45:13 +0700
Subject: [PATCH 12/51] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From 23d16960819606cf3c00f7879d6e19142eac636c 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 22:49:05 +0700
Subject: [PATCH 13/51] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From a664ffd91863f57cb315026edf1d53ecfc4a4f92 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 22:58:18 +0700
Subject: [PATCH 14/51] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From dd6c34613fae764f02af888ec33dd1c0e8032852 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 23:01:19 +0700
Subject: [PATCH 15/51] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 192383e01a563ea46a545976340cb761a7978945 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 23:01:56 +0700
Subject: [PATCH 16/51] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..16bbe6b64b5
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/html5lib/html5lib-python"
+license="MIT"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From f8b1c744118c03acdd1e8d00d4ae58df797922b3 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 23:07:49 +0700
Subject: [PATCH 17/51] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..6ba2997de4c
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/gsnedders/python-webencodings"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
+checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
From bd9695e1ca53aab9cc112114697866a41953d691 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 23:08:58 +0700
Subject: [PATCH 18/51] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 647770f80fdb85caea966c8b6cd5a789037d64d8 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 23:10:42 +0700
Subject: [PATCH 19/51] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From a756adb025c79c919fbf136ba2ddf78d9b7ae8e1 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 23:12:46 +0700
Subject: [PATCH 20/51] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From afcecec0b2915168e7fe8e5e00a9fe10c5db76ff 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 23:15:25 +0700
Subject: [PATCH 21/51] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From 3bd1c486f07b045e59b26570620d556bb4156bad 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 23:15:52 +0700
Subject: [PATCH 22/51] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From 77581e0d0a5ab979036d49dcfc1460895c4766c6 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 23:16:45 +0700
Subject: [PATCH 23/51] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From a694a8b2698abb53a094af0a054c6d802867fbd3 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 23:18:15 +0700
Subject: [PATCH 24/51] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 8ba47cf7f01ff7fa81eff7cc3f564baef35fdd59 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 23:19:28 +0700
Subject: [PATCH 25/51] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..0c469431639
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="python-snappy"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 6010b987f9dc99625319a472b1f16bcb592e2b59 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 23:36:11 +0700
Subject: [PATCH 26/51] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From e5aee1dafb3cd10ae3f22aacdd8146a023aca51c 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 23:41:22 +0700
Subject: [PATCH 27/51] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From 3515e28859896b7f6f5897a97885ff5553fc6570 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 23:42:09 +0700
Subject: [PATCH 28/51] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..0b80d983549
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+license="BSD-3-Clause"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From fbd1743183b691f706361d50cc36f411d384d3f1 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 23:52:31 +0700
Subject: [PATCH 29/51] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From 82ed8974bbd16c1bc231ad5315dc082786d54dc2 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 23:55:16 +0700
Subject: [PATCH 30/51] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 8cc0b5b5f88f6dd61630bdb2038e96cbb53b79f6 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 23:55:53 +0700
Subject: [PATCH 31/51] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From f54a87561291fabfb6b36c05199442879eeedcac 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 23:56:08 +0700
Subject: [PATCH 32/51] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..57fd8bfe7c7
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+homepage="https://github.com/eliben/pyelftools"
+license="Public Domain"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From 4158f20d7b1e0eaedf732e6a808e5727d9198a8a 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 33/51] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 382251791bdd836571b8827ecb54f0aa24a2852f 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 34/51] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From bc0c447b500f07b8d707e9ebc20141b16eb52bde 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 35/51] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From ba6afa75cdc0cf59773a344831cbc1d1a497fac8 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 36/51] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From a9a29726251867bb81df6b6a40ecc6b7cead09b7 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 37/51] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
From 0ac7f0c918708e6b59dc4b9c0027c8adc61cd463 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: Wed, 30 Sep 2020 21:16:16 +0700
Subject: [PATCH 38/51] python3-pafy: drop noarch
Also drop python 2 transitional package.
---
srcpkgs/python3-pafy/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 8d3fafaf789..1165626f76e 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,8 +1,7 @@
# Template file for 'python3-pafy'
pkgname=python3-pafy
version=0.5.5
-revision=1
-archs=noarch
+revision=2
wrksrc="pafy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools youtube-dl"
@@ -13,9 +12,3 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/mps-youtube/pafy"
distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
checksum=3b878d319dc63be2f2a84aca5df4ee08baf7256d26e61c94d92b6165b965994f
-
-python-pafy_package() {
- depends="python3-pafy"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From a1ce872984b769091b73501bb965fa21fb693fd5 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: Wed, 30 Sep 2020 21:18:51 +0700
Subject: [PATCH 39/51] python-numexpr: drop package
---
srcpkgs/python-numexpr/template | 30 ------------------------------
srcpkgs/python3-numexpr | 1 -
srcpkgs/python3-numexpr/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-numexpr/template
delete mode 120000 srcpkgs/python3-numexpr
create mode 100644 srcpkgs/python3-numexpr/template
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
deleted file mode 100644
index baf91175a33..00000000000
--- a/srcpkgs/python-numexpr/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-numexpr'
-pkgname=python-numexpr
-version=2.7.0
-revision=2
-wrksrc="numexpr-${version}"
-build_style=python-module
-pycompile_module="numexpr"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Fast numerical expression evaluator for NumPy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/pydata/numexpr"
-distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-numexpr_package() {
- depends="python3-numpy"
- pycompile_module="numexpr"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-numexpr b/srcpkgs/python3-numexpr
deleted file mode 120000
index cab9d2a5293..00000000000
--- a/srcpkgs/python3-numexpr
+++ /dev/null
@@ -1 +0,0 @@
-python-numexpr
\ No newline at end of file
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
new file mode 100644
index 00000000000..066e9648dec
--- /dev/null
+++ b/srcpkgs/python3-numexpr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-numexpr'
+pkgname=python3-numexpr
+version=2.7.0
+revision=3
+wrksrc="numexpr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Fast numerical expression evaluator for NumPy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pydata/numexpr"
+distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 9a495f60af72d565e367e85366a4926ae5557684 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: Wed, 30 Sep 2020 22:03:39 +0700
Subject: [PATCH 40/51] python-nbxmpp: drop package
---
srcpkgs/python-nbxmpp | 1 -
srcpkgs/python3-nbxmpp/template | 7 -------
2 files changed, 8 deletions(-)
delete mode 120000 srcpkgs/python-nbxmpp
diff --git a/srcpkgs/python-nbxmpp b/srcpkgs/python-nbxmpp
deleted file mode 120000
index ae760ace99f..00000000000
--- a/srcpkgs/python-nbxmpp
+++ /dev/null
@@ -1 +0,0 @@
-python3-nbxmpp
\ No newline at end of file
diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index fc711fb5821..583a4691a4d 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -13,10 +13,3 @@ homepage="https://python-nbxmpp.gajim.org/"
#changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
checksum=991f014a2736123e989da454d6a467be8c4314bf86dbcc889e899f03726e856f
-
-python-nbxmpp_package() {
- build_style=meta
- archs=noarch
- # Someone bumped this package to 1.0.0, which doesn't support Python 2
- short_desc+=" - Python 2 - removed package"
-}
From 3a231afdae15525e178d4b7c645f913e8fd35840 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: Wed, 30 Sep 2020 22:04:36 +0700
Subject: [PATCH 41/51] python-musicbrainzngs: drop package
---
srcpkgs/python-musicbrainzngs/template | 30 -------------------------
srcpkgs/python3-musicbrainzngs | 1 -
srcpkgs/python3-musicbrainzngs/template | 19 ++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-musicbrainzngs/template
delete mode 120000 srcpkgs/python3-musicbrainzngs
create mode 100644 srcpkgs/python3-musicbrainzngs/template
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
deleted file mode 100644
index 8679b3bfcf5..00000000000
--- a/srcpkgs/python-musicbrainzngs/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-musicbrainzngs'
-pkgname=python-musicbrainzngs
-version=0.6
-revision=5
-wrksrc="musicbrainzngs-${version}"
-build_style="python-module"
-pycompile_module="musicbrainzngs"
-hostmakedepends="python-devel python3-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-short_desc="Python2 bindings for the Musicbrainz NGS webservice interface"
-maintainer="Steven R <dev@styez.com>"
-license="BSD"
-homepage="https://github.com/alastair/python-musicbrainz-ngs/"
-distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
-
-post_install() {
- vlicense COPYING
-}
-
-python3-musicbrainzngs_package() {
- depends="python3"
- pycompile_module="musicbrainzngs"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYING
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-musicbrainzngs b/srcpkgs/python3-musicbrainzngs
deleted file mode 120000
index 81a3ce402a2..00000000000
--- a/srcpkgs/python3-musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainzngs
\ No newline at end of file
diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
new file mode 100644
index 00000000000..6bb7c93ce6a
--- /dev/null
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-musicbrainzngs'
+pkgname=python3-musicbrainzngs
+version=0.6
+revision=6
+wrksrc="musicbrainzngs-${version}"
+build_style="python3-module"
+hostmakedepends="python3-devel"
+makedepends="${hostmakedepends}"
+depends="python3"
+short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
+maintainer="Steven R <dev@styez.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/alastair/python-musicbrainz-ngs/"
+distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
+checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+
+post_install() {
+ vlicense COPYING
+}
From 6750521d33c6ed3dced5f1c5efddc64a053d25b0 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: Wed, 30 Sep 2020 22:06:03 +0700
Subject: [PATCH 42/51] python-monotonic: drop package
---
srcpkgs/python-monotonic/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-monotonic/template
diff --git a/srcpkgs/python-monotonic/template b/srcpkgs/python-monotonic/template
deleted file mode 100644
index 71bd26c6f18..00000000000
--- a/srcpkgs/python-monotonic/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-monotonic'
-pkgname=python-monotonic
-version=1.5
-revision=2
-wrksrc="monotonic-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-pycompile_module="monotonic.py"
-short_desc="Implementation of time.monotonic() for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
-homepage="https://github.com/atdt/monotonic"
-distfiles="${PYPI_SITE}/m/monotonic/monotonic-${version}.tar.gz"
-checksum=23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0
From 8254bea93ca1b7aa2ae5c8446d317b43117f3cca 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: Wed, 30 Sep 2020 22:07:14 +0700
Subject: [PATCH 43/51] python-miniupnpc: drop package
---
srcpkgs/python-miniupnpc/template | 28 ----------------------------
srcpkgs/python3-miniupnpc | 1 -
srcpkgs/python3-miniupnpc/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-miniupnpc/template
delete mode 120000 srcpkgs/python3-miniupnpc
create mode 100644 srcpkgs/python3-miniupnpc/template
diff --git a/srcpkgs/python-miniupnpc/template b/srcpkgs/python-miniupnpc/template
deleted file mode 100644
index f7892bab073..00000000000
--- a/srcpkgs/python-miniupnpc/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-miniupnpc'
-pkgname=python-miniupnpc
-version=2.0.2
-revision=3
-wrksrc="${pkgname#python-}-$version"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel miniupnpc-devel"
-depends="python"
-short_desc="Python2 bindings for miniupnpc, a UPnP library"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/miniupnpc/"
-distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
-checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
-
-python3-miniupnpc_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense LICENSE
- vmove usr/lib/python3*
- }
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python3-miniupnpc b/srcpkgs/python3-miniupnpc
deleted file mode 120000
index 17d4960a570..00000000000
--- a/srcpkgs/python3-miniupnpc
+++ /dev/null
@@ -1 +0,0 @@
-python-miniupnpc
\ No newline at end of file
diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
new file mode 100644
index 00000000000..4331ce7e85e
--- /dev/null
+++ b/srcpkgs/python3-miniupnpc/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-miniupnpc'
+pkgname=python3-miniupnpc
+version=2.0.2
+revision=4
+wrksrc="miniupnpc-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel miniupnpc-devel"
+depends="python3"
+short_desc="Python3 bindings for miniupnpc, a UPnP library"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/miniupnpc/"
+distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
+checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
+
+
+post_install() {
+ vlicense LICENSE
+}
From e77ecb6b864351de0175ce99b2e0a954db11ffb7 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: Wed, 30 Sep 2020 22:07:54 +0700
Subject: [PATCH 44/51] python-marisa-trie: drop package
---
srcpkgs/python3-marisa-trie | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-marisa-trie
rename srcpkgs/{python-marisa-trie => python3-marisa-trie}/template (58%)
diff --git a/srcpkgs/python3-marisa-trie b/srcpkgs/python3-marisa-trie
deleted file mode 120000
index 8efb226c0fc..00000000000
--- a/srcpkgs/python3-marisa-trie
+++ /dev/null
@@ -1 +0,0 @@
-python-marisa-trie
\ No newline at end of file
diff --git a/srcpkgs/python-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
similarity index 58%
rename from srcpkgs/python-marisa-trie/template
rename to srcpkgs/python3-marisa-trie/template
index 5e46b686ace..ab26456bd5b 100644
--- a/srcpkgs/python-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,12 +1,12 @@
-# Template file for 'python-marisa-trie'
-pkgname=python-marisa-trie
+# Template file for 'python3-marisa-trie'
+pkgname=python3-marisa-trie
version=0.7.5
-revision=3
+revision=4
wrksrc="marisa-trie-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Static memory-efficient Trie-like structures (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Static memory-efficient Trie-like structures (Python3)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="https://github.com/pytries/marisa-trie"
@@ -17,11 +17,3 @@ checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
post_install() {
vlicense LICENSE
}
-
-python3-marisa-trie_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From c7123a88a718fc537816e21e1b00850147b36efe 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: Wed, 30 Sep 2020 22:08:14 +0700
Subject: [PATCH 45/51] python-libpcap: drop package
---
srcpkgs/python-libpcap/template | 19 -------------------
srcpkgs/python-libpcap/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-libpcap/template
delete mode 100644 srcpkgs/python-libpcap/update
diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template
deleted file mode 100644
index b39b9558fc5..00000000000
--- a/srcpkgs/python-libpcap/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-libpcap'
-pkgname=python-libpcap
-version=0.6.4
-revision=2
-wrksrc="pylibpcap-$version"
-build_style=python2-module
-pycompile_module="pcap.py"
-hostmakedepends="python"
-makedepends="libpcap-devel python-devel"
-short_desc="Python2 module for the libpcap packet capture library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://pylibpcap.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz"
-checksum=cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/python-libpcap/update b/srcpkgs/python-libpcap/update
deleted file mode 100644
index ec0f249750a..00000000000
--- a/srcpkgs/python-libpcap/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pylibpcap
From 7a2bf035396b6f31335f6471c8e1a7352737024a 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: Wed, 30 Sep 2020 22:08:28 +0700
Subject: [PATCH 46/51] python-lazy-object-proxy: drop package
---
srcpkgs/python-lazy-object-proxy/template | 28 ----------------------
srcpkgs/python3-lazy-object-proxy | 1 -
srcpkgs/python3-lazy-object-proxy/template | 22 +++++++++++++++++
3 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-lazy-object-proxy/template
delete mode 120000 srcpkgs/python3-lazy-object-proxy
create mode 100644 srcpkgs/python3-lazy-object-proxy/template
diff --git a/srcpkgs/python-lazy-object-proxy/template b/srcpkgs/python-lazy-object-proxy/template
deleted file mode 100644
index 067890e5176..00000000000
--- a/srcpkgs/python-lazy-object-proxy/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-lazy-object-proxy'
-pkgname=python-lazy-object-proxy
-version=1.4.3
-revision=2
-wrksrc="lazy-object-proxy-${version}"
-build_style=python-module
-pycompile_module="lazy_object_proxy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast and thorough lazy object proxy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/ionelmc/python-lazy-object-proxy"
-distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
-checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-lazy-object-proxy_package() {
- pycompile_module="lazy_object_proxy"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-lazy-object-proxy b/srcpkgs/python3-lazy-object-proxy
deleted file mode 120000
index a1a392a0e66..00000000000
--- a/srcpkgs/python3-lazy-object-proxy
+++ /dev/null
@@ -1 +0,0 @@
-python-lazy-object-proxy
\ No newline at end of file
diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
new file mode 100644
index 00000000000..5284244320a
--- /dev/null
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-lazy-object-proxy'
+pkgname=python3-lazy-object-proxy
+version=1.4.3
+revision=3
+wrksrc="lazy-object-proxy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast and thorough lazy object proxy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-lazy-object-proxy"
+distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
+checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
+
+post_patch() {
+ vsed -i '/setuptools_scm/d' setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 01228197b0b5df342ce47133ef7db9d7b2a2231e 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: Wed, 30 Sep 2020 22:10:46 +0700
Subject: [PATCH 47/51] python-kiwisolver: drop package
---
srcpkgs/python3-kiwisolver | 1 -
.../template | 24 +++++++------------
2 files changed, 8 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-kiwisolver
rename srcpkgs/{python-kiwisolver => python3-kiwisolver}/template (54%)
diff --git a/srcpkgs/python3-kiwisolver b/srcpkgs/python3-kiwisolver
deleted file mode 120000
index 6bb16d6a5b7..00000000000
--- a/srcpkgs/python3-kiwisolver
+++ /dev/null
@@ -1 +0,0 @@
-python-kiwisolver
\ No newline at end of file
diff --git a/srcpkgs/python-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
similarity index 54%
rename from srcpkgs/python-kiwisolver/template
rename to srcpkgs/python3-kiwisolver/template
index 67f0805aa51..896c3c0eab4 100644
--- a/srcpkgs/python-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,13 +1,13 @@
-# Template file for 'python-kiwisolver'
-pkgname=python-kiwisolver
+# Template file for 'python3-kiwisolver'
+pkgname=python3-kiwisolver
version=1.0.1
-revision=3
+revision=4
wrksrc="kiwisolver-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast implementation of the Cassowary constraint solver (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast implementation of the Cassowary constraint solver (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://github.com/nucleic/kiwi"
license="BSD-3-Clause"
distfiles="${PYPI_SITE}/k/kiwisolver/kiwisolver-${version}.tar.gz"
@@ -20,11 +20,3 @@ pre_build() {
post_install() {
vlicense COPYING.txt LICENSE
}
-
-python3-kiwisolver_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense COPYING.txt LICENSE
- }
-}
From d110060cb7146c83fde7b565d295a54a0d09e65b 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: Wed, 30 Sep 2020 22:11:05 +0700
Subject: [PATCH 48/51] python-keyutils: drop package
---
srcpkgs/python-keyutils/template | 22 ----------------------
srcpkgs/python3-keyutils | 1 -
srcpkgs/python3-keyutils/template | 13 +++++++++++++
3 files changed, 13 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-keyutils/template
delete mode 120000 srcpkgs/python3-keyutils
create mode 100644 srcpkgs/python3-keyutils/template
diff --git a/srcpkgs/python-keyutils/template b/srcpkgs/python-keyutils/template
deleted file mode 100644
index a72819e963a..00000000000
--- a/srcpkgs/python-keyutils/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-keyutils'
-pkgname=python-keyutils
-version=0.6
-revision=2
-build_style=python-module
-pycompile_module="keyutils"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel keyutils-devel"
-short_desc="Python2 bindings for keyutils"
-maintainer="Matthias Fulz <mfulz@olznet.de>"
-license="Apache-2.0"
-homepage="https://github.com/sassoftware/python-keyutils"
-distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
-checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
-
-python3-keyutils_package() {
- pycompile_module="keyutils"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-keyutils b/srcpkgs/python3-keyutils
deleted file mode 120000
index 0b8009d923a..00000000000
--- a/srcpkgs/python3-keyutils
+++ /dev/null
@@ -1 +0,0 @@
-python-keyutils
\ No newline at end of file
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
new file mode 100644
index 00000000000..2df2f8fdc8e
--- /dev/null
+++ b/srcpkgs/python3-keyutils/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-keyutils'
+pkgname=python3-keyutils
+version=0.6
+revision=3
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel keyutils-devel"
+short_desc="Python3 bindings for keyutils"
+maintainer="Matthias Fulz <mfulz@olznet.de>"
+license="Apache-2.0"
+homepage="https://github.com/sassoftware/python-keyutils"
+distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
+checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
From d60d74f15f3cab0c35fdcbaa05e82850e9cacf08 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: Wed, 30 Sep 2020 22:15:23 +0700
Subject: [PATCH 49/51] python-gconf: drop package
---
srcpkgs/python-gconf/template | 26 --------------------------
srcpkgs/python-gconf/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-gconf/template
delete mode 100644 srcpkgs/python-gconf/update
diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template
deleted file mode 100644
index 0dcc94d3e1f..00000000000
--- a/srcpkgs/python-gconf/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-gconf'
-pkgname=python-gconf
-version=2.28.1
-revision=5
-wrksrc="gnome-python-${version}"
-build_style=gnu-configure
-configure_args="--enable-gconf --disable-gnome --disable-gnomeui
---disable-gnomecanvas --disable-gnomevfs --disable-gnomevfsbonobo
---disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo
---disable-bonoboui"
-pycompile_dirs="usr/share/pygtk/2.0"
-hostmakedepends="pkg-config python-devel"
-makedepends="python-devel pygtk-devel GConf-devel"
-depends="pygtk"
-short_desc="Python bindings for interacting with GConf"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/gnome-python/2.28/gnome-python-${version}.tar.bz2"
-checksum=759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
-nocross="could not find Python headers or library"
-lib32disabled=yes
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/python-gconf/update b/srcpkgs/python-gconf/update
deleted file mode 100644
index 2b4a7297027..00000000000
--- a/srcpkgs/python-gconf/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="gnome-python"
From 173086a346c8a61e2964290acbf50523f1030f72 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: Wed, 30 Sep 2020 22:17:36 +0700
Subject: [PATCH 50/51] python-ecdsa: drop package
---
srcpkgs/python-ecdsa/template | 34 ----------------------------------
srcpkgs/python3-ecdsa | 1 -
srcpkgs/python3-ecdsa/template | 23 +++++++++++++++++++++++
3 files changed, 23 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-ecdsa/template
delete mode 120000 srcpkgs/python3-ecdsa
create mode 100644 srcpkgs/python3-ecdsa/template
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
deleted file mode 100644
index 64d642f26b6..00000000000
--- a/srcpkgs/python-ecdsa/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ecdsa'
-pkgname=python-ecdsa
-version=0.14.1
-revision=3
-wrksrc="${pkgname/python-/}-${version}"
-build_style=python-module
-pycompile_module="ecdsa"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Implementation of ECDSA in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/warner/python-ecdsa/"
-distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
-
-pre_build() {
- # use system six
- find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
- rm -f ecdsa/six.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-ecdsa_package() {
- depends="python3-six"
- pycompile_module="ecdsa"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-ecdsa b/srcpkgs/python3-ecdsa
deleted file mode 120000
index 7f15d919f9b..00000000000
--- a/srcpkgs/python3-ecdsa
+++ /dev/null
@@ -1 +0,0 @@
-python-ecdsa
\ No newline at end of file
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
new file mode 100644
index 00000000000..f7482a0a04a
--- /dev/null
+++ b/srcpkgs/python3-ecdsa/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-ecdsa'
+pkgname=python3-ecdsa
+version=0.14.1
+revision=4
+wrksrc="ecdsa-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Implementation of ECDSA in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
+distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
+checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
+
+pre_build() {
+ # use system six
+ find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
+ rm -f ecdsa/six.py
+}
+post_install() {
+ vlicense LICENSE
+}
From 7eeaea4764bf84899212720326a4c38c3ec2a255 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: Wed, 30 Sep 2020 22:19:35 +0700
Subject: [PATCH 51/51] python-click: drop package
---
srcpkgs/python-click/template | 27 -------------------
srcpkgs/python3-click | 1 -
srcpkgs/python3-click/template | 18 +++++++++++++
.../{python-click => python3-click}/update | 0
4 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-click/template
delete mode 120000 srcpkgs/python3-click
create mode 100644 srcpkgs/python3-click/template
rename srcpkgs/{python-click => python3-click}/update (100%)
diff --git a/srcpkgs/python-click/template b/srcpkgs/python-click/template
deleted file mode 100644
index e798cd0eca5..00000000000
--- a/srcpkgs/python-click/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-click'
-pkgname=python-click
-version=7.1.2
-revision=2
-wrksrc="click-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package for creating beautiful command line interfaces"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
-distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
-
-post_install() {
- vlicense LICENSE.rst
-}
-
-python3-click_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
diff --git a/srcpkgs/python3-click b/srcpkgs/python3-click
deleted file mode 120000
index d6543636ddb..00000000000
--- a/srcpkgs/python3-click
+++ /dev/null
@@ -1 +0,0 @@
-python-click
\ No newline at end of file
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
new file mode 100644
index 00000000000..2b29bebfbcc
--- /dev/null
+++ b/srcpkgs/python3-click/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click'
+pkgname=python3-click
+version=7.1.2
+revision=3
+wrksrc="click-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package for creating beautiful command line interfaces"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="http://click.pocoo.org/"
+distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
+checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+
+post_install() {
+ vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python-click/update b/srcpkgs/python3-click/update
similarity index 100%
rename from srcpkgs/python-click/update
rename to srcpkgs/python3-click/update
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (8 preceding siblings ...)
2020-09-30 15:23 ` sgn
@ 2020-10-01 0:32 ` sgn
2020-10-01 15:37 ` sgn
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-01 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There is an updated 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 and related packages.
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: 144599 bytes --]
From 4033644d36cf17ca548fa315f13cdcd8b17712b8 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 01/51] 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 0992aa1327e27305a52b19b7edc23218384911e4 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 02/51] 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"
From df6c1d29ef98923474a8bf7a82a6ca629fba38bc 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 22:17:26 +0700
Subject: [PATCH 03/51] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From b80b2f890d35816c1497b4246f03017b7a32ae18 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 22:19:02 +0700
Subject: [PATCH 04/51] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 6bde5645237f510c5eded3812e9017309bf887e6 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 22:27:20 +0700
Subject: [PATCH 05/51] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From f053f56a40fc6aa0c5e94878813fb2fc1c248998 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 22:35:47 +0700
Subject: [PATCH 06/51] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From dea5ebd84c1f2577f8eed8db922546f11aaec6bf 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 22:36:41 +0700
Subject: [PATCH 07/51] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 9b76abc19a0e4437d3e4f144130b714e2d370c96 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 22:40:45 +0700
Subject: [PATCH 08/51] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From a7b3883aeb605c5a2e3abc106a9ee95499f7ec60 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 22:41:28 +0700
Subject: [PATCH 09/51] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From b2b6a4d2f179a06c203ca1684510fb8397a21832 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 22:42:25 +0700
Subject: [PATCH 10/51] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 28dbd665bd76ba63d91d874ee9fdb41088b9ac78 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 22:43:42 +0700
Subject: [PATCH 11/51] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From 5c13f118841e3f826fd99ce769bff5f459b107f3 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 22:45:13 +0700
Subject: [PATCH 12/51] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From b9b5761063e4764a8e90133de722b4c535283c65 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 22:49:05 +0700
Subject: [PATCH 13/51] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From a430101e7354d455c1028675c25cfd6b6e558e39 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 22:58:18 +0700
Subject: [PATCH 14/51] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From 1c6808a37541366fb111db02f671c2dd04e06b9d 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 23:01:19 +0700
Subject: [PATCH 15/51] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 48583c996e0acfad508a40a66223dfe9324d472b 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 23:01:56 +0700
Subject: [PATCH 16/51] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..5568ed9acdd
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/html5lib/html5lib-python"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From 5c540d311a874e8c4186fbc00991a274f8a1557c 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 23:07:49 +0700
Subject: [PATCH 17/51] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..0c57a319520
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/gsnedders/python-webencodings"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz
+ https://raw.githubusercontent.com/gsnedders/python-webencodings/v$version/LICENSE"
+checksum="b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
+ f23bae6ada76095610a77137fb92aec7342723900211c5826d54b4c57907ca56"
+skip_extraction=LICENSE
+
+post_install() {
+ vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE
+}
From 3152b1565c12790a97149f4354ae2514a0d25ab6 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 23:08:58 +0700
Subject: [PATCH 18/51] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 9bf9c81df6707a271cb84b9489f3ce957120dc68 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 23:10:42 +0700
Subject: [PATCH 19/51] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From acd1a8d3e6cd697373769fb4517eaedd21d1859e 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 23:12:46 +0700
Subject: [PATCH 20/51] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From d752c61e5e2151d05b0791470e7617fc24f34395 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 23:15:25 +0700
Subject: [PATCH 21/51] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From eec552098f9bf1f38a26e995e2898e31e089bb79 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 23:15:52 +0700
Subject: [PATCH 22/51] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From caec2f9a2c740b747ff1c8f937f3fa4dee71218d 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 23:16:45 +0700
Subject: [PATCH 23/51] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From 36e5b8ff0549ac4974eccf3b4219af6c82aba7de 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 23:18:15 +0700
Subject: [PATCH 24/51] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 64a5565d4ed2bfff3032514a5e47f800343aa29c 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 23:19:28 +0700
Subject: [PATCH 25/51] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..a23d3d6e401
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="Python library for the snappy compression library from Google"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 48e958777f6d9350f6835f7adefe53c475527f04 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 23:36:11 +0700
Subject: [PATCH 26/51] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From 02e8983fa6144af1dfcd9a2ee87f4ae5c46ba415 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 23:41:22 +0700
Subject: [PATCH 27/51] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From a5d70d8af6790216a56a52455c3e47ca20a59625 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 23:42:09 +0700
Subject: [PATCH 28/51] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..6b6f93931af
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From 4fbb2c5a9c72a2889ee58f1190e3e059a31a0e26 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 23:52:31 +0700
Subject: [PATCH 29/51] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From 55bc3a0b933c56d80f9174c21387d34a33a8a034 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 23:55:16 +0700
Subject: [PATCH 30/51] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 68305e4794d525e92872850e956c06704c3ca18e 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 23:55:53 +0700
Subject: [PATCH 31/51] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From ecf8c9a00979091825c66655af04e6f9c440368b 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 23:56:08 +0700
Subject: [PATCH 32/51] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..dbd62331b0c
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://github.com/eliben/pyelftools"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From 10c1d667096f957edafc31e6da1bf7846762d89b 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 33/51] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From a973bdb324f84b0932b7987a49f85f99c1142d11 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 34/51] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From e26e4d834cf2893d8a691fb511270c535647afb0 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 35/51] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From b7912713324917a101accb9dbdc34d0b8c4e6b82 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 36/51] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From ec412819b42c7876688eb0066ff50948fc90ac97 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 37/51] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
From 2f0bcf4fc86344b077ff7e6d8b0d69d0483894f0 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: Wed, 30 Sep 2020 21:16:16 +0700
Subject: [PATCH 38/51] python3-pafy: drop noarch
Also drop python 2 transitional package.
---
srcpkgs/python3-pafy/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 8d3fafaf789..1165626f76e 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,8 +1,7 @@
# Template file for 'python3-pafy'
pkgname=python3-pafy
version=0.5.5
-revision=1
-archs=noarch
+revision=2
wrksrc="pafy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools youtube-dl"
@@ -13,9 +12,3 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/mps-youtube/pafy"
distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
checksum=3b878d319dc63be2f2a84aca5df4ee08baf7256d26e61c94d92b6165b965994f
-
-python-pafy_package() {
- depends="python3-pafy"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From 27b8048aa86d5a243340598a13de643176fe1330 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: Wed, 30 Sep 2020 21:18:51 +0700
Subject: [PATCH 39/51] python-numexpr: drop package
---
srcpkgs/python-numexpr/template | 30 ------------------------------
srcpkgs/python3-numexpr | 1 -
srcpkgs/python3-numexpr/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-numexpr/template
delete mode 120000 srcpkgs/python3-numexpr
create mode 100644 srcpkgs/python3-numexpr/template
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
deleted file mode 100644
index baf91175a33..00000000000
--- a/srcpkgs/python-numexpr/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-numexpr'
-pkgname=python-numexpr
-version=2.7.0
-revision=2
-wrksrc="numexpr-${version}"
-build_style=python-module
-pycompile_module="numexpr"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Fast numerical expression evaluator for NumPy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/pydata/numexpr"
-distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-numexpr_package() {
- depends="python3-numpy"
- pycompile_module="numexpr"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-numexpr b/srcpkgs/python3-numexpr
deleted file mode 120000
index cab9d2a5293..00000000000
--- a/srcpkgs/python3-numexpr
+++ /dev/null
@@ -1 +0,0 @@
-python-numexpr
\ No newline at end of file
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
new file mode 100644
index 00000000000..c19b5149018
--- /dev/null
+++ b/srcpkgs/python3-numexpr/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-numexpr'
+pkgname=python3-numexpr
+version=2.7.0
+revision=3
+wrksrc="numexpr-${version}"
+build_style=python3-module
+build_helper=numpy
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Fast numerical expression evaluator for NumPy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pydata/numexpr"
+distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 584c747b01cf610ccda905152194cfd787c1c972 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: Wed, 30 Sep 2020 22:03:39 +0700
Subject: [PATCH 40/51] python-nbxmpp: drop package
---
srcpkgs/python-nbxmpp | 1 -
srcpkgs/python3-nbxmpp/template | 7 -------
2 files changed, 8 deletions(-)
delete mode 120000 srcpkgs/python-nbxmpp
diff --git a/srcpkgs/python-nbxmpp b/srcpkgs/python-nbxmpp
deleted file mode 120000
index ae760ace99f..00000000000
--- a/srcpkgs/python-nbxmpp
+++ /dev/null
@@ -1 +0,0 @@
-python3-nbxmpp
\ No newline at end of file
diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index fc711fb5821..583a4691a4d 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -13,10 +13,3 @@ homepage="https://python-nbxmpp.gajim.org/"
#changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
checksum=991f014a2736123e989da454d6a467be8c4314bf86dbcc889e899f03726e856f
-
-python-nbxmpp_package() {
- build_style=meta
- archs=noarch
- # Someone bumped this package to 1.0.0, which doesn't support Python 2
- short_desc+=" - Python 2 - removed package"
-}
From e46b7580987b31b29bcf56fa4a53f566ff35d86d 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: Wed, 30 Sep 2020 22:04:36 +0700
Subject: [PATCH 41/51] python-musicbrainzngs: drop package
---
srcpkgs/python-musicbrainzngs/template | 30 -------------------------
srcpkgs/python3-musicbrainzngs | 1 -
srcpkgs/python3-musicbrainzngs/template | 19 ++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-musicbrainzngs/template
delete mode 120000 srcpkgs/python3-musicbrainzngs
create mode 100644 srcpkgs/python3-musicbrainzngs/template
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
deleted file mode 100644
index 8679b3bfcf5..00000000000
--- a/srcpkgs/python-musicbrainzngs/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-musicbrainzngs'
-pkgname=python-musicbrainzngs
-version=0.6
-revision=5
-wrksrc="musicbrainzngs-${version}"
-build_style="python-module"
-pycompile_module="musicbrainzngs"
-hostmakedepends="python-devel python3-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-short_desc="Python2 bindings for the Musicbrainz NGS webservice interface"
-maintainer="Steven R <dev@styez.com>"
-license="BSD"
-homepage="https://github.com/alastair/python-musicbrainz-ngs/"
-distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
-
-post_install() {
- vlicense COPYING
-}
-
-python3-musicbrainzngs_package() {
- depends="python3"
- pycompile_module="musicbrainzngs"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYING
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-musicbrainzngs b/srcpkgs/python3-musicbrainzngs
deleted file mode 120000
index 81a3ce402a2..00000000000
--- a/srcpkgs/python3-musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainzngs
\ No newline at end of file
diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
new file mode 100644
index 00000000000..6bb7c93ce6a
--- /dev/null
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-musicbrainzngs'
+pkgname=python3-musicbrainzngs
+version=0.6
+revision=6
+wrksrc="musicbrainzngs-${version}"
+build_style="python3-module"
+hostmakedepends="python3-devel"
+makedepends="${hostmakedepends}"
+depends="python3"
+short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
+maintainer="Steven R <dev@styez.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/alastair/python-musicbrainz-ngs/"
+distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
+checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+
+post_install() {
+ vlicense COPYING
+}
From 2ab3727bdb2d7cb3c7e41dd16973bbf3edf62738 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: Wed, 30 Sep 2020 22:06:03 +0700
Subject: [PATCH 42/51] python-monotonic: drop package
---
srcpkgs/python-monotonic/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-monotonic/template
diff --git a/srcpkgs/python-monotonic/template b/srcpkgs/python-monotonic/template
deleted file mode 100644
index 71bd26c6f18..00000000000
--- a/srcpkgs/python-monotonic/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-monotonic'
-pkgname=python-monotonic
-version=1.5
-revision=2
-wrksrc="monotonic-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-pycompile_module="monotonic.py"
-short_desc="Implementation of time.monotonic() for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
-homepage="https://github.com/atdt/monotonic"
-distfiles="${PYPI_SITE}/m/monotonic/monotonic-${version}.tar.gz"
-checksum=23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0
From 73b8ad41184e64d754f474bae6693977d9255995 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: Wed, 30 Sep 2020 22:07:14 +0700
Subject: [PATCH 43/51] python-miniupnpc: drop package
---
srcpkgs/python-miniupnpc/template | 28 ----------------------------
srcpkgs/python3-miniupnpc | 1 -
srcpkgs/python3-miniupnpc/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-miniupnpc/template
delete mode 120000 srcpkgs/python3-miniupnpc
create mode 100644 srcpkgs/python3-miniupnpc/template
diff --git a/srcpkgs/python-miniupnpc/template b/srcpkgs/python-miniupnpc/template
deleted file mode 100644
index f7892bab073..00000000000
--- a/srcpkgs/python-miniupnpc/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-miniupnpc'
-pkgname=python-miniupnpc
-version=2.0.2
-revision=3
-wrksrc="${pkgname#python-}-$version"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel miniupnpc-devel"
-depends="python"
-short_desc="Python2 bindings for miniupnpc, a UPnP library"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/miniupnpc/"
-distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
-checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
-
-python3-miniupnpc_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense LICENSE
- vmove usr/lib/python3*
- }
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python3-miniupnpc b/srcpkgs/python3-miniupnpc
deleted file mode 120000
index 17d4960a570..00000000000
--- a/srcpkgs/python3-miniupnpc
+++ /dev/null
@@ -1 +0,0 @@
-python-miniupnpc
\ No newline at end of file
diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
new file mode 100644
index 00000000000..4331ce7e85e
--- /dev/null
+++ b/srcpkgs/python3-miniupnpc/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-miniupnpc'
+pkgname=python3-miniupnpc
+version=2.0.2
+revision=4
+wrksrc="miniupnpc-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel miniupnpc-devel"
+depends="python3"
+short_desc="Python3 bindings for miniupnpc, a UPnP library"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/miniupnpc/"
+distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
+checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
+
+
+post_install() {
+ vlicense LICENSE
+}
From 784ef07f1b5ad37330d9db25a9ae2884107b62ca 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: Wed, 30 Sep 2020 22:07:54 +0700
Subject: [PATCH 44/51] python-marisa-trie: drop package
---
srcpkgs/python3-marisa-trie | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-marisa-trie
rename srcpkgs/{python-marisa-trie => python3-marisa-trie}/template (58%)
diff --git a/srcpkgs/python3-marisa-trie b/srcpkgs/python3-marisa-trie
deleted file mode 120000
index 8efb226c0fc..00000000000
--- a/srcpkgs/python3-marisa-trie
+++ /dev/null
@@ -1 +0,0 @@
-python-marisa-trie
\ No newline at end of file
diff --git a/srcpkgs/python-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
similarity index 58%
rename from srcpkgs/python-marisa-trie/template
rename to srcpkgs/python3-marisa-trie/template
index 5e46b686ace..ab26456bd5b 100644
--- a/srcpkgs/python-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,12 +1,12 @@
-# Template file for 'python-marisa-trie'
-pkgname=python-marisa-trie
+# Template file for 'python3-marisa-trie'
+pkgname=python3-marisa-trie
version=0.7.5
-revision=3
+revision=4
wrksrc="marisa-trie-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Static memory-efficient Trie-like structures (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Static memory-efficient Trie-like structures (Python3)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="https://github.com/pytries/marisa-trie"
@@ -17,11 +17,3 @@ checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
post_install() {
vlicense LICENSE
}
-
-python3-marisa-trie_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 51d06e9a6e6bd231d27682a9032e51abe3706160 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: Wed, 30 Sep 2020 22:08:14 +0700
Subject: [PATCH 45/51] python-libpcap: drop package
---
srcpkgs/python-libpcap/template | 19 -------------------
srcpkgs/python-libpcap/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-libpcap/template
delete mode 100644 srcpkgs/python-libpcap/update
diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template
deleted file mode 100644
index b39b9558fc5..00000000000
--- a/srcpkgs/python-libpcap/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-libpcap'
-pkgname=python-libpcap
-version=0.6.4
-revision=2
-wrksrc="pylibpcap-$version"
-build_style=python2-module
-pycompile_module="pcap.py"
-hostmakedepends="python"
-makedepends="libpcap-devel python-devel"
-short_desc="Python2 module for the libpcap packet capture library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://pylibpcap.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz"
-checksum=cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/python-libpcap/update b/srcpkgs/python-libpcap/update
deleted file mode 100644
index ec0f249750a..00000000000
--- a/srcpkgs/python-libpcap/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pylibpcap
From 36f825f12716b2b8e7bedbafce093e46ca9acca0 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: Wed, 30 Sep 2020 22:08:28 +0700
Subject: [PATCH 46/51] python-lazy-object-proxy: drop package
---
srcpkgs/python-lazy-object-proxy/template | 28 ----------------------
srcpkgs/python3-lazy-object-proxy | 1 -
srcpkgs/python3-lazy-object-proxy/template | 22 +++++++++++++++++
3 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-lazy-object-proxy/template
delete mode 120000 srcpkgs/python3-lazy-object-proxy
create mode 100644 srcpkgs/python3-lazy-object-proxy/template
diff --git a/srcpkgs/python-lazy-object-proxy/template b/srcpkgs/python-lazy-object-proxy/template
deleted file mode 100644
index 067890e5176..00000000000
--- a/srcpkgs/python-lazy-object-proxy/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-lazy-object-proxy'
-pkgname=python-lazy-object-proxy
-version=1.4.3
-revision=2
-wrksrc="lazy-object-proxy-${version}"
-build_style=python-module
-pycompile_module="lazy_object_proxy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast and thorough lazy object proxy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/ionelmc/python-lazy-object-proxy"
-distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
-checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-lazy-object-proxy_package() {
- pycompile_module="lazy_object_proxy"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-lazy-object-proxy b/srcpkgs/python3-lazy-object-proxy
deleted file mode 120000
index a1a392a0e66..00000000000
--- a/srcpkgs/python3-lazy-object-proxy
+++ /dev/null
@@ -1 +0,0 @@
-python-lazy-object-proxy
\ No newline at end of file
diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
new file mode 100644
index 00000000000..5284244320a
--- /dev/null
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-lazy-object-proxy'
+pkgname=python3-lazy-object-proxy
+version=1.4.3
+revision=3
+wrksrc="lazy-object-proxy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast and thorough lazy object proxy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-lazy-object-proxy"
+distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
+checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
+
+post_patch() {
+ vsed -i '/setuptools_scm/d' setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 0c875212772c1b20fb1bf17e6859ebbffc33c403 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: Wed, 30 Sep 2020 22:10:46 +0700
Subject: [PATCH 47/51] python-kiwisolver: drop package
---
srcpkgs/python3-kiwisolver | 1 -
.../template | 26 +++++++------------
2 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-kiwisolver
rename srcpkgs/{python-kiwisolver => python3-kiwisolver}/template (54%)
diff --git a/srcpkgs/python3-kiwisolver b/srcpkgs/python3-kiwisolver
deleted file mode 120000
index 6bb16d6a5b7..00000000000
--- a/srcpkgs/python3-kiwisolver
+++ /dev/null
@@ -1 +0,0 @@
-python-kiwisolver
\ No newline at end of file
diff --git a/srcpkgs/python-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
similarity index 54%
rename from srcpkgs/python-kiwisolver/template
rename to srcpkgs/python3-kiwisolver/template
index 67f0805aa51..cbabfa84931 100644
--- a/srcpkgs/python-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,15 +1,15 @@
-# Template file for 'python-kiwisolver'
-pkgname=python-kiwisolver
+# Template file for 'python3-kiwisolver'
+pkgname=python3-kiwisolver
version=1.0.1
-revision=3
+revision=4
wrksrc="kiwisolver-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast implementation of the Cassowary constraint solver (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/nucleic/kiwi"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast implementation of the Cassowary constraint solver (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
+homepage="https://github.com/nucleic/kiwi"
distfiles="${PYPI_SITE}/k/kiwisolver/kiwisolver-${version}.tar.gz"
checksum=ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278
@@ -20,11 +20,3 @@ pre_build() {
post_install() {
vlicense COPYING.txt LICENSE
}
-
-python3-kiwisolver_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense COPYING.txt LICENSE
- }
-}
From 829d9298bb6df46c8e88a8512da00606256525e6 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: Wed, 30 Sep 2020 22:11:05 +0700
Subject: [PATCH 48/51] python-keyutils: drop package
---
srcpkgs/python-keyutils/template | 22 ----------------------
srcpkgs/python3-keyutils | 1 -
srcpkgs/python3-keyutils/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-keyutils/template
delete mode 120000 srcpkgs/python3-keyutils
create mode 100644 srcpkgs/python3-keyutils/template
diff --git a/srcpkgs/python-keyutils/template b/srcpkgs/python-keyutils/template
deleted file mode 100644
index a72819e963a..00000000000
--- a/srcpkgs/python-keyutils/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-keyutils'
-pkgname=python-keyutils
-version=0.6
-revision=2
-build_style=python-module
-pycompile_module="keyutils"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel keyutils-devel"
-short_desc="Python2 bindings for keyutils"
-maintainer="Matthias Fulz <mfulz@olznet.de>"
-license="Apache-2.0"
-homepage="https://github.com/sassoftware/python-keyutils"
-distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
-checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
-
-python3-keyutils_package() {
- pycompile_module="keyutils"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-keyutils b/srcpkgs/python3-keyutils
deleted file mode 120000
index 0b8009d923a..00000000000
--- a/srcpkgs/python3-keyutils
+++ /dev/null
@@ -1 +0,0 @@
-python-keyutils
\ No newline at end of file
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
new file mode 100644
index 00000000000..20f5a6b8e21
--- /dev/null
+++ b/srcpkgs/python3-keyutils/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-keyutils'
+pkgname=python3-keyutils
+version=0.6
+revision=3
+wrksrc=python-keyutils-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel keyutils-devel"
+short_desc="Python3 bindings for keyutils"
+maintainer="Matthias Fulz <mfulz@olznet.de>"
+license="Apache-2.0"
+homepage="https://github.com/sassoftware/python-keyutils"
+distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
+checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
From 3f34b1bbdbdbacb457e9764591d922c4a48b8d3f 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: Wed, 30 Sep 2020 22:15:23 +0700
Subject: [PATCH 49/51] python-gconf: drop package
---
srcpkgs/python-gconf/template | 26 --------------------------
srcpkgs/python-gconf/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-gconf/template
delete mode 100644 srcpkgs/python-gconf/update
diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template
deleted file mode 100644
index 0dcc94d3e1f..00000000000
--- a/srcpkgs/python-gconf/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-gconf'
-pkgname=python-gconf
-version=2.28.1
-revision=5
-wrksrc="gnome-python-${version}"
-build_style=gnu-configure
-configure_args="--enable-gconf --disable-gnome --disable-gnomeui
---disable-gnomecanvas --disable-gnomevfs --disable-gnomevfsbonobo
---disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo
---disable-bonoboui"
-pycompile_dirs="usr/share/pygtk/2.0"
-hostmakedepends="pkg-config python-devel"
-makedepends="python-devel pygtk-devel GConf-devel"
-depends="pygtk"
-short_desc="Python bindings for interacting with GConf"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/gnome-python/2.28/gnome-python-${version}.tar.bz2"
-checksum=759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
-nocross="could not find Python headers or library"
-lib32disabled=yes
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/python-gconf/update b/srcpkgs/python-gconf/update
deleted file mode 100644
index 2b4a7297027..00000000000
--- a/srcpkgs/python-gconf/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="gnome-python"
From 32cbe98c4a60dbfa09182cc42f69aaaf131a71fd 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: Wed, 30 Sep 2020 22:17:36 +0700
Subject: [PATCH 50/51] python-ecdsa: drop package
---
srcpkgs/python-ecdsa/template | 34 ----------------------------------
srcpkgs/python3-ecdsa | 1 -
srcpkgs/python3-ecdsa/template | 23 +++++++++++++++++++++++
3 files changed, 23 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-ecdsa/template
delete mode 120000 srcpkgs/python3-ecdsa
create mode 100644 srcpkgs/python3-ecdsa/template
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
deleted file mode 100644
index 64d642f26b6..00000000000
--- a/srcpkgs/python-ecdsa/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ecdsa'
-pkgname=python-ecdsa
-version=0.14.1
-revision=3
-wrksrc="${pkgname/python-/}-${version}"
-build_style=python-module
-pycompile_module="ecdsa"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Implementation of ECDSA in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/warner/python-ecdsa/"
-distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
-
-pre_build() {
- # use system six
- find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
- rm -f ecdsa/six.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-ecdsa_package() {
- depends="python3-six"
- pycompile_module="ecdsa"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-ecdsa b/srcpkgs/python3-ecdsa
deleted file mode 120000
index 7f15d919f9b..00000000000
--- a/srcpkgs/python3-ecdsa
+++ /dev/null
@@ -1 +0,0 @@
-python-ecdsa
\ No newline at end of file
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
new file mode 100644
index 00000000000..f7482a0a04a
--- /dev/null
+++ b/srcpkgs/python3-ecdsa/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-ecdsa'
+pkgname=python3-ecdsa
+version=0.14.1
+revision=4
+wrksrc="ecdsa-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Implementation of ECDSA in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
+distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
+checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
+
+pre_build() {
+ # use system six
+ find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
+ rm -f ecdsa/six.py
+}
+post_install() {
+ vlicense LICENSE
+}
From af4177e28b1592498d26b325979bde63d2496bda 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: Wed, 30 Sep 2020 22:19:35 +0700
Subject: [PATCH 51/51] python-click: drop package
---
srcpkgs/python-click/template | 27 -------------------
srcpkgs/python3-click | 1 -
srcpkgs/python3-click/template | 18 +++++++++++++
.../{python-click => python3-click}/update | 0
4 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-click/template
delete mode 120000 srcpkgs/python3-click
create mode 100644 srcpkgs/python3-click/template
rename srcpkgs/{python-click => python3-click}/update (100%)
diff --git a/srcpkgs/python-click/template b/srcpkgs/python-click/template
deleted file mode 100644
index e798cd0eca5..00000000000
--- a/srcpkgs/python-click/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-click'
-pkgname=python-click
-version=7.1.2
-revision=2
-wrksrc="click-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package for creating beautiful command line interfaces"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
-distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
-
-post_install() {
- vlicense LICENSE.rst
-}
-
-python3-click_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
diff --git a/srcpkgs/python3-click b/srcpkgs/python3-click
deleted file mode 120000
index d6543636ddb..00000000000
--- a/srcpkgs/python3-click
+++ /dev/null
@@ -1 +0,0 @@
-python-click
\ No newline at end of file
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
new file mode 100644
index 00000000000..2b29bebfbcc
--- /dev/null
+++ b/srcpkgs/python3-click/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click'
+pkgname=python3-click
+version=7.1.2
+revision=3
+wrksrc="click-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package for creating beautiful command line interfaces"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="http://click.pocoo.org/"
+distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
+checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+
+post_install() {
+ vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python-click/update b/srcpkgs/python3-click/update
similarity index 100%
rename from srcpkgs/python-click/update
rename to srcpkgs/python3-click/update
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (9 preceding siblings ...)
2020-10-01 0:32 ` sgn
@ 2020-10-01 15:37 ` sgn
2020-10-01 15:57 ` sgn
2020-10-01 16:42 ` [PR PATCH] [Closed]: " sgn
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-01 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There is an updated 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 and related packages.
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: 148994 bytes --]
From afee4c781b2c9bd95b2d0187b5002b26bf5825c4 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 01/53] 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 9f1cce5525cad405c6b0fe5fafa46cccace57375 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 02/53] 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"
From 2b3de74306b606f3f7e64a16ee71517e2f02f9cb 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 22:17:26 +0700
Subject: [PATCH 03/53] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From e6e37a121378c6ed3d73e6154e2d3d2dd6f6124d 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 22:19:02 +0700
Subject: [PATCH 04/53] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 6925cbd46e3577b69b43f606e9536b4d9ef72188 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 22:27:20 +0700
Subject: [PATCH 05/53] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From 14f25c64e06a4f9a95789ef63cc03b56c2ec3825 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 22:35:47 +0700
Subject: [PATCH 06/53] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From 6ed3afbc6db6df6fcbcbe94689aa0b80d7d66792 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 22:36:41 +0700
Subject: [PATCH 07/53] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 938f2e08595918172aeaf470d4eb3124ca6cfe9d 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 22:40:45 +0700
Subject: [PATCH 08/53] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From 40dd9cc362309605ea789889f74123caf6f505d0 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 22:41:28 +0700
Subject: [PATCH 09/53] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From 081975069cfb196e285df3589a137784a0d8b9bc 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 22:42:25 +0700
Subject: [PATCH 10/53] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 4f14176a7c53b83fd250293eeb812898fb4012bc 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 22:43:42 +0700
Subject: [PATCH 11/53] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From 1419c39e432207d17759a35f68985b40e9235d07 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 22:45:13 +0700
Subject: [PATCH 12/53] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From 0f268148746fe569249df06fd7b176d419b42449 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 22:49:05 +0700
Subject: [PATCH 13/53] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From 13135c7d708229ecc0c61d26d768df4053c244f0 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 22:58:18 +0700
Subject: [PATCH 14/53] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From f28ad72e039f5143de474979f7e665c1aff051a8 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 23:01:19 +0700
Subject: [PATCH 15/53] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 985457f0ad8c02b0a201d92ad06393ad58783254 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 23:01:56 +0700
Subject: [PATCH 16/53] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..5568ed9acdd
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/html5lib/html5lib-python"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From 6d096afd1a5c73e91f33c749113e5b14d478212f 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 23:07:49 +0700
Subject: [PATCH 17/53] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..0c57a319520
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/gsnedders/python-webencodings"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz
+ https://raw.githubusercontent.com/gsnedders/python-webencodings/v$version/LICENSE"
+checksum="b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
+ f23bae6ada76095610a77137fb92aec7342723900211c5826d54b4c57907ca56"
+skip_extraction=LICENSE
+
+post_install() {
+ vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE
+}
From 84247f25af416b5af19268503fbfe834b2fe4aa6 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 23:08:58 +0700
Subject: [PATCH 18/53] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 6d6c7e75af70af77e6495172c7062f566f394a24 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 23:10:42 +0700
Subject: [PATCH 19/53] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From 71eb4266c1412b05e9c4d662c78298ddb486373e 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 23:12:46 +0700
Subject: [PATCH 20/53] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From 1b2d66bdc675ce23045cba44ce877f3830ef8ca9 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 23:15:25 +0700
Subject: [PATCH 21/53] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From dee083c587ba6749ef0056fabe9b956da1865b2b 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 23:15:52 +0700
Subject: [PATCH 22/53] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From 37a39ab10a1c83fc8cdb29ce47a9420c609239a7 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 23:16:45 +0700
Subject: [PATCH 23/53] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From a830bb30eec35dcdb3b0fff2f9db7d74a1a9f1fe 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 23:18:15 +0700
Subject: [PATCH 24/53] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 003643e158d32787f46d1bc7d624eb7284b51472 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 23:19:28 +0700
Subject: [PATCH 25/53] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..a23d3d6e401
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="Python library for the snappy compression library from Google"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 3a055ab7033ec37aaf47829d1f85906079154598 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 23:36:11 +0700
Subject: [PATCH 26/53] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From 3926ccff899d83f0ba77e3e0f617d707acc5b231 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 23:41:22 +0700
Subject: [PATCH 27/53] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From f916c797f51fa054fe93439c4d012d4045267f77 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 23:42:09 +0700
Subject: [PATCH 28/53] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..6b6f93931af
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From 405eea08166e9cadd71a3115daade77786a6da86 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 23:52:31 +0700
Subject: [PATCH 29/53] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From 9fe18166c1e1040da9dc5003333a44ff14a09a33 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 23:55:16 +0700
Subject: [PATCH 30/53] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 498ac8aedeb4f52dd1de1efa89bcfd4ddc2ee443 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 23:55:53 +0700
Subject: [PATCH 31/53] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From de7d2c555882628133434212f34aadfdbb225a1d 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 23:56:08 +0700
Subject: [PATCH 32/53] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..dbd62331b0c
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://github.com/eliben/pyelftools"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From e086fd8748220140b359532abf3cf408b5bb249d 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 33/53] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 910ab2464e724fc8166e2151b75bb9b08211aad6 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 34/53] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 6c317f4ca1acdc54ba75438f3b73c1ddac669a7c 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 35/53] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From 2cae61c3688dff40aa6cafa827008e351db69dc1 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 36/53] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From 54651591f7eb832e131238c4ece28a1145da798f 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 37/53] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
From 04fa352150487c6cf77134df3353a41d1003adc9 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: Wed, 30 Sep 2020 21:16:16 +0700
Subject: [PATCH 38/53] python3-pafy: drop noarch
Also drop python 2 transitional package.
---
srcpkgs/python3-pafy/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 8d3fafaf789..1165626f76e 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,8 +1,7 @@
# Template file for 'python3-pafy'
pkgname=python3-pafy
version=0.5.5
-revision=1
-archs=noarch
+revision=2
wrksrc="pafy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools youtube-dl"
@@ -13,9 +12,3 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/mps-youtube/pafy"
distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
checksum=3b878d319dc63be2f2a84aca5df4ee08baf7256d26e61c94d92b6165b965994f
-
-python-pafy_package() {
- depends="python3-pafy"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From a32ed65f62448255c17ded57a17d9307579c2f8a 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: Wed, 30 Sep 2020 21:18:51 +0700
Subject: [PATCH 39/53] python-numexpr: drop package
---
srcpkgs/python-numexpr/template | 30 ------------------------------
srcpkgs/python3-numexpr | 1 -
srcpkgs/python3-numexpr/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-numexpr/template
delete mode 120000 srcpkgs/python3-numexpr
create mode 100644 srcpkgs/python3-numexpr/template
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
deleted file mode 100644
index baf91175a33..00000000000
--- a/srcpkgs/python-numexpr/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-numexpr'
-pkgname=python-numexpr
-version=2.7.0
-revision=2
-wrksrc="numexpr-${version}"
-build_style=python-module
-pycompile_module="numexpr"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Fast numerical expression evaluator for NumPy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/pydata/numexpr"
-distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-numexpr_package() {
- depends="python3-numpy"
- pycompile_module="numexpr"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-numexpr b/srcpkgs/python3-numexpr
deleted file mode 120000
index cab9d2a5293..00000000000
--- a/srcpkgs/python3-numexpr
+++ /dev/null
@@ -1 +0,0 @@
-python-numexpr
\ No newline at end of file
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
new file mode 100644
index 00000000000..c19b5149018
--- /dev/null
+++ b/srcpkgs/python3-numexpr/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-numexpr'
+pkgname=python3-numexpr
+version=2.7.0
+revision=3
+wrksrc="numexpr-${version}"
+build_style=python3-module
+build_helper=numpy
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Fast numerical expression evaluator for NumPy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pydata/numexpr"
+distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
+
+post_install() {
+ vlicense LICENSE.txt
+}
From afd4b6c0e22c493e924c5e79e0a06f6f263b6d63 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: Wed, 30 Sep 2020 22:03:39 +0700
Subject: [PATCH 40/53] python-nbxmpp: drop package
---
srcpkgs/python-nbxmpp | 1 -
srcpkgs/python3-nbxmpp/template | 7 -------
2 files changed, 8 deletions(-)
delete mode 120000 srcpkgs/python-nbxmpp
diff --git a/srcpkgs/python-nbxmpp b/srcpkgs/python-nbxmpp
deleted file mode 120000
index ae760ace99f..00000000000
--- a/srcpkgs/python-nbxmpp
+++ /dev/null
@@ -1 +0,0 @@
-python3-nbxmpp
\ No newline at end of file
diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index fc711fb5821..583a4691a4d 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -13,10 +13,3 @@ homepage="https://python-nbxmpp.gajim.org/"
#changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
checksum=991f014a2736123e989da454d6a467be8c4314bf86dbcc889e899f03726e856f
-
-python-nbxmpp_package() {
- build_style=meta
- archs=noarch
- # Someone bumped this package to 1.0.0, which doesn't support Python 2
- short_desc+=" - Python 2 - removed package"
-}
From bf9f211d2c2de1e9e343183e7fde4d9adfd261cd 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: Wed, 30 Sep 2020 22:04:36 +0700
Subject: [PATCH 41/53] python-musicbrainzngs: drop package
---
srcpkgs/python-musicbrainzngs/template | 30 -------------------------
srcpkgs/python3-musicbrainzngs | 1 -
srcpkgs/python3-musicbrainzngs/template | 19 ++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-musicbrainzngs/template
delete mode 120000 srcpkgs/python3-musicbrainzngs
create mode 100644 srcpkgs/python3-musicbrainzngs/template
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
deleted file mode 100644
index 8679b3bfcf5..00000000000
--- a/srcpkgs/python-musicbrainzngs/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-musicbrainzngs'
-pkgname=python-musicbrainzngs
-version=0.6
-revision=5
-wrksrc="musicbrainzngs-${version}"
-build_style="python-module"
-pycompile_module="musicbrainzngs"
-hostmakedepends="python-devel python3-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-short_desc="Python2 bindings for the Musicbrainz NGS webservice interface"
-maintainer="Steven R <dev@styez.com>"
-license="BSD"
-homepage="https://github.com/alastair/python-musicbrainz-ngs/"
-distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
-
-post_install() {
- vlicense COPYING
-}
-
-python3-musicbrainzngs_package() {
- depends="python3"
- pycompile_module="musicbrainzngs"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYING
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-musicbrainzngs b/srcpkgs/python3-musicbrainzngs
deleted file mode 120000
index 81a3ce402a2..00000000000
--- a/srcpkgs/python3-musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainzngs
\ No newline at end of file
diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
new file mode 100644
index 00000000000..6bb7c93ce6a
--- /dev/null
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-musicbrainzngs'
+pkgname=python3-musicbrainzngs
+version=0.6
+revision=6
+wrksrc="musicbrainzngs-${version}"
+build_style="python3-module"
+hostmakedepends="python3-devel"
+makedepends="${hostmakedepends}"
+depends="python3"
+short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
+maintainer="Steven R <dev@styez.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/alastair/python-musicbrainz-ngs/"
+distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
+checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+
+post_install() {
+ vlicense COPYING
+}
From 8b5f17c82d86a260cd21e0efc481d6a29f94a688 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: Wed, 30 Sep 2020 22:06:03 +0700
Subject: [PATCH 42/53] python-monotonic: drop package
---
srcpkgs/python-monotonic/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-monotonic/template
diff --git a/srcpkgs/python-monotonic/template b/srcpkgs/python-monotonic/template
deleted file mode 100644
index 71bd26c6f18..00000000000
--- a/srcpkgs/python-monotonic/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-monotonic'
-pkgname=python-monotonic
-version=1.5
-revision=2
-wrksrc="monotonic-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-pycompile_module="monotonic.py"
-short_desc="Implementation of time.monotonic() for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
-homepage="https://github.com/atdt/monotonic"
-distfiles="${PYPI_SITE}/m/monotonic/monotonic-${version}.tar.gz"
-checksum=23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0
From 2fc83f0329218f8445e92ec27f3aa6afacabed4d 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: Wed, 30 Sep 2020 22:07:14 +0700
Subject: [PATCH 43/53] python-miniupnpc: drop package
---
srcpkgs/python-miniupnpc/template | 28 ----------------------------
srcpkgs/python3-miniupnpc | 1 -
srcpkgs/python3-miniupnpc/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-miniupnpc/template
delete mode 120000 srcpkgs/python3-miniupnpc
create mode 100644 srcpkgs/python3-miniupnpc/template
diff --git a/srcpkgs/python-miniupnpc/template b/srcpkgs/python-miniupnpc/template
deleted file mode 100644
index f7892bab073..00000000000
--- a/srcpkgs/python-miniupnpc/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-miniupnpc'
-pkgname=python-miniupnpc
-version=2.0.2
-revision=3
-wrksrc="${pkgname#python-}-$version"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel miniupnpc-devel"
-depends="python"
-short_desc="Python2 bindings for miniupnpc, a UPnP library"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/miniupnpc/"
-distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
-checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
-
-python3-miniupnpc_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense LICENSE
- vmove usr/lib/python3*
- }
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python3-miniupnpc b/srcpkgs/python3-miniupnpc
deleted file mode 120000
index 17d4960a570..00000000000
--- a/srcpkgs/python3-miniupnpc
+++ /dev/null
@@ -1 +0,0 @@
-python-miniupnpc
\ No newline at end of file
diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
new file mode 100644
index 00000000000..4331ce7e85e
--- /dev/null
+++ b/srcpkgs/python3-miniupnpc/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-miniupnpc'
+pkgname=python3-miniupnpc
+version=2.0.2
+revision=4
+wrksrc="miniupnpc-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel miniupnpc-devel"
+depends="python3"
+short_desc="Python3 bindings for miniupnpc, a UPnP library"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/miniupnpc/"
+distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
+checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
+
+
+post_install() {
+ vlicense LICENSE
+}
From 9330bb06c326c0038704ab493c9544d4b7dd7644 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: Wed, 30 Sep 2020 22:07:54 +0700
Subject: [PATCH 44/53] python-marisa-trie: drop package
---
srcpkgs/python3-marisa-trie | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-marisa-trie
rename srcpkgs/{python-marisa-trie => python3-marisa-trie}/template (58%)
diff --git a/srcpkgs/python3-marisa-trie b/srcpkgs/python3-marisa-trie
deleted file mode 120000
index 8efb226c0fc..00000000000
--- a/srcpkgs/python3-marisa-trie
+++ /dev/null
@@ -1 +0,0 @@
-python-marisa-trie
\ No newline at end of file
diff --git a/srcpkgs/python-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
similarity index 58%
rename from srcpkgs/python-marisa-trie/template
rename to srcpkgs/python3-marisa-trie/template
index 5e46b686ace..ab26456bd5b 100644
--- a/srcpkgs/python-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,12 +1,12 @@
-# Template file for 'python-marisa-trie'
-pkgname=python-marisa-trie
+# Template file for 'python3-marisa-trie'
+pkgname=python3-marisa-trie
version=0.7.5
-revision=3
+revision=4
wrksrc="marisa-trie-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Static memory-efficient Trie-like structures (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Static memory-efficient Trie-like structures (Python3)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="https://github.com/pytries/marisa-trie"
@@ -17,11 +17,3 @@ checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
post_install() {
vlicense LICENSE
}
-
-python3-marisa-trie_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 0c674ac05bb5a5edda27abed3f74b239fcbd1b06 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: Wed, 30 Sep 2020 22:08:14 +0700
Subject: [PATCH 45/53] python-libpcap: drop package
---
srcpkgs/python-libpcap/template | 19 -------------------
srcpkgs/python-libpcap/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-libpcap/template
delete mode 100644 srcpkgs/python-libpcap/update
diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template
deleted file mode 100644
index b39b9558fc5..00000000000
--- a/srcpkgs/python-libpcap/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-libpcap'
-pkgname=python-libpcap
-version=0.6.4
-revision=2
-wrksrc="pylibpcap-$version"
-build_style=python2-module
-pycompile_module="pcap.py"
-hostmakedepends="python"
-makedepends="libpcap-devel python-devel"
-short_desc="Python2 module for the libpcap packet capture library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://pylibpcap.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz"
-checksum=cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/python-libpcap/update b/srcpkgs/python-libpcap/update
deleted file mode 100644
index ec0f249750a..00000000000
--- a/srcpkgs/python-libpcap/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pylibpcap
From 2c599263d08ff12fc32e9b6bd35adbcb2f0d334a 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: Wed, 30 Sep 2020 22:08:28 +0700
Subject: [PATCH 46/53] python-lazy-object-proxy: drop package
---
srcpkgs/python-lazy-object-proxy/template | 28 ----------------------
srcpkgs/python3-lazy-object-proxy | 1 -
srcpkgs/python3-lazy-object-proxy/template | 22 +++++++++++++++++
3 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-lazy-object-proxy/template
delete mode 120000 srcpkgs/python3-lazy-object-proxy
create mode 100644 srcpkgs/python3-lazy-object-proxy/template
diff --git a/srcpkgs/python-lazy-object-proxy/template b/srcpkgs/python-lazy-object-proxy/template
deleted file mode 100644
index 067890e5176..00000000000
--- a/srcpkgs/python-lazy-object-proxy/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-lazy-object-proxy'
-pkgname=python-lazy-object-proxy
-version=1.4.3
-revision=2
-wrksrc="lazy-object-proxy-${version}"
-build_style=python-module
-pycompile_module="lazy_object_proxy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast and thorough lazy object proxy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/ionelmc/python-lazy-object-proxy"
-distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
-checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-lazy-object-proxy_package() {
- pycompile_module="lazy_object_proxy"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-lazy-object-proxy b/srcpkgs/python3-lazy-object-proxy
deleted file mode 120000
index a1a392a0e66..00000000000
--- a/srcpkgs/python3-lazy-object-proxy
+++ /dev/null
@@ -1 +0,0 @@
-python-lazy-object-proxy
\ No newline at end of file
diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
new file mode 100644
index 00000000000..5284244320a
--- /dev/null
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-lazy-object-proxy'
+pkgname=python3-lazy-object-proxy
+version=1.4.3
+revision=3
+wrksrc="lazy-object-proxy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast and thorough lazy object proxy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-lazy-object-proxy"
+distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
+checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
+
+post_patch() {
+ vsed -i '/setuptools_scm/d' setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From fc2e22e7fd723bb5cdb62f859a59a357d298dcdb 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: Wed, 30 Sep 2020 22:10:46 +0700
Subject: [PATCH 47/53] python-kiwisolver: drop package
---
srcpkgs/python3-kiwisolver | 1 -
.../template | 26 +++++++------------
2 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-kiwisolver
rename srcpkgs/{python-kiwisolver => python3-kiwisolver}/template (54%)
diff --git a/srcpkgs/python3-kiwisolver b/srcpkgs/python3-kiwisolver
deleted file mode 120000
index 6bb16d6a5b7..00000000000
--- a/srcpkgs/python3-kiwisolver
+++ /dev/null
@@ -1 +0,0 @@
-python-kiwisolver
\ No newline at end of file
diff --git a/srcpkgs/python-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
similarity index 54%
rename from srcpkgs/python-kiwisolver/template
rename to srcpkgs/python3-kiwisolver/template
index 67f0805aa51..cbabfa84931 100644
--- a/srcpkgs/python-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,15 +1,15 @@
-# Template file for 'python-kiwisolver'
-pkgname=python-kiwisolver
+# Template file for 'python3-kiwisolver'
+pkgname=python3-kiwisolver
version=1.0.1
-revision=3
+revision=4
wrksrc="kiwisolver-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast implementation of the Cassowary constraint solver (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/nucleic/kiwi"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast implementation of the Cassowary constraint solver (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
+homepage="https://github.com/nucleic/kiwi"
distfiles="${PYPI_SITE}/k/kiwisolver/kiwisolver-${version}.tar.gz"
checksum=ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278
@@ -20,11 +20,3 @@ pre_build() {
post_install() {
vlicense COPYING.txt LICENSE
}
-
-python3-kiwisolver_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense COPYING.txt LICENSE
- }
-}
From 8120b9d42a000249cd5fea47efb2dc88a10c0ec9 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: Wed, 30 Sep 2020 22:11:05 +0700
Subject: [PATCH 48/53] python-keyutils: drop package
---
srcpkgs/python-keyutils/template | 22 ----------------------
srcpkgs/python3-keyutils | 1 -
srcpkgs/python3-keyutils/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-keyutils/template
delete mode 120000 srcpkgs/python3-keyutils
create mode 100644 srcpkgs/python3-keyutils/template
diff --git a/srcpkgs/python-keyutils/template b/srcpkgs/python-keyutils/template
deleted file mode 100644
index a72819e963a..00000000000
--- a/srcpkgs/python-keyutils/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-keyutils'
-pkgname=python-keyutils
-version=0.6
-revision=2
-build_style=python-module
-pycompile_module="keyutils"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel keyutils-devel"
-short_desc="Python2 bindings for keyutils"
-maintainer="Matthias Fulz <mfulz@olznet.de>"
-license="Apache-2.0"
-homepage="https://github.com/sassoftware/python-keyutils"
-distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
-checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
-
-python3-keyutils_package() {
- pycompile_module="keyutils"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-keyutils b/srcpkgs/python3-keyutils
deleted file mode 120000
index 0b8009d923a..00000000000
--- a/srcpkgs/python3-keyutils
+++ /dev/null
@@ -1 +0,0 @@
-python-keyutils
\ No newline at end of file
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
new file mode 100644
index 00000000000..20f5a6b8e21
--- /dev/null
+++ b/srcpkgs/python3-keyutils/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-keyutils'
+pkgname=python3-keyutils
+version=0.6
+revision=3
+wrksrc=python-keyutils-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel keyutils-devel"
+short_desc="Python3 bindings for keyutils"
+maintainer="Matthias Fulz <mfulz@olznet.de>"
+license="Apache-2.0"
+homepage="https://github.com/sassoftware/python-keyutils"
+distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
+checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
From 37295ffd5435c9b28beb884351356dff02f001f3 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: Wed, 30 Sep 2020 22:15:23 +0700
Subject: [PATCH 49/53] python-gconf: drop package
---
srcpkgs/python-gconf/template | 26 --------------------------
srcpkgs/python-gconf/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-gconf/template
delete mode 100644 srcpkgs/python-gconf/update
diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template
deleted file mode 100644
index 0dcc94d3e1f..00000000000
--- a/srcpkgs/python-gconf/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-gconf'
-pkgname=python-gconf
-version=2.28.1
-revision=5
-wrksrc="gnome-python-${version}"
-build_style=gnu-configure
-configure_args="--enable-gconf --disable-gnome --disable-gnomeui
---disable-gnomecanvas --disable-gnomevfs --disable-gnomevfsbonobo
---disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo
---disable-bonoboui"
-pycompile_dirs="usr/share/pygtk/2.0"
-hostmakedepends="pkg-config python-devel"
-makedepends="python-devel pygtk-devel GConf-devel"
-depends="pygtk"
-short_desc="Python bindings for interacting with GConf"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/gnome-python/2.28/gnome-python-${version}.tar.bz2"
-checksum=759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
-nocross="could not find Python headers or library"
-lib32disabled=yes
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/python-gconf/update b/srcpkgs/python-gconf/update
deleted file mode 100644
index 2b4a7297027..00000000000
--- a/srcpkgs/python-gconf/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="gnome-python"
From 7a2ab7e3b3ae2d529d4b0cd93d112e13662d17b5 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: Wed, 30 Sep 2020 22:17:36 +0700
Subject: [PATCH 50/53] python-ecdsa: drop package
---
srcpkgs/python-ecdsa/template | 34 ----------------------------------
srcpkgs/python3-ecdsa | 1 -
srcpkgs/python3-ecdsa/template | 23 +++++++++++++++++++++++
3 files changed, 23 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-ecdsa/template
delete mode 120000 srcpkgs/python3-ecdsa
create mode 100644 srcpkgs/python3-ecdsa/template
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
deleted file mode 100644
index 64d642f26b6..00000000000
--- a/srcpkgs/python-ecdsa/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ecdsa'
-pkgname=python-ecdsa
-version=0.14.1
-revision=3
-wrksrc="${pkgname/python-/}-${version}"
-build_style=python-module
-pycompile_module="ecdsa"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Implementation of ECDSA in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/warner/python-ecdsa/"
-distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
-
-pre_build() {
- # use system six
- find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
- rm -f ecdsa/six.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-ecdsa_package() {
- depends="python3-six"
- pycompile_module="ecdsa"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-ecdsa b/srcpkgs/python3-ecdsa
deleted file mode 120000
index 7f15d919f9b..00000000000
--- a/srcpkgs/python3-ecdsa
+++ /dev/null
@@ -1 +0,0 @@
-python-ecdsa
\ No newline at end of file
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
new file mode 100644
index 00000000000..f7482a0a04a
--- /dev/null
+++ b/srcpkgs/python3-ecdsa/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-ecdsa'
+pkgname=python3-ecdsa
+version=0.14.1
+revision=4
+wrksrc="ecdsa-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Implementation of ECDSA in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
+distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
+checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
+
+pre_build() {
+ # use system six
+ find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
+ rm -f ecdsa/six.py
+}
+post_install() {
+ vlicense LICENSE
+}
From b6b43b7312a0c8a2fa02093b611ff94d480053bf 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: Wed, 30 Sep 2020 22:19:35 +0700
Subject: [PATCH 51/53] python-click: drop package
---
srcpkgs/python-click/template | 27 -------------------
srcpkgs/python3-click | 1 -
srcpkgs/python3-click/template | 18 +++++++++++++
.../{python-click => python3-click}/update | 0
4 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-click/template
delete mode 120000 srcpkgs/python3-click
create mode 100644 srcpkgs/python3-click/template
rename srcpkgs/{python-click => python3-click}/update (100%)
diff --git a/srcpkgs/python-click/template b/srcpkgs/python-click/template
deleted file mode 100644
index e798cd0eca5..00000000000
--- a/srcpkgs/python-click/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-click'
-pkgname=python-click
-version=7.1.2
-revision=2
-wrksrc="click-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package for creating beautiful command line interfaces"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
-distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
-
-post_install() {
- vlicense LICENSE.rst
-}
-
-python3-click_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
diff --git a/srcpkgs/python3-click b/srcpkgs/python3-click
deleted file mode 120000
index d6543636ddb..00000000000
--- a/srcpkgs/python3-click
+++ /dev/null
@@ -1 +0,0 @@
-python-click
\ No newline at end of file
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
new file mode 100644
index 00000000000..2b29bebfbcc
--- /dev/null
+++ b/srcpkgs/python3-click/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click'
+pkgname=python3-click
+version=7.1.2
+revision=3
+wrksrc="click-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package for creating beautiful command line interfaces"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="http://click.pocoo.org/"
+distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
+checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+
+post_install() {
+ vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python-click/update b/srcpkgs/python3-click/update
similarity index 100%
rename from srcpkgs/python-click/update
rename to srcpkgs/python3-click/update
From d1e0d9280d98b48c803e1411db03224c49b2b2fb 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: Thu, 1 Oct 2020 07:39:19 +0700
Subject: [PATCH 52/53] python-yaml: drop package
---
srcpkgs/python-yaml/template | 30 --------------------
srcpkgs/python3-yaml | 1 -
srcpkgs/python3-yaml/template | 22 ++++++++++++++
srcpkgs/{python-yaml => python3-yaml}/update | 0
4 files changed, 22 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-yaml/template
delete mode 120000 srcpkgs/python3-yaml
create mode 100644 srcpkgs/python3-yaml/template
rename srcpkgs/{python-yaml => python3-yaml}/update (100%)
diff --git a/srcpkgs/python-yaml/template b/srcpkgs/python-yaml/template
deleted file mode 100644
index 34df72de973..00000000000
--- a/srcpkgs/python-yaml/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-yaml'
-pkgname=python-yaml
-version=5.3.1
-revision=1
-wrksrc="PyYAML-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="libyaml-devel python-devel python3-devel"
-short_desc="YAML parser and emitter for Python2"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="http://pyyaml.org/wiki/PyYAML"
-distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
-
-do_check() {
- python3 setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-yaml_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-yaml b/srcpkgs/python3-yaml
deleted file mode 120000
index 8ad435a8a6f..00000000000
--- a/srcpkgs/python3-yaml
+++ /dev/null
@@ -1 +0,0 @@
-python-yaml
\ No newline at end of file
diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
new file mode 100644
index 00000000000..34c2820cfee
--- /dev/null
+++ b/srcpkgs/python3-yaml/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-yaml'
+pkgname=python3-yaml
+version=5.3.1
+revision=2
+wrksrc="PyYAML-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libyaml-devel python3-devel"
+short_desc="YAML parser and emitter for Python 3"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="http://pyyaml.org/wiki/PyYAML"
+distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
+checksum=e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-yaml/update b/srcpkgs/python3-yaml/update
similarity index 100%
rename from srcpkgs/python-yaml/update
rename to srcpkgs/python3-yaml/update
From 76ab46f537b1bf853c587a4bdcdd69e086b3e431 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: Thu, 1 Oct 2020 08:30:51 +0700
Subject: [PATCH 53/53] python-yenc: drop package
---
srcpkgs/python-yenc/template | 20 --------------------
srcpkgs/python-yenc/update | 1 -
2 files changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-yenc/template
delete mode 100644 srcpkgs/python-yenc/update
diff --git a/srcpkgs/python-yenc/template b/srcpkgs/python-yenc/template
deleted file mode 100644
index a2f1f882056..00000000000
--- a/srcpkgs/python-yenc/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-yenc'
-pkgname=python-yenc
-version=0.4.0
-revision=2
-wrksrc="yenc-${version}"
-build_style=python2-module
-hostmakedepends="python-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-pycompile_module="yenc.py"
-short_desc="yEnc Module for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://bitbucket.org/dual75/yenc"
-license="LGPL-2.1"
-distfiles="http://www.golug.it/pub/yenc/yenc-${version}.tar.gz"
-checksum=075f6c4e4f43b7c6dafac579eabb17287b62d80e9147cbea0b046bc3ee8edd2f
-
-pre_build() {
- sed -i 's/extra_compile_args=\[[^]]*\]/extra_compile_args=[]/' setup.py
-}
diff --git a/srcpkgs/python-yenc/update b/srcpkgs/python-yenc/update
deleted file mode 100644
index 72bf9817e4b..00000000000
--- a/srcpkgs/python-yenc/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="yenc"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (10 preceding siblings ...)
2020-10-01 15:37 ` sgn
@ 2020-10-01 15:57 ` sgn
2020-10-01 16:42 ` [PR PATCH] [Closed]: " sgn
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-01 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 335 bytes --]
There is an updated 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 and related packages.
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: 148994 bytes --]
From afee4c781b2c9bd95b2d0187b5002b26bf5825c4 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 01/53] 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 9f1cce5525cad405c6b0fe5fafa46cccace57375 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 02/53] 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"
From 2b3de74306b606f3f7e64a16ee71517e2f02f9cb 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 22:17:26 +0700
Subject: [PATCH 03/53] python-soupsieve: drop package
---
srcpkgs/python-soupsieve/template | 40 ------------------------------
srcpkgs/python3-soupsieve | 1 -
srcpkgs/python3-soupsieve/template | 25 +++++++++++++++++++
3 files changed, 25 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/python-soupsieve/template
delete mode 120000 srcpkgs/python3-soupsieve
create mode 100644 srcpkgs/python3-soupsieve/template
diff --git a/srcpkgs/python-soupsieve/template b/srcpkgs/python-soupsieve/template
deleted file mode 100644
index 8fdef36b1a2..00000000000
--- a/srcpkgs/python-soupsieve/template
+++ /dev/null
@@ -1,40 +0,0 @@
-# Template file for 'python-soupsieve'
-pkgname=python-soupsieve
-version=1.9.5
-revision=3
-wrksrc="soupsieve-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-checkdepends="python-pytest python-lxml python-html5lib python-BeautifulSoup4
- python-backports.functools_lru_cache python3-pytest python3-lxml
- python3-html5lib python3-BeautifulSoup4"
-short_desc="CSS4 selector implementation for Python2 Beautiful Soup"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
-license="MIT"
-homepage="https://facelessuser.github.io/soupsieve/"
-distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
-checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
-
-do_check() {
- PY2PATH="${PWD}/build-2.7/lib"
- PY3PATH="${PWD}/build-${py3_ver}/lib"
-
- PYTHONPATH="${PY2PATH}" python2 -m pytest
- PYTHONPATH="${PY3PATH}" python3 -m pytest
-}
-
-post_install() {
- vlicense LICENSE.md
-
- # Remove tests outside of the namespace
- rm -rf ${DESTDIR}/${py3_sitelib}/tests
- rm -rf ${DESTDIR}/${py2_sitelib}/tests
-}
-
-python3-soupsieve_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE.md
- }
-}
diff --git a/srcpkgs/python3-soupsieve b/srcpkgs/python3-soupsieve
deleted file mode 120000
index 7dd14aa4dc9..00000000000
--- a/srcpkgs/python3-soupsieve
+++ /dev/null
@@ -1 +0,0 @@
-python-soupsieve
\ No newline at end of file
diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
new file mode 100644
index 00000000000..568fe455668
--- /dev/null
+++ b/srcpkgs/python3-soupsieve/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-soupsieve'
+pkgname=python3-soupsieve
+version=1.9.5
+revision=3
+wrksrc="soupsieve-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
+maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+license="MIT"
+homepage="https://facelessuser.github.io/soupsieve/"
+distfiles="${PYPI_SITE}/s/soupsieve/soupsieve-${version}.tar.gz"
+checksum=e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda
+
+do_check() {
+ PYTHONPATH="${PWD}/build/lib" python3 -m pytest
+}
+
+post_install() {
+ vlicense LICENSE.md
+
+ # Remove tests outside of the namespace
+ rm -rf ${DESTDIR}/${py3_sitelib}/tests
+}
From e6e37a121378c6ed3d73e6154e2d3d2dd6f6124d 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 22:19:02 +0700
Subject: [PATCH 04/53] python-BeautifulSoup4: drop package
---
srcpkgs/python-BeautifulSoup4/template | 27 -------------------------
srcpkgs/python3-BeautifulSoup4 | 1 -
srcpkgs/python3-BeautifulSoup4/template | 21 +++++++++++++++++++
3 files changed, 21 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-BeautifulSoup4/template
delete mode 120000 srcpkgs/python3-BeautifulSoup4
create mode 100644 srcpkgs/python3-BeautifulSoup4/template
diff --git a/srcpkgs/python-BeautifulSoup4/template b/srcpkgs/python-BeautifulSoup4/template
deleted file mode 100644
index ddeb3d52b35..00000000000
--- a/srcpkgs/python-BeautifulSoup4/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-BeautifulSoup4'
-pkgname=python-BeautifulSoup4
-version=4.8.2
-revision=2
-wrksrc="beautifulsoup4-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-soupsieve"
-short_desc="Python2 HTML/XML parser"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://www.crummy.com/software/BeautifulSoup"
-distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
-checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-BeautifulSoup4_package() {
- depends="python3 python3-soupsieve"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-BeautifulSoup4 b/srcpkgs/python3-BeautifulSoup4
deleted file mode 120000
index 3b3f906dbe7..00000000000
--- a/srcpkgs/python3-BeautifulSoup4
+++ /dev/null
@@ -1 +0,0 @@
-python-BeautifulSoup4
\ No newline at end of file
diff --git a/srcpkgs/python3-BeautifulSoup4/template b/srcpkgs/python3-BeautifulSoup4/template
new file mode 100644
index 00000000000..7e2f40ab129
--- /dev/null
+++ b/srcpkgs/python3-BeautifulSoup4/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-BeautifulSoup4'
+pkgname=python3-BeautifulSoup4
+version=4.8.2
+revision=2
+wrksrc="beautifulsoup4-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-soupsieve"
+short_desc="Python3 HTML/XML parser"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://www.crummy.com/software/BeautifulSoup"
+distfiles="${PYPI_SITE}/b/beautifulsoup4/beautifulsoup4-${version}.tar.gz"
+checksum=05fd825eb01c290877657a56df4c6e4c311b3965bda790c613a3d6fb01a5462a
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense LICENSE
+}
From 6925cbd46e3577b69b43f606e9536b4d9ef72188 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 22:27:20 +0700
Subject: [PATCH 05/53] python-apsw: drop package
---
srcpkgs/python3-apsw | 1 -
.../{python-apsw => python3-apsw}/template | 26 ++++++++-----------
srcpkgs/{python-apsw => python3-apsw}/update | 0
3 files changed, 11 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-apsw
rename srcpkgs/{python-apsw => python3-apsw}/template (55%)
rename srcpkgs/{python-apsw => python3-apsw}/update (100%)
diff --git a/srcpkgs/python3-apsw b/srcpkgs/python3-apsw
deleted file mode 120000
index 7db0b0b52f4..00000000000
--- a/srcpkgs/python3-apsw
+++ /dev/null
@@ -1 +0,0 @@
-python-apsw
\ No newline at end of file
diff --git a/srcpkgs/python-apsw/template b/srcpkgs/python3-apsw/template
similarity index 55%
rename from srcpkgs/python-apsw/template
rename to srcpkgs/python3-apsw/template
index 00415c8a4cb..48cc530c1ec 100644
--- a/srcpkgs/python-apsw/template
+++ b/srcpkgs/python3-apsw/template
@@ -1,14 +1,14 @@
-# Template file for 'python-apsw'
-pkgname=python-apsw
+# Template file for 'python3-apsw'
+pkgname=python3-apsw
_distver=3.32.2
_patchver=r1
version=${_distver}${_patchver}
-revision=1
+revision=2
wrksrc="apsw-${_distver}-${_patchver}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Another Python SQLite Wrapper (Python2)"
+build_style=python3-module
+hostmakedepends="python3-devel"
+makedepends="python3-devel sqlite-devel"
+short_desc="Another Python SQLite Wrapper (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="Zlib"
homepage="https://github.com/rogerbinns/apsw"
@@ -16,14 +16,10 @@ changelog="https://raw.githubusercontent.com/rogerbinns/apsw/master/doc/changes.
distfiles="${homepage}/archive/${_distver}-${_patchver}.tar.gz"
checksum=33f3ccfd8a7537dccef2caeb8cc06e26f300f1cf547c22c4e8ec8dcfecb72aa0
-post_install() {
- vlicense LICENSE
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
}
-python3-apsw_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense LICENSE
- }
+post_install() {
+ vlicense LICENSE
}
diff --git a/srcpkgs/python-apsw/update b/srcpkgs/python3-apsw/update
similarity index 100%
rename from srcpkgs/python-apsw/update
rename to srcpkgs/python3-apsw/update
From 14f25c64e06a4f9a95789ef63cc03b56c2ec3825 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 22:35:47 +0700
Subject: [PATCH 06/53] python-css-parser: drop package
---
srcpkgs/python-css-parser/template | 29 -----------------------------
srcpkgs/python3-css-parser | 1 -
srcpkgs/python3-css-parser/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-css-parser/template
delete mode 120000 srcpkgs/python3-css-parser
create mode 100644 srcpkgs/python3-css-parser/template
diff --git a/srcpkgs/python-css-parser/template b/srcpkgs/python-css-parser/template
deleted file mode 100644
index 851990de938..00000000000
--- a/srcpkgs/python-css-parser/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-css-parser'
-pkgname=python-css-parser
-version=1.0.4
-revision=3
-wrksrc="css-parser-${version}"
-build_style=python-module
-pycompile_module="css_parser"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-checkdepends="python3-chardet"
-short_desc="CSS related utilities (Python2)"
-maintainer="bra1nwave <brainwave@openmailbox.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/ebook-utils/css-parser"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
-
-do_check() {
- python3 setup.py test
-}
-
-python3-css-parser_package() {
- pycompile_module="css_parser"
- depends="python3"
- short_desc="${short_desc/2/3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-css-parser b/srcpkgs/python3-css-parser
deleted file mode 120000
index 67113a6b128..00000000000
--- a/srcpkgs/python3-css-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-css-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-css-parser/template b/srcpkgs/python3-css-parser/template
new file mode 100644
index 00000000000..12d7796b622
--- /dev/null
+++ b/srcpkgs/python3-css-parser/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-css-parser'
+pkgname=python3-css-parser
+version=1.0.4
+revision=4
+wrksrc="css-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-chardet"
+short_desc="CSS related utilities (Python3)"
+maintainer="bra1nwave <brainwave@openmailbox.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/ebook-utils/css-parser"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=ccfa62d56ccb892bd89f26926142692998db7757b691929c181af350d77c2c45
+
+do_check() {
+ python3 setup.py test
+}
From 6ed3afbc6db6df6fcbcbe94689aa0b80d7d66792 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 22:36:41 +0700
Subject: [PATCH 07/53] python3-html5-parser: depends on BeautifulSoup
While we're at it, drop python-html5-parser.
---
srcpkgs/python-html5-parser/template | 25 -------------------------
srcpkgs/python3-html5-parser | 1 -
srcpkgs/python3-html5-parser/template | 16 ++++++++++++++++
3 files changed, 16 insertions(+), 26 deletions(-)
delete mode 100644 srcpkgs/python-html5-parser/template
delete mode 120000 srcpkgs/python3-html5-parser
create mode 100644 srcpkgs/python3-html5-parser/template
diff --git a/srcpkgs/python-html5-parser/template b/srcpkgs/python-html5-parser/template
deleted file mode 100644
index 66c2d01e453..00000000000
--- a/srcpkgs/python-html5-parser/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'python-html5-parser'
-pkgname=python-html5-parser
-version=0.4.9
-revision=2
-wrksrc="html5-parser-${version}"
-build_style=python-module
-pycompile_module="html5_parser"
-hostmakedepends="python-setuptools python3-setuptools pkg-config"
-makedepends="python-devel python3-devel libxml2-devel"
-depends="python-chardet python-lxml"
-short_desc="Fast C-based HTML5 parsing (Python2)"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="Apache-2.0"
-homepage="https://html5-parser.readthedocs.io/"
-distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
-checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
-
-python3-html5-parser_package() {
- pycompile_module="html5_parser"
- depends="python3-chardet python3-lxml"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- }
-}
diff --git a/srcpkgs/python3-html5-parser b/srcpkgs/python3-html5-parser
deleted file mode 120000
index b3539598446..00000000000
--- a/srcpkgs/python3-html5-parser
+++ /dev/null
@@ -1 +0,0 @@
-python-html5-parser
\ No newline at end of file
diff --git a/srcpkgs/python3-html5-parser/template b/srcpkgs/python3-html5-parser/template
new file mode 100644
index 00000000000..6b975e1dc15
--- /dev/null
+++ b/srcpkgs/python3-html5-parser/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-html5-parser'
+pkgname=python3-html5-parser
+version=0.4.9
+revision=3
+wrksrc="html5-parser-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools pkg-config"
+makedepends="python3-devel libxml2-devel"
+depends="python3-chardet python3-lxml python3-BeautifulSoup4"
+checkdepends="$depends"
+short_desc="Fast C-based HTML5 parsing (Python3)"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="Apache-2.0"
+homepage="https://html5-parser.readthedocs.io/"
+distfiles="${PYPI_SITE}/h/html5-parser/html5-parser-${version}.tar.gz"
+checksum=25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f
From 938f2e08595918172aeaf470d4eb3124ca6cfe9d 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 22:40:45 +0700
Subject: [PATCH 08/53] python-msgpack: drop package
---
srcpkgs/python-msgpack/template | 27 ---------------------------
srcpkgs/python3-msgpack | 1 -
srcpkgs/python3-msgpack/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-msgpack/template
delete mode 120000 srcpkgs/python3-msgpack
create mode 100644 srcpkgs/python3-msgpack/template
diff --git a/srcpkgs/python-msgpack/template b/srcpkgs/python-msgpack/template
deleted file mode 100644
index a792957533b..00000000000
--- a/srcpkgs/python-msgpack/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-msgpack'
-pkgname=python-msgpack
-version=1.0.0
-revision=2
-wrksrc="msgpack-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-checkdepends="python-pytest python3-pytest"
-short_desc="Python module for Msgpack serializer (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="https://msgpack.org/"
-distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
-checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
-
-do_check() {
- PYTHONPATH=$(pwd)/build-$py2_ver/lib python2 -m pytest
- PYTHONPATH=$(pwd)/build-$py3_ver/lib python3 -m pytest
-}
-
-python3-msgpack_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-msgpack b/srcpkgs/python3-msgpack
deleted file mode 120000
index f2c3e3262c9..00000000000
--- a/srcpkgs/python3-msgpack
+++ /dev/null
@@ -1 +0,0 @@
-python-msgpack
\ No newline at end of file
diff --git a/srcpkgs/python3-msgpack/template b/srcpkgs/python3-msgpack/template
new file mode 100644
index 00000000000..f6f5f17be58
--- /dev/null
+++ b/srcpkgs/python3-msgpack/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-msgpack'
+pkgname=python3-msgpack
+version=1.0.0
+revision=3
+wrksrc="msgpack-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+checkdepends="python3-pytest"
+short_desc="Python module for Msgpack serializer (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://msgpack.org/"
+distfiles="${PYPI_SITE}/m/msgpack/msgpack-${version}.tar.gz"
+checksum=9534d5cc480d4aff720233411a1f765be90885750b07df772380b34c10ecb5c0
+
+do_check() {
+ PYTHONPATH=$PWD/build/lib python3 -m pytest
+}
From 40dd9cc362309605ea789889f74123caf6f505d0 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 22:41:28 +0700
Subject: [PATCH 09/53] python-regex: drop package
---
srcpkgs/python-regex/template | 33 ---------------------------------
srcpkgs/python3-regex | 1 -
srcpkgs/python3-regex/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 34 deletions(-)
delete mode 100644 srcpkgs/python-regex/template
delete mode 120000 srcpkgs/python3-regex
create mode 100644 srcpkgs/python3-regex/template
diff --git a/srcpkgs/python-regex/template b/srcpkgs/python-regex/template
deleted file mode 100644
index 9145a6ad5c0..00000000000
--- a/srcpkgs/python-regex/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-regex'
-pkgname=python-regex
-version=2020.2.20
-revision=1
-wrksrc="regex-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Alternative regular expression module (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Python-2.0"
-homepage="https://pypi.org/project/regex/"
-distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
-
-post_install() {
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
-}
-
-python3-regex_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- local i
- for i in docs/*.* ; do
- vdoc $i
- done
- }
-}
diff --git a/srcpkgs/python3-regex b/srcpkgs/python3-regex
deleted file mode 120000
index 172b6e9673d..00000000000
--- a/srcpkgs/python3-regex
+++ /dev/null
@@ -1 +0,0 @@
-python-regex
\ No newline at end of file
diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
new file mode 100644
index 00000000000..355563d6494
--- /dev/null
+++ b/srcpkgs/python3-regex/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-regex'
+pkgname=python3-regex
+version=2020.2.20
+revision=2
+wrksrc="regex-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+short_desc="Alternative regular expression module (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Python-2.0"
+homepage="https://pypi.org/project/regex/"
+distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
+checksum=9e9624440d754733eddbcd4614378c18713d2d9d0dc647cf9c72f64e39671be5
+
+post_install() {
+ local i
+ for i in docs/*.* ; do
+ vdoc $i
+ done
+}
From 081975069cfb196e285df3589a137784a0d8b9bc 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 22:42:25 +0700
Subject: [PATCH 10/53] python-cssselect: drop package
---
srcpkgs/python-cssselect/template | 29 -----------------------------
srcpkgs/python3-cssselect | 1 -
srcpkgs/python3-cssselect/template | 22 ++++++++++++++++++++++
3 files changed, 22 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-cssselect/template
delete mode 120000 srcpkgs/python3-cssselect
create mode 100644 srcpkgs/python3-cssselect/template
diff --git a/srcpkgs/python-cssselect/template b/srcpkgs/python-cssselect/template
deleted file mode 100644
index ed5c677b8e5..00000000000
--- a/srcpkgs/python-cssselect/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-cssselect'
-pkgname=python-cssselect
-version=1.1.0
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-pycompile_module="cssselect"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="CSS selectors for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://cssselect.readthedocs.io/"
-distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
-checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-cssselect_package() {
- depends="python3"
- pycompile_module="cssselect"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-cssselect b/srcpkgs/python3-cssselect
deleted file mode 120000
index 5e6b659b035..00000000000
--- a/srcpkgs/python3-cssselect
+++ /dev/null
@@ -1 +0,0 @@
-python-cssselect
\ No newline at end of file
diff --git a/srcpkgs/python3-cssselect/template b/srcpkgs/python3-cssselect/template
new file mode 100644
index 00000000000..d35ad7ccd66
--- /dev/null
+++ b/srcpkgs/python3-cssselect/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-cssselect'
+pkgname=python3-cssselect
+version=1.1.0
+revision=4
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="CSS selectors for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://cssselect.readthedocs.io/"
+distfiles="${PYPI_SITE}/c/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
+checksum=f95f8dedd925fd8f54edb3d2dfb44c190d9d18512377d3c1e2388d16126879bc
+
+do_check() {
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 4f14176a7c53b83fd250293eeb812898fb4012bc 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 22:43:42 +0700
Subject: [PATCH 11/53] python-dnspython: drop package
---
srcpkgs/python-dnspython/INSTALL.msg | 2 --
srcpkgs/python-dnspython/template | 29 -------------------
srcpkgs/python3-dnspython | 1 -
.../INSTALL.msg} | 0
.../patches/gh-345.patch | 0
srcpkgs/python3-dnspython/template | 18 ++++++++++++
6 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-dnspython/INSTALL.msg
delete mode 100644 srcpkgs/python-dnspython/template
delete mode 120000 srcpkgs/python3-dnspython
rename srcpkgs/{python-dnspython/python3-dnspython.INSTALL.msg => python3-dnspython/INSTALL.msg} (100%)
rename srcpkgs/{python-dnspython => python3-dnspython}/patches/gh-345.patch (100%)
create mode 100644 srcpkgs/python3-dnspython/template
diff --git a/srcpkgs/python-dnspython/INSTALL.msg b/srcpkgs/python-dnspython/INSTALL.msg
deleted file mode 100644
index cee7c25b931..00000000000
--- a/srcpkgs/python-dnspython/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to perform DNSSEC validation install python-pycryptodome.
-To do elliptic curves install also python-ecdsa.
diff --git a/srcpkgs/python-dnspython/template b/srcpkgs/python-dnspython/template
deleted file mode 100644
index 76f1f538401..00000000000
--- a/srcpkgs/python-dnspython/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-dnspython'
-pkgname=python-dnspython
-version=1.16.0
-revision=3
-wrksrc="dnspython-${version}"
-build_style=python-module
-pycompile_module="dns"
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="DNS toolkit for Python2"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="ISC"
-homepage="http://www.dnspython.org/"
-distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
-checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-dnspython_package() {
- pycompile_module="dns"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-dnspython b/srcpkgs/python3-dnspython
deleted file mode 120000
index 9c4b0ce7792..00000000000
--- a/srcpkgs/python3-dnspython
+++ /dev/null
@@ -1 +0,0 @@
-python-dnspython
\ No newline at end of file
diff --git a/srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg b/srcpkgs/python3-dnspython/INSTALL.msg
similarity index 100%
rename from srcpkgs/python-dnspython/python3-dnspython.INSTALL.msg
rename to srcpkgs/python3-dnspython/INSTALL.msg
diff --git a/srcpkgs/python-dnspython/patches/gh-345.patch b/srcpkgs/python3-dnspython/patches/gh-345.patch
similarity index 100%
rename from srcpkgs/python-dnspython/patches/gh-345.patch
rename to srcpkgs/python3-dnspython/patches/gh-345.patch
diff --git a/srcpkgs/python3-dnspython/template b/srcpkgs/python3-dnspython/template
new file mode 100644
index 00000000000..152cee924da
--- /dev/null
+++ b/srcpkgs/python3-dnspython/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-dnspython'
+pkgname=python3-dnspython
+version=1.16.0
+revision=4
+wrksrc="dnspython-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="DNS toolkit for Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="ISC"
+homepage="http://www.dnspython.org/"
+distfiles="${PYPI_SITE}/d/dnspython/dnspython-${version}.zip"
+checksum=36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01
+
+post_install() {
+ vlicense LICENSE
+}
From 1419c39e432207d17759a35f68985b40e9235d07 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 22:45:13 +0700
Subject: [PATCH 12/53] python-mechanize: drop package
---
srcpkgs/python-mechanize/template | 29 -----------------------------
srcpkgs/python3-mechanize | 1 -
srcpkgs/python3-mechanize/template | 19 +++++++++++++++++++
3 files changed, 19 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-mechanize/template
delete mode 120000 srcpkgs/python3-mechanize
create mode 100644 srcpkgs/python3-mechanize/template
diff --git a/srcpkgs/python-mechanize/template b/srcpkgs/python-mechanize/template
deleted file mode 100644
index 260ef70ebb2..00000000000
--- a/srcpkgs/python-mechanize/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-mechanize'
-pkgname=python-mechanize
-version=0.4.3
-revision=4
-wrksrc="mechanize-${version}"
-build_style=python-module
-pycompile_module="mechanize"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python python-html5lib"
-short_desc="Stateful programmatic web browsing (Python2)"
-maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/python-mechanize/mechanize"
-distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
-checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-mechanize_package() {
- depends="python3 python3-html5lib"
- pycompile_module="mechanize"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-mechanize b/srcpkgs/python3-mechanize
deleted file mode 120000
index e96661e4701..00000000000
--- a/srcpkgs/python3-mechanize
+++ /dev/null
@@ -1 +0,0 @@
-python-mechanize
\ No newline at end of file
diff --git a/srcpkgs/python3-mechanize/template b/srcpkgs/python3-mechanize/template
new file mode 100644
index 00000000000..d6b8f7d764d
--- /dev/null
+++ b/srcpkgs/python3-mechanize/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mechanize'
+pkgname=python3-mechanize
+version=0.4.3
+revision=5
+wrksrc="mechanize-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-html5lib"
+checkdepends="$depends"
+short_desc="Stateful programmatic web browsing (Python3)"
+maintainer="Farhad Shahbazi <grauwolf@geekosphere.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/python-mechanize/mechanize"
+distfiles="https://github.com/python-mechanize/mechanize/archive/v${version}.tar.gz"
+checksum=7c452a3eed7f83a13674027a58a4afe57ca67630d252a789ac1c15dcd55d310c
+
+post_install() {
+ vlicense LICENSE
+}
From 0f268148746fe569249df06fd7b176d419b42449 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 22:49:05 +0700
Subject: [PATCH 13/53] python-html2text: drop package
---
srcpkgs/python-html2text/template | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 srcpkgs/python-html2text/template
diff --git a/srcpkgs/python-html2text/template b/srcpkgs/python-html2text/template
deleted file mode 100644
index cf9617a4f54..00000000000
--- a/srcpkgs/python-html2text/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python2-html2text'
-# Remove after calibre moves to py3
-pkgname=python-html2text
-version=2019.8.11
-revision=3
-wrksrc="${pkgname#*-}-${version}"
-build_style=python2-module
-pycompile_module="html2text"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="HTML to Markdown-formatted text converter (Python2)"
-maintainer="q66 <daniel@octaforge.org>"
-license="GPL-3.0-only"
-homepage="https://github.com/Alir3z4/html2text/"
-distfiles="${PYPI_SITE}/h/html2text/html2text-${version}.tar.gz"
-checksum=f516b9c10284174e2a974d86f91cab02b3cf983a17752075da751af0e895ef5e
-
-post_install() {
- rm -rf ${DESTDIR}/usr/bin
- # for some reason the permissions are wrong (600)
- chmod 644 ${DESTDIR}/${py2_sitelib}/html2text-*.egg-info/*
-}
From 13135c7d708229ecc0c61d26d768df4053c244f0 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 22:58:18 +0700
Subject: [PATCH 14/53] python-sip{,-devel,-PyQt5}: drop packages
---
srcpkgs/python-sip | 1 -
srcpkgs/python-sip-PyQt5 | 1 -
srcpkgs/python-sip-devel | 1 -
srcpkgs/sip/template | 82 ++++------------------------------------
4 files changed, 8 insertions(+), 77 deletions(-)
delete mode 120000 srcpkgs/python-sip
delete mode 120000 srcpkgs/python-sip-PyQt5
delete mode 120000 srcpkgs/python-sip-devel
diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcce..00000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5b..8f53db1cf10 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
# Template file for 'sip'
pkgname=sip
version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
-post_extract() {
- mv sip-$version sip-${py2_ver}
- cp -a sip-${py2_ver} sip-${py3_ver}
- cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
do_build() {
- for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
- if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
- pyinc="$py3_inc"
- else
- pyinc="$py2_inc"
- fi
- if [ "${pyver##*-}" = "PyQt5" ]; then
- pyqt5="--sip-module PyQt5.sip --no-tools"
- fi
- cd ${wrksrc}/sip-${pyver}
- python${pyver%-PyQt5} configure.py \
- CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
- INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
- make ${makejobs}
- done
+ python3 configure.py \
+ CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+ INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+ make ${makejobs}
}
do_install() {
- cd ${wrksrc}/sip-${py2_ver}
- # install sip
- make DESTDIR=${DESTDIR} install -C sipgen
- # install python-sip
- make DESTDIR=${DESTDIR} install -C siplib
- vinstall sipconfig.py 644 $py2_sitelib
- vinstall sipdistutils.py 644 $py2_sitelib
-
- # install python3-sip
- cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C sipgen
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
-
- # install python2 PyQt5 sip
- cd ${wrksrc}/sip-${py2_ver}-PyQt5
- make DESTDIR=${DESTDIR} install -C siplib
-
vlicense LICENSE
}
-python-sip_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings"
- pkg_install() {
- vmove ${py2_sitelib}/sip.so
- vmove ${py2_sitelib}/sipconfig.py
- vmove ${py2_sitelib}/sip.pyi
- vlicense sip-${py2_ver}/LICENSE
- }
-}
-
-python-sip-devel_package() {
- lib32disabled=yes
- depends="sip-${version}_${revision} python-sip-${version}_${revision}"
- short_desc="Python2 SIP bindings - development files"
- pkg_install() {
- vmove ${py2_inc}
- vmove ${py2_sitelib}/sipdistutils.py
- }
-}
-
python3-sip_package() {
lib32disabled=yes
depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
- vlicense sip-${py3_ver}/LICENSE
+ vlicense LICENSE
}
}
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
vmove ${py3_sitelib}/sipdistutils.py
}
}
-
-python-sip-PyQt5_package() {
- lib32disabled=yes
- depends="python"
- short_desc="Python2 SIP bindings (PyQt5 version)"
- pkg_install() {
- vmove ${py2_sitelib}/PyQt5/sip.so
- vmove ${py2_sitelib}/PyQt5/sip.pyi
- vlicense sip-${py2_ver}-PyQt5/LICENSE
- }
-}
From f28ad72e039f5143de474979f7e665c1aff051a8 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 23:01:19 +0700
Subject: [PATCH 15/53] python-wrapt: drop package
---
srcpkgs/python-wrapt/template | 28 ----------------------------
srcpkgs/python3-wrapt | 1 -
srcpkgs/python3-wrapt/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-wrapt/template
delete mode 120000 srcpkgs/python3-wrapt
create mode 100644 srcpkgs/python3-wrapt/template
diff --git a/srcpkgs/python-wrapt/template b/srcpkgs/python-wrapt/template
deleted file mode 100644
index e6ace42011b..00000000000
--- a/srcpkgs/python-wrapt/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-wrapt'
-pkgname=python-wrapt
-version=1.11.2
-revision=2
-wrksrc="wrapt-${version}"
-build_style=python-module
-pycompile_module="wrapt"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 module for decorators, wrappers and monkey patching"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/GrahamDumpleton/wrapt"
-distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
-checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-wrapt_package() {
- pycompile_module="wrapt"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-wrapt b/srcpkgs/python3-wrapt
deleted file mode 120000
index d9d8dda7ebe..00000000000
--- a/srcpkgs/python3-wrapt
+++ /dev/null
@@ -1 +0,0 @@
-python-wrapt
\ No newline at end of file
diff --git a/srcpkgs/python3-wrapt/template b/srcpkgs/python3-wrapt/template
new file mode 100644
index 00000000000..b41968c4855
--- /dev/null
+++ b/srcpkgs/python3-wrapt/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-wrapt'
+pkgname=python3-wrapt
+version=1.11.2
+revision=3
+wrksrc="wrapt-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 module for decorators, wrappers and monkey patching"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/GrahamDumpleton/wrapt"
+distfiles="${PYPI_SITE}/w/wrapt/wrapt-${version}.tar.gz"
+checksum=565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1
+
+post_install() {
+ vlicense LICENSE
+}
From 985457f0ad8c02b0a201d92ad06393ad58783254 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 23:01:56 +0700
Subject: [PATCH 16/53] python-html5lib: drop package
---
srcpkgs/python-html5lib/template | 32 -------------------
srcpkgs/python3-html5lib | 1 -
srcpkgs/python3-html5lib/template | 26 +++++++++++++++
.../update | 0
4 files changed, 26 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-html5lib/template
delete mode 120000 srcpkgs/python3-html5lib
create mode 100644 srcpkgs/python3-html5lib/template
rename srcpkgs/{python-html5lib => python3-html5lib}/update (100%)
diff --git a/srcpkgs/python-html5lib/template b/srcpkgs/python-html5lib/template
deleted file mode 100644
index a9ff3cac98d..00000000000
--- a/srcpkgs/python-html5lib/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-html5lib'
-pkgname=python-html5lib
-version=1.0.1
-revision=3
-wrksrc="html5lib-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six python-webencodings"
-pycompile_module="html5lib"
-short_desc="Python2 HTML parser based on the WHATWG HTML5 specification"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/html5lib/html5lib-python"
-license="MIT"
-distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
-checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
-
-pre_build() {
- sed -i '/setuptools>=/d' setup.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-html5lib_package() {
- pycompile_module="html5lib"
- depends="python3-six python3-webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-html5lib b/srcpkgs/python3-html5lib
deleted file mode 120000
index a9b42a3dabf..00000000000
--- a/srcpkgs/python3-html5lib
+++ /dev/null
@@ -1 +0,0 @@
-python-html5lib
\ No newline at end of file
diff --git a/srcpkgs/python3-html5lib/template b/srcpkgs/python3-html5lib/template
new file mode 100644
index 00000000000..5568ed9acdd
--- /dev/null
+++ b/srcpkgs/python3-html5lib/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-html5lib'
+pkgname=python3-html5lib
+version=1.0.1
+revision=4
+wrksrc="html5lib-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six python3-webencodings"
+checkdepends="$depends python3-pytest python3-mock python3-lxml"
+short_desc="Python3 HTML parser based on the WHATWG HTML5 specification"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/html5lib/html5lib-python"
+distfiles="${PYPI_SITE}/h/html5lib/html5lib-${version}.tar.gz"
+checksum=66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736
+
+pre_build() {
+ sed -i '/setuptools>=/d' setup.py
+}
+do_check() {
+ export PYTHONPATH=$PWD/build/lib
+ : requires more Python modules
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-html5lib/update b/srcpkgs/python3-html5lib/update
similarity index 100%
rename from srcpkgs/python-html5lib/update
rename to srcpkgs/python3-html5lib/update
From 6d096afd1a5c73e91f33c749113e5b14d478212f 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 23:07:49 +0700
Subject: [PATCH 17/53] python-webencodings: drop package
---
srcpkgs/python-webencodings/template | 24 ------------------------
srcpkgs/python3-webencodings | 1 -
srcpkgs/python3-webencodings/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/python-webencodings/template
delete mode 120000 srcpkgs/python3-webencodings
create mode 100644 srcpkgs/python3-webencodings/template
diff --git a/srcpkgs/python-webencodings/template b/srcpkgs/python-webencodings/template
deleted file mode 100644
index c9d7ca700fa..00000000000
--- a/srcpkgs/python-webencodings/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-webencodings'
-pkgname=python-webencodings
-version=0.5.1
-revision=4
-wrksrc="webencodings-${version}"
-build_style=python-module
-pycompile_module="webencodings"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of the WHATWG Encoding standard"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/gsnedders/python-webencodings"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz"
-checksum=b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
-
-python3-webencodings_package() {
- depends="python3"
- pycompile_module="webencodings"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-webencodings b/srcpkgs/python3-webencodings
deleted file mode 120000
index b6398d6f113..00000000000
--- a/srcpkgs/python3-webencodings
+++ /dev/null
@@ -1 +0,0 @@
-python-webencodings
\ No newline at end of file
diff --git a/srcpkgs/python3-webencodings/template b/srcpkgs/python3-webencodings/template
new file mode 100644
index 00000000000..0c57a319520
--- /dev/null
+++ b/srcpkgs/python3-webencodings/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-webencodings'
+pkgname=python3-webencodings
+version=0.5.1
+revision=5
+wrksrc="webencodings-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of the WHATWG Encoding standard"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/gsnedders/python-webencodings"
+distfiles="${PYPI_SITE}/w/webencodings/webencodings-${version}.tar.gz
+ https://raw.githubusercontent.com/gsnedders/python-webencodings/v$version/LICENSE"
+checksum="b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
+ f23bae6ada76095610a77137fb92aec7342723900211c5826d54b4c57907ca56"
+skip_extraction=LICENSE
+
+post_install() {
+ vlicense $XBPS_SRCDISTDIR/$pkgname-$version/LICENSE
+}
From 84247f25af416b5af19268503fbfe834b2fe4aa6 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 23:08:58 +0700
Subject: [PATCH 18/53] python-pyte: drop package
---
srcpkgs/python-pyte/template | 28 ----------------------------
srcpkgs/python3-pyte | 1 -
srcpkgs/python3-pyte/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-pyte/template
delete mode 120000 srcpkgs/python3-pyte
create mode 100644 srcpkgs/python3-pyte/template
diff --git a/srcpkgs/python-pyte/template b/srcpkgs/python-pyte/template
deleted file mode 100644
index 11a1dd80b8f..00000000000
--- a/srcpkgs/python-pyte/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-pyte'
-pkgname=python-pyte
-version=0.8.0
-revision=3
-wrksrc="pyte-${version}"
-build_style=python-module
-pycompile_module="pyte"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-wcwidth"
-short_desc="Simple Python2 VTXXX-compatible linux terminal emulator"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-3.0-or-later"
-homepage="https://github.com/selectel/pyte"
-distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
-checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
-
-pre_build() {
- sed -i '/setup_requires/d' setup.py
-}
-
-python3-pyte_package() {
- pycompile_module="pyte"
- short_desc="${short_desc/Python2/Python3}"
- depends="python3-wcwidth"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-pyte b/srcpkgs/python3-pyte
deleted file mode 120000
index cb06f5fc635..00000000000
--- a/srcpkgs/python3-pyte
+++ /dev/null
@@ -1 +0,0 @@
-python-pyte
\ No newline at end of file
diff --git a/srcpkgs/python3-pyte/template b/srcpkgs/python3-pyte/template
new file mode 100644
index 00000000000..301e466c1b9
--- /dev/null
+++ b/srcpkgs/python3-pyte/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyte'
+pkgname=python3-pyte
+version=0.8.0
+revision=4
+wrksrc="pyte-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-wcwidth"
+short_desc="Simple Python3 VTXXX-compatible linux terminal emulator"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/selectel/pyte"
+distfiles="https://github.com/selectel/pyte/archive/${version}.tar.gz"
+checksum=80f77a4f8a325faf761c22eb8ad597671e25d0de524c68d42dc765c52bf5be70
+
+pre_build() {
+ sed -i '/setup_requires/d' setup.py
+}
From 6d6c7e75af70af77e6495172c7062f566f394a24 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 23:10:42 +0700
Subject: [PATCH 19/53] python-prompt_toolkit1: drop package
---
srcpkgs/python-prompt_toolkit | 1 -
.../python3-prompt_toolkit1.INSTALL.msg | 2 --
srcpkgs/python-prompt_toolkit1/template | 33 -------------------
srcpkgs/python-prompt_toolkit1/update | 2 --
srcpkgs/python3-prompt_toolkit1 | 1 -
5 files changed, 39 deletions(-)
delete mode 120000 srcpkgs/python-prompt_toolkit
delete mode 100644 srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
delete mode 100644 srcpkgs/python-prompt_toolkit1/template
delete mode 100644 srcpkgs/python-prompt_toolkit1/update
delete mode 120000 srcpkgs/python3-prompt_toolkit1
diff --git a/srcpkgs/python-prompt_toolkit b/srcpkgs/python-prompt_toolkit
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python-prompt_toolkit
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
diff --git a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg b/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
deleted file mode 100644
index 83ded3f3da3..00000000000
--- a/srcpkgs/python-prompt_toolkit1/python3-prompt_toolkit1.INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-python3-prompt_toolkit1 is no longer provided by Void Linux, and will be fully
-removed from the repos on 2021/01/23
diff --git a/srcpkgs/python-prompt_toolkit1/template b/srcpkgs/python-prompt_toolkit1/template
deleted file mode 100644
index 028c7223b43..00000000000
--- a/srcpkgs/python-prompt_toolkit1/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'python-prompt_toolkit1'
-pkgname=python-prompt_toolkit1
-reverts="2.0.9_1"
-version=1.0.18
-revision=3
-wrksrc="prompt_toolkit-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python-six python-wcwidth"
-short_desc="Python2 library for building powerful interactive command lines"
-maintainer="xaltsc <xaltsc@protonmail.ch>"
-license="BSD-3-Clause"
-homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
-distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=dd4fca02c8069497ad931a2d09914c6b0d1b50151ce876bc15bde4c747090126
-conflicts="python-prompt_toolkit2<=2.0.9_4"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-prompt_toolkit1_package() {
- build_style=meta
- short_desc="Python3 library for building command lines (removed package)"
- license="metapackage"
-}
-
-python-prompt_toolkit_package() {
- reverts="2.0.9_1"
- build_style=meta
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
diff --git a/srcpkgs/python-prompt_toolkit1/update b/srcpkgs/python-prompt_toolkit1/update
deleted file mode 100644
index 9b10459879a..00000000000
--- a/srcpkgs/python-prompt_toolkit1/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pypi.org/simple/prompt_toolkit/"
-pattern='prompt_toolkit-\K1\.[0-9.]+(?=.tar.gz)'
diff --git a/srcpkgs/python3-prompt_toolkit1 b/srcpkgs/python3-prompt_toolkit1
deleted file mode 120000
index 1e14e8845b4..00000000000
--- a/srcpkgs/python3-prompt_toolkit1
+++ /dev/null
@@ -1 +0,0 @@
-python-prompt_toolkit1
\ No newline at end of file
From 71eb4266c1412b05e9c4d662c78298ddb486373e 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 23:12:46 +0700
Subject: [PATCH 20/53] python-watchman: drop package
---
srcpkgs/python-watchman/template | 38 -------------------------------
srcpkgs/python3-watchman | 1 -
srcpkgs/python3-watchman/template | 26 +++++++++++++++++++++
3 files changed, 26 insertions(+), 39 deletions(-)
delete mode 100644 srcpkgs/python-watchman/template
delete mode 120000 srcpkgs/python3-watchman
create mode 100644 srcpkgs/python3-watchman/template
diff --git a/srcpkgs/python-watchman/template b/srcpkgs/python-watchman/template
deleted file mode 100644
index f8cb7b9a6d5..00000000000
--- a/srcpkgs/python-watchman/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-watchman'
-pkgname=python-watchman
-version=1.4.1
-revision=4
-create_wrksrc=yes
-build_wrksrc="pywatchman-${version}"
-build_style=python-module
-hostmakedepends="python-devel python3-devel python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-depends="watchman"
-short_desc="Connect and query Watchman to discover file changes (Python2)"
-maintainer="Hoang Nguyen <hoang@wetrust.io>"
-license="BSD-3-Clause"
-homepage="https://facebook.github.io/watchman/"
-distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
- https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
-checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
- d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
-alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make2
- watchman-wait:watchman-wait:/usr/bin/watchman-wait2"
-
-post_install() {
- vlicense ../LICENSE.txt
-}
-
-python3-watchman_package() {
- short_desc="${short_desc/Python2/Python3}"
- depends="watchman"
- alternatives="
- watchman-make:watchman-make:/usr/bin/watchman-make3
- watchman-wait:watchman-wait:/usr/bin/watchman-wait3"
- pkg_install() {
- vmove usr/bin/watchman-make3
- vmove usr/bin/watchman-wait3
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-watchman b/srcpkgs/python3-watchman
deleted file mode 120000
index 44c4d43b203..00000000000
--- a/srcpkgs/python3-watchman
+++ /dev/null
@@ -1 +0,0 @@
-python-watchman
\ No newline at end of file
diff --git a/srcpkgs/python3-watchman/template b/srcpkgs/python3-watchman/template
new file mode 100644
index 00000000000..657e75d7a35
--- /dev/null
+++ b/srcpkgs/python3-watchman/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-watchman'
+pkgname=python3-watchman
+version=1.4.1
+revision=5
+create_wrksrc=yes
+build_wrksrc="pywatchman-${version}"
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+makedepends="python3-devel"
+depends="watchman"
+short_desc="Connect and query Watchman to discover file changes (Python3)"
+maintainer="Hoang Nguyen <hoang@wetrust.io>"
+license="BSD-3-Clause"
+homepage="https://facebook.github.io/watchman/"
+distfiles="${PYPI_SITE}/p/pywatchman/pywatchman-${version}.tar.gz
+ https://raw.githubusercontent.com/facebook/watchman/master/python/LICENSE>LICENSE.txt"
+checksum="d0047eb275deafb0011eda0a1a815fbd9742478c3d2b5ad6956d300e447dc2f9
+ d96f8d0b74d194c021f153c562307697128da61143515c947580b2489a341980"
+conflicts="python-watchman>=0"
+
+do_check() {
+ :
+}
+post_install() {
+ vlicense ../LICENSE.txt
+}
From 1b2d66bdc675ce23045cba44ce877f3830ef8ca9 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 23:15:25 +0700
Subject: [PATCH 21/53] python-urlnorm: drop package
---
srcpkgs/python-urlnorm/template | 20 --------------------
1 file changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-urlnorm/template
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
deleted file mode 100644
index 46723e0f869..00000000000
--- a/srcpkgs/python-urlnorm/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-urlnorm'
-pkgname=python-urlnorm
-version=1.1.4
-revision=3
-wrksrc="urlnorm-${version}"
-build_style=python2-module
-pycompile_module="urlnorm"
-hostmakedepends="python-setuptools"
-depends="python"
-short_desc="Python2 module for normalizing URLs"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/jehiah/urlnorm"
-distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
-checksum=3cde99b7ec8edb6768dfecbed5d97e9bd0c784b0593ee28a3f83b20419dcd75e
-
-post_install() {
- sed -n '/^__license__/,/^"""/{/"""$/d;p}' urlnorm.py > LICENSE
- vlicense LICENSE
-}
From dee083c587ba6749ef0056fabe9b956da1865b2b 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 23:15:52 +0700
Subject: [PATCH 22/53] python-uritemplate: drop package
---
srcpkgs/python-uritemplate/template | 27 ---------------------------
srcpkgs/python3-uritemplate | 1 -
srcpkgs/python3-uritemplate/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-uritemplate/template
delete mode 120000 srcpkgs/python3-uritemplate
create mode 100644 srcpkgs/python3-uritemplate/template
diff --git a/srcpkgs/python-uritemplate/template b/srcpkgs/python-uritemplate/template
deleted file mode 100644
index eb358488bc7..00000000000
--- a/srcpkgs/python-uritemplate/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-uritemplate'
-pkgname=python-uritemplate
-version=3.0.1
-revision=2
-wrksrc="${pkgname#*-}-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 implementation of RFC6570 URI Template"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0, BSD-3-Clause"
-homepage="https://github.com/sigmavirus24/uritemplate"
-distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
-checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-uritemplate_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-uritemplate b/srcpkgs/python3-uritemplate
deleted file mode 120000
index fa183c856b5..00000000000
--- a/srcpkgs/python3-uritemplate
+++ /dev/null
@@ -1 +0,0 @@
-python-uritemplate
\ No newline at end of file
diff --git a/srcpkgs/python3-uritemplate/template b/srcpkgs/python3-uritemplate/template
new file mode 100644
index 00000000000..9e4053f31ce
--- /dev/null
+++ b/srcpkgs/python3-uritemplate/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-uritemplate'
+pkgname=python3-uritemplate
+version=3.0.1
+revision=3
+wrksrc="${pkgname#*-}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 implementation of RFC6570 URI Template"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="https://github.com/sigmavirus24/uritemplate"
+distfiles="${PYPI_SITE}/u/uritemplate/uritemplate-${version}.tar.gz"
+checksum=5af8ad10cec94f215e3f48112de2022e1d5a37ed427fbd88652fa908f2ab7cae
+
+post_install() {
+ vlicense LICENSE
+}
From 37a39ab10a1c83fc8cdb29ce47a9420c609239a7 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 23:16:45 +0700
Subject: [PATCH 23/53] python-subprocess32: drop package
---
srcpkgs/python-subprocess32/template | 24 ------------------------
1 file changed, 24 deletions(-)
delete mode 100644 srcpkgs/python-subprocess32/template
diff --git a/srcpkgs/python-subprocess32/template b/srcpkgs/python-subprocess32/template
deleted file mode 100644
index ec7100cdb9b..00000000000
--- a/srcpkgs/python-subprocess32/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'python-subprocess32'
-pkgname=python-subprocess32
-version=3.5.4
-revision=1
-wrksrc="subprocess32-${version}"
-build_style=python2-module
-pycompile_module="subprocess32.py"
-hostmakedepends="python-setuptools"
-makedepends="python-devel"
-short_desc="Backport of subprocess module from Python 3.x"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/google/python-subprocess32"
-license="Python-2.0"
-distfiles="${PYPI_SITE}/s/subprocess32/subprocess32-${version}.tar.gz"
-checksum=eb2937c80497978d181efa1b839ec2d9622cf9600a039a79d0e108d1f9aec79d
-
-pre_build() {
- if [ "$CROSS_BUILD" ]; then
- sed -i 's/^cross_compiling=no/cross_compiling=yes/' configure
- fi
-}
-post_install() {
- vlicense LICENSE
-}
From a830bb30eec35dcdb3b0fff2f9db7d74a1a9f1fe 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 23:18:15 +0700
Subject: [PATCH 24/53] python-subliminal: drop
---
srcpkgs/python-subliminal | 1 -
srcpkgs/subliminal/template | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
delete mode 120000 srcpkgs/python-subliminal
diff --git a/srcpkgs/python-subliminal b/srcpkgs/python-subliminal
deleted file mode 120000
index b03131f9466..00000000000
--- a/srcpkgs/python-subliminal
+++ /dev/null
@@ -1 +0,0 @@
-subliminal
\ No newline at end of file
diff --git a/srcpkgs/subliminal/template b/srcpkgs/subliminal/template
index 1d93d421276..a5ec3dc3ac8 100644
--- a/srcpkgs/subliminal/template
+++ b/srcpkgs/subliminal/template
@@ -1,8 +1,7 @@
# Template file for 'subliminal'
pkgname=subliminal
version=2.1.0
-revision=3
-archs=noarch
+revision=4
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3 python3-guessit python3-babelfish python3-enzyme
@@ -25,12 +24,6 @@ post_install() {
vlicense LICENSE
}
-python-subliminal_package() {
- build_style=meta
- depends="subliminal>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
-}
-
python3-subliminal_package() {
build_style=meta
depends="subliminal>=${version}_${revision}"
From 003643e158d32787f46d1bc7d624eb7284b51472 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 23:19:28 +0700
Subject: [PATCH 25/53] python-snappy: drop package
---
srcpkgs/python-snappy/template | 27 -------------------
srcpkgs/python3-snappy | 1 -
srcpkgs/python3-snappy/template | 22 +++++++++++++++
.../{python-snappy => python3-snappy}/update | 0
4 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-snappy/template
delete mode 120000 srcpkgs/python3-snappy
create mode 100644 srcpkgs/python3-snappy/template
rename srcpkgs/{python-snappy => python3-snappy}/update (100%)
diff --git a/srcpkgs/python-snappy/template b/srcpkgs/python-snappy/template
deleted file mode 100644
index b1870cbe681..00000000000
--- a/srcpkgs/python-snappy/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-snappy'
-pkgname=python-snappy
-version=0.5.4
-revision=2
-build_style=python-module
-pycompile_module="snappy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel snappy-devel"
-short_desc="Python2 bindings for the snappy compression library from Google"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://github.com/andrix/python-snappy"
-distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-snappy_package() {
- pycompile_module="snappy"
- short_desc="${pkgname/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-snappy b/srcpkgs/python3-snappy
deleted file mode 120000
index 0918969c3e0..00000000000
--- a/srcpkgs/python3-snappy
+++ /dev/null
@@ -1 +0,0 @@
-python-snappy
\ No newline at end of file
diff --git a/srcpkgs/python3-snappy/template b/srcpkgs/python3-snappy/template
new file mode 100644
index 00000000000..a23d3d6e401
--- /dev/null
+++ b/srcpkgs/python3-snappy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-snappy'
+pkgname=python3-snappy
+_pkgname=python-snappy
+version=0.5.4
+revision=3
+wrksrc=$_pkgname-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel snappy-devel python3-cffi libffi-devel"
+short_desc="Python library for the snappy compression library from Google"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/andrix/python-snappy"
+distfiles="${PYPI_SITE}/p/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=d9c26532cfa510f45e8d135cde140e8a5603d3fb254cfec273ebc0ecf9f668e2
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-snappy/update b/srcpkgs/python3-snappy/update
similarity index 100%
rename from srcpkgs/python-snappy/update
rename to srcpkgs/python3-snappy/update
From 3a055ab7033ec37aaf47829d1f85906079154598 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 23:36:11 +0700
Subject: [PATCH 26/53] python-snakeoil: drop package
---
srcpkgs/python-snakeoil-devel | 1 -
srcpkgs/python-snakeoil/template | 43 -------------------------------
srcpkgs/python3-snakeoil | 1 -
srcpkgs/python3-snakeoil-devel | 2 +-
srcpkgs/python3-snakeoil/template | 31 ++++++++++++++++++++++
5 files changed, 32 insertions(+), 46 deletions(-)
delete mode 120000 srcpkgs/python-snakeoil-devel
delete mode 100644 srcpkgs/python-snakeoil/template
delete mode 120000 srcpkgs/python3-snakeoil
create mode 100644 srcpkgs/python3-snakeoil/template
diff --git a/srcpkgs/python-snakeoil-devel b/srcpkgs/python-snakeoil-devel
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python-snakeoil-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template
deleted file mode 100644
index 79e964d9254..00000000000
--- a/srcpkgs/python-snakeoil/template
+++ /dev/null
@@ -1,43 +0,0 @@
-# Template file for 'python-snakeoil'
-pkgname=python-snakeoil
-version=0.7.5
-revision=3
-wrksrc="snakeoil-${version}"
-build_style=python-module
-pycompile_module="snakeoil"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 optimized versions of common python functionality"
-maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
-license="BSD, GPL-2"
-homepage="https://github.com/pkgcore/snakeoil"
-# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
-distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
-checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
-
-post_install() {
- vlicense BSD
-}
-
-python-snakeoil-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include/python2.7
- }
-}
-python3-snakeoil_package() {
- pycompile_module="snakeoil"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense BSD
- }
-}
-python3-snakeoil-devel_package() {
- depends="python3-snakeoil>=${version}_${revision}"
- short_desc="${short_desc/Python2/Python3} - development files"
- pkg_install() {
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil
deleted file mode 120000
index d67a8048bda..00000000000
--- a/srcpkgs/python3-snakeoil
+++ /dev/null
@@ -1 +0,0 @@
-python-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel
index d67a8048bda..b1f4b023230 120000
--- a/srcpkgs/python3-snakeoil-devel
+++ b/srcpkgs/python3-snakeoil-devel
@@ -1 +1 @@
-python-snakeoil
\ No newline at end of file
+python3-snakeoil
\ No newline at end of file
diff --git a/srcpkgs/python3-snakeoil/template b/srcpkgs/python3-snakeoil/template
new file mode 100644
index 00000000000..713eb7aae81
--- /dev/null
+++ b/srcpkgs/python3-snakeoil/template
@@ -0,0 +1,31 @@
+# Template file for 'python3-snakeoil'
+pkgname=python3-snakeoil
+version=0.7.5
+revision=4
+wrksrc="snakeoil-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 optimized versions of common python functionality"
+maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
+license="BSD-3-Clause, GPL-2.0-only"
+homepage="https://github.com/pkgcore/snakeoil"
+# changelog="https://github.com/pkgcore/snakeoil/blob/master/NEWS.rst"
+distfiles="${PYPI_SITE}/s/snakeoil/snakeoil-${version}.tar.gz"
+checksum=2cbcd8b39d0f05c76e734840ef87796b1acfd9dd4c6d352253a7b5b91be7f4c3
+
+pre_check() {
+ export PYTHONPATH=$(cd build/lib* && pwd)
+}
+
+post_install() {
+ vlicense BSD
+}
+
+python3-snakeoil-devel_package() {
+ depends="python3-snakeoil>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/python3*
+ }
+}
From 3926ccff899d83f0ba77e3e0f617d707acc5b231 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 23:41:22 +0700
Subject: [PATCH 27/53] python-simplejson: drop package
---
srcpkgs/python3-simplejson | 1 -
.../template | 24 ++++++-------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-simplejson
rename srcpkgs/{python-simplejson => python3-simplejson}/template (58%)
diff --git a/srcpkgs/python3-simplejson b/srcpkgs/python3-simplejson
deleted file mode 120000
index 50018d41468..00000000000
--- a/srcpkgs/python3-simplejson
+++ /dev/null
@@ -1 +0,0 @@
-python-simplejson
\ No newline at end of file
diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python3-simplejson/template
similarity index 58%
rename from srcpkgs/python-simplejson/template
rename to srcpkgs/python3-simplejson/template
index d9975ff9581..93ebf93980f 100644
--- a/srcpkgs/python-simplejson/template
+++ b/srcpkgs/python3-simplejson/template
@@ -1,13 +1,12 @@
-# Template file for 'python-simplejson'
-pkgname=python-simplejson
+# Template file for 'python3-simplejson'
+pkgname=python3-simplejson
version=3.17.0
-revision=2
+revision=3
wrksrc="simplejson-${version}"
-build_style=python-module
-pycompile_module="simplejson"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Simple, fast, extensible JSON encoder/decoder for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Simple, fast, extensible JSON encoder/decoder for Python3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT, AFL-2.1"
homepage="https://github.com/simplejson/simplejson"
@@ -22,12 +21,3 @@ do_check() {
post_install() {
vlicense LICENSE.txt LICENSE
}
-
-python3-simplejson_package() {
- pycompile_module="simplejson"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt LICENSE
- }
-}
From f916c797f51fa054fe93439c4d012d4045267f77 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 23:42:09 +0700
Subject: [PATCH 28/53] python-setproctitle: drop package
---
srcpkgs/python-setproctitle/template | 26 --------------------------
srcpkgs/python3-setproctitle | 1 -
srcpkgs/python3-setproctitle/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 27 deletions(-)
delete mode 100644 srcpkgs/python-setproctitle/template
delete mode 120000 srcpkgs/python3-setproctitle
create mode 100644 srcpkgs/python3-setproctitle/template
diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template
deleted file mode 100644
index c47e3a9db53..00000000000
--- a/srcpkgs/python-setproctitle/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-setproctitle'
-pkgname=python-setproctitle
-version=1.1.10
-revision=6
-wrksrc="setproctitle-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Python2 library to allow customization of the process title"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://github.com/dvarrazzo/py-setproctitle"
-license="3-clause-BSD"
-distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
-checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
-
-post_install() {
- vlicense COPYRIGHT LICENSE
-}
-
-python3-setproctitle_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYRIGHT LICENSE
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-setproctitle b/srcpkgs/python3-setproctitle
deleted file mode 120000
index 5edeb0c8129..00000000000
--- a/srcpkgs/python3-setproctitle
+++ /dev/null
@@ -1 +0,0 @@
-python-setproctitle
\ No newline at end of file
diff --git a/srcpkgs/python3-setproctitle/template b/srcpkgs/python3-setproctitle/template
new file mode 100644
index 00000000000..6b6f93931af
--- /dev/null
+++ b/srcpkgs/python3-setproctitle/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-setproctitle'
+pkgname=python3-setproctitle
+version=1.1.10
+revision=7
+wrksrc="setproctitle-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Python3 library to allow customization of the process title"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/dvarrazzo/py-setproctitle"
+distfiles="${PYPI_SITE}/s/setproctitle/setproctitle-${version}.tar.gz"
+checksum=6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398
+
+post_install() {
+ vlicense COPYRIGHT LICENSE
+}
From 405eea08166e9cadd71a3115daade77786a6da86 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 23:52:31 +0700
Subject: [PATCH 29/53] python-rencode: drop package
---
srcpkgs/python-rencode/template | 23 -----------------------
srcpkgs/python3-rencode | 1 -
srcpkgs/python3-rencode/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/python-rencode/template
delete mode 120000 srcpkgs/python3-rencode
create mode 100644 srcpkgs/python3-rencode/template
diff --git a/srcpkgs/python-rencode/template b/srcpkgs/python-rencode/template
deleted file mode 100644
index 021e1d414b8..00000000000
--- a/srcpkgs/python-rencode/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rencode'
-pkgname=python-rencode
-version=1.0.6
-revision=3
-wrksrc="rencode-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel"
-pycompile_module="rencode"
-short_desc="Python2 module for fast (basic) object serialization"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3"
-homepage="https://github.com/aresch/rencode"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
-
-python3-rencode_package() {
- pycompile_module="rencode"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-rencode b/srcpkgs/python3-rencode
deleted file mode 120000
index 9b67925b92f..00000000000
--- a/srcpkgs/python3-rencode
+++ /dev/null
@@ -1 +0,0 @@
-python-rencode
\ No newline at end of file
diff --git a/srcpkgs/python3-rencode/template b/srcpkgs/python3-rencode/template
new file mode 100644
index 00000000000..81b1cfdd233
--- /dev/null
+++ b/srcpkgs/python3-rencode/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-rencode'
+pkgname=python3-rencode
+version=1.0.6
+revision=4
+wrksrc="rencode-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel"
+short_desc="Python3 module for fast (basic) object serialization"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/aresch/rencode"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=0ed61111f053ea37511da86ca7aed2a3cfda6bdaa1f54a237c4b86eea52f0733
From 9fe18166c1e1040da9dc5003333a44ff14a09a33 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 23:55:16 +0700
Subject: [PATCH 30/53] python-pyzmq: drop package
---
srcpkgs/python3-pyzmq | 1 -
.../{python-pyzmq => python3-pyzmq}/template | 23 +++++++------------
2 files changed, 8 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-pyzmq
rename srcpkgs/{python-pyzmq => python3-pyzmq}/template (53%)
diff --git a/srcpkgs/python3-pyzmq b/srcpkgs/python3-pyzmq
deleted file mode 120000
index f908dd6b61b..00000000000
--- a/srcpkgs/python3-pyzmq
+++ /dev/null
@@ -1 +0,0 @@
-python-pyzmq
\ No newline at end of file
diff --git a/srcpkgs/python-pyzmq/template b/srcpkgs/python3-pyzmq/template
similarity index 53%
rename from srcpkgs/python-pyzmq/template
rename to srcpkgs/python3-pyzmq/template
index f08dd14690e..fae748d8754 100644
--- a/srcpkgs/python-pyzmq/template
+++ b/srcpkgs/python3-pyzmq/template
@@ -1,15 +1,15 @@
-# Template file for 'python-pyzmq'
-pkgname=python-pyzmq
+# Template file for 'python3-pyzmq'
+pkgname=python3-pyzmq
version=19.0.2
-revision=1
+revision=2
wrksrc="pyzmq-${version}"
-build_style=python-module
+build_style=python3-module
make_build_args="--zmq=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config python-devel python3-devel python-Cython
- python3-Cython zeromq-devel"
+hostmakedepends="pkg-config python3-devel
+python3-Cython zeromq-devel"
makedepends="${hostmakedepends/pkg-config/}"
-short_desc="Python2 bindings for the ZeroMQ messaging library"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
+short_desc="Python3 bindings for the ZeroMQ messaging library"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3.0-or-later, BSD-3-Clause"
homepage="https://pyzmq.readthedocs.io/"
distfiles="https://github.com/zeromq/pyzmq/archive/v${version}.tar.gz"
@@ -25,10 +25,3 @@ pre_build() {
post_install() {
vlicense COPYING.BSD
}
-
-python3-pyzmq_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
From 498ac8aedeb4f52dd1de1efa89bcfd4ddc2ee443 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 23:55:53 +0700
Subject: [PATCH 31/53] python-pygame: drop package
---
srcpkgs/python3-pygame | 1 -
.../template | 24 ++++++-------------
.../{python-pygame => python3-pygame}/update | 0
3 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-pygame
rename srcpkgs/{python-pygame => python3-pygame}/template (52%)
rename srcpkgs/{python-pygame => python3-pygame}/update (100%)
diff --git a/srcpkgs/python3-pygame b/srcpkgs/python3-pygame
deleted file mode 120000
index 48ee583d7d4..00000000000
--- a/srcpkgs/python3-pygame
+++ /dev/null
@@ -1 +0,0 @@
-python-pygame
\ No newline at end of file
diff --git a/srcpkgs/python-pygame/template b/srcpkgs/python3-pygame/template
similarity index 52%
rename from srcpkgs/python-pygame/template
rename to srcpkgs/python3-pygame/template
index 4970301899a..ee1736245b4 100644
--- a/srcpkgs/python-pygame/template
+++ b/srcpkgs/python3-pygame/template
@@ -1,15 +1,14 @@
-# Template file for 'python-pygame'
-pkgname=python-pygame
+# Template file for 'python3-pygame'
+pkgname=python3-pygame
version=1.9.6
-revision=2
+revision=3
wrksrc="pygame-${version}"
-build_style=python-module
-pycompile_module="pygame"
-hostmakedepends="pkg-config python-setuptools python3-setuptools SDL_mixer-devel
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools SDL_mixer-devel
SDL_image-devel SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-makedepends="python-devel python3-devel SDL_mixer-devel SDL_image-devel
+makedepends="python3-devel SDL_mixer-devel SDL_image-devel
SDL_ttf-devel libjpeg-turbo-devel portmidi-devel"
-short_desc="Collection of Python modules for writing games (Python2)"
+short_desc="Collection of Python modules for writing games (Python3)"
maintainer="Archaeme <normandy@firemail.cc>"
license="LGPL-2.1-or-later"
homepage="https://www.pygame.org/"
@@ -17,12 +16,3 @@ distfiles="${PYPI_SITE}/p/pygame/pygame-${version}.tar.gz"
checksum=301c6428c0880ecd4a9e3951b80e539c33863b6ff356a443db1758de4f297957
export PORTMIDI_INC_PORTTIME=1
-
-python3-pygame_package() {
- pycompile_module="pygame"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vmove usr/include/python3*
- }
-}
diff --git a/srcpkgs/python-pygame/update b/srcpkgs/python3-pygame/update
similarity index 100%
rename from srcpkgs/python-pygame/update
rename to srcpkgs/python3-pygame/update
From de7d2c555882628133434212f34aadfdbb225a1d 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 23:56:08 +0700
Subject: [PATCH 32/53] python-pyelftools: drop package
---
srcpkgs/python-pyelftools/template | 32 -----------------------------
srcpkgs/python3-pyelftools | 1 -
srcpkgs/python3-pyelftools/template | 20 ++++++++++++++++++
3 files changed, 20 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-pyelftools/template
delete mode 120000 srcpkgs/python3-pyelftools
create mode 100644 srcpkgs/python3-pyelftools/template
diff --git a/srcpkgs/python-pyelftools/template b/srcpkgs/python-pyelftools/template
deleted file mode 100644
index a9d53a9d77d..00000000000
--- a/srcpkgs/python-pyelftools/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-pyelftools'
-pkgname=python-pyelftools
-version=0.25
-revision=3
-wrksrc="pyelftools-${version}"
-build_style=python-module
-pycompile_module="elftools"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 library for parsing ELF and DWARF"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/eliben/pyelftools"
-license="Public Domain"
-distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
-checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
-alternatives="pyelftools:readelf:/usr/bin/readelf.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-pyelftools_package() {
- pycompile_module="elftools"
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-pyelftools b/srcpkgs/python3-pyelftools
deleted file mode 120000
index 5871f624853..00000000000
--- a/srcpkgs/python3-pyelftools
+++ /dev/null
@@ -1 +0,0 @@
-python-pyelftools
\ No newline at end of file
diff --git a/srcpkgs/python3-pyelftools/template b/srcpkgs/python3-pyelftools/template
new file mode 100644
index 00000000000..dbd62331b0c
--- /dev/null
+++ b/srcpkgs/python3-pyelftools/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pyelftools'
+pkgname=python3-pyelftools
+version=0.25
+revision=4
+wrksrc="pyelftools-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 library for parsing ELF and DWARF"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Public Domain"
+homepage="https://github.com/eliben/pyelftools"
+distfiles="${PYPI_SITE}/p/pyelftools/pyelftools-${version}.tar.gz"
+checksum=89c6da6f56280c37a5ff33468591ba9a124e17d71fe42de971818cbff46c1b24
+alternatives="pyelftools:readelf:/usr/bin/readelf.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/readelf.py $DESTDIR/usr/bin/readelf.py3
+ vlicense LICENSE
+}
From e086fd8748220140b359532abf3cf408b5bb249d 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: Tue, 29 Sep 2020 00:00:03 +0700
Subject: [PATCH 33/53] python-pyaes: drop package
---
srcpkgs/python-pyaes/template | 29 -----------------------------
srcpkgs/python3-pyaes | 1 -
srcpkgs/python3-pyaes/template | 18 ++++++++++++++++++
3 files changed, 18 insertions(+), 30 deletions(-)
delete mode 100644 srcpkgs/python-pyaes/template
delete mode 120000 srcpkgs/python3-pyaes
create mode 100644 srcpkgs/python3-pyaes/template
diff --git a/srcpkgs/python-pyaes/template b/srcpkgs/python-pyaes/template
deleted file mode 100644
index 8cc0dd4d5db..00000000000
--- a/srcpkgs/python-pyaes/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'python-pyaes'
-pkgname=python-pyaes
-version=1.6.1
-revision=3
-wrksrc="pyaes-${version}"
-build_style=python-module
-pycompile_module="pyaes"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Pure-Python implementation of the AES block cipher (Python2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/ricmoo/pyaes"
-distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
-checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pyaes_package() {
- depends="python3"
- pycompile_module="pyaes"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pyaes b/srcpkgs/python3-pyaes
deleted file mode 120000
index d19f6a6f486..00000000000
--- a/srcpkgs/python3-pyaes
+++ /dev/null
@@ -1 +0,0 @@
-python-pyaes
\ No newline at end of file
diff --git a/srcpkgs/python3-pyaes/template b/srcpkgs/python3-pyaes/template
new file mode 100644
index 00000000000..d48717625a8
--- /dev/null
+++ b/srcpkgs/python3-pyaes/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-pyaes'
+pkgname=python3-pyaes
+version=1.6.1
+revision=4
+wrksrc="pyaes-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Pure-Python implementation of the AES block cipher (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/ricmoo/pyaes"
+distfiles="${PYPI_SITE}/p/pyaes/pyaes-${version}.tar.gz"
+checksum=02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 910ab2464e724fc8166e2151b75bb9b08211aad6 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: Tue, 29 Sep 2020 00:00:41 +0700
Subject: [PATCH 34/53] python-py: drop package
---
srcpkgs/python3-py | 1 -
srcpkgs/{python-py => python3-py}/template | 27 +++++++++-------------
2 files changed, 11 insertions(+), 17 deletions(-)
delete mode 120000 srcpkgs/python3-py
rename srcpkgs/{python-py => python3-py}/template (54%)
diff --git a/srcpkgs/python3-py b/srcpkgs/python3-py
deleted file mode 120000
index 1a72927b964..00000000000
--- a/srcpkgs/python3-py
+++ /dev/null
@@ -1 +0,0 @@
-python-py
\ No newline at end of file
diff --git a/srcpkgs/python-py/template b/srcpkgs/python3-py/template
similarity index 54%
rename from srcpkgs/python-py/template
rename to srcpkgs/python3-py/template
index 181bbbd3567..5bfcb42bc88 100644
--- a/srcpkgs/python-py/template
+++ b/srcpkgs/python3-py/template
@@ -1,13 +1,13 @@
-# Template file for 'python-py'
-pkgname=python-py
+# Template file for 'python3-py'
+pkgname=python3-py
version=1.9.0
-revision=1
+revision=2
wrksrc="py-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
checkdepends="python3-pytest"
-short_desc="Python2 development support library"
+short_desc="Python3 development support library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pytest-dev/py"
@@ -15,6 +15,10 @@ changelog="https://github.com/pytest-dev/py/raw/master/CHANGELOG"
distfiles="${PYPI_SITE}/p/py/py-${version}.tar.gz"
checksum=9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342
+post_extract() {
+ vsed -i -e 's/"setuptools-scm"//' setup.py
+}
+
do_check() {
python3 -m pytest
}
@@ -22,12 +26,3 @@ do_check() {
post_install() {
vlicense LICENSE
}
-
-python3-py_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 6c317f4ca1acdc54ba75438f3b73c1ddac669a7c 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: Tue, 29 Sep 2020 00:04:32 +0700
Subject: [PATCH 35/53] python-prctl: drop package
---
srcpkgs/python-prctl/template | 22 ----------------------
srcpkgs/python3-prctl | 1 -
srcpkgs/python3-prctl/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-prctl/template
delete mode 120000 srcpkgs/python3-prctl
create mode 100644 srcpkgs/python3-prctl/template
diff --git a/srcpkgs/python-prctl/template b/srcpkgs/python-prctl/template
deleted file mode 100644
index e8bf54b98fd..00000000000
--- a/srcpkgs/python-prctl/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-prctl'
-pkgname=python-prctl
-version=1.7
-revision=4
-build_style=python-module
-pycompile_module="prctl.py"
-hostmakedepends="python-setuptools python3-setuptools libcap-devel"
-makedepends="libcap-devel python-devel python3-devel"
-short_desc="Python2 interface for the Linux prctl syscall"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/seveas/python-prctl"
-distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
-checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
-
-python3-prctl_package() {
- pycompile_module="prctl.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-prctl b/srcpkgs/python3-prctl
deleted file mode 120000
index b31e38b939e..00000000000
--- a/srcpkgs/python3-prctl
+++ /dev/null
@@ -1 +0,0 @@
-python-prctl
\ No newline at end of file
diff --git a/srcpkgs/python3-prctl/template b/srcpkgs/python3-prctl/template
new file mode 100644
index 00000000000..f81cceb6735
--- /dev/null
+++ b/srcpkgs/python3-prctl/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-prctl'
+pkgname=python3-prctl
+version=1.7
+revision=5
+wrksrc=python-prctl-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools libcap-devel"
+makedepends="libcap-devel python3-devel"
+short_desc="Python3 interface for the Linux prctl syscall"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/seveas/python-prctl"
+distfiles="https://github.com/seveas/python-prctl/archive/v${version}.tar.gz"
+checksum=03bb346430f5ffa707f14de5a3796936f64d627cd07c8e97135d100598bf38a5
From 2cae61c3688dff40aa6cafa827008e351db69dc1 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: Tue, 29 Sep 2020 00:07:11 +0700
Subject: [PATCH 36/53] python-pip: drop package
---
srcpkgs/python-pip/template | 31 -------------------
srcpkgs/python3-pip | 1 -
.../patches/no-versioned-pip.patch | 0
srcpkgs/python3-pip/template | 21 +++++++++++++
srcpkgs/{python-pip => python3-pip}/update | 0
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/python-pip/template
delete mode 120000 srcpkgs/python3-pip
rename srcpkgs/{python-pip => python3-pip}/patches/no-versioned-pip.patch (100%)
create mode 100644 srcpkgs/python3-pip/template
rename srcpkgs/{python-pip => python3-pip}/update (100%)
diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template
deleted file mode 100644
index b438cd13c00..00000000000
--- a/srcpkgs/python-pip/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'python-pip'
-pkgname=python-pip
-version=20.2.3
-revision=1
-wrksrc="pip-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="PyPA recommended tool for installing PyPI packages (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://pip.pypa.io/"
-changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
-distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
-alternatives="pip:pip:/usr/bin/pip2"
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-pip_package() {
- depends="python3-setuptools"
- short_desc="${short_desc/Python2/Python3}"
- alternatives="pip:pip:/usr/bin/pip3"
- pkg_install() {
- vmove usr/bin/pip3
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-pip b/srcpkgs/python3-pip
deleted file mode 120000
index 9de2412ef67..00000000000
--- a/srcpkgs/python3-pip
+++ /dev/null
@@ -1 +0,0 @@
-python-pip
\ No newline at end of file
diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch
similarity index 100%
rename from srcpkgs/python-pip/patches/no-versioned-pip.patch
rename to srcpkgs/python3-pip/patches/no-versioned-pip.patch
diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
new file mode 100644
index 00000000000..fcfc36e4c17
--- /dev/null
+++ b/srcpkgs/python3-pip/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-pip'
+pkgname=python3-pip
+version=20.2.3
+revision=2
+wrksrc="pip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="PyPA recommended tool for installing PyPI packages (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://pip.pypa.io/"
+changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
+distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
+checksum=30c70b6179711a7c4cf76da89e8a0f5282279dfb0278bec7b94134be92543b6d
+alternatives="pip:pip:/usr/bin/pip3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pip $DESTDIR/usr/bin/pip3
+ vlicense LICENSE.txt
+}
diff --git a/srcpkgs/python-pip/update b/srcpkgs/python3-pip/update
similarity index 100%
rename from srcpkgs/python-pip/update
rename to srcpkgs/python3-pip/update
From 54651591f7eb832e131238c4ece28a1145da798f 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: Tue, 29 Sep 2020 00:11:03 +0700
Subject: [PATCH 37/53] python-peewee: drop package
---
srcpkgs/python-peewee/template | 32 --------------------------------
srcpkgs/python3-peewee | 1 -
srcpkgs/python3-peewee/template | 21 +++++++++++++++++++++
3 files changed, 21 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/python-peewee/template
delete mode 120000 srcpkgs/python3-peewee
create mode 100644 srcpkgs/python3-peewee/template
diff --git a/srcpkgs/python-peewee/template b/srcpkgs/python-peewee/template
deleted file mode 100644
index 8d037291a8f..00000000000
--- a/srcpkgs/python-peewee/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'python-peewee'
-pkgname=python-peewee
-version=3.13.3
-revision=1
-wrksrc="peewee-${version}"
-build_style=python-module
-pycompile_module="playhouse peewee.py pwiz.py"
-hostmakedepends="python-setuptools python3-setuptools python-Cython python3-Cython"
-makedepends="python-devel python3-devel sqlite-devel"
-short_desc="Small and simple ORM for Python2"
-maintainer="johannes <johannes.brechtmann@gmail.com>"
-license="MIT"
-homepage="https://github.com/coleifer/peewee"
-changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
-distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
-checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
-alternatives="peewee:pwiz:/usr/bin/pwiz.py2"
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-peewee_package() {
- alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
- pycompile_module="playhouse peewee.py pwiz.py"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/bin/*3
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-peewee b/srcpkgs/python3-peewee
deleted file mode 120000
index 92c3b35d75b..00000000000
--- a/srcpkgs/python3-peewee
+++ /dev/null
@@ -1 +0,0 @@
-python-peewee
\ No newline at end of file
diff --git a/srcpkgs/python3-peewee/template b/srcpkgs/python3-peewee/template
new file mode 100644
index 00000000000..ba282e88a90
--- /dev/null
+++ b/srcpkgs/python3-peewee/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-peewee'
+pkgname=python3-peewee
+version=3.13.3
+revision=2
+wrksrc="peewee-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel sqlite-devel"
+short_desc="Small and simple ORM for Python3"
+maintainer="johannes <johannes.brechtmann@gmail.com>"
+license="MIT"
+homepage="https://github.com/coleifer/peewee"
+changelog="https://raw.githubusercontent.com/coleifer/peewee/master/CHANGELOG.md"
+distfiles="https://github.com/coleifer/peewee/archive/${version}.tar.gz"
+checksum=cff86b690a746ac43b998330310a25feb92510662f442383d728927c0d6aea58
+alternatives="peewee:pwiz:/usr/bin/pwiz.py3"
+
+post_install() {
+ mv $DESTDIR/usr/bin/pwiz.py $DESTDIR/usr/bin/pwiz.py3
+ vlicense LICENSE
+}
From 04fa352150487c6cf77134df3353a41d1003adc9 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: Wed, 30 Sep 2020 21:16:16 +0700
Subject: [PATCH 38/53] python3-pafy: drop noarch
Also drop python 2 transitional package.
---
srcpkgs/python3-pafy/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/python3-pafy/template b/srcpkgs/python3-pafy/template
index 8d3fafaf789..1165626f76e 100644
--- a/srcpkgs/python3-pafy/template
+++ b/srcpkgs/python3-pafy/template
@@ -1,8 +1,7 @@
# Template file for 'python3-pafy'
pkgname=python3-pafy
version=0.5.5
-revision=1
-archs=noarch
+revision=2
wrksrc="pafy-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools youtube-dl"
@@ -13,9 +12,3 @@ license="LGPL-3.0-or-later"
homepage="https://github.com/mps-youtube/pafy"
distfiles="https://github.com/mps-youtube/pafy/archive/v${version}.tar.gz"
checksum=3b878d319dc63be2f2a84aca5df4ee08baf7256d26e61c94d92b6165b965994f
-
-python-pafy_package() {
- depends="python3-pafy"
- short_desc+=" - transitional dummy package"
- build_style=meta
-}
From a32ed65f62448255c17ded57a17d9307579c2f8a 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: Wed, 30 Sep 2020 21:18:51 +0700
Subject: [PATCH 39/53] python-numexpr: drop package
---
srcpkgs/python-numexpr/template | 30 ------------------------------
srcpkgs/python3-numexpr | 1 -
srcpkgs/python3-numexpr/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-numexpr/template
delete mode 120000 srcpkgs/python3-numexpr
create mode 100644 srcpkgs/python3-numexpr/template
diff --git a/srcpkgs/python-numexpr/template b/srcpkgs/python-numexpr/template
deleted file mode 100644
index baf91175a33..00000000000
--- a/srcpkgs/python-numexpr/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-numexpr'
-pkgname=python-numexpr
-version=2.7.0
-revision=2
-wrksrc="numexpr-${version}"
-build_style=python-module
-pycompile_module="numexpr"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel python-numpy python3-numpy"
-depends="python-numpy"
-short_desc="Fast numerical expression evaluator for NumPy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="MIT"
-homepage="https://github.com/pydata/numexpr"
-distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
-checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
-
-post_install() {
- vlicense LICENSE.txt
-}
-
-python3-numexpr_package() {
- depends="python3-numpy"
- pycompile_module="numexpr"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.txt
- }
-}
diff --git a/srcpkgs/python3-numexpr b/srcpkgs/python3-numexpr
deleted file mode 120000
index cab9d2a5293..00000000000
--- a/srcpkgs/python3-numexpr
+++ /dev/null
@@ -1 +0,0 @@
-python-numexpr
\ No newline at end of file
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
new file mode 100644
index 00000000000..c19b5149018
--- /dev/null
+++ b/srcpkgs/python3-numexpr/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-numexpr'
+pkgname=python3-numexpr
+version=2.7.0
+revision=3
+wrksrc="numexpr-${version}"
+build_style=python3-module
+build_helper=numpy
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-numpy"
+depends="python3-numpy"
+short_desc="Fast numerical expression evaluator for NumPy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/pydata/numexpr"
+distfiles="${PYPI_SITE}/n/numexpr/numexpr-${version}.tar.gz"
+checksum=37324b5981b8962102bdc8640c4f05f5589da5d1df2702418783085cb78ca217
+
+post_install() {
+ vlicense LICENSE.txt
+}
From afd4b6c0e22c493e924c5e79e0a06f6f263b6d63 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: Wed, 30 Sep 2020 22:03:39 +0700
Subject: [PATCH 40/53] python-nbxmpp: drop package
---
srcpkgs/python-nbxmpp | 1 -
srcpkgs/python3-nbxmpp/template | 7 -------
2 files changed, 8 deletions(-)
delete mode 120000 srcpkgs/python-nbxmpp
diff --git a/srcpkgs/python-nbxmpp b/srcpkgs/python-nbxmpp
deleted file mode 120000
index ae760ace99f..00000000000
--- a/srcpkgs/python-nbxmpp
+++ /dev/null
@@ -1 +0,0 @@
-python3-nbxmpp
\ No newline at end of file
diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index fc711fb5821..583a4691a4d 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -13,10 +13,3 @@ homepage="https://python-nbxmpp.gajim.org/"
#changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
checksum=991f014a2736123e989da454d6a467be8c4314bf86dbcc889e899f03726e856f
-
-python-nbxmpp_package() {
- build_style=meta
- archs=noarch
- # Someone bumped this package to 1.0.0, which doesn't support Python 2
- short_desc+=" - Python 2 - removed package"
-}
From bf9f211d2c2de1e9e343183e7fde4d9adfd261cd 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: Wed, 30 Sep 2020 22:04:36 +0700
Subject: [PATCH 41/53] python-musicbrainzngs: drop package
---
srcpkgs/python-musicbrainzngs/template | 30 -------------------------
srcpkgs/python3-musicbrainzngs | 1 -
srcpkgs/python3-musicbrainzngs/template | 19 ++++++++++++++++
3 files changed, 19 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-musicbrainzngs/template
delete mode 120000 srcpkgs/python3-musicbrainzngs
create mode 100644 srcpkgs/python3-musicbrainzngs/template
diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template
deleted file mode 100644
index 8679b3bfcf5..00000000000
--- a/srcpkgs/python-musicbrainzngs/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-musicbrainzngs'
-pkgname=python-musicbrainzngs
-version=0.6
-revision=5
-wrksrc="musicbrainzngs-${version}"
-build_style="python-module"
-pycompile_module="musicbrainzngs"
-hostmakedepends="python-devel python3-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-short_desc="Python2 bindings for the Musicbrainz NGS webservice interface"
-maintainer="Steven R <dev@styez.com>"
-license="BSD"
-homepage="https://github.com/alastair/python-musicbrainz-ngs/"
-distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
-checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
-
-post_install() {
- vlicense COPYING
-}
-
-python3-musicbrainzngs_package() {
- depends="python3"
- pycompile_module="musicbrainzngs"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense COPYING
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-musicbrainzngs b/srcpkgs/python3-musicbrainzngs
deleted file mode 120000
index 81a3ce402a2..00000000000
--- a/srcpkgs/python3-musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainzngs
\ No newline at end of file
diff --git a/srcpkgs/python3-musicbrainzngs/template b/srcpkgs/python3-musicbrainzngs/template
new file mode 100644
index 00000000000..6bb7c93ce6a
--- /dev/null
+++ b/srcpkgs/python3-musicbrainzngs/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-musicbrainzngs'
+pkgname=python3-musicbrainzngs
+version=0.6
+revision=6
+wrksrc="musicbrainzngs-${version}"
+build_style="python3-module"
+hostmakedepends="python3-devel"
+makedepends="${hostmakedepends}"
+depends="python3"
+short_desc="Python3 bindings for the Musicbrainz NGS webservice interface"
+maintainer="Steven R <dev@styez.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/alastair/python-musicbrainz-ngs/"
+distfiles="${PYPI_SITE}/m/musicbrainzngs/musicbrainzngs-${version}.tar.gz"
+checksum=28ef261a421dffde0a25281dab1ab214e1b407eec568cd05a53e73256f56adb5
+
+post_install() {
+ vlicense COPYING
+}
From 8b5f17c82d86a260cd21e0efc481d6a29f94a688 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: Wed, 30 Sep 2020 22:06:03 +0700
Subject: [PATCH 42/53] python-monotonic: drop package
---
srcpkgs/python-monotonic/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/python-monotonic/template
diff --git a/srcpkgs/python-monotonic/template b/srcpkgs/python-monotonic/template
deleted file mode 100644
index 71bd26c6f18..00000000000
--- a/srcpkgs/python-monotonic/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'python-monotonic'
-pkgname=python-monotonic
-version=1.5
-revision=2
-wrksrc="monotonic-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-depends="python"
-pycompile_module="monotonic.py"
-short_desc="Implementation of time.monotonic() for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Apache-2.0"
-homepage="https://github.com/atdt/monotonic"
-distfiles="${PYPI_SITE}/m/monotonic/monotonic-${version}.tar.gz"
-checksum=23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0
From 2fc83f0329218f8445e92ec27f3aa6afacabed4d 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: Wed, 30 Sep 2020 22:07:14 +0700
Subject: [PATCH 43/53] python-miniupnpc: drop package
---
srcpkgs/python-miniupnpc/template | 28 ----------------------------
srcpkgs/python3-miniupnpc | 1 -
srcpkgs/python3-miniupnpc/template | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-miniupnpc/template
delete mode 120000 srcpkgs/python3-miniupnpc
create mode 100644 srcpkgs/python3-miniupnpc/template
diff --git a/srcpkgs/python-miniupnpc/template b/srcpkgs/python-miniupnpc/template
deleted file mode 100644
index f7892bab073..00000000000
--- a/srcpkgs/python-miniupnpc/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-miniupnpc'
-pkgname=python-miniupnpc
-version=2.0.2
-revision=3
-wrksrc="${pkgname#python-}-$version"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel miniupnpc-devel"
-depends="python"
-short_desc="Python2 bindings for miniupnpc, a UPnP library"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="BSD-3-Clause"
-homepage="https://pypi.org/project/miniupnpc/"
-distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
-checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
-
-python3-miniupnpc_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vlicense LICENSE
- vmove usr/lib/python3*
- }
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/python3-miniupnpc b/srcpkgs/python3-miniupnpc
deleted file mode 120000
index 17d4960a570..00000000000
--- a/srcpkgs/python3-miniupnpc
+++ /dev/null
@@ -1 +0,0 @@
-python-miniupnpc
\ No newline at end of file
diff --git a/srcpkgs/python3-miniupnpc/template b/srcpkgs/python3-miniupnpc/template
new file mode 100644
index 00000000000..4331ce7e85e
--- /dev/null
+++ b/srcpkgs/python3-miniupnpc/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-miniupnpc'
+pkgname=python3-miniupnpc
+version=2.0.2
+revision=4
+wrksrc="miniupnpc-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel miniupnpc-devel"
+depends="python3"
+short_desc="Python3 bindings for miniupnpc, a UPnP library"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/miniupnpc/"
+distfiles="${PYPI_SITE}/m/miniupnpc/miniupnpc-${version}.tar.gz"
+checksum=7ea46c93486fe1bdb31f0e0c2d911d224fce70bf5ea120e4295d647dfe274931
+
+
+post_install() {
+ vlicense LICENSE
+}
From 9330bb06c326c0038704ab493c9544d4b7dd7644 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: Wed, 30 Sep 2020 22:07:54 +0700
Subject: [PATCH 44/53] python-marisa-trie: drop package
---
srcpkgs/python3-marisa-trie | 1 -
.../template | 22 ++++++-------------
2 files changed, 7 insertions(+), 16 deletions(-)
delete mode 120000 srcpkgs/python3-marisa-trie
rename srcpkgs/{python-marisa-trie => python3-marisa-trie}/template (58%)
diff --git a/srcpkgs/python3-marisa-trie b/srcpkgs/python3-marisa-trie
deleted file mode 120000
index 8efb226c0fc..00000000000
--- a/srcpkgs/python3-marisa-trie
+++ /dev/null
@@ -1 +0,0 @@
-python-marisa-trie
\ No newline at end of file
diff --git a/srcpkgs/python-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
similarity index 58%
rename from srcpkgs/python-marisa-trie/template
rename to srcpkgs/python3-marisa-trie/template
index 5e46b686ace..ab26456bd5b 100644
--- a/srcpkgs/python-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,12 +1,12 @@
-# Template file for 'python-marisa-trie'
-pkgname=python-marisa-trie
+# Template file for 'python3-marisa-trie'
+pkgname=python3-marisa-trie
version=0.7.5
-revision=3
+revision=4
wrksrc="marisa-trie-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Static memory-efficient Trie-like structures (Python2)"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Static memory-efficient Trie-like structures (Python3)"
maintainer="bra1nwave <brainwave@openmailbox.org>"
license="MIT"
homepage="https://github.com/pytries/marisa-trie"
@@ -17,11 +17,3 @@ checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
post_install() {
vlicense LICENSE
}
-
-python3-marisa-trie_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
From 0c674ac05bb5a5edda27abed3f74b239fcbd1b06 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: Wed, 30 Sep 2020 22:08:14 +0700
Subject: [PATCH 45/53] python-libpcap: drop package
---
srcpkgs/python-libpcap/template | 19 -------------------
srcpkgs/python-libpcap/update | 1 -
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/python-libpcap/template
delete mode 100644 srcpkgs/python-libpcap/update
diff --git a/srcpkgs/python-libpcap/template b/srcpkgs/python-libpcap/template
deleted file mode 100644
index b39b9558fc5..00000000000
--- a/srcpkgs/python-libpcap/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'python-libpcap'
-pkgname=python-libpcap
-version=0.6.4
-revision=2
-wrksrc="pylibpcap-$version"
-build_style=python2-module
-pycompile_module="pcap.py"
-hostmakedepends="python"
-makedepends="libpcap-devel python-devel"
-short_desc="Python2 module for the libpcap packet capture library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="http://pylibpcap.sourceforge.net/"
-distfiles="$SOURCEFORGE_SITE/pylibpcap/pylibpcap/$version/pylibpcap-$version.tar.gz"
-checksum=cfc365f2707a7986496acacf71789fef932a5ddbeaa36274cc8f9834831ca3b1
-
-post_install() {
- vlicense COPYING
-}
diff --git a/srcpkgs/python-libpcap/update b/srcpkgs/python-libpcap/update
deleted file mode 100644
index ec0f249750a..00000000000
--- a/srcpkgs/python-libpcap/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=pylibpcap
From 2c599263d08ff12fc32e9b6bd35adbcb2f0d334a 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: Wed, 30 Sep 2020 22:08:28 +0700
Subject: [PATCH 46/53] python-lazy-object-proxy: drop package
---
srcpkgs/python-lazy-object-proxy/template | 28 ----------------------
srcpkgs/python3-lazy-object-proxy | 1 -
srcpkgs/python3-lazy-object-proxy/template | 22 +++++++++++++++++
3 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/python-lazy-object-proxy/template
delete mode 120000 srcpkgs/python3-lazy-object-proxy
create mode 100644 srcpkgs/python3-lazy-object-proxy/template
diff --git a/srcpkgs/python-lazy-object-proxy/template b/srcpkgs/python-lazy-object-proxy/template
deleted file mode 100644
index 067890e5176..00000000000
--- a/srcpkgs/python-lazy-object-proxy/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'python-lazy-object-proxy'
-pkgname=python-lazy-object-proxy
-version=1.4.3
-revision=2
-wrksrc="lazy-object-proxy-${version}"
-build_style=python-module
-pycompile_module="lazy_object_proxy"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast and thorough lazy object proxy (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-2-Clause"
-homepage="https://github.com/ionelmc/python-lazy-object-proxy"
-distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
-checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-lazy-object-proxy_package() {
- pycompile_module="lazy_object_proxy"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-lazy-object-proxy b/srcpkgs/python3-lazy-object-proxy
deleted file mode 120000
index a1a392a0e66..00000000000
--- a/srcpkgs/python3-lazy-object-proxy
+++ /dev/null
@@ -1 +0,0 @@
-python-lazy-object-proxy
\ No newline at end of file
diff --git a/srcpkgs/python3-lazy-object-proxy/template b/srcpkgs/python3-lazy-object-proxy/template
new file mode 100644
index 00000000000..5284244320a
--- /dev/null
+++ b/srcpkgs/python3-lazy-object-proxy/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-lazy-object-proxy'
+pkgname=python3-lazy-object-proxy
+version=1.4.3
+revision=3
+wrksrc="lazy-object-proxy-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast and thorough lazy object proxy (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="BSD-2-Clause"
+homepage="https://github.com/ionelmc/python-lazy-object-proxy"
+distfiles="${PYPI_SITE}/l/lazy-object-proxy/lazy-object-proxy-${version}.tar.gz"
+checksum=f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0
+
+post_patch() {
+ vsed -i '/setuptools_scm/d' setup.cfg
+}
+
+post_install() {
+ vlicense LICENSE
+}
From fc2e22e7fd723bb5cdb62f859a59a357d298dcdb 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: Wed, 30 Sep 2020 22:10:46 +0700
Subject: [PATCH 47/53] python-kiwisolver: drop package
---
srcpkgs/python3-kiwisolver | 1 -
.../template | 26 +++++++------------
2 files changed, 9 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/python3-kiwisolver
rename srcpkgs/{python-kiwisolver => python3-kiwisolver}/template (54%)
diff --git a/srcpkgs/python3-kiwisolver b/srcpkgs/python3-kiwisolver
deleted file mode 120000
index 6bb16d6a5b7..00000000000
--- a/srcpkgs/python3-kiwisolver
+++ /dev/null
@@ -1 +0,0 @@
-python-kiwisolver
\ No newline at end of file
diff --git a/srcpkgs/python-kiwisolver/template b/srcpkgs/python3-kiwisolver/template
similarity index 54%
rename from srcpkgs/python-kiwisolver/template
rename to srcpkgs/python3-kiwisolver/template
index 67f0805aa51..cbabfa84931 100644
--- a/srcpkgs/python-kiwisolver/template
+++ b/srcpkgs/python3-kiwisolver/template
@@ -1,15 +1,15 @@
-# Template file for 'python-kiwisolver'
-pkgname=python-kiwisolver
+# Template file for 'python3-kiwisolver'
+pkgname=python3-kiwisolver
version=1.0.1
-revision=3
+revision=4
wrksrc="kiwisolver-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel"
-short_desc="Fast implementation of the Cassowary constraint solver (Python2)"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/nucleic/kiwi"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+short_desc="Fast implementation of the Cassowary constraint solver (Python3)"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
+homepage="https://github.com/nucleic/kiwi"
distfiles="${PYPI_SITE}/k/kiwisolver/kiwisolver-${version}.tar.gz"
checksum=ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278
@@ -20,11 +20,3 @@ pre_build() {
post_install() {
vlicense COPYING.txt LICENSE
}
-
-python3-kiwisolver_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense COPYING.txt LICENSE
- }
-}
From 8120b9d42a000249cd5fea47efb2dc88a10c0ec9 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: Wed, 30 Sep 2020 22:11:05 +0700
Subject: [PATCH 48/53] python-keyutils: drop package
---
srcpkgs/python-keyutils/template | 22 ----------------------
srcpkgs/python3-keyutils | 1 -
srcpkgs/python3-keyutils/template | 14 ++++++++++++++
3 files changed, 14 insertions(+), 23 deletions(-)
delete mode 100644 srcpkgs/python-keyutils/template
delete mode 120000 srcpkgs/python3-keyutils
create mode 100644 srcpkgs/python3-keyutils/template
diff --git a/srcpkgs/python-keyutils/template b/srcpkgs/python-keyutils/template
deleted file mode 100644
index a72819e963a..00000000000
--- a/srcpkgs/python-keyutils/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python-keyutils'
-pkgname=python-keyutils
-version=0.6
-revision=2
-build_style=python-module
-pycompile_module="keyutils"
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="python-devel python3-devel keyutils-devel"
-short_desc="Python2 bindings for keyutils"
-maintainer="Matthias Fulz <mfulz@olznet.de>"
-license="Apache-2.0"
-homepage="https://github.com/sassoftware/python-keyutils"
-distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
-checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
-
-python3-keyutils_package() {
- pycompile_module="keyutils"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- }
-}
diff --git a/srcpkgs/python3-keyutils b/srcpkgs/python3-keyutils
deleted file mode 120000
index 0b8009d923a..00000000000
--- a/srcpkgs/python3-keyutils
+++ /dev/null
@@ -1 +0,0 @@
-python-keyutils
\ No newline at end of file
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
new file mode 100644
index 00000000000..20f5a6b8e21
--- /dev/null
+++ b/srcpkgs/python3-keyutils/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-keyutils'
+pkgname=python3-keyutils
+version=0.6
+revision=3
+wrksrc=python-keyutils-$version
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel keyutils-devel"
+short_desc="Python3 bindings for keyutils"
+maintainer="Matthias Fulz <mfulz@olznet.de>"
+license="Apache-2.0"
+homepage="https://github.com/sassoftware/python-keyutils"
+distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
+checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
From 37295ffd5435c9b28beb884351356dff02f001f3 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: Wed, 30 Sep 2020 22:15:23 +0700
Subject: [PATCH 49/53] python-gconf: drop package
---
srcpkgs/python-gconf/template | 26 --------------------------
srcpkgs/python-gconf/update | 1 -
2 files changed, 27 deletions(-)
delete mode 100644 srcpkgs/python-gconf/template
delete mode 100644 srcpkgs/python-gconf/update
diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template
deleted file mode 100644
index 0dcc94d3e1f..00000000000
--- a/srcpkgs/python-gconf/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'python-gconf'
-pkgname=python-gconf
-version=2.28.1
-revision=5
-wrksrc="gnome-python-${version}"
-build_style=gnu-configure
-configure_args="--enable-gconf --disable-gnome --disable-gnomeui
---disable-gnomecanvas --disable-gnomevfs --disable-gnomevfsbonobo
---disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo
---disable-bonoboui"
-pycompile_dirs="usr/share/pygtk/2.0"
-hostmakedepends="pkg-config python-devel"
-makedepends="python-devel pygtk-devel GConf-devel"
-depends="pygtk"
-short_desc="Python bindings for interacting with GConf"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/gnome-python/2.28/gnome-python-${version}.tar.bz2"
-checksum=759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8
-nocross="could not find Python headers or library"
-lib32disabled=yes
-
-post_install() {
- rm -rf ${DESTDIR}/usr/lib/pkgconfig
-}
diff --git a/srcpkgs/python-gconf/update b/srcpkgs/python-gconf/update
deleted file mode 100644
index 2b4a7297027..00000000000
--- a/srcpkgs/python-gconf/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="gnome-python"
From 7a2ab7e3b3ae2d529d4b0cd93d112e13662d17b5 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: Wed, 30 Sep 2020 22:17:36 +0700
Subject: [PATCH 50/53] python-ecdsa: drop package
---
srcpkgs/python-ecdsa/template | 34 ----------------------------------
srcpkgs/python3-ecdsa | 1 -
srcpkgs/python3-ecdsa/template | 23 +++++++++++++++++++++++
3 files changed, 23 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/python-ecdsa/template
delete mode 120000 srcpkgs/python3-ecdsa
create mode 100644 srcpkgs/python3-ecdsa/template
diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template
deleted file mode 100644
index 64d642f26b6..00000000000
--- a/srcpkgs/python-ecdsa/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'python-ecdsa'
-pkgname=python-ecdsa
-version=0.14.1
-revision=3
-wrksrc="${pkgname/python-/}-${version}"
-build_style=python-module
-pycompile_module="ecdsa"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-six"
-short_desc="Implementation of ECDSA in Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/warner/python-ecdsa/"
-distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
-checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
-
-pre_build() {
- # use system six
- find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
- rm -f ecdsa/six.py
-}
-post_install() {
- vlicense LICENSE
-}
-
-python3-ecdsa_package() {
- depends="python3-six"
- pycompile_module="ecdsa"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-ecdsa b/srcpkgs/python3-ecdsa
deleted file mode 120000
index 7f15d919f9b..00000000000
--- a/srcpkgs/python3-ecdsa
+++ /dev/null
@@ -1 +0,0 @@
-python-ecdsa
\ No newline at end of file
diff --git a/srcpkgs/python3-ecdsa/template b/srcpkgs/python3-ecdsa/template
new file mode 100644
index 00000000000..f7482a0a04a
--- /dev/null
+++ b/srcpkgs/python3-ecdsa/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-ecdsa'
+pkgname=python3-ecdsa
+version=0.14.1
+revision=4
+wrksrc="ecdsa-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-six"
+short_desc="Implementation of ECDSA in Python3"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/warner/python-ecdsa/"
+distfiles="${PYPI_SITE}/e/ecdsa/ecdsa-${version}.tar.gz"
+checksum=64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e
+
+pre_build() {
+ # use system six
+ find . -type f -name '*.py' -exec sed -i 's/from \(ecdsa\|\)\.six/from six/g' {} +
+ rm -f ecdsa/six.py
+}
+post_install() {
+ vlicense LICENSE
+}
From b6b43b7312a0c8a2fa02093b611ff94d480053bf 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: Wed, 30 Sep 2020 22:19:35 +0700
Subject: [PATCH 51/53] python-click: drop package
---
srcpkgs/python-click/template | 27 -------------------
srcpkgs/python3-click | 1 -
srcpkgs/python3-click/template | 18 +++++++++++++
.../{python-click => python3-click}/update | 0
4 files changed, 18 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/python-click/template
delete mode 120000 srcpkgs/python3-click
create mode 100644 srcpkgs/python3-click/template
rename srcpkgs/{python-click => python3-click}/update (100%)
diff --git a/srcpkgs/python-click/template b/srcpkgs/python-click/template
deleted file mode 100644
index e798cd0eca5..00000000000
--- a/srcpkgs/python-click/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'python-click'
-pkgname=python-click
-version=7.1.2
-revision=2
-wrksrc="click-${version}"
-build_style="python-module"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python"
-short_desc="Python2 package for creating beautiful command line interfaces"
-maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
-license="BSD-3-Clause"
-homepage="http://click.pocoo.org/"
-distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
-checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
-
-post_install() {
- vlicense LICENSE.rst
-}
-
-python3-click_package() {
- depends="python3"
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE.rst
- }
-}
diff --git a/srcpkgs/python3-click b/srcpkgs/python3-click
deleted file mode 120000
index d6543636ddb..00000000000
--- a/srcpkgs/python3-click
+++ /dev/null
@@ -1 +0,0 @@
-python-click
\ No newline at end of file
diff --git a/srcpkgs/python3-click/template b/srcpkgs/python3-click/template
new file mode 100644
index 00000000000..2b29bebfbcc
--- /dev/null
+++ b/srcpkgs/python3-click/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-click'
+pkgname=python3-click
+version=7.1.2
+revision=3
+wrksrc="click-${version}"
+build_style="python3-module"
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Python3 package for creating beautiful command line interfaces"
+maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
+license="BSD-3-Clause"
+homepage="http://click.pocoo.org/"
+distfiles="${PYPI_SITE}/c/click/click-${version}.tar.gz"
+checksum=d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a
+
+post_install() {
+ vlicense LICENSE.rst
+}
diff --git a/srcpkgs/python-click/update b/srcpkgs/python3-click/update
similarity index 100%
rename from srcpkgs/python-click/update
rename to srcpkgs/python3-click/update
From c7d57c7448aa76722a9ee5bc879001906309c0e4 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: Thu, 1 Oct 2020 07:39:19 +0700
Subject: [PATCH 52/53] python-yaml: drop package
---
srcpkgs/python-yaml/template | 30 --------------------
srcpkgs/python3-yaml | 1 -
srcpkgs/python3-yaml/template | 22 ++++++++++++++
srcpkgs/{python-yaml => python3-yaml}/update | 0
4 files changed, 22 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/python-yaml/template
delete mode 120000 srcpkgs/python3-yaml
create mode 100644 srcpkgs/python3-yaml/template
rename srcpkgs/{python-yaml => python3-yaml}/update (100%)
diff --git a/srcpkgs/python-yaml/template b/srcpkgs/python-yaml/template
deleted file mode 100644
index 34df72de973..00000000000
--- a/srcpkgs/python-yaml/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python-yaml'
-pkgname=python-yaml
-version=5.3.1
-revision=1
-wrksrc="PyYAML-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools"
-makedepends="libyaml-devel python-devel python3-devel"
-short_desc="YAML parser and emitter for Python2"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="http://pyyaml.org/wiki/PyYAML"
-distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
-checksum=b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
-
-do_check() {
- python3 setup.py test
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-python3-yaml_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove usr/lib/python3*
- vlicense LICENSE
- }
-}
diff --git a/srcpkgs/python3-yaml b/srcpkgs/python3-yaml
deleted file mode 120000
index 8ad435a8a6f..00000000000
--- a/srcpkgs/python3-yaml
+++ /dev/null
@@ -1 +0,0 @@
-python-yaml
\ No newline at end of file
diff --git a/srcpkgs/python3-yaml/template b/srcpkgs/python3-yaml/template
new file mode 100644
index 00000000000..b2e961166a0
--- /dev/null
+++ b/srcpkgs/python3-yaml/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-yaml'
+pkgname=python3-yaml
+version=5.3.1
+revision=2
+wrksrc="PyYAML-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="libyaml-devel python3-devel"
+short_desc="YAML parser and emitter for Python 3"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="http://pyyaml.org/wiki/PyYAML"
+distfiles="${PYPI_SITE}/P/PyYAML/PyYAML-${version}.tar.gz"
+checksum=b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d
+
+do_check() {
+ python3 setup.py test
+}
+
+post_install() {
+ vlicense LICENSE
+}
diff --git a/srcpkgs/python-yaml/update b/srcpkgs/python3-yaml/update
similarity index 100%
rename from srcpkgs/python-yaml/update
rename to srcpkgs/python3-yaml/update
From 1f4bf50877aa381dd774f2ccde889df50581e130 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: Thu, 1 Oct 2020 08:30:51 +0700
Subject: [PATCH 53/53] python-yenc: drop package
---
srcpkgs/python-yenc/template | 20 --------------------
srcpkgs/python-yenc/update | 1 -
2 files changed, 21 deletions(-)
delete mode 100644 srcpkgs/python-yenc/template
delete mode 100644 srcpkgs/python-yenc/update
diff --git a/srcpkgs/python-yenc/template b/srcpkgs/python-yenc/template
deleted file mode 100644
index a2f1f882056..00000000000
--- a/srcpkgs/python-yenc/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'python-yenc'
-pkgname=python-yenc
-version=0.4.0
-revision=2
-wrksrc="yenc-${version}"
-build_style=python2-module
-hostmakedepends="python-devel"
-makedepends="${hostmakedepends}"
-depends="python"
-pycompile_module="yenc.py"
-short_desc="yEnc Module for Python2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="https://bitbucket.org/dual75/yenc"
-license="LGPL-2.1"
-distfiles="http://www.golug.it/pub/yenc/yenc-${version}.tar.gz"
-checksum=075f6c4e4f43b7c6dafac579eabb17287b62d80e9147cbea0b046bc3ee8edd2f
-
-pre_build() {
- sed -i 's/extra_compile_args=\[[^]]*\]/extra_compile_args=[]/' setup.py
-}
diff --git a/srcpkgs/python-yenc/update b/srcpkgs/python-yenc/update
deleted file mode 100644
index 72bf9817e4b..00000000000
--- a/srcpkgs/python-yenc/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname="yenc"
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: Drop python 2 pyqt5 and related packages.
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
` (11 preceding siblings ...)
2020-10-01 15:57 ` sgn
@ 2020-10-01 16:42 ` sgn
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-10-01 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
There's a closed pull request on the void-packages repository
Drop python 2 pyqt5 and related packages.
https://github.com/void-linux/void-packages/pull/25150
Description:
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-10-01 16:42 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-28 13:09 [PR PATCH] Drop python 2 pyqt5 sgn
2020-09-28 14:42 ` ericonr
2020-09-28 14:47 ` [PR PATCH] [Updated] " sgn
2020-09-28 15:04 ` sgn
2020-09-28 17:12 ` sgn
2020-09-30 13:58 ` sgn
2020-09-30 14:00 ` [PR PATCH] [Updated] " sgn
2020-09-30 14:14 ` sgn
2020-09-30 15:02 ` [PR PATCH] [Updated] Drop python 2 pyqt5 and related packages sgn
2020-09-30 15:23 ` sgn
2020-10-01 0:32 ` sgn
2020-10-01 15:37 ` sgn
2020-10-01 15:57 ` sgn
2020-10-01 16:42 ` [PR PATCH] [Closed]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).