commit: 57aa973c8f342594619c02d915ffe76f917dbe33 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 25 16:03:36 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jan 26 03:05:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57aa973c
dev-python/pillow: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/pillow/Manifest | 4 - dev-python/pillow/files/pillow-10.3.0-py313.patch | 23 ---- .../files/pillow-11.0.0-automagic-disable.patch | 26 ---- .../pillow/files/pillow-11.0.0-wrong-arg.patch | 32 ----- dev-python/pillow/pillow-10.2.0-r1.ebuild | 131 ------------------ dev-python/pillow/pillow-10.3.0.ebuild | 139 ------------------- dev-python/pillow/pillow-10.4.0.ebuild | 137 ------------------- dev-python/pillow/pillow-11.0.0-r1.ebuild | 149 -------------------- dev-python/pillow/pillow-11.0.0-r2.ebuild | 151 --------------------- dev-python/pillow/pillow-11.0.0.ebuild | 136 ------------------- 10 files changed, 928 deletions(-) diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index f4a38677adf2..4f95ca51fa5b 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,5 +1 @@ -DIST pillow-10.2.0.gh.tar.gz 46244216 BLAKE2B 27bb076f0adade34295e6dfec5c5a1499471036e4f5358f0b3985c064a0ae962be9e91985851b369a49162ef520a84bb20eb1a5acb074fe94d861f042e4ada92 SHA512 d77ebedfb89d541db2fcba4fc354e097b9917594170bad07c67e22de123c9e0bbc9c55a938fc152bbdcca3ce23de6fa374a6d3d3bdbd44f16dbc2616c1bddf60 -DIST pillow-10.3.0.gh.tar.gz 46636534 BLAKE2B 523486a3adc8905dbe0691e7092654e7884c34703f351e228a49b1cb6e9cffdf504b842aa0c83b18afb8f0dbe1265274044003aba540d6427ec3cd46ddda1498 SHA512 11095f435ba30ac364575271de4c94d498b6fc1d67730b8212fae6f187902129018ca950aa878843f4d1b29e25aab1be245ed313fd3bc110ccf9ce3ae266d840 -DIST pillow-10.4.0.gh.tar.gz 46617167 BLAKE2B 3eb7852ab087d18e5b9a03d6cbf83ead96b637a71d4209a4574d66c9d098936d240c0be3235d9e951ec094b9b0def196b265a8e68f59802f843171c74ca7bbac SHA512 835a8766c384ec3fcf67b42c9bbad35dad0848cc5bd9eba1b0768a864e174a1d9c4a5e989f22496a40f2c29dd7f492f6f80465903fe872b10749cfa0340e1bc5 -DIST pillow-11.0.0.gh.tar.gz 46807844 BLAKE2B c91b92152d2f763fd20a74e2bddf413a669430074b8c5304b623ff63df177346ec4031e928fbc9765e1e0ca5f21cc101d5b7688a09dea19c5828f0cea02fe018 SHA512 0a74d7b12311acb3c9b39af87dc4e1e2ecae22134300a2a8c979daa3947a20f78bf77a93cd7f0029e98936a07e8d5e4fae826322fe0ccc1d1a8200350f9cbb7b DIST pillow-11.1.0.gh.tar.gz 46815201 BLAKE2B 7990683c90359e0a72e17a13e1a29455bc3ace8ce3616d6af59360edfc1ac87541bd1fd6967160bd8d7dd25cfedfc9d2e9b058c3ed433a6208379834f15bc312 SHA512 bb0622fae0b9c3903ddd945dced8e2b94348b2bd06c14bc74da00d8aa3a795aab2daaff39ca6c40b712dcce4f10218cd30739f0eb616c9dfbc16efcf80886f1e diff --git a/dev-python/pillow/files/pillow-10.3.0-py313.patch b/dev-python/pillow/files/pillow-10.3.0-py313.patch deleted file mode 100644 index 1574d6be3cef..000000000000 --- a/dev-python/pillow/files/pillow-10.3.0-py313.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 57399ce204d79c74c80612c622bb788e20d786e8 Mon Sep 17 00:00:00 2001 -From: Andrew Murray <[email protected]> -Date: Fri, 10 May 2024 22:43:56 +1000 -Subject: [PATCH] Parse _version contents instead of using exec() - ---- - setup.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index 7d8e1c1ee21..abdd87ea252 100644 ---- a/setup.py -+++ b/setup.py -@@ -23,8 +23,7 @@ - def get_version(): - version_file = "src/PIL/_version.py" - with open(version_file, encoding="utf-8") as f: -- exec(compile(f.read(), version_file, "exec")) -- return locals()["__version__"] -+ return f.read().split('"')[1] - - - configuration = {} diff --git a/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch b/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch deleted file mode 100644 index 81bd47dc4a8b..000000000000 --- a/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/947136 -https://github.com/python-pillow/Pillow/issues/8468 -https://github.com/python-pillow/Pillow/pull/8469 - -From 7c194b54ef3e7a04c5b669353622687075b5ebb4 Mon Sep 17 00:00:00 2001 -From: Andrew Murray <[email protected]> -Date: Wed, 16 Oct 2024 21:37:14 +1100 -Subject: [PATCH] Fixed disabling a feature - ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 60707083f6e..def3417845d 100644 ---- a/setup.py -+++ b/setup.py -@@ -389,7 +389,7 @@ def finalize_options(self) -> None: - pass - for x in self.feature: - if getattr(self, f"disable_{x}"): -- setattr(self.feature, x, False) -+ self.feature.set(x, False) - self.feature.required.discard(x) - _dbg("Disabling %s", x) - if getattr(self, f"enable_{x}"): diff --git a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch b/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch deleted file mode 100644 index 3337b8c4be23..000000000000 --- a/dev-python/pillow/files/pillow-11.0.0-wrong-arg.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 180c1d1ef0c0ef12e0c56adfe10c7779dff3b55f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sun, 3 Nov 2024 16:35:54 +0100 -Subject: [PATCH] Revert "Corrected passing TIFF_LONG to libtiff" - -This is the wrong solution to the problem at hand, and results -in passing an int64_t where libtiff expects uint32_t. This seems -to miraculously work on most of our platforms but it is clearly wrong, -and it breaks ppc32. - -Bug: https://github.com/python-pillow/Pillow/issues/8522 -Reverts: b1b0353d17bcdca99cfcb2ea48c6af7861fb43ba ---- - src/encode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/encode.c b/src/encode.c -index 1a4cd489d..ba350c39a 100644 ---- a/src/encode.c -+++ b/src/encode.c -@@ -929,7 +929,7 @@ PyImaging_LibTiffEncoderNew(PyObject *self, PyObject *args) { - ); - } else if (type == TIFF_LONG) { - status = ImagingLibTiffSetField( -- &encoder->state, (ttag_t)key_int, PyLong_AsLongLong(value) -+ &encoder->state, (ttag_t)key_int, (UINT32)PyLong_AsLong(value) - ); - } else if (type == TIFF_SSHORT) { - status = ImagingLibTiffSetField( --- -2.47.0 - diff --git a/dev-python/pillow/pillow-10.2.0-r1.ebuild b/dev-python/pillow/pillow-10.2.0-r1.ebuild deleted file mode 100644 index c9d3ec32f1c5..000000000000 --- a/dev-python/pillow/pillow-10.2.0-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 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_{10..12} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -S="${WORKDIR}/${MY_P}" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - virtual/pkgconfig - test? ( - ${RDEPEND} - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-timeout[${PYTHON_USEDEP}] - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[png] - ) - ) -" - -EPYTEST_DESELECT=( - # TODO; incompatible Qt version? - Tests/test_qt_image_qapplication.py::test_sanity -) - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${P}-cross.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - # It's important that these flags are also passed during the install phase - # as well. Make sure of that if you change the lines below. See bug 661308. - cat >> setup.cfg <<-EOF || die - [build_ext] - disable_platform_guessing = 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 webp)_webpmux = True - $(usepil xcb)_xcb = True - $(usepil zlib)_zlib = True - EOF - - # We have patched in this env var. - 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 - ) - - "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed - epytest -p no:relaxed || 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/dev-python/pillow/pillow-10.3.0.ebuild b/dev-python/pillow/pillow-10.3.0.ebuild deleted file mode 100644 index 81b77d909bc5..000000000000 --- a/dev-python/pillow/pillow-10.3.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2024 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_{10..13} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -S="${WORKDIR}/${MY_P}" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" -IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${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 - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" - # https://github.com/python-pillow/Pillow/pull/8050 - "${FILESDIR}/${P}-py313.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = 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 webp)_webpmux = 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 - ) - - "${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 -} diff --git a/dev-python/pillow/pillow-10.4.0.ebuild b/dev-python/pillow/pillow-10.4.0.ebuild deleted file mode 100644 index 4b882d2ca2df..000000000000 --- a/dev-python/pillow/pillow-10.4.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2024 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_{10..13} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -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="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${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 - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = 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 webp)_webpmux = 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 - ) - - "${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 -} diff --git a/dev-python/pillow/pillow-11.0.0-r1.ebuild b/dev-python/pillow/pillow-11.0.0-r1.ebuild deleted file mode 100644 index 3ffd135f83db..000000000000 --- a/dev-python/pillow/pillow-11.0.0-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 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_{10..13} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -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="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${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 - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" - # https://github.com/python-pillow/Pillow/issues/8522 - "${FILESDIR}/${P}-wrong-arg.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = 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 -} diff --git a/dev-python/pillow/pillow-11.0.0-r2.ebuild b/dev-python/pillow/pillow-11.0.0-r2.ebuild deleted file mode 100644 index 95d2098b3325..000000000000 --- a/dev-python/pillow/pillow-11.0.0-r2.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2024 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_{10..13} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -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="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${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 - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" - # https://github.com/python-pillow/Pillow/issues/8522 - "${FILESDIR}/${P}-wrong-arg.patch" - # https://github.com/python-pillow/Pillow/pull/8469 - "${FILESDIR}/${P}-automagic-disable.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = 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 -} diff --git a/dev-python/pillow/pillow-11.0.0.ebuild b/dev-python/pillow/pillow-11.0.0.ebuild deleted file mode 100644 index 1545baf35679..000000000000 --- a/dev-python/pillow/pillow-11.0.0.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 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_{10..13} pypy3 ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE=" - https://python-pillow.org/ - 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 -" -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="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - webp? ( media-libs/libwebp:= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:= ) -" -RDEPEND=" - ${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/setuptools[${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 - -PATCHES=( - # https://github.com/python-pillow/pillow/pull/7634 - "${FILESDIR}/${PN}-10.2.0-cross.patch" -) - -usepil() { - usex "${1}" enable disable -} - -python_configure_all() { - cat >> setup.cfg <<-EOF || die - [build_ext] - debug = True - disable_platform_guessing = 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 - ) - - "${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 -}
