commit:     9eaceb7f2b7ed746358a46dee917236859881421
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 29 16:53:35 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:58:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eaceb7f

dev-python/pillow: Improve readability

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pillow/pillow-10.3.0.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-python/pillow/pillow-10.3.0.ebuild 
b/dev-python/pillow/pillow-10.3.0.ebuild
index c1d84827dc09..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
-               $(usex truetype "vendor_raqm = False" "") # BUG 935124
-               $(usex truetype "vendor_fribidi = False" "") # ditto
                $(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
 }

Reply via email to