From 537fa1e909d08f760d4a7a6b7278520c2f46f5da Mon Sep 17 00:00:00 2001 From: Lorem Date: Wed, 19 May 2021 13:57:15 +0530 Subject: [PATCH 1/6] New package: python3-zipp-3.4.1 re-introduce since python3-importlib_metadata needs it. --- srcpkgs/python3-zipp/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-zipp/template diff --git a/srcpkgs/python3-zipp/template b/srcpkgs/python3-zipp/template new file mode 100644 index 000000000000..06e5ce2ecf98 --- /dev/null +++ b/srcpkgs/python3-zipp/template @@ -0,0 +1,21 @@ +# Template file for 'python3-zipp' +pkgname=python3-zipp +version=3.4.1 +revision=1 +wrksrc="zipp-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm python3-toml" +checkdepends="python3-jaraco" +short_desc="Pathlib-compatible Zipfile object wrapper (Python 3)" +maintainer="Lorem " +license="MIT" +homepage="https://github.com/jaraco/zipp" +changelog="https://raw.githubusercontent.com/jaraco/zipp/master/CHANGES.rst" +distfiles="${PYPI_SITE}/z/zipp/zipp-${version}.tar.gz" +checksum=3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76 +# Needs unpackaged "jaraco.itertools" +make_check=no + +post_install() { + vlicense LICENSE +} From 56e1cc93d09677a2eebcb3c3e64dfc5f0f8e0022 Mon Sep 17 00:00:00 2001 From: Lorem Date: Wed, 19 May 2021 13:57:26 +0530 Subject: [PATCH 2/6] New package: python3-importlib_metadata-4.0.1 This package was dropped earlier as its functionality was added into Python 3.8 standard library. However, this package contains features that are not (yet) part of Python's standard library. Those features are needed by python3-keyring package. So, reintroduce this package. See: https://github.com/jaraco/keyring/issues/499#issuecomment-798973597 --- srcpkgs/python3-importlib_metadata/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/python3-importlib_metadata/template diff --git a/srcpkgs/python3-importlib_metadata/template b/srcpkgs/python3-importlib_metadata/template new file mode 100644 index 000000000000..51fed1d1bcf5 --- /dev/null +++ b/srcpkgs/python3-importlib_metadata/template @@ -0,0 +1,16 @@ +# Template file for 'python3-importlib_metadata' +pkgname=python3-importlib_metadata +version=4.0.1 +revision=1 +wrksrc="importlib_metadata-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools_scm python3-toml" +depends="python3-zipp" +short_desc="Read metadata from Python packages (Python 3)" +maintainer="Lorem " +license="Apache-2.0" +homepage="https://github.com/python/importlib_metadata" +distfiles="${PYPI_SITE}/i/importlib_metadata/importlib_metadata-${version}.tar.gz" +checksum=8c501196e49fb9df5df43833bdb1e4328f64847763ec8a50703148b73784d581 +# Needs unpackaged "pyfakefs" +make_check=no From aae732da4bbd08b0d17ce341ef55897ccbc90e13 Mon Sep 17 00:00:00 2001 From: Lorem Date: Wed, 19 May 2021 13:57:30 +0530 Subject: [PATCH 3/6] python3-keyring: update to 23.0.1. - update dependencies --- srcpkgs/python3-keyring/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template index 89783fc3036a..4038c5907f3c 100644 --- a/srcpkgs/python3-keyring/template +++ b/srcpkgs/python3-keyring/template @@ -1,18 +1,20 @@ # Template file for 'python3-keyring' pkgname=python3-keyring -version=21.2.1 -revision=3 +version=23.0.1 +revision=1 wrksrc="keyring-${version}" build_style=python3-module hostmakedepends="python3-setuptools_scm python3-toml" -depends="python3-setuptools python3-SecretStorage python3-entrypoints" +depends="python3-SecretStorage python3-importlib_metadata" +checkdepends="python3-importlib_metadata python3-pytest + python3-pytest-flake8 python3-pytest-cov" short_desc="Python interface to the system keyring service" maintainer="Oliver Kiddle " license="MIT" homepage="https://github.com/jaraco/keyring" changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst" distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz" -checksum=c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec +checksum=045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 post_install() { vlicense LICENSE From cb230c179693beb870ee7d66c8dc683a34d24b80 Mon Sep 17 00:00:00 2001 From: Lorem Date: Sun, 13 Jun 2021 06:07:47 +0530 Subject: [PATCH 4/6] New package: python3-cloudscraper-1.2.58 reintroduce as Komikku needs it again. --- srcpkgs/python3-cloudscraper/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/python3-cloudscraper/template diff --git a/srcpkgs/python3-cloudscraper/template b/srcpkgs/python3-cloudscraper/template new file mode 100644 index 000000000000..570eea582d1c --- /dev/null +++ b/srcpkgs/python3-cloudscraper/template @@ -0,0 +1,23 @@ +# Template file for 'python3-cloudscraper' +pkgname=python3-cloudscraper +version=1.2.58 +revision=1 +wrksrc=cloudscraper-${version} +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-requests-toolbelt" +short_desc="Python module to bypass Cloudflare's anti-bot page" +maintainer="Lorem " +license="MIT" +homepage="https://github.com/venomous/cloudscraper" +distfiles="${PYPI_SITE}/c/cloudscraper/cloudscraper-${version}.tar.gz" +checksum=dda29028c5628b5ba3e4dc43816ed38fd46bd945ef938c420f185586a6d8dff2 + +do_check() { + # Needs unpackaged v8eval + : +} + +post_install() { + vlicense LICENSE +} From 5e2101bee2f88bbd393d1ecd9e04308e243c8b7c Mon Sep 17 00:00:00 2001 From: Lorem Date: Sun, 13 Jun 2021 06:39:55 +0530 Subject: [PATCH 5/6] removed-packages: remove python3-cloudscraper As it is reintroduced. --- srcpkgs/removed-packages/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 09bd3a3ab01d..d93a4dec2825 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -244,7 +244,6 @@ replaces=" python-sqlite<=2.8.3_1 python-xlib<0.29_1 python3-Django<=3.0.7_2 - python3-cloudscraper<=1.2.52_1 python3-pyPEG2<=2.15.2_7 python3-pyenet<=5.15.0_2 python3-pyside<=5.15.0_2 From 83ea1708f3800ea00587e9b27be3f9740f4f836e Mon Sep 17 00:00:00 2001 From: Lorem Date: Sun, 13 Jun 2021 06:42:09 +0530 Subject: [PATCH 6/6] Komikku: remove python3-requests from depends It's already pulled in by python3-cloudscraper. Also sort depends for convenience. --- srcpkgs/Komikku/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template index 1fb41f0035df..a8d21545b64c 100644 --- a/srcpkgs/Komikku/template +++ b/srcpkgs/Komikku/template @@ -1,15 +1,15 @@ # Template file for 'Komikku' pkgname=Komikku version=0.29.2 -revision=1 +revision=2 wrksrc=Komikku-v${version} build_style=meson hostmakedepends="gettext glib-devel gobject-introspection pkg-config" makedepends="gtk+3-devel libhandy1-devel" -depends="gtk+3 python3-BeautifulSoup4 python3-requests python3-dateparser - python3-gobject python3-lxml python3-magic python3-Pillow python3-pure-protobuf - libhandy1 libnotify libsecret python3-Unidecode python3-keyring - python3-cloudscraper" +depends="gtk+3 libhandy1 libnotify libsecret python3-BeautifulSoup4 + python3-Pillow python3-Unidecode python3-cloudscraper python3-dateparser + python3-gobject python3-keyring python3-lxml python3-magic + python3-pure-protobuf" checkdepends="appstream-glib desktop-file-utils" short_desc="Online/offline manga reader for GNOME" maintainer="Lorem "