gentoo auto-resync : 03:11:2024 - 03:04:03

5 files changed, 2 insertions, 215 deletions

diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index 2b9e46f38493..0a8df43d5582 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,7 +1,3 @@
-AUX zstandard-0.22.0-build.patch 2228 BLAKE2B a8c2b6ef7cfb0a6f4037f25505ab6f81875f760078165e89d4956af022e074cf8b55c20a4a78b6a1eee3f5e1711b3b4c78b432cf58f582d21a005e9921f993b2 SHA512 25ecb4ec764af46af104e8e1fa5a4a2e0a8a5f312cac582d6c740b36c0b43af403028c04aae2bda3238f7d73b88dd863d3624e211e87a3eafe63a7a603324891
-DIST python-zstandard-0.22.0.gh.tar.gz 707644 BLAKE2B ce400120f9106d729b50ae091a581f4a9fb2e796ec0872cb7db393aa7a55cf6e22cbff79c3ff780b4f609fbd8289a9744cbdfc730ba51cb09ee4e7c56b1dac9e SHA512 b3041217ad4b6297d0727dd5d22bc83645d43fa591985bef43e8633feb960310a3f2eb1edaa133595941a6932683af91d565266f312c987e6b6c514ce70c9ddb
 DIST python-zstandard-0.23.0.gh.tar.gz 732448 BLAKE2B 920b53dc4a221059411062229ddf0ff51c478c2212e5599dec21298fef8e30b7a160c2f7d958ef95251ce5fb1357eaf4a8c3e4eca37304ef7a43176f723f3394 SHA512 06d799f8c5e89e5cc2f5b8ff100aeb3c3ff938757ce39852affb075487f65406d7d3f6d611b1864ec025fff86a51bf15b80c8af6260beda050b4fef5b7edd206
-EBUILD zstandard-0.22.0-r1.ebuild 1870 BLAKE2B efc3c5be7c490817af373e8cbdd267ab3db42e61c214ccbe141dc8a4b2f7e83a6e1ca88b2cba1fd211a43d74695be55fb9e6d1847de2d0208c6ec4804636f4e6 SHA512 f5c4352879a4edab4f52c8f3e243a683bd841e908a8d4ca65ffd8650322b7a9f14adb9e8c1ec057563182571cd93020aaa131d4fdddd18cd8e6d70ba8e647280
-EBUILD zstandard-0.22.0.ebuild 1806 BLAKE2B 136bde4cf9cdafa28603b26483b2ccb3ee2dfe8f3fc959feff58ff6f65934d9f68074ad44a9d75ca40df44e4a2d365497ce42e949cc4a57d140221dc4a7f9825 SHA512 f204abfc0416a841d6d49908abfc4475d8868eeaa55767fdf49da88695f53f24b12a56a30d7f84472e1276df8e6cd8c351354afcde6ee9cc71f018d481b0aeaa
-EBUILD zstandard-0.23.0.ebuild 1809 BLAKE2B 2bebdd67eb7ee42299786c6fab574e32ca3735ed961cacf8cd4bc0281e2bd20d14595e460924437036d2c58d2282af0001268b70522e6961f1c8149dc1228bb4 SHA512 25342a901ba14bd213abd4018102da9d8b2a96666c5417b74f6d1d48e01714cffddb3178972260854af91f0f59b637f34d7412c70fcd86aca101fd43e99abc0f
+EBUILD zstandard-0.23.0.ebuild 1808 BLAKE2B 88e9f4519e6ece7282f20ec46362a7217744f6c129de90d3f94b62ca6c8a80feba5ee5934e0983bee5162f4cf4e3d4686adc575e53e4db7c549a9f62e294732e SHA512 595a187db9256061848bdb09331fb3c311b15bfac5eb24ebd243910238bc8dad107410548d122619a2b85ea7ca012694565bd9d38b7fa6f5aa6da48e3f01ddd8
 MISC metadata.xml 378 BLAKE2B dd5834c84bb375812b3a3cfcc00d29aa43ac8954b044e188e8f38bdca93fdf1ce98fe78b78dbeccd935c83ca10f3ce18f893e5720dd8991118b6c69149a4ac61 SHA512 06554d973b525d53c680c3e43041f33125dad222339e645294fbc22670a7eadb0e9bf8a3b0771d2b2fb8f136d958eadb32c295179d1547c50ae26754360609f3
