From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C20C138335 for ; Thu, 2 Jan 2020 08:07:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D0EEE0C47; Thu, 2 Jan 2020 08:07:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68BEFE0C47 for ; Thu, 2 Jan 2020 08:07:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BFF334DE63 for ; Thu, 2 Jan 2020 08:07:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09E8D7C for ; Thu, 2 Jan 2020 08:07:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1577952415.5a17c0a82728f57ca2b1850b91b98b4015b826aa.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pillow/Manifest dev-python/pillow/pillow-6.0.0.ebuild dev-python/pillow/pillow-6.1.0.ebuild dev-python/pillow/pillow-6.2.0.ebuild dev-python/pillow/pillow-6.2.2.ebuild X-VCS-Directories: dev-python/pillow/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5a17c0a82728f57ca2b1850b91b98b4015b826aa X-VCS-Branch: master Date: Thu, 2 Jan 2020 08:07:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d9dc5a36-e289-4e53-9a8a-eab7b2db9494 X-Archives-Hash: 6bdec68d3e9add3ff0f2bed1567e8fa3 commit: 5a17c0a82728f57ca2b1850b91b98b4015b826aa Author: Michał Górny gentoo org> AuthorDate: Thu Jan 2 07:12:14 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 2 08:06:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a17c0a8 dev-python/pillow: Bump to 6.2.2 Signed-off-by: Michał Górny gentoo.org> dev-python/pillow/Manifest | 4 +- dev-python/pillow/pillow-6.0.0.ebuild | 106 --------------------- dev-python/pillow/pillow-6.1.0.ebuild | 106 --------------------- .../{pillow-6.2.0.ebuild => pillow-6.2.2.ebuild} | 21 ++-- 4 files changed, 8 insertions(+), 229 deletions(-) diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index a85151615c5..d890e174f2f 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,6 +1,4 @@ DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62 -DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5 -DIST pillow-6.1.0.tar.gz 33523149 BLAKE2B 305613aa1f444327c0a70a9e88b51035dc87c17af9d0dd4be47192eeef1b496ba0da3675d9fed5dbaed1bd9a5f2c739370bfd7d1292d7db27230c7ad60b4db14 SHA512 b531644d7214f624369ada12a953c773a0009eaa50217e91aeae30b1ea065c685c7ad331bd9d5e952cb25edfaaf4e8255025004b4c83624ecd2dc06f3501d60a -DIST pillow-6.2.0.tar.gz 37404132 BLAKE2B 3f86f7fcf4695f152f021fda629df182846e33e7031e1b6bb8f71b0cc1bd7e8039bb94ea8e480afa29324c3015902839cdcaaa359fe58f2bcd8c287a3eb13417 SHA512 9de48d9acdb4367325fb16f970bb533dc369b895615169e0ec77155b400d878e3ebb67f706243ff3e81cc957f9b5360ca8206d4f7fb2d00e9474abb9925bf9d5 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31 +DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e diff --git a/dev-python/pillow/pillow-6.0.0.ebuild b/dev-python/pillow/pillow-6.0.0.ebuild deleted file mode 100644 index fd37a520efd..00000000000 --- a/dev-python/pillow/pillow-6.0.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE="https://python-pillow.org/" -SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" -RESTRICT="!test? ( test )" - -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,zlib] ) - 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/pytest[${PYTHON_USEDEP}] - media-gfx/imagemagick[png] - ) -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.4.1-{pkg-config,toolchain-paths}.patch -) - -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) - $(use_enable jpeg2k jpeg2000) - $(use_enable lcms) - $(use_enable tiff) - $(use_enable imagequant) - $(use_enable webp) - $(use_enable webp webpmux) - $(use_enable zlib) - ) - - # setup.py sucks at adding the right toolchain paths but it does - # accept additional ones from INCLUDE and LIB so set these. You - # wouldn't normally need these at all as the toolchain should look - # here anyway but this setup.py does stupid things. - export \ - INCLUDE=${ESYSROOT}/usr/include \ - LIB=${ESYSROOT}/usr/$(get_libdir) - - # We have patched in this env var. - tc-export PKG_CONFIG -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed - virtx pytest -vv -p no:relaxed -} - -python_install() { - python_doheader src/libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto example - dodoc docs/example/* - docompress -x /usr/share/doc/${PF}/example - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pillow/pillow-6.1.0.ebuild b/dev-python/pillow/pillow-6.1.0.ebuild deleted file mode 100644 index 64b1c01eb7e..00000000000 --- a/dev-python/pillow/pillow-6.1.0.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 toolchain-funcs virtualx - -MY_PN=Pillow -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python Imaging Library (fork)" -HOMEPAGE="https://python-pillow.org/" -SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" -RESTRICT="!test? ( test )" - -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,zlib] ) - 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/pytest[${PYTHON_USEDEP}] - media-gfx/imagemagick[png] - ) -" - -S="${WORKDIR}/${MY_P}" - -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) - $(use_enable jpeg2k jpeg2000) - $(use_enable lcms) - $(use_enable tiff) - $(use_enable imagequant) - $(use_enable webp) - $(use_enable webp webpmux) - $(use_enable zlib) - ) - - # setup.py sucks at adding the right toolchain paths but it does - # accept additional ones from INCLUDE and LIB so set these. You - # wouldn't normally need these at all as the toolchain should look - # here anyway but this setup.py does stupid things. - export \ - INCLUDE=${ESYSROOT}/usr/include \ - LIB=${ESYSROOT}/usr/$(get_libdir) - - # We have patched in this env var. - tc-export PKG_CONFIG -} - -python_compile_all() { - use doc && emake -C docs html -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" - # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed - pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}" -} - -python_install() { - python_doheader src/libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - if use examples ; then - docinto example - dodoc docs/example/* - docompress -x /usr/share/doc/${PF}/example - fi - distutils-r1_python_install_all -} diff --git a/dev-python/pillow/pillow-6.2.0.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild similarity index 84% rename from dev-python/pillow/pillow-6.2.0.ebuild rename to dev-python/pillow/pillow-6.2.2.ebuild index dbe4d52efc2..efd958def24 100644 --- a/dev-python/pillow/pillow-6.2.0.ebuild +++ b/dev-python/pillow/pillow-6.2.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 toolchain-funcs virtualx @@ -14,11 +14,12 @@ MY_P=${MY_PN}-${PV} DESCRIPTION="Python Imaging Library (fork)" HOMEPAGE="https://python-pillow.org/" SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" +IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" RESTRICT="!test? ( test )" @@ -34,17 +35,14 @@ RDEPEND=" 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/pytest[${PYTHON_USEDEP}] media-gfx/imagemagick[png] ) " -S="${WORKDIR}/${MY_P}" +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme python_configure_all() { # It's important that these flags are also passed during the install phase @@ -75,16 +73,12 @@ python_configure_all() { tc-export PKG_CONFIG } -python_compile_all() { - use doc && emake -C docs html -} - src_test() { virtx distutils-r1_src_test } python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}" } @@ -95,7 +89,6 @@ python_install() { } python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) if use examples ; then docinto example dodoc docs/example/*