gentoo auto-resync : 02:02:2024 - 23:45:38

3 files changed, 61 insertions, 3 deletions

diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 0718d348338d..f430ddc1225b 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,4 @@
+AUX pendulum-3.0.0-system-tzdata.patch 1809 BLAKE2B 05b33d6ae6d673f82953c3128f9305ca58dc5fa9eef9a40b227f2e44ab973319402bf9b04a9e8f2d6f79265cf6366811b2daa60356d1f8b1c8a91ea4a2af5df2 SHA512 c3920988393b657543cae0594c3ca7e0d34460f27740d5b70aa2c708437571508a81d344ca9bf7f25972b5daafa4a139f2667127ddff8465d1230391ff3ac6cb
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
@@ -38,5 +39,5 @@ DIST windows_x86_64_gnu-0.42.1.crate 697614 BLAKE2B 3cef0a3da3ce142bbdf932dbb54e
 DIST windows_x86_64_gnullvm-0.42.1.crate 362788 BLAKE2B fff81e63b86ad04ce22ad3e05ec4cc02c0b791384c93bafb50832f6db9cb7fd9301ad3845339a08dd8cadac1d59f3e8dc9d5f56d7a987989dbfc16b9131af67b SHA512 8cc988b5995a4726bb7518b7fccff528274ad9b2b0160fe247eb240f9ced10db95afe7bff91bfc5a08ebd8237b6821e4a4abad1ff9da45022f1ce7e7586bcf05
 DIST windows_x86_64_msvc-0.42.1.crate 664606 BLAKE2B 6c460cfa392aad0d11add200d652a42ee1a60052570527c4e85405f765255375729d4e26287f5246dcad65fa89ccadea23c5135171b311e6da5027e33149c547 SHA512 a651b1a34f101125f929c1d1f5e933691c7a5c19d0bb0c501fb6812236d2771805428e3bd5e05be7d72715595f5fc9e7978dd7934e5d92e9b78a41c2ece695b2
 EBUILD pendulum-2.1.2-r2.ebuild 1016 BLAKE2B 00f262dcd729c6eb67a9a38a32254df8c3ef3160b0d4f97dafbbd15cf37bb61d1e8d13ec09f4eee30b87281cb3c404b73450e7cec40d8da5167b909c5d458339 SHA512 8ecb0412003f734d3ada27d610a4da348691fee07fe8649e0567a5dece5d7e5e557f10983453958df311ea389425fe071a4adb2c17dc7f8c7230d9fe033e2759
-EBUILD pendulum-3.0.0.ebuild 1850 BLAKE2B 2516547066e6fb9cf129ed5b1a6c0a243a48b15195c08db0be026b177e81092dc970f720684a596d06d581df81e36fee18b413fc899912086018401adc97a3cc SHA512 7031687f9c765dde50ef1c2cb9581ffe153f7e1db2d93d535ea4d3ad1d947da2c15b8d7942b417da4bfdf038ef78e311c151553fa5d70bd2ceea4c0b3b46e4bc
+EBUILD pendulum-3.0.0-r1.ebuild 2020 BLAKE2B ce3da9eb25f65d0a39f52fb1db8f8a0cec2dd836cf65bf067131ad63986c9328aae4bbee9d2d051c15e62880b761b3bef8a2b3f8553315ecfcca2d7f38a5f41c SHA512 cd69f1bf07b9be04ade86f51d43c0ca8d47a46f553f4e8cb1698ca783fcb66bc680d49222ef19fd28b5925f8b61e633d82c2b840779ba4cefbf83925157c70b1
 MISC metadata.xml 389 BLAKE2B 516d7400e97ab8c53ea341d642ac5d7098232b8bc5e622308a535ca3ae3f34f08893954b820232467bd66da7bed729e10205ac20e75190347ae5aa607b4bd88b SHA512 f5d036a5075eeaedfd073671a10bb2972912760549db758d126273abcb18e68ea057dbad0d3bc7915406ee0e519bf10e6ae1cb15c2f0ecd64303a456440987ca
diff --git a/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch b/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch
new file mode 100644
index 000000000000..c99bbb3ca9ea
--- /dev/null
+++ b/dev-python/pendulum/files/pendulum-3.0.0-system-tzdata.patch
@@ -0,0 +1,50 @@
+From 0143f10dfcc94f5cba1a83912e055026a0282c19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 2 Feb 2024 17:48:55 +0100
+Subject: [PATCH] Fix `pendulum.tz.timezones()` to use system tzdata
+
+Fix the `pendulum.tz.available_timezones()` to use
+`available_timezones()` function instead of iterating over the files
+in `tzdata` package.  This is more in line with PEP 615, as the system
+timezone functions will operate on system-provided tzdata when
+available, and use the `tzdata` package only if it's not available.
+Therefore, the previous code would yield a potentially different list
+of timezones than the system actually provides.
+
+Furthermore, Gentoo provides a dummy `tzdata` package that does not
+provide any data, since Python always uses system tzdata.  This change
+is necessary to make pendulum work again on Gentoo.
+
+Fixes #769
+---
+ src/pendulum/tz/__init__.py | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/pendulum/tz/__init__.py b/src/pendulum/tz/__init__.py
+index 36c2c692..8dc64705 100644
+--- a/src/pendulum/tz/__init__.py
++++ b/src/pendulum/tz/__init__.py
+@@ -9,7 +9,7 @@
+ from pendulum.tz.timezone import UTC
+ from pendulum.tz.timezone import FixedTimezone
+ from pendulum.tz.timezone import Timezone
+-from pendulum.utils._compat import resources
++from pendulum.utils._zoneinfo import available_timezones
+ 
+ 
+ PRE_TRANSITION = "pre"
+@@ -22,13 +22,7 @@
+ 
+ 
+ def timezones() -> tuple[str, ...]:
+-    global _timezones
+-
+-    if _timezones is None:
+-        with cast(Path, resources.files("tzdata").joinpath("zones")).open() as f:
+-            _timezones = tuple(tz.strip() for tz in f.readlines())
+-
+-    return _timezones
++    return available_timezones()
+ 
+ 
+ def fixed_timezone(offset: int) -> FixedTimezone:
diff --git a/dev-python/pendulum/pendulum-3.0.0.ebuild b/dev-python/pendulum/pendulum-3.0.0-r1.ebuild
index dc6bceec790c..2baadad9d93e 100644
--- a/dev-python/pendulum/pendulum-3.0.0.ebuild
+++ b/dev-python/pendulum/pendulum-3.0.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_USE_PEP517=maturin
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 CRATES="
 	autocfg@1.1.0
@@ -84,3 +84,10 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/sdispater/pendulum/pull/801
+	"${FILESDIR}/${P}-system-tzdata.patch"
+)
+
+QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/pendulum/_pendulum.*.so"