From 758e6ebc05309b6e77209d1be64577da49e917ac Mon Sep 17 00:00:00 2001 From: Patrick Lauer Date: Sun, 22 Oct 2017 16:52:34 +0000 Subject: dev-python/pillow: jpeg dependency is unconditional #632418 Package-Manager: Portage-2.3.12, Repoman-2.3.3 --- dev-python/pillow/metadata.xml | 1 - dev-python/pillow/pillow-4.2.1-r1.ebuild | 83 -------------------------------- dev-python/pillow/pillow-4.2.1-r2.ebuild | 82 +++++++++++++++++++++++++++++++ dev-python/pillow/pillow-4.2.1.ebuild | 83 -------------------------------- 4 files changed, 82 insertions(+), 167 deletions(-) delete mode 100644 dev-python/pillow/pillow-4.2.1-r1.ebuild create mode 100644 dev-python/pillow/pillow-4.2.1-r2.ebuild delete mode 100644 dev-python/pillow/pillow-4.2.1.ebuild (limited to 'dev-python/pillow') diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml index d641c40047bf..c3f74b982665 100644 --- a/dev-python/pillow/metadata.xml +++ b/dev-python/pillow/metadata.xml @@ -6,7 +6,6 @@ Python - Add support for OLE2 image format Build with Image Quantization Library support diff --git a/dev-python/pillow/pillow-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r1.ebuild deleted file mode 100644 index 1621cc8edf34..000000000000 --- a/dev-python/pillow/pillow-4.2.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 eutils virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE="https://python-pillow.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" - -REQUIRED_USE="test? ( jpeg tiff )" - -RDEPEND=" - dev-python/olefile[${PYTHON_USEDEP}] - 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?] ) - truetype? ( media-libs/freetype:2= ) - webp? ( media-libs/libwebp:0= ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # raqm not in portage yet - distutils-r1_src_compile \ - --disable-raqm \ - $(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) -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - virtx nosetests -vx Tests/test_*.py -} - -python_install() { - python_doheader libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto examples - dodoc Scripts/* - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pillow/pillow-4.2.1-r2.ebuild b/dev-python/pillow/pillow-4.2.1-r2.ebuild new file mode 100644 index 000000000000..785dfedc3b93 --- /dev/null +++ b/dev-python/pillow/pillow-4.2.1-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE='tk?,threads(+)' + +inherit distutils-r1 eutils virtualx + +MY_PN=Pillow +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python Imaging Library (fork)" +HOMEPAGE="https://python-pillow.org/" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib" + +REQUIRED_USE="test? ( tiff )" + +RDEPEND=" + dev-python/olefile[${PYTHON_USEDEP}] + imagequant? ( media-gfx/libimagequant:0 ) + virtual/jpeg:0 + jpeg2k? ( media-libs/openjpeg:2= ) + lcms? ( media-libs/lcms:2= ) + tiff? ( media-libs/tiff:0=[jpeg] ) + truetype? ( media-libs/freetype:2= ) + webp? ( media-libs/libwebp:0= ) + zlib? ( sys-libs/zlib:0= )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ) + test? ( dev-python/nose[${PYTHON_USEDEP}] ) +" + +S="${WORKDIR}/${MY_P}" + +src_compile() { + # raqm not in portage yet + distutils-r1_src_compile \ + --disable-raqm \ + $(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) +} + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + virtx nosetests -vx Tests/test_*.py +} + +python_install() { + python_doheader libImaging/*.h + distutils-r1_python_install +} + +python_install_all() { + use doc && local HTML_DOCS=( docs/_build/html/. ) + if use examples ; then + docinto examples + dodoc Scripts/* + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all +} diff --git a/dev-python/pillow/pillow-4.2.1.ebuild b/dev-python/pillow/pillow-4.2.1.ebuild deleted file mode 100644 index a22b7b1fd8b9..000000000000 --- a/dev-python/pillow/pillow-4.2.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 eutils virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE="https://python-pillow.org/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib" - -REQUIRED_USE="test? ( jpeg tiff )" - -RDEPEND=" - imagequant? ( media-gfx/libimagequant:0 ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2= ) - ole? ( dev-python/olefile[${PYTHON_USEDEP}] ) - tiff? ( media-libs/tiff:0=[jpeg?] ) - truetype? ( media-libs/freetype:2= ) - webp? ( media-libs/libwebp:0= ) - zlib? ( sys-libs/zlib:0= )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - # raqm not in portage yet - distutils-r1_src_compile \ - --disable-raqm \ - $(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) -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - virtx nosetests -vx Tests/test_*.py -} - -python_install() { - python_doheader libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto examples - dodoc Scripts/* - docompress -x /usr/share/doc/${PF}/examples - fi - distutils-r1_python_install_all -} -- cgit v1.2.3-65-gdbad