gentoo resync : 14.05.2020

3 files changed, 2 insertions, 102 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3d8ed6b8b926..1a9e3c7d6c6e 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,9 +1,7 @@
-DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
-DIST pillow-7.1.1.tar.gz 38933780 BLAKE2B 411e97f7ae26361501e51c1756d9c495b8fe893fdd7eeea5f51e83aab99b04216e9518f54a69a57b482b3f6837a1318daed2963f196fa5c6166d71cb7bba281e SHA512 1f3c0a3c604e95ac60e2b9170fd2f45156a444a2f98dc3afe523178364a38e2f33ca8e312be85d2ec7a13c461236063dc2622db8df7ad7fe393aeb98b5bf2dfa
-EBUILD pillow-6.2.1.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
+DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5ef8a9a23db45b3d5fc9d383d7d534ee63fbfce27f9ee4318982dec46e1e60eb55ce5aa14588b1468792c8188f5b SHA512 4e20f6dbc3c9d138de6270b14e85911ac5d2953328be4fd4b0754d8fe834625f914ee1f1b2f32cfb26ab57b6ea4b74d14a81a65938cbb94895c0afcd639bb38f
 EBUILD pillow-6.2.2.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
 EBUILD pillow-7.0.0.ebuild 2639 BLAKE2B 60656a534caaae9acd435f0fb1214883ba2f4e7034439e4d4cbbf50f4629041e70ee32614c9f6e7b16f96fe397d35801eb35c600ceb091007e7c7b4d9c11512d SHA512 c893374b60712853ad19c420658c34ae4147883d6788d3aecd52b82563cbe876b25a1e2ea893d6cc51d71b07de6883fa292366565291f23884b696f50e674957
-EBUILD pillow-7.1.1.ebuild 2696 BLAKE2B 882aed2dc93b5491d88976f262f3e6fc140316201066f5e9e52062a4fe3d32a24bf5da2ed05e7ceeba1131b4c00ac3103cc781f34ae3da8af74478b238de7e04 SHA512 7f30e4a72e2abe361f9729b634572cb9b4ea2ebce614b4215f6643d579404745311f378db4fa48548bd4c971544707d90b4349528969ac90ef82b6fa7124df9f
+EBUILD pillow-7.1.2.ebuild 2696 BLAKE2B 882aed2dc93b5491d88976f262f3e6fc140316201066f5e9e52062a4fe3d32a24bf5da2ed05e7ceeba1131b4c00ac3103cc781f34ae3da8af74478b238de7e04 SHA512 7f30e4a72e2abe361f9729b634572cb9b4ea2ebce614b4215f6643d579404745311f378db4fa48548bd4c971544707d90b4349528969ac90ef82b6fa7124df9f
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
deleted file mode 100644
index a53a7f73a727..000000000000
--- a/dev-python/pillow/pillow-6.2.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-REQUIRED_USE="test? ( jpeg tiff )"
-RESTRICT="!test? ( test )"
-
-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}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-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
-	# 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
-}
-
-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-7.1.1.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 43f8084cc1ee..43f8084cc1ee 100644
--- a/dev-python/pillow/pillow-7.1.1.ebuild
+++ b/dev-python/pillow/pillow-7.1.2.ebuild