commit: 74923ba5afe3ea77d7f1f754750087ca928a8084 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Oct 16 01:59:40 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Oct 16 02:20:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74923ba5
dev-python/pillow: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pillow/Manifest | 2 - dev-python/pillow/files/pillow-11.2.1-py314.patch | 49 ------- dev-python/pillow/pillow-11.2.1.ebuild | 170 ---------------------- 3 files changed, 221 deletions(-) diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 09ccbd135851..c12409b2df98 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,4 +1,2 @@ -DIST pillow-11.2.1.gh.tar.gz 47086538 BLAKE2B 306c3f4292681caea75835dc972229854e12260190f7e7b63ad5292091fcbb28a16fe102c9b2359fe72b99ad97821fa37715f5934bfe79a983efa81b07abf2a4 SHA512 4b5eee712b6cedf175e251ca29bb6e6dda27491585d343ef71ed416819e91510c4add6be50fe1151ab5f178f4686968de111beff4143a978b7a32519293a5725 DIST pillow-11.3.0.gh.tar.gz 47173056 BLAKE2B 1260c7025e6013c50782024756a0c891d3735bd7d4c1c9d0a89d9eb1c94bd2f762369086f7269d487100e8a0e2678a73012bf29172697c1a1a18e58f9019a9bd SHA512 7d97e623bd41da94dd89a66dc600cea016d0a4f33fbf036175768ea96b2031c1968acf4fc3d9b2835ce93f9533838a9ce68a6579a7397f4aeccafb6032adb3db DIST pillow-test-images-7077675d2cda485d63de4aefe0fefbf6f655c5a0.gh.tar.gz 57430276 BLAKE2B 6e8dcde60832004f5a0ea0e14024fdcd0b08cf0e225f27e39b7c2058582d6d5efe7fcaccb5bd28754affa6fe4125735fb4beeaa2075e6aceea0a998ebc0747fe SHA512 795f015c9b73a8c941fb5cd880b1ab36b24d38612db53367ab0e6c05dd1cdbfd47034decb7e36d7de940eeea1582d644ca7bee3b131577578692569c2c60c32b -DIST pillow-test-images-716bdc4adaf97601e5b9a31c9be25f8975381ee1.gh.tar.gz 57416881 BLAKE2B 8ea5fff2231567f957fc911120c1b50610722477da99559639317e4513e4bc4e73b8b49368a6d95c6938333f0c48db7672c3713eaef70494f7896dadd07cc42d SHA512 b00009be0f5ca85ec0c761fa780f0e650c1877b456b9a9426a4d2300a0c5654358495299e129ded411fccb641e4add7e460bcb3ca7be055f3b207407ccefb33c diff --git a/dev-python/pillow/files/pillow-11.2.1-py314.patch b/dev-python/pillow/files/pillow-11.2.1-py314.patch deleted file mode 100644 index b9fe40d47046..000000000000 --- a/dev-python/pillow/files/pillow-11.2.1-py314.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://github.com/python-pillow/Pillow/pull/8948 -https://github.com/python-pillow/Pillow/commit/3c71559804e661a5f727e2007a5be51f26d9af27 - -From c7193f74fc5ce1a0fe1742a0845165024be45ef5 Mon Sep 17 00:00:00 2001 -From: Andrew Murray <[email protected]> -Date: Thu, 8 May 2025 20:10:34 +1000 -Subject: [PATCH 1/3] Updated error message - ---- - Tests/test_image_resample.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Tests/test_image_resample.py b/Tests/test_image_resample.py -index ce6209c0da4..73b25ed51b2 100644 ---- a/Tests/test_image_resample.py -+++ b/Tests/test_image_resample.py -@@ -462,7 +462,7 @@ def test_wrong_arguments(self, resample: Image.Resampling) -> None: - im.resize((32, 32), resample, (20, 20, 20, 100)) - im.resize((32, 32), resample, (20, 20, 100, 20)) - -- with pytest.raises(TypeError, match="must be sequence of length 4"): -+ with pytest.raises(TypeError, match="must be (sequence|tuple) of length 4"): - im.resize((32, 32), resample, (im.width, im.height)) # type: ignore[arg-type] - - with pytest.raises(ValueError, match="can't be negative"): - -From 215069af5ddec6f4d3b92b8bc7554a10e2efb669 Mon Sep 17 00:00:00 2001 -From: Andrew Murray <[email protected]> -Date: Thu, 8 May 2025 22:13:13 +1000 -Subject: [PATCH 3/3] Added support for Python 3.14 - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 5ecd6b8160a..5d41e27d981 100644 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,7 @@ def get_version() -> str: - ZLIB_ROOT = None - FUZZING_BUILD = "LIB_FUZZING_ENGINE" in os.environ - --if sys.platform == "win32" and sys.version_info >= (3, 14): -+if sys.platform == "win32" and sys.version_info >= (3, 15): - import atexit - - atexit.register( - diff --git a/dev-python/pillow/pillow-11.2.1.ebuild b/dev-python/pillow/pillow-11.2.1.ebuild deleted file mode 100644 index 21b270555054..000000000000 --- a/dev-python/pillow/pillow-11.2.1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -# setuptools wrapper -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{11..14} pypy3_11 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -# upstream always fetches from main -TEST_IMAGE_COMMIT="716bdc4adaf97601e5b9a31c9be25f8975381ee1" - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.github.io/ - https://github.com/python-pillow/Pillow/ - https://pypi.org/project/pillow/ -" -SRC_URI=" - https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - test? ( - https://github.com/python-pillow/test-images/archive/${TEST_IMAGE_COMMIT}.tar.gz - -> pillow-test-images-${TEST_IMAGE_COMMIT}.gh.tar.gz - ) -" -S=${WORKDIR}/${MY_P} - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -IUSE="avif examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - avif? ( media-libs/libavif:= ) - imagequant? ( media-gfx/libimagequant:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2= ) - tiff? ( media-libs/tiff:=[jpeg,zlib] ) - truetype? ( - media-libs/freetype:2= - media-libs/harfbuzz:= - ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-77[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/pkgconfig - test? ( - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[png] - ) - ) -" - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" - # https://github.com/python-pillow/Pillow/pull/8948 - "${FILESDIR}/${PN}-11.2.1-py314.patch" - ) - - distutils-r1_src_prepare - - if use test; then - mv "${WORKDIR}/test-images-${TEST_IMAGE_COMMIT}"/* \ - Tests/images || die - fi -} - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = True - $(usepil avif)_avif = True - $(usepil truetype)_freetype = True - $(usepil jpeg)_jpeg = True - $(usepil jpeg2k)_jpeg2000 = True - $(usepil lcms)_lcms = True - $(usepil tiff)_tiff = True - $(usepil imagequant)_imagequant = True - $(usepil webp)_webp = True - $(usepil xcb)_xcb = True - $(usepil zlib)_zlib = True - EOF - if use truetype; then - # these dependencies are implicitly disabled by USE=-truetype - # and we can't pass both disable_* and vendor_* - # https://bugs.gentoo.org/935124 - cat >> setup.cfg <<-EOF || die - vendor_raqm = False - vendor_fribidi = False - EOF - fi - - tc-export PKG_CONFIG -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # TODO (is clipboard unreliable in Xvfb?) - Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard - # requires xz-utils[extra-filters]? - Tests/test_file_libtiff.py::TestFileLibTiff::test_lzma - ) - - case ${ARCH} in - ppc) - EPYTEST_DESELECT+=( - # https://github.com/python-pillow/Pillow/issues/7008 - # (we've reverted the upstream patch because it was worse - # than the original issue) - Tests/test_file_libtiff.py::TestFileLibTiff::test_exif_ifd - ) - ;; - esac - - "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - # leak tests are fragile and broken under xdist - epytest -k "not leak" -p timeout || die "Tests failed with ${EPYTHON}" -} - -python_install() { - python_doheader src/libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - if use examples ; then - docinto example - dodoc docs/example/* - docompress -x /usr/share/doc/${PF}/example - fi - distutils-r1_python_install_all -}
