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?= 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 " 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?= 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 " -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 < 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 " -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 " +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?= 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 " -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 " +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?= 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 " 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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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?= 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 " @@ -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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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?= 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 " -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 " +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?= 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 " -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?= 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 " -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 " +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?= 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 " -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?= 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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " 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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " +short_desc="Python3 bindings for the ZeroMQ messaging library" +maintainer="Orphaned " 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?= 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 " 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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " 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?= 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 " -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 " +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?= 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 " -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 " +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?= 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 " -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 " +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 +}