From d5ee59790ee8298b8599b0aa0fa21a98b972a44d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2024 08:00:51 +0100 Subject: gentoo auto-resync : 30:06:2024 - 08:00:50 --- dev-python/pillow/Manifest | 2 +- dev-python/pillow/pillow-10.3.0.ebuild | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'dev-python/pillow') diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index 1863fa422f6b..5a1d22f02a7b 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -3,5 +3,5 @@ AUX pillow-10.3.0-py313.patch 691 BLAKE2B acd10146af5467543c44a29bd8236f79fee803 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.2.0-r1.ebuild 3271 BLAKE2B dcbe6350a55e28c2fdb6cfbbe33e638bde17fa291b5b507b5071084a8cc13a16be2c87ba986e7c59acd27ffb01cfc8ea4d6ae58cc845890aee6356dc29434139 SHA512 45e05f96ad73aa58e11d6f0fce2afc4b727f6538801b861aec0f586d8714ed4270532973b063f2e3af3e0971986dd75f22606dadcb267a907930bd8d9d82a623 -EBUILD pillow-10.3.0.ebuild 3242 BLAKE2B 31317873028e1fe51d3c9bd35c77b01ccd45aedb0518c87cb6ce5d80e892ee4b92aaa9d26651ba2806724410ad5eb21833e7052c8f296e0d5e824fe792b520b2 SHA512 409eb4a2c77dba5fd7440d61ac0c3217fd5b47fc7dd6ea977d0e4e3b54a19ad64f7b2a44de0cfd876bc101be3865a7fcab2679d837f3072a3793b8dc7aad2800 +EBUILD pillow-10.3.0.ebuild 3459 BLAKE2B 6b3bb0499eaed048c66a196cd328a5f8875b36fe09564238a24fbdcbd3bdf2b6f43b56a2d72593c03cc3b81c02af244c4ae1ecfd400e013f16552f7f494aacb5 SHA512 783085b083b8b5ba185962aa0a655d806163b471a7f0df54397360fc969f4d89a352596bb682c2bc56913b90c4b0bc77160a7f8dac7bef5519b71fb963a5e90b MISC metadata.xml 480 BLAKE2B 9fe5188b0a5eb4f19b53f34efad5c7da2ba086dd5eb9ed2e4fce8b6a6fac14d9a848392980cd1d2eaff5b334d7c5e39f58d60b763f44879d852dfb0b4f5e3efc SHA512 2b15d9e07b13a6028e87a3d5f0e72b2d252cfb2fa843783acfd2a9dd38bb6f0641f94d067f3a900fede445c606da361d509de2d4541513126b57c6782f69a5bb diff --git a/dev-python/pillow/pillow-10.3.0.ebuild b/dev-python/pillow/pillow-10.3.0.ebuild index cb13d5f02390..d97803483ddb 100644 --- a/dev-python/pillow/pillow-10.3.0.ebuild +++ b/dev-python/pillow/pillow-10.3.0.ebuild @@ -82,8 +82,6 @@ python_configure_all() { [build_ext] debug = True disable_platform_guessing = True - vendor_raqm = False - vendor_fribidi = False $(usepil truetype)_freetype = True $(usepil jpeg)_jpeg = True $(usepil jpeg2k)_jpeg2000 = True @@ -95,6 +93,15 @@ python_configure_all() { $(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 } -- cgit v1.2.3