gentoo Easter resync : 12.04.2020

6 files changed, 110 insertions, 8 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 9df077f9bb3b..3d8ed6b8b926 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,9 @@
 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
-EBUILD pillow-6.2.1.ebuild 2648 BLAKE2B 3a93f8baae33245b32c5d90800a699f6f725d797d1134642517c0ca137aa90834dc19724c5dd187e51d309add143b73e4044c974de351a858dc929e785da510e SHA512 776123e3352e5023e7adb9008c229e625330c772a62ad3f9ffacc6300d88f58b97b963b9c5af40ff62c4a179b985409d42f182a9df4c6e29a4f731b737ddb7c0
-EBUILD pillow-6.2.2.ebuild 2650 BLAKE2B fe771e02b32bf3ef0ee0aa7e48f3d53ecf7e285440316f525b0299ab9c2cc6882c4d1f13b07db6646807d481716a850b050a6a4d4e298b4f8cbb7b7685f391d5 SHA512 55f55d95a21bec33dee065ccd75d3e45cb0222c345d9234660568f2db59c3904a49e03d9e6fe1d03767fd6d57828462469b660d969501e56919f74b621359752
-EBUILD pillow-7.0.0.ebuild 2646 BLAKE2B e1b5a4fd0c980780bd16212bb19965c67a3a4d024003d93ccd0385340d13fd46f7ccdeb89ed77770ce9103dd0cba2a2eb82fbfc2b0573450faeba3b58eb02a12 SHA512 22592c3483bab0ddd13546c47f085f0ab5007a8cf7de7754663be31454049dfc949d32d14dde7380e96ed0fa062a9ddb614f494243c7808a597cddfa717d7547
-MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
+DIST pillow-7.1.1.tar.gz 38933780 BLAKE2B 411e97f7ae26361501e51c1756d9c495b8fe893fdd7eeea5f51e83aab99b04216e9518f54a69a57b482b3f6837a1318daed2963f196fa5c6166d71cb7bba281e SHA512 1f3c0a3c604e95ac60e2b9170fd2f45156a444a2f98dc3afe523178364a38e2f33ca8e312be85d2ec7a13c461236063dc2622db8df7ad7fe393aeb98b5bf2dfa
+EBUILD pillow-6.2.1.ebuild 2649 BLAKE2B 3f233472f98f78aa279a770dacbf9e3456b640f9284d96a5b347f60a0d3734358661e1f3a3ac444cc69d8da1a139444a9228b8cd85c434e0131e1f529e304792 SHA512 a45903c4d2c67be2e10c6c22e8722793d8e12953ad0061d3f4c8b63402d16025cba26410b1407ef7ab21ae7cd9b9f6281e79560b6f106bd19e9349e3f4ef4c5b
+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
+MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index c3f74b982665..f350483c5d15 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -10,6 +10,6 @@
   </use>
   <upstream>
     <remote-id type="pypi">Pillow</remote-id>
-    <remote-id type="github">pillow-dev/pillow</remote-id>
+    <remote-id type="github">python-pillow/Pillow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
index 8c3b3fd995ee..a53a7f73a727 100644
--- a/dev-python/pillow/pillow-6.2.1.ebuild
+++ b/dev-python/pillow/pillow-6.2.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-6.2.2.ebuild
index fd6807ca95a2..a53a7f73a727 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-6.2.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-python/pillow/pillow-7.0.0.ebuild b/dev-python/pillow/pillow-7.0.0.ebuild
index 04853bc300ad..c7ad6f549790 100644
--- a/dev-python/pillow/pillow-7.0.0.ebuild
+++ b/dev-python/pillow/pillow-7.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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 )"
diff --git a/dev-python/pillow/pillow-7.1.1.ebuild b/dev-python/pillow/pillow-7.1.1.ebuild
new file mode 100644
index 000000000000..43f8084cc1ee
--- /dev/null
+++ b/dev-python/pillow/pillow-7.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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 xcb 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= )
+	xcb? ( x11-libs/libxcb )
+	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 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
+}