diff --git a/dev-python/zstandard/files/zstandard-0.22.0-build.patch b/dev-python/zstandard/files/zstandard-0.22.0-build.patch
deleted file mode 100644
index 1a5ff9affeda..000000000000
--- a/dev-python/zstandard/files/zstandard-0.22.0-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d7cb41b4ec0239c82d77a6cd7f55b4c7e3fe0c8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 1 Nov 2023 16:17:13 +0100
-Subject: [PATCH] build: fix building with modern setuptools backend
-
-Set correct `sys.path` prior to importing `setup_zstd`, in order to fix
-building with the modern setuptools backend, i.e.:
-
-```
-* Getting build dependencies for wheel...
-<string>:37: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
-<string>:38: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
-Traceback (most recent call last):
-  File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 353, in <module>
-    main()
-  File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 335, in main
-    json_out['return_val'] = hook(**hook_input['kwargs'])
-                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/usr/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 118, in get_requires_for_build_wheel
-    return hook(config_settings)
-           ^^^^^^^^^^^^^^^^^^^^^
-  File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 355, in get_requires_for_build_wheel
-    return self._get_build_requires(config_settings, requirements=['wheel'])
-           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 325, in _get_build_requires
-    self.run_setup()
-  File "/tmp/build-env-mgz__6r4/lib/python3.12/site-packages/setuptools/build_meta.py", line 341, in run_setup
-    exec(code, locals())
-  File "<string>", line 49, in <module>
-ModuleNotFoundError: No module named 'setup_zstd'
-
-ERROR Backend subprocess exited when trying to invoke get_requires_for_build_wheel
-```
----
- setup.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/setup.py b/setup.py
-index 7cc1f4f..2b2895b 100755
---- a/setup.py
-+++ b/setup.py
-@@ -46,6 +46,8 @@ try:
- except ImportError:
-     cffi = None
- 
-+sys.path.insert(0, ".")
-+
- import setup_zstd
- 
- SUPPORT_LEGACY = False
--- 
-2.42.0
-
diff --git a/dev-python/zstandard/zstandard-0.22.0-r1.ebuild b/dev-python/zstandard/zstandard-0.22.0-r1.ebuild
deleted file mode 100644
index e87c79a8840c..000000000000
--- a/dev-python/zstandard/zstandard-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-zstandard-${PV}
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="
-	https://github.com/indygreg/python-zstandard/
-	https://pypi.org/project/zstandard/
-"
-SRC_URI="
-	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-build.patch"
-	)
-
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unbundle zstd
-	rm zstd/* || die
-	> zstd/zstd.c || die
-	# it does random preprocessing on that, so we can't use #include
-	local f
-	for f in zdict.h zstd.h; do
-		cp "${ESYSROOT}/usr/include/${f}" "zstd/${f}" || die
-	done
-	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
-
-	distutils-r1_src_prepare
-
-	DISTUTILS_ARGS=(
-		--no-c-backend
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# unreliable, fails on x86
-		tests/test_data_structures.py::TestCompressionParameters::test_estimated_compression_context_size
-		# check for bundled zstd version, fails on other system zstd
-		tests/test_module_attributes.py::TestModuleAttributes::test_version
-	)
-
-	rm -rf zstandard || die
-	epytest
-}
diff --git a/dev-python/zstandard/zstandard-0.22.0.ebuild b/dev-python/zstandard/zstandard-0.22.0.ebuild
deleted file mode 100644
index 4cdbd6d5636a..000000000000
--- a/dev-python/zstandard/zstandard-0.22.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-zstandard-${PV}
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="
-	https://github.com/indygreg/python-zstandard/
-	https://pypi.org/project/zstandard/
-"
-SRC_URI="
-	https://github.com/indygreg/python-zstandard/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	app-arch/zstd:=
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]
-	' 'python*')
-"
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-build.patch"
-	)
-
-	# the C backend is repeatedly broken, so force CFFI instead
-	sed -e '/PYTHON_ZSTANDARD_IMPORT_POLICY/s:default:cffi:' \
-		-i zstandard/__init__.py || die
-	# unbundle zstd
-	: > zstd/zstdlib.c || die
-	# it does random preprocessing on that, so we can't use #include
-	cp "${ESYSROOT}/usr/include/zstd.h" zstd/zstd.h || die
-	sed -i -e '/include_dirs/a    libraries=["zstd"],' make_cffi.py || die
-
-	distutils-r1_src_prepare
-
-	DISTUTILS_ARGS=(
-		--no-c-backend
-	)
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# unreliable, fails on x86
-		tests/test_data_structures.py::TestCompressionParameters::test_estimated_compression_context_size
-		# check for bundled zstd version, fails on other system zstd
-		tests/test_module_attributes.py::TestModuleAttributes::test_version
-	)
-
-	rm -rf zstandard || die
-	epytest
-}
diff --git a/dev-python/zstandard/zstandard-0.23.0.ebuild b/dev-python/zstandard/zstandard-0.23.0.ebuild
index e952167bd3b4..f4c5b58eacfa 100644
--- a/dev-python/zstandard/zstandard-0.23.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.23.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	app-arch/zstd:=