gentoo resync : 06.04.2022

3 files changed, 122 insertions, 2 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 622a4e8292f0..0161a241cc7d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,9 @@
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 DIST pillow-9.0.1.tar.gz 49512045 BLAKE2B 14f0969c87c57bad8fc38d873bba7a118d666e8b2e62e777ea17197e5ca973b3994bafb56b4464cde4059f2fc4040d73e7ddeec2a1053aeb1f201bf2ec2b38e2 SHA512 73893fe079bb2405c87b73b13b6eff198fb8970a891a7c9586bd2620ea0310d54cb35b1d594c6c6d3859e47d8d467700f987ae32aa6d3dc4a2e9286e8749869e
+DIST pillow-9.1.0.tar.gz 49748153 BLAKE2B 0051ea9c06c86f004f0708b3aa38f234e9b1fec32ef2ebaddfe47b3717b8ebb4834a2c8c2fe68cfeb44d24abe3a9039732679705f7aec790e62105ac5b51545f SHA512 22ef3a98a36ca8162447b6c716a0a9cff79ae9bf1007b7f835e0a8529fc6a062bea77afff17f444586989fff3e30589a595db34dc78e1e4000b966e8d10172f1
 EBUILD pillow-9.0.0-r1.ebuild 2889 BLAKE2B 5aa19477632d17ae9ce031f5dbcab51e1b315fd7b8a82cd3e3cf4c1ef200180d8bbdd607dedcbf390e319bdcfe8960d966d4f5ae1544de413b408aaa74549546 SHA512 d902760494cd2d8dcfc32da0808678ab5198d8eaf4c1e8534ec586f380de317b15944627d07ae0984b11e9a06afc98fe0b115e981a5844b73af0370572f41ebb
 EBUILD pillow-9.0.0.ebuild 2637 BLAKE2B 393b8e2fa5dbb13ef28acfbaf87709496617eaa904ada6f5503745e933a960aef982f5e11df5e4204b8cd754eb505508b79db01bce3d15089d9f56621753eb7e SHA512 af0aed73003e291f08aba7ae98bf803daadb1fceac2ca058a994c62865773648e04aa310fdf445ce2c8d5d7d965bfc113d40df52447e11ce340f6997f2da91fc
-EBUILD pillow-9.0.1-r1.ebuild 2886 BLAKE2B 140c4bcc03263f063958eda8516af17d34bc0d8864280283655bd75f6c82bc1a15f6c14ab613f69ce8a323d183e027b68e6759a8d0fe8e73d83f9283e52ffbe9 SHA512 a5334c4c8b0c3dc7678a764c2aa5305f820d7af8bc211f6cc0d918a4a5fe0300392b129affcb286e372304dfcb248087816e2cb427b13581e0c02fedb6638fd9
+EBUILD pillow-9.0.1-r1.ebuild 2885 BLAKE2B 2ac64ea8ec3f59376cbfbe0722a32f2c9ec0c8c485bb4fed0e46c4fc339e74c291fd3418163fd6af2179bd1b7ad70b02bbc2ed9035a0a1063c401bd83b22989e SHA512 a61d94afc10f40d56b6b20a6d7da8382f011976d1be46ccce2fde8b54da96301b0d363736812ebbe5bd32c890904cea9e84efa735ec5749e5fc8977ad92a2d6b
 EBUILD pillow-9.0.1.ebuild 2639 BLAKE2B a77660a7c500f3df1f1e0af026ce44610a9f63476bd52e48c215ddd32d692f0da1b565f37752014409f711626dabac600e18c66b032e38feeff8f48b5f2dc1dd SHA512 7200c180661b56943c1df9a6161e06a9afa041cdeb78965fcde758d5dd1cf5d5ade8acfdc954f4bc8fbd741f3511b32b3509c79690bbbc7f50f54c5a5312fb4b
+EBUILD pillow-9.1.0.ebuild 3128 BLAKE2B 31fe441968f5dd2860e5f703beddf6da18b4123f9b3049b744d4fe4cba62d5897e213623dc3743737fbc5755ff024e87f14355fe7ea5f60799a45871beb27d03 SHA512 8ddd411ce52932d7d84f64a6d30365f4a32d56cb1b55686abbb1ddf2ea9b5faee91e34020cab0350e8bbc0271637df51ec1d0ea1ea96591e7e369c92471f718d
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.1-r1.ebuild b/dev-python/pillow/pillow-9.0.1-r1.ebuild
index f534df0431d8..390287bf5a92 100644
--- a/dev-python/pillow/pillow-9.0.1-r1.ebuild
+++ b/dev-python/pillow/pillow-9.0.1-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-9.1.0.ebuild b/dev-python/pillow/pillow-9.1.0.ebuild
new file mode 100644
index 000000000000..4b2101d1e1b2
--- /dev/null
+++ b/dev-python/pillow/pillow-9.1.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} 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/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	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() {
+	"${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
+}