From 6d2f791d7e40f47d75b65ec9210427a2f8aa6bda Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:24:00 +0100 Subject: [PATCH 1/7] mailpile: remove package --- srcpkgs/mailpile/template | 20 -------------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 srcpkgs/mailpile/template diff --git a/srcpkgs/mailpile/template b/srcpkgs/mailpile/template deleted file mode 100644 index dd287602a13c..000000000000 --- a/srcpkgs/mailpile/template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'mailpile' -pkgname=mailpile -version=0.5.2 -revision=4 -wrksrc="Mailpile-${version}" -build_style=python2-module -hostmakedepends="python-setuptools" -depends="python python-Jinja2 python-lxml python-MarkupSafe python-Pillow - python-spambayes python-pydns python-pgpdump gnupg python-setuptools" -short_desc="Modern email client with user-friendly encryption and privacy features" -maintainer="Duncaen " -license="AGPL-3.0-or-later" -homepage="https://mailpile.is" -distfiles="https://github.com/mailpile/Mailpile/archive/${version}.tar.gz" -checksum=2619dd0711628e25e216bec196d42381e50d45d943a727177f11f8ce89e26004 - -post_install() { - vlicense COPYING.md - vlicense AGPLv3.txt -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 3c7a24da0ff5..7c19293ada47 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -227,6 +227,7 @@ replaces=" luxrays-devel<=3.1_18 luxrays<=3.1_18 mac<=3.99u4b5s7_3 + mailpile<=0.5.2_4 masterpassword-cli<=2.6_5 mattermost-desktop<=4.6.0_1 mdds0<=0.12.1_3 From 195821396ef9a16012bae73bf179425b9930277b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:23:49 +0100 Subject: [PATCH 2/7] python-lxml: remove package --- srcpkgs/python-lxml/template | 38 ------------------- srcpkgs/python3-lxml | 1 - .../patches/tests-fix-encoding-name.patch | 16 ++++++++ srcpkgs/python3-lxml/template | 27 +++++++++++++ srcpkgs/{python-lxml => python3-lxml}/update | 0 srcpkgs/removed-packages/template | 1 + 6 files changed, 44 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/python-lxml/template delete mode 120000 srcpkgs/python3-lxml create mode 100644 srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch create mode 100644 srcpkgs/python3-lxml/template rename srcpkgs/{python-lxml => python3-lxml}/update (100%) diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template deleted file mode 100644 index f01ee0c963cb..000000000000 --- a/srcpkgs/python-lxml/template +++ /dev/null @@ -1,38 +0,0 @@ -# Template file for 'python-lxml' -pkgname=python-lxml -version=4.6.4 -revision=2 -wrksrc="lxml-lxml-${version}" -build_style=python-module -make_build_args="--with-cython" -hostmakedepends="python-Cython python-setuptools python3-Cython python3-setuptools" -makedepends="libxslt-devel python-devel python3-devel" -checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib" -short_desc="Python2 binding for the libxml2 and libxslt libraries" -maintainer="Alessio Sergi " -license="BSD-3-Clause, custom:ElementTree" -homepage="https://lxml.de/" -distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" -checksum=5a7cef132353fc36de6f6b26dacde07b22217c6b4f8c11ef48e8bf0011f48160 - -do_check() { - cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml - python3 test.py -vv --all-levels -p -} - -post_install() { - vlicense LICENSES.txt - vlicense doc/licenses/BSD.txt - vlicense doc/licenses/elementtree.txt -} - -python3-lxml_package() { - short_desc="${short_desc/Python2/Python3}" - depends="python3" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSES.txt - vlicense doc/licenses/BSD.txt - vlicense doc/licenses/elementtree.txt - } -} diff --git a/srcpkgs/python3-lxml b/srcpkgs/python3-lxml deleted file mode 120000 index e69b7beb133d..000000000000 --- a/srcpkgs/python3-lxml +++ /dev/null @@ -1 +0,0 @@ -python-lxml \ No newline at end of file diff --git a/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch b/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch new file mode 100644 index 000000000000..28f165c24f46 --- /dev/null +++ b/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch @@ -0,0 +1,16 @@ +from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/commit/369de77b6197a5d04beb551537533fc82141a516 + +From: Patrycja Rosa +Date: Thu, 10 Feb 2022 14:09:24 +0100 +Subject: test_incremental_xmlfile: fix encoding name + +diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py +--- a/src/lxml/tests/test_incremental_xmlfile.py ++++ b/src/lxml/tests/test_incremental_xmlfile.py +@@ -173,4 +173,4 @@ +- with etree.xmlfile(self._file, encoding='utf16') as xf: ++ with etree.xmlfile(self._file, encoding='utf-16') as xf: + with xf.element('test'): + xf.write('toast') +- self.assertXml('toast', encoding='utf16') ++ self.assertXml('toast', encoding='utf-16') diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template new file mode 100644 index 000000000000..e980df0e97ef --- /dev/null +++ b/srcpkgs/python3-lxml/template @@ -0,0 +1,27 @@ +# Template file for 'python3-lxml' +pkgname=python3-lxml +version=4.6.4 +revision=2 +wrksrc="lxml-lxml-${version}" +build_style=python3-module +make_build_args="--with-cython" +hostmakedepends="python3-Cython python3-setuptools" +makedepends="libxslt-devel python3-devel" +depends="python3" +checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib" +short_desc="Python binding for the libxml2 and libxslt libraries" +maintainer="Alessio Sergi " +license="BSD-3-Clause, custom:ElementTree" +homepage="https://lxml.de/" +distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz" +checksum=5a7cef132353fc36de6f6b26dacde07b22217c6b4f8c11ef48e8bf0011f48160 + +do_check() { + make test3 +} + +post_install() { + vlicense LICENSES.txt + vlicense doc/licenses/BSD.txt + vlicense doc/licenses/elementtree.txt +} diff --git a/srcpkgs/python-lxml/update b/srcpkgs/python3-lxml/update similarity index 100% rename from srcpkgs/python-lxml/update rename to srcpkgs/python3-lxml/update diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 7c19293ada47..6503f3835207 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -272,6 +272,7 @@ replaces=" python-gntp<=1.0.3_7 python-iso8601<=0.1.16_2 python-jellyfish<=0.6.1_2 + python-lxml<=4.6.4_2 python-matplotlib-data<=2.2.4_2 python-matplotlib<=2.2.4_2 python-netifaces<=0.10.9_3 From ba6274fa3166517bab69a97ae0a895777f4be492 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:25:34 +0100 Subject: [PATCH 3/7] python-Pillow: remove package --- srcpkgs/python-Pillow/template | 21 --------------------- srcpkgs/python-Pillow/update | 1 - srcpkgs/removed-packages/template | 1 + 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 srcpkgs/python-Pillow/template delete mode 100644 srcpkgs/python-Pillow/update diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template deleted file mode 100644 index 072f37b611b0..000000000000 --- a/srcpkgs/python-Pillow/template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'python-Pillow' -pkgname=python-Pillow -version=6.2.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 python-tkinter" -short_desc="Python Imaging Library (PIL) fork for Python2" -maintainer="Alessio Sergi " -license="custom:PIL" -homepage="https://python-pillow.org/" -changelog="https://raw.githubusercontent.com/python-pillow/Pillow/master/CHANGES.rst" -distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz" -checksum=db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950 - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/python-Pillow/update b/srcpkgs/python-Pillow/update deleted file mode 100644 index 37e09b1a872f..000000000000 --- a/srcpkgs/python-Pillow/update +++ /dev/null @@ -1 +0,0 @@ -pattern="Pillow-\K6\.[0-9.]+(?=.tar.gz)" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6503f3835207..12863bf484d2 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -261,6 +261,7 @@ replaces=" pyside-tools<=0.2.15_2 pystopwatch<=2019_2 python-M2Crypto<=0.35.2_7 + python-Pillow<=6.2.2_3 python-PyQt4<=4.12.1_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 From 861a435063206e6b4dbf441f38b9aeaf7e662064 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:26:53 +0100 Subject: [PATCH 4/7] python-spambayes: remove package --- srcpkgs/python-spambayes/template | 14 -------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/python-spambayes/template diff --git a/srcpkgs/python-spambayes/template b/srcpkgs/python-spambayes/template deleted file mode 100644 index 04386eb3942f..000000000000 --- a/srcpkgs/python-spambayes/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'python-spambayes' -pkgname=python-spambayes -version=1.1b3 -revision=3 -wrksrc=${pkgname#*-}-${version} -build_style=python2-module -hostmakedepends="python-setuptools" -depends="python-lockfile python-pydns" -short_desc="Spam classification system" -maintainer="Duncaen " -license="PSF-2.0" -homepage="http://spambayes.sourceforge.net/" -distfiles="${PYPI_SITE}/s/spambayes/spambayes-${version}.tar.gz" -checksum=188d650fa930b27f74c96233429bd48f96d304a22d401b34cde32839c81bd904 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 12863bf484d2..31182fb781b5 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -285,6 +285,7 @@ replaces=" python-pytest-relaxed<=1.1.2_2 python-reportlab<=3.5.42_3 python-requests<=2.26.0_2 + python-spambayes<=1.1b3_3 python-sqlite<=2.8.3_1 python-unicorn>=0 python-urllib3<=1.26.6_2 From 713f4cbc66812b4ba3606a740fe48a3c95f8e9b9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:27:11 +0100 Subject: [PATCH 5/7] python-pydns: remove package --- srcpkgs/python-pydns/template | 19 ------------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 srcpkgs/python-pydns/template diff --git a/srcpkgs/python-pydns/template b/srcpkgs/python-pydns/template deleted file mode 100644 index 21b646944287..000000000000 --- a/srcpkgs/python-pydns/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'python-pydns' -pkgname=python-pydns -version=2.3.6 -revision=4 -wrksrc="${pkgname#*-}-${version}" -build_style=python2-module -pycompile_module="DNS" -hostmakedepends="python-setuptools" -depends="python" -short_desc="Python DNS library" -maintainer="Duncaen " -license="CNRI-Python" -homepage="http://pydns.sourceforge.net/" -distfiles="${PYPI_SITE}/p/pydns/pydns-${version}.tar.gz" -checksum=f1960d8bff0aafad9252b9e80279748fe7ebe5e719487d132ccb1281523cdb62 - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 31182fb781b5..36448c4691ff 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -280,6 +280,7 @@ replaces=" python-nose<=1.3.7_7 python-pivy<=0.6.4_2 python-pycryptodome<=3.9.7_3 + python-pydns<=2.3.6_4 python-pyenet<=1.3.13.post7_2 python-pyside<=1.2.2_7 python-pytest-relaxed<=1.1.2_2 From 79bed22d53c3832f0459a6dc54f98b7d82eb831b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:28:26 +0100 Subject: [PATCH 6/7] python-pgpdump: remove package --- srcpkgs/python-pgpdump/template | 25 ------------------------- srcpkgs/python3-pgpdump | 1 - srcpkgs/removed-packages/template | 2 ++ 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/python-pgpdump/template delete mode 120000 srcpkgs/python3-pgpdump diff --git a/srcpkgs/python-pgpdump/template b/srcpkgs/python-pgpdump/template deleted file mode 100644 index 02372035bf63..000000000000 --- a/srcpkgs/python-pgpdump/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'python-pgpdump' -pkgname=python-pgpdump -version=1.5 -revision=10 -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python" -short_desc="Python2 library for parsing PGP packets" -maintainer="Duncaen " -license="BSD-3-Clause" -homepage="https://github.com/toofishes/python-pgpdump" -distfiles="https://github.com/toofishes/python-pgpdump/archive/${version}.tar.gz" -checksum=05383f66e467e855299d1ed51161c6038ac338d9d10bd33476b574dc3bef64ff - -post_install() { - vlicense COPYRIGHT -} - -python3-pgpdump_package() { - depends="python3" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-pgpdump b/srcpkgs/python3-pgpdump deleted file mode 120000 index 7d91dad5a60b..000000000000 --- a/srcpkgs/python3-pgpdump +++ /dev/null @@ -1 +0,0 @@ -python-pgpdump \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 36448c4691ff..8af2413829a6 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -278,6 +278,7 @@ replaces=" python-matplotlib<=2.2.4_2 python-netifaces<=0.10.9_3 python-nose<=1.3.7_7 + python-pgpdump<=1.5_10 python-pivy<=0.6.4_2 python-pycryptodome<=3.9.7_3 python-pydns<=2.3.6_4 @@ -300,6 +301,7 @@ replaces=" python3-grako<=3.99.9_7 python3-idna-ssl<=1.1.0_3 python3-keepalive<=0.5_6 + python3-pgpdump<=1.5_10 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside-phonon<=5.15.0_2 From 9ac33cf7099aba595fe6b5a3412c795fc9a9313b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 24 Feb 2022 16:31:09 +0100 Subject: [PATCH 7/7] python-lockfile: remove package --- srcpkgs/python-lockfile/template | 30 ------------------------------ srcpkgs/python3-lockfile | 1 - srcpkgs/removed-packages/template | 2 ++ 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/python-lockfile/template delete mode 120000 srcpkgs/python3-lockfile diff --git a/srcpkgs/python-lockfile/template b/srcpkgs/python-lockfile/template deleted file mode 100644 index c7edf44832d2..000000000000 --- a/srcpkgs/python-lockfile/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'python-lockfile' -pkgname=python-lockfile -version=0.12.2 -revision=7 -wrksrc="lockfile-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools python-pbr python3-pbr" -makedepends="python-pbr python3-pbr" -depends="python" -pycompile_module="lockfile" -short_desc="Platform-independent file locking module (Python2)" -maintainer="Orphaned " -homepage="https://pypi.org/project/lockfile/" -license="MIT" -distfiles="${PYPI_SITE}/l/lockfile/lockfile-${version}.tar.gz" -checksum=6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 - -post_install() { - vlicense LICENSE -} - -python3-lockfile_package() { - pycompile_module="lockfile" - depends="python3" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE - } -} diff --git a/srcpkgs/python3-lockfile b/srcpkgs/python3-lockfile deleted file mode 120000 index 3a54cd60526d..000000000000 --- a/srcpkgs/python3-lockfile +++ /dev/null @@ -1 +0,0 @@ -python-lockfile \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 8af2413829a6..5943dc39bb57 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -273,6 +273,7 @@ replaces=" python-gntp<=1.0.3_7 python-iso8601<=0.1.16_2 python-jellyfish<=0.6.1_2 + python-lockfile<=0.12.2_7 python-lxml<=4.6.4_2 python-matplotlib-data<=2.2.4_2 python-matplotlib<=2.2.4_2 @@ -302,6 +303,7 @@ replaces=" python3-idna-ssl<=1.1.0_3 python3-keepalive<=0.5_6 python3-pgpdump<=1.5_10 + python3-lockfile<=0.12.2_7 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside-phonon<=5.15.0_2