diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-python/pillow | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-python/pillow')
-rw-r--r-- | dev-python/pillow/Manifest | 6 | ||||
-rw-r--r-- | dev-python/pillow/pillow-8.1.2.ebuild | 98 | ||||
-rw-r--r-- | dev-python/pillow/pillow-8.2.0.ebuild (renamed from dev-python/pillow/pillow-8.1.1.ebuild) | 14 |
3 files changed, 9 insertions, 109 deletions
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest index a7c8a9dae3bf..0c80768e0f98 100644 --- a/dev-python/pillow/Manifest +++ b/dev-python/pillow/Manifest @@ -1,5 +1,3 @@ -DIST pillow-8.1.1.tar.gz 44976395 BLAKE2B 208534f3e24d9416360efaab8f802b4d482208fe81d1b39bf8339ddd1fe992b281a59faaadeb5ad5364ff062b1b7b19c3dadc11f9a453d5bd14bbf5170521396 SHA512 d04300442ac33e946bea186d6293516b615059b0f4b1b6ac7a48ce3a2e4e22bce5bc403331be697c022a4c81cb30f943cc33bfda649873c734af7db23afd6b69 -DIST pillow-8.1.2.tar.gz 45217041 BLAKE2B dbc7fb5c426c6a8f0efd218db5cd404c6b6a603054b36125ea687c69cca78ddd2e58712e8fe94460978bffe6bc059e5819d7ac6371bad11ee8fc1df445495c70 SHA512 32ffedf8cc8f2c21c241f41938d0521626ea05206d1a762305ac38abedecdf9bc8a6e5e2ded7565340e54797a4395acefb3b4d939ebdde8fc9583a1998bae34d -EBUILD pillow-8.1.1.ebuild 2621 BLAKE2B a0df80c884d2ae46c5f02126e220dbb10330c35e25ccc8a24ba4ce451efe93aac0ce1f2ce753cccc286626a3841a46a683ef4c15435175e0caa6a46f7ee86e6a SHA512 3337dd0acc4a11306870d428a64e7af65f381d57ada6fe44ebdbd748eeef28b69d7081c6485fe93b38e93f33da734d7d398a91fd4b8e9e273624d4a687464fb7 -EBUILD pillow-8.1.2.ebuild 2629 BLAKE2B fe83d3ef84696b841bda4c81ecb331d2187ab00778246ef67942138e22267dbbea3eaafe8718520f3072c6157483dc52653a2716d8e723301b0467f963d31eea SHA512 665272d523162f76719895e3a3a0ba82736834e2675f96236968b702eba765456c0252c70eb06f825b16e72db847f750acd6b37c8ed0ba8f4e31a9e29d01d8a8 +DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722738e1036bfbb533f420881ea638016ac56e9e66ec74a93c6dafc6e4f8807ec3d504400bb675488da00c9c3cb1c SHA512 40e97a54689ca04349d17b69b0e95bb3ef4fde0b60c6c55a2ec76034a5c2a9ebee0b310f68de1636db08786d9b2ad444bf10ac3b42a31404847cc165aa8392ac +EBUILD pillow-8.2.0.ebuild 2614 BLAKE2B 16ecdb61c8cfa1e2170adbddf68b5c073ef0db36f7da10f82043b6d61f27f5e49d4c569afe4982ae50c4ef6f601d99a93ab747369049e939582fc6bdf004a7af SHA512 0037ea1a32a5f1f1389f655704b69bff4b6db61b8cab49d12ab6e2ee784dc0998e1faec5658f1a56be551ef8f76d7efc3ffc6e6861fc4881c59040cce659f353 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2 diff --git a/dev-python/pillow/pillow-8.1.2.ebuild b/dev-python/pillow/pillow-8.1.2.ebuild deleted file mode 100644 index 65a55a7139fe..000000000000 --- a/dev-python/pillow/pillow-8.1.2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} pypy3 ) -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg jpeg2k tiff )" -RESTRICT="!test? ( test )" - -DEPEND=" - 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= ) - xcb? ( x11-libs/libxcb ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${DEPEND} - dev-python/olefile[${PYTHON_USEDEP}]" -BDEPEND=" - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - media-gfx/imagemagick[png] - ) -" - -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 xcb) - $(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 -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - "${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}" -} - -python_install() { - python_doheader src/libImaging/*.h - distutils-r1_python_install -} - -python_install_all() { - 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-8.1.1.ebuild b/dev-python/pillow/pillow-8.2.0.ebuild index cea581c6c538..af4b7299e066 100644 --- a/dev-python/pillow/pillow-8.1.1.ebuild +++ b/dev-python/pillow/pillow-8.2.0.ebuild @@ -20,7 +20,7 @@ LICENSE="HPND" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib" -REQUIRED_USE="test? ( jpeg tiff )" +REQUIRED_USE="test? ( jpeg jpeg2k tiff )" RESTRICT="!test? ( test )" DEPEND=" @@ -36,10 +36,14 @@ DEPEND=" RDEPEND="${DEPEND} dev-python/olefile[${PYTHON_USEDEP}]" BDEPEND=" + virtual/pkgconfig test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] - media-gfx/imagemagick[png] + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[png] + ) ) " @@ -73,14 +77,10 @@ python_configure_all() { tc-export PKG_CONFIG } -src_test() { - virtx distutils-r1_src_test -} - python_test() { "${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}" + virtx epytest -p no:relaxed } python_install() { |