From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- dev-python/pillow/Manifest | 6 +- dev-python/pillow/pillow-5.3.0.ebuild | 94 ------------------------------ dev-python/pillow/pillow-5.4.1.ebuild | 2 +- dev-python/pillow/pillow-6.0.0.ebuild | 105 ++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 98 deletions(-) delete mode 100644 dev-python/pillow/pillow-5.3.0.ebuild create mode 100644 dev-python/pillow/pillow-6.0.0.ebuild (limited to 'dev-python/pillow') diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index dce947ea7735..8d3cb357843a 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -4,10 +4,10 @@ AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56 AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c -DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62 +DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9 EBUILD pillow-5.2.0.ebuild 2732 BLAKE2B b603fc71dfb8cd3421a4460a36a9abd5be1f121a83f85c941399ab6a44474fbdf0bf673d2a3200360788279edcbb3973e153966dc0734db8008d390c12b4029a SHA512 235588590a41de73863bba24c92be25d815cc40aade9aab8bc94ff9b8e507d5953ecd0dc3be0953abf7e91188073bea71f0fb4e1c53fc6bcc9009a67d30d182a -EBUILD pillow-5.3.0.ebuild 2318 BLAKE2B 4e619ddc6b8ac66beb75809c67f9555080c136bfeba8d9cb1be67432ae72ea4b2e2b488f228d8629dc3b41a555bb28744daff0c94f9e842e1e7a4463c29b5a38 SHA512 aaeb62ce2d17833205a0c32a47778bbe1465e9b6d9fa70828d67bd718920f25e5000d06a1d911040a42b0269480a4845472f2156ab544a6ff2be16af2661bf25 -EBUILD pillow-5.4.1.ebuild 2777 BLAKE2B c39730350035dd69c196e901d8658e11a0faabadff5dd1c3714e9b6ed20ce51b2eff5b278ed822b78393ae40ed45c432151b1268634f2d9de4c70af86b07ad03 SHA512 217dc85851f3f80d7a236b7bf9601306fa6dff83a854ca82913fa6963b9cd87039fd54f91c3e54586732dd38d7c8aa0ea694c8334932d232c0432d75e3acfe35 +EBUILD pillow-5.4.1.ebuild 2775 BLAKE2B 7d1dde851e3f0f3253a655252fd9b48e56a460034b9de5a4b0c70ebe63754ed67a7fab2a542985682b474742499ca3d990df9a649873706dbbf86fd02d3437bd SHA512 e02bbd5ae941320598b0b2a5c767454db87688bd2c8614c3f656b0271485209370ece3e5dafd2a628d8f0f7a2bdda28a0cb60d0a7cae5f60254563a548d4efbd +EBUILD pillow-6.0.0.ebuild 2776 BLAKE2B 4fdc8914bcc72c58e89aeff5e1adbe11ab38ecb6dfed52297ca9d1acf615021e847e6b7780b583dc8a5e98b4f0139efb38ad99f9c03f19910bc2c3540182ae94 SHA512 b12641e3630355270aa92239ba63cd9b43d072b9c780e6f594df0684a06f1992bb12f4891fbb2678dfde520584cf37a0b90951acce5e4e3e039f13421c6da73e MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a diff --git a/dev-python/pillow/pillow-5.3.0.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild deleted file mode 100644 index 13d76f2458f5..000000000000 --- a/dev-python/pillow/pillow-5.3.0.ebuild +++ /dev/null @@ -1,94 +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_{4,5,6,7} pypy ) -PYTHON_REQ_USE='tk?,threads(+)' - -inherit distutils-r1 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 arm ~arm64 ~hppa ~ppc ~ppc64 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,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.2.0-fix-lib-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) - ) -} - -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-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild index 98e0b4930127..0f964b03c559 100644 --- a/dev-python/pillow/pillow-5.4.1.ebuild +++ b/dev-python/pillow/pillow-5.4.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta LICENSE="HPND" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +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" REQUIRED_USE="test? ( jpeg tiff )" diff --git a/dev-python/pillow/pillow-6.0.0.ebuild b/dev-python/pillow/pillow-6.0.0.ebuild new file mode 100644 index 000000000000..b987fe75792a --- /dev/null +++ b/dev-python/pillow/pillow-6.0.0.ebuild @@ -0,0 +1,105 @@ +# 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" + +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 +} -- cgit v1.2.3