From 44cec61076bf2bbb3cea1fc89943dd6818a5acc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 6 Jun 2024 00:07:58 +0100 Subject: gentoo auto-resync : 06:06:2024 - 00:07:57 --- dev-python/pillow/Manifest | 6 - .../pillow/files/pillow-10.1.0-olefile-0.47.patch | 50 -------- dev-python/pillow/pillow-10.0.1.ebuild | 134 -------------------- dev-python/pillow/pillow-10.1.0-r1.ebuild | 139 --------------------- dev-python/pillow/pillow-10.2.0.ebuild | 134 -------------------- 5 files changed, 463 deletions(-) delete mode 100644 dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch delete mode 100644 dev-python/pillow/pillow-10.0.1.ebuild delete mode 100644 dev-python/pillow/pillow-10.1.0-r1.ebuild delete mode 100644 dev-python/pillow/pillow-10.2.0.ebuild (limited to 'dev-python/pillow') diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 7938f7399242..a0263a26a88f 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,13 +1,7 @@ -AUX pillow-10.1.0-olefile-0.47.patch 1456 BLAKE2B de5fda5245b9674f7a695bcde5125eeb326fdfa29c6cca2a7406c12b31af1d8e4b4ef2919c99e2ce8ed08dc6cb441b7728190cce23b7d4e1a384605a584a086b SHA512 3eef1572704eba1fa5047f866c11b563f0c79e04ae1da5f70aa2fb9876dbf21583376326c47d44691732492c092b0c4821fbd18f62de4de9a1970b6e177384dd AUX pillow-10.2.0-cross.patch 2390 BLAKE2B d690b3f93d59c32d0f1b209b51ea4787230892488059ec206f548276a1f697394ca539fcd9f92fa7c547b37dd6b4fc738400a3034f54eec6260f0f98ae372b39 SHA512 4afaec6964298e2f1c21fea77791ce0cdacdbc65bf9798d46e99681c772065c1ad1175f5821162157cacac64f556e320af2ca7dcbd0806c07d04f8116f8f508c AUX pillow-10.3.0-py313.patch 691 BLAKE2B acd10146af5467543c44a29bd8236f79fee803d1d0b3bf97b3db2e6ae817f81f30382e9751ae694039ae589a04e4f1ac5169e9a2e60ba5a10c9d2bee1fe00dfb SHA512 5ecd82ae120e3456902f3ab44b0c7a3491ba33de987d005e2a966e8150c45baef46dd357db997662c02734ac00eeaa6a544372610c06e6435e282f5e4fed73aa -DIST pillow-10.0.1.gh.tar.gz 50539264 BLAKE2B 83c3bf4abc9c3eab210576dc28d6f8926ce0998ec344e792433afc05190bb248a926902ce7706e3569cd6cbf8deb640cafda86f102166cf6492ec00b66f9392f SHA512 27e2f0d86563c3b7f5a2e0ba2bbe98fc2cb2fa5871d0b6cbb5a0014e9d9eb03dde9969301419d806d1a22cd4881e624465a355ba9bc42b95746226e1f95712a9 -DIST pillow-10.1.0.gh.tar.gz 50798274 BLAKE2B a69be8187e7206b50350af399b73b5c43b29c249a4a5a6bb23438dae9967bb84f1d487f52b188811cb3d2e550245f8d5a765668d8d5de1375a84fcd96fc531d9 SHA512 01c97b68d4167d10539a2d29fb82676fb417ee5003f0acd9f602ed13d41b200579497cc0ef0949b2c1549b684f76f2d43895a52abdb1367345d2affd544c5b5a 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 -EBUILD pillow-10.0.1.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5 -EBUILD pillow-10.1.0-r1.ebuild 3606 BLAKE2B bcec30251d71e5c9cc439bad1fef9e701721af432a05187165880ee2ba9e776ac6c7208275168e6843727d33987a7482977aacd1d6e7f77b492bd74d9ee10ebd SHA512 4ced9aa36035a8c9865497378df8fead39e50c9d61b8b47fb218031a1ba9f6ea9086d9104b594e75936ef41870e435601ee51d621f61cd1531dc6d99a1ce61cd EBUILD pillow-10.2.0-r1.ebuild 3271 BLAKE2B dcbe6350a55e28c2fdb6cfbbe33e638bde17fa291b5b507b5071084a8cc13a16be2c87ba986e7c59acd27ffb01cfc8ea4d6ae58cc845890aee6356dc29434139 SHA512 45e05f96ad73aa58e11d6f0fce2afc4b727f6538801b861aec0f586d8714ed4270532973b063f2e3af3e0971986dd75f22606dadcb267a907930bd8d9d82a623 -EBUILD pillow-10.2.0.ebuild 3509 BLAKE2B 1901ee3f18c79007ccfd0489719a022fa3d68d5c4a21d625e87579d54ebecb025eeef65b781518e3a85cf464e125887f2bd2344f7de12036b23d6ad7271d05e7 SHA512 9aef737b1689c30ce05eae1b96f9f9a83c4f3d1b5eb0223ae21a61994f8f28fceaee57d5ff5c4a3f145e8a4ae2a9700c527c29a4ef6357567361c125e39da2b9 EBUILD pillow-10.3.0.ebuild 3370 BLAKE2B 3009608cdcfc4cc7f375c0743c3b1890babc2bc806ddb4e0a19eae9e08e6dd00e438f80d15690e4926ff01297155da5e9ed7f80a3526885e116c5120580a3bcf SHA512 ffb453c9c462d0f7964474951253ceedfaec9d288c2019b2b282e2f34947953788c8f50324b3a095f7bdf25f785e54be7caf7d4d03af7bc05e5973de8dbcddc8 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb diff --git a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch b/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch deleted file mode 100644 index e3b6a6473dfc..000000000000 --- a/dev-python/pillow/files/pillow-10.1.0-olefile-0.47.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0e523d986858e7c0b4acd45ea1c5a3a639e39b4b Mon Sep 17 00:00:00 2001 -From: Andrew Murray -Date: Sat, 2 Dec 2023 10:57:16 +1100 -Subject: [PATCH] Fixed closing file pointer with olefile 0.47 - ---- - src/PIL/FpxImagePlugin.py | 1 + - src/PIL/MicImagePlugin.py | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/src/PIL/FpxImagePlugin.py b/src/PIL/FpxImagePlugin.py -index a878cbfd2..3027ef45b 100644 ---- a/src/PIL/FpxImagePlugin.py -+++ b/src/PIL/FpxImagePlugin.py -@@ -227,6 +227,7 @@ class FpxImageFile(ImageFile.ImageFile): - break # isn't really required - - self.stream = stream -+ self._fp = self.fp - self.fp = None - - def load(self): -diff --git a/src/PIL/MicImagePlugin.py b/src/PIL/MicImagePlugin.py -index 801318930..e4154902f 100644 ---- a/src/PIL/MicImagePlugin.py -+++ b/src/PIL/MicImagePlugin.py -@@ -66,6 +66,7 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): - self._n_frames = len(self.images) - self.is_animated = self._n_frames > 1 - -+ self.__fp = self.fp - self.seek(0) - - def seek(self, frame): -@@ -87,10 +88,12 @@ class MicImageFile(TiffImagePlugin.TiffImageFile): - return self.frame - - def close(self): -+ self.__fp.close() - self.ole.close() - super().close() - - def __exit__(self, *args): -+ self.__fp.close() - self.ole.close() - super().__exit__() - --- -2.43.0 - diff --git a/dev-python/pillow/pillow-10.0.1.ebuild b/dev-python/pillow/pillow-10.0.1.ebuild deleted file mode 100644 index 1e25a3391179..000000000000 --- a/dev-python/pillow/pillow-10.0.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2023 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/ - 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 ~ia64 ~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 -) - -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 - - # setup.py won't let us add the right toolchain paths but it does - # accept additional ones from INCLUDE and LIB so set these. You - # wouldn't normally need these at all as the toolchain should look - # here anyway but it doesn't for this setup.py. - export \ - INCLUDE="${ESYSROOT}"/usr/include \ - LIB="${ESYSROOT}"/usr/$(get_libdir) - - # 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.1.0-r1.ebuild b/dev-python/pillow/pillow-10.1.0-r1.ebuild deleted file mode 100644 index 0c65cdff5b1c..000000000000 --- a/dev-python/pillow/pillow-10.1.0-r1.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..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/ - 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 ~ia64 ~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/7594 - "${FILESDIR}/${P}-olefile-0.47.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 - - # setup.py won't let us add the right toolchain paths but it does - # accept additional ones from INCLUDE and LIB so set these. You - # wouldn't normally need these at all as the toolchain should look - # here anyway but it doesn't for this setup.py. - export \ - INCLUDE="${ESYSROOT}"/usr/include \ - LIB="${ESYSROOT}"/usr/$(get_libdir) - - # 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.2.0.ebuild b/dev-python/pillow/pillow-10.2.0.ebuild deleted file mode 100644 index 6149846c306e..000000000000 --- a/dev-python/pillow/pillow-10.2.0.ebuild +++ /dev/null @@ -1,134 +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 ~ia64 ~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 -) - -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 - - # setup.py won't let us add the right toolchain paths but it does - # accept additional ones from INCLUDE and LIB so set these. You - # wouldn't normally need these at all as the toolchain should look - # here anyway but it doesn't for this setup.py. - export \ - INCLUDE="${ESYSROOT}"/usr/include \ - LIB="${ESYSROOT}"/usr/$(get_libdir) - - # 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 -} -- cgit v1.2.3