dev-python/pillow: fix broken build process

In 4.3.0 and 5.2.0, we had a broken way of passing flags to Pillow's
build script. Flags would be passed fine in the compile phase, but would
not be passed at all at the install phase, whichwas the equivalent of
not sending flags at all.

I'm committing straight to stable to 4.3.0-r2 because the build process
is broken.

Closes: https://bugs.gentoo.org/661308
Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild
index e6169726869f471b8da88fe9f636172b35d6fdb8..25dddfce611f6c0fa337e41e46559ec0507aed0a 100644 (file)
--- a/dev-python/pillow/pillow-4.3.0-r2.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r2.ebuild
@@ -52,10 +52,11 @@ PATCHES=(
        "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
 )
 
-python_compile() {
-       # raqm not in portage yet
-       local args=(
-               --disable-raqm
+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.
+       mydistutilsargs=(
+               build_ext
                --disable-platform-guessing
                $(use_enable truetype freetype)
                $(use_enable jpeg)
@@ -67,7 +68,6 @@ python_compile() {
                $(use_enable webp webpmux)
                $(use_enable zlib)
        )
-       distutils-r1_python_compile build_ext "${args[@]}"
 }
 
 python_compile_all() {

diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index ad0c8bde22b625fe377338c8112d7502eb9f4ca5..1476c3915c58d7f7df9c538f112a186292050a40 100644 (file)
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -46,8 +46,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile() {
-       local args=(
+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.
+       mydistutilsargs=(
+               build_ext
                --disable-platform-guessing
                $(use_enable truetype freetype)
                $(use_enable jpeg)
@@ -59,7 +62,6 @@ python_compile() {
                $(use_enable webp webpmux)
                $(use_enable zlib)
        )
-       distutils-r1_python_compile build_ext "${args[@]}"
 }
 
 python_compile_all() {