From b27e1ef548bd1f2a6099a566acbd5b367cc915be Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 27 Feb 2026 12:00:49 +0100 Subject: [PATCH 1/4] overlay profiles: Mark dev-python/pillow as provided In next weekly updates batch, pillow gained a dependency on dev-python/pybind11, which pulls in dev-cpp/eigen, which pulls in some eclasses and more deps. This is too annoying for a tool that is effectively of no use for Flatcar. We should be able to get away with just "providing" the package, since docutils (the only package that pulls dev-python/pillow) is documented to handle missing pillow gracefully. Signed-off-by: Krzesimir Nowak --- .../coreos-overlay/profiles/coreos/base/package.provided | 6 ++++++ .../coreos-overlay/profiles/coreos/base/package.use.mask | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided index a7fb521eff..1d15adda9c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided @@ -34,3 +34,9 @@ llvm-core/clang-9999 # Pulled in by sys-apps/texinfo, contains only an info file, which # will get masked anyway during installation. app-doc/info-manual-9999 + +# Pillow is a dependency of docutils. Ebuild unconditionally requires +# it, but docutils actually autodetects pillow. So let's skip it then +# - it is only used for docs, which we don't ship in production +# images. +dev-python/pillow-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask index b635b4660b..b68b16acd4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -13,12 +13,6 @@ sys-libs/ncurses cxx # Pulls dev-python/sphinx, which in turn pulls a lot of other python stuff. sys-fs/btrfs-progs man -# The dev-python/pillow package is pulled in by dev-python/docutils. -# As the name suggests, it's for generating docs, which we don't even -# put anywhere. Thus avoid pulling more dependencies than necessary -# for throw-away things. -dev-python/pillow jpeg - # Gentoo force-enables X for app-emulation/qemu, because qemu is doing # some automagic detection of gtk ignoring whether we want to use gtk # or not. We don't have gtk on Flatcar, so it is not an issue here, From fe08215638e9af74fa506615348726a5754c8382 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 27 Feb 2026 12:58:03 +0100 Subject: [PATCH 2/4] dev-python/pillow: Drop the package Signed-off-by: Krzesimir Nowak --- .../portage-stable/dev-python/pillow/Manifest | 4 - .../pillow/files/pillow-10.2.0-cross.patch | 62 ------- .../dev-python/pillow/metadata.xml | 15 -- .../dev-python/pillow/pillow-11.3.0.ebuild | 168 ----------------- .../dev-python/pillow/pillow-12.0.0.ebuild | 169 ------------------ .../dev-python/pillow/pillow-12.1.0.ebuild | 169 ------------------ 6 files changed, 587 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/files/pillow-10.2.0-cross.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest deleted file mode 100644 index 1f224a5360..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST pillow-11.3.0.gh.tar.gz 47173056 BLAKE2B 1260c7025e6013c50782024756a0c891d3735bd7d4c1c9d0a89d9eb1c94bd2f762369086f7269d487100e8a0e2678a73012bf29172697c1a1a18e58f9019a9bd SHA512 7d97e623bd41da94dd89a66dc600cea016d0a4f33fbf036175768ea96b2031c1968acf4fc3d9b2835ce93f9533838a9ce68a6579a7397f4aeccafb6032adb3db -DIST pillow-12.0.0.gh.tar.gz 47078314 BLAKE2B 14540f6b016004de56e5736f66f23999ebc2683c4be5053631fd6890502d7416d05e9ef858460fec4473d873893303b51f251ed3b50facb11616211b0629e79c SHA512 816237bf65b65a8f7ec941db6ea07814af602efe6f214e2a253b1d0b6b9dbbe9895a9822c6de67af40bd507e658b8c088707440f689d5fd237985f4ee0f7bfc2 -DIST pillow-12.1.0.gh.tar.gz 47045570 BLAKE2B 1ba09d4a9540584c6649f29f03c8f2673fa675a8309f0a7ff45eb95b878498d3adfa239a755dda2d14035c2d4ac22920b78d2caeaa1c2f403ad4da0c50960f8e SHA512 f542780a7894ca4eade3ee2c806f2bb0866cd93967ce45228ffaff9d0c9fb09eb3193a5afc9aa08caff1ed7f495031414fbd4a1addb3c373f8fa76a373a0be8d -DIST pillow-test-images-7077675d2cda485d63de4aefe0fefbf6f655c5a0.gh.tar.gz 57430276 BLAKE2B 6e8dcde60832004f5a0ea0e14024fdcd0b08cf0e225f27e39b7c2058582d6d5efe7fcaccb5bd28754affa6fe4125735fb4beeaa2075e6aceea0a998ebc0747fe SHA512 795f015c9b73a8c941fb5cd880b1ab36b24d38612db53367ab0e6c05dd1cdbfd47034decb7e36d7de940eeea1582d644ca7bee3b131577578692569c2c60c32b diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/files/pillow-10.2.0-cross.patch b/sdk_container/src/third_party/portage-stable/dev-python/pillow/files/pillow-10.2.0-cross.patch deleted file mode 100644 index 864a9b1218..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/files/pillow-10.2.0-cross.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 774d7a570d9f76903de3c3267512b8a7d252c21e Mon Sep 17 00:00:00 2001 -From: James Le Cuirot -Date: Fri, 22 Dec 2023 22:38:27 +0000 -Subject: [PATCH] Fix cross-compiling by searching the right lib and include - directories - -We were previously searching the `{sys.prefix}/lib` and -`{sys.prefix}/include` directories unconditionally. This is problematic -when cross-compiling, as it does not take account of any sysroot where -alternative libraries and headers are located. Adding `-I/usr/include` -causes the build to explode, at least when cross-compiling from 64-bit -to 32-bit. - -Python does not officially support cross-compiling, but Gentoo achieves -this by modifying the sysconfig variables like `LIBDIR` and `INCLUDEDIR` -with great results. - -Assuming "lib" is bad. 64-bit Linux systems often use lib64, putting -32-bit libraries under lib. You cannot assume that either though, as -pure 64-bit Linux systems may just use lib instead. Things get even -stranger on RISC-V. - -The value of `sys.prefix` changes when using a virtualenv. Dependencies -may be installed here, so it does make sense to continue supporting this -case, even if it is incompatible with cross-compiling. Unlike regular -environments, "lib" is generally used for libraries, although a lib64 -symlink may also be present. ---- - setup.py | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 1bf0bcff558..07163d001fc 100755 ---- a/setup.py -+++ b/setup.py -@@ -15,6 +15,7 @@ - import struct - import subprocess - import sys -+import sysconfig - import warnings - - from setuptools import Extension, setup -@@ -504,8 +505,16 @@ def build_extensions(self): - for d in os.environ[k].split(os.path.pathsep): - _add_directory(library_dirs, d) - -- _add_directory(library_dirs, os.path.join(sys.prefix, "lib")) -- _add_directory(include_dirs, os.path.join(sys.prefix, "include")) -+ _add_directory( -+ library_dirs, -+ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR")) -+ or os.path.join(sys.prefix, "lib"), -+ ) -+ _add_directory( -+ include_dirs, -+ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR")) -+ or os.path.join(sys.prefix, "include"), -+ ) - - # - # add platform directories diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pillow/metadata.xml deleted file mode 100644 index f29ae70ed9..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - python@gentoo.org - Python - - - Build with Image Quantization Library support - - - pillow - python-pillow/Pillow - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild deleted file mode 100644 index 9fb70e8585..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-11.3.0.ebuild +++ /dev/null @@ -1,168 +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="7077675d2cda485d63de4aefe0fefbf6f655c5a0" - -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 ~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? ( virtual/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}] - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[png] - ) - ) -" - -EPYTEST_PLUGINS=( pytest-timeout ) -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" - ) - - 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}" - # leak tests are fragile and broken under xdist - # nonfatal implied by xvfb - nonfatal epytest -k "not leak" || 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 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild deleted file mode 100644 index 130bfbe577..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.0.0.ebuild +++ /dev/null @@ -1,169 +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="7077675d2cda485d63de4aefe0fefbf6f655c5a0" - -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 ~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? ( virtual/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/setuptools-77[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/pkgconfig - test? ( - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[png] - ) - ) -" - -EPYTEST_PLUGINS=( pytest-timeout ) -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" - ) - - 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}" - # leak tests are fragile and broken under xdist - # nonfatal implied by xvfb - nonfatal epytest -k "not leak" || 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 -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild deleted file mode 100644 index 14e6df655a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pillow/pillow-12.1.0.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2026 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="7077675d2cda485d63de4aefe0fefbf6f655c5a0" - -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 ~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? ( virtual/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/pybind11[${PYTHON_USEDEP}] - >=dev-python/setuptools-77[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/pkgconfig - test? ( - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[png] - ) - ) -" - -EPYTEST_PLUGINS=( pytest-timeout ) -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" - ) - - 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}" - # leak tests are fragile and broken under xdist - # nonfatal implied by xvfb - nonfatal epytest -k "not leak" || 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 -} From 18aaf9933226fbf66096f501df8842e35109eba3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 27 Feb 2026 12:58:19 +0100 Subject: [PATCH 3/4] dev-python/olefile: Drop the package It was a dependency of the dev-python/pillow package, which we dropped. Signed-off-by: Krzesimir Nowak --- .../dev-python/olefile/Manifest | 1 - .../dev-python/olefile/metadata.xml | 13 --------- .../dev-python/olefile/olefile-0.47.ebuild | 28 ------------------- 3 files changed, 42 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/olefile/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/olefile/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/olefile/olefile-0.47.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-python/olefile/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/olefile/Manifest deleted file mode 100644 index 5bec7dfa47..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/olefile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST olefile-0.47.gh.tar.gz 102116 BLAKE2B d3b3e8349901b7bf4a4facd0a784e9fa01f3acc50412f3952e85d59e6816321cd41d65cca83731cf280a6a83c3a4bf4e9ae9ee84662f0883e138dc2ceb22798d SHA512 efd73092f4fb428a91066c11fd319a60fa43e46f7abc4e7ba38627f11e19a6fbba227d1307ee308d1297e97b3fff30e6e497c50d7f708204e20122ea01dddfd8 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/olefile/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/olefile/metadata.xml deleted file mode 100644 index 268ecd95d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/olefile/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - python@gentoo.org - Python - - - - olefile - decalage2/olefile - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/olefile/olefile-0.47.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/olefile/olefile-0.47.ebuild deleted file mode 100644 index ddebd7715f..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/olefile/olefile-0.47.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11..14} pypy3_11 ) - -inherit distutils-r1 - -DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files" -HOMEPAGE=" - https://www.decalage.info/olefile/ - https://github.com/decalage2/olefile/ - https://pypi.org/project/olefile/ -" -SRC_URI=" - https://github.com/decalage2/olefile/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" - -distutils_enable_sphinx doc \ - dev-python/sphinx-rtd-theme -distutils_enable_tests unittest From 199b602fa14872179a0eab9c425296f89036c9d7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 27 Feb 2026 13:00:05 +0100 Subject: [PATCH 4/4] .github: Remove dropped packages from automation Signed-off-by: Krzesimir Nowak --- .github/workflows/portage-stable-packages-list | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index c32bc6b6d5..715463d768 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -346,11 +346,9 @@ dev-python/markupsafe dev-python/mdurl dev-python/more-itertools dev-python/msgpack -dev-python/olefile dev-python/packaging dev-python/pathspec dev-python/pefile -dev-python/pillow dev-python/pip dev-python/platformdirs dev-python/pluggy