gentoo auto-resync : 30:12:2024 - 06:30:40

3 files changed, 179 insertions, 0 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index e2d6e1f58363..32e794a4cf3d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,6 @@
 AUX pillow-10.2.0-cross.patch 2390 BLAKE2B d690b3f93d59c32d0f1b209b51ea4787230892488059ec206f548276a1f697394ca539fcd9f92fa7c547b37dd6b4fc738400a3034f54eec6260f0f98ae372b39 SHA512 4afaec6964298e2f1c21fea77791ce0cdacdbc65bf9798d46e99681c772065c1ad1175f5821162157cacac64f556e320af2ca7dcbd0806c07d04f8116f8f508c
 AUX pillow-10.3.0-py313.patch 691 BLAKE2B acd10146af5467543c44a29bd8236f79fee803d1d0b3bf97b3db2e6ae817f81f30382e9751ae694039ae589a04e4f1ac5169e9a2e60ba5a10c9d2bee1fe00dfb SHA512 5ecd82ae120e3456902f3ab44b0c7a3491ba33de987d005e2a966e8150c45baef46dd357db997662c02734ac00eeaa6a544372610c06e6435e282f5e4fed73aa
+AUX pillow-11.0.0-automagic-disable.patch 909 BLAKE2B 39a431178a8f7d1382cfaeea4e2bb1bd0eba3d9a520bfa6116d62ae85220e334347533335ec8a035d849ccd16abe7cc7171d3105e9f79269184a0295685b0c06 SHA512 b72351c27e89884125878538a3ee4bf38765e12b7fb4ad6ec5cf776ce262a6e6ef6a43640822c55958ccb98276b5496b5a1bc889301951137999204455356ed4
 AUX pillow-11.0.0-wrong-arg.patch 1242 BLAKE2B 0da76fa225e8107ad15639e540b3935e868e7682d4a241ca609fb019e1269f473b084c35e35d30102c20ee1ca505d1290953e3393e382dcf15bd6f794e080415 SHA512 5f74e04d76f7280bd053b02b01bbff22ce2fc95c1fa8e7c279df9171c61d6a747bbf46644a065fde15457ac6ec008713d8746d611561caf2a0058a84448be15f
 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
@@ -9,5 +10,6 @@ EBUILD pillow-10.2.0-r1.ebuild 3265 BLAKE2B 5a95a0777e9a5db4fc6f77a63292d4896382
 EBUILD pillow-10.3.0.ebuild 3453 BLAKE2B ca42e9e8ca086a04bacae7feddf787fc3c61670ab77bca49dbf9f8288e50e4537dc173f4df9515cad93c2fbce321379ef00862f80f987532bfeb232b3a4c2baa SHA512 9f2beda5c4276b9a4c62746c89cd89a90298baff6a9f1c432c0c576e435ab620e2025b0ddd56f649fdd1f663c57a9e6258187cfa3f237662b1d3b4bba43df090
 EBUILD pillow-10.4.0.ebuild 3376 BLAKE2B 7a97c501376a84236ef8cf1e5d128a20510a3ac0c8ee278241596bd2a67be08ba6a4d1512304d24a459dac15ba340ece49877936d5dc919cc6dc6cb417159f95 SHA512 54d5277fa23251448b9d0be74940e2b79d38e32e78a872e93c7f2d37752b0432e9752b7c88654651bbbf0cd712f3bec6ce0f82cf4775603376ba75bcb2151332
 EBUILD pillow-11.0.0-r1.ebuild 3714 BLAKE2B bd927d4da938b7df8da8abbbe5173ffbaa5de4466f55a9bcb51baf7920df17acbddef5d6c8dc23c5f89c302105b4fdddc87c1b09bf4d091df5c84c16bde596ac SHA512 1093baca5cc647df55bec38a7d0ae539cd90920ce291de29c9244553746c9b7b7f0b594d9ece0a27aec6d31226eb8605fa1a98746c182b7ed758abb4bc848e11
+EBUILD pillow-11.0.0-r2.ebuild 3811 BLAKE2B 7d5e1275e387a85331da78df08ee96a13aa2fe16226ee66db26eec522daea96bf30048b4bfdbd387be62339e9fae1ae5851b040f7ab5bf894b3db0a5a32d4ef6 SHA512 21da03e19593150fa5a19984614241cc8ce8f9bf98d63fe1d58fa9988d6d61e79c94169fa3055adf08d402debec8010d7d8635e9d647d2f89a271bc4c027738c
 EBUILD pillow-11.0.0.ebuild 3345 BLAKE2B fe43dbfff81caee000ee2881b890d09bf2306291bc7eedaad8241e938cdf4dd9a89b8469f4d2ed3cb484c6b4a0ae545cf147f876be2a96d19ad738d67b0e52bf SHA512 ab171a3740b758ccf9ede559d4d4cc59305d5d01be8473b1d0597fcf290bc5ac8cb53a22746412e8ad5acf83b9567fee93c1025bfa28287e3885475eee315e30
 MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb
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
new file mode 100644
index 000000000000..81bd47dc4a8b
--- /dev/null
+++ b/dev-python/pillow/files/pillow-11.0.0-automagic-disable.patch
@@ -0,0 +1,26 @@
+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 <radarhere@users.noreply.github.com>
+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/pillow-11.0.0-r2.ebuild b/dev-python/pillow/pillow-11.0.0-r2.ebuild
new file mode 100644
index 000000000000..95d2098b3325
--- /dev/null
+++ b/dev-python/pillow/pillow-11.0.0-r2.ebuild
@@ -0,0 +1,151 @@
+# 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
+}