commit: a294ee52a39ed64ee53d3fe4cc65e2638e523e4c Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Jun 28 02:10:34 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Jun 28 02:10:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a294ee52
dev-python/pillow: restore jpeg USE flag Also wire-up the compile phase correctly instead of abusing mydistutilsargs. Closes: https://bugs.gentoo.org/632418 Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247 dev-python/pillow/pillow-4.3.0.ebuild | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dev-python/pillow/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0.ebuild index 0106f57a945..e18c4f67f8e 100644 --- a/dev-python/pillow/pillow-4.3.0.ebuild +++ b/dev-python/pillow/pillow-4.3.0.ebuild @@ -18,14 +18,14 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="HPND" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib" +IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" -REQUIRED_USE="test? ( tiff )" +REQUIRED_USE="test? ( jpeg tiff )" RDEPEND=" dev-python/olefile[${PYTHON_USEDEP}] imagequant? ( media-gfx/libimagequant:0 ) - virtual/jpeg:0 + jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg] ) @@ -43,19 +43,22 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" -src_configure(){ +python_compile() { # raqm not in portage yet - mydistutilsargs=( build_ext \ - --disable-raqm \ - --disable-platform-guessing \ - $(use_enable truetype freetype) \ - $(use_enable jpeg2k jpeg2000) \ - $(use_enable lcms) \ - $(use_enable tiff) \ - $(use_enable imagequant) \ - $(use_enable webp) \ - $(use_enable webp webpmux) \ - $(use_enable zlib)) + local args=( + --disable-raqm + --disable-platform-guessing + $(use_enable truetype freetype) + $(use_enable jpeg) + $(use_enable jpeg2k jpeg2000) + $(use_enable lcms) + $(use_enable tiff) + $(use_enable imagequant) + $(use_enable webp) + $(use_enable webp webpmux) + $(use_enable zlib) + ) + distutils-r1_python_compile build_ext "${args[@]}" } python_compile_all() {
