gentoo resync : 25.11.2020

3 files changed, 31 insertions, 16 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index bc018afe8e87..08b4cd69f727 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,7 @@
-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.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
-EBUILD pillow-6.2.2.ebuild 2222 BLAKE2B d373d805ef653c5893c1a3be174737aa8f005e5ca69bc4e57348d12d34354bb1f3d691b3fb6a1524818daed3fe8ef04c6b116bf7610ec90af6a285a1fbc81fad SHA512 86380958da1fd74a5356501c3ac949813c59b2eb5ea12e155e53c8541db8ef5fe7fae9d2a7e85063a137618478b7d898a777f460961e107bf394790390ce6b40
+DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
-EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B 1b4ee46ff5821a68079e43b2645f40a7f86e964b5875b5dbb10a232be9f55901be1efada636d0383930dd5fc76a0ad1f12e8af090e981b7e036a3393d7e48632 SHA512 1de60e1ed6de3d9945ce4c6d8ce0e7f04669c76133f564dc0a58914124be6c644dd09fb80cc6589e67dead064e109a9675366bb58ad63529bf312ed878675864
+EBUILD pillow-7.2.0.ebuild 2694 BLAKE2B 0c5ac7be9523a70ef6b0abda1bbaa1183fde635e608d76b0b99216256d4d63288ece9f9901176d2a405969143f86aa524e09f7a23fc64c53de01ab785e3b6ab3 SHA512 21573a1826123c84025e9706114f6cef7f6c21a8c88237957b23d0e05425ea477e468738af1cc8379e3b4e322d3f1c81248fc70d835dc333f90f7250c58c2ce2
+EBUILD pillow-8.0.1.ebuild 2622 BLAKE2B e9f9ba09f8f8e67bd0a7be1fb4ed50f50cf0d09e865eeaab177fbc7838548483c47a4419ccfce7dc99c4a21ca83596d9a3f192c97f5122429823c49e998d662b SHA512 a3822b5332f62fad5a120376149338ae0901b5cbd3d587865eaf2e15bc1f22803ebe3793f2eb68601a2379f5ca6ac6e241a5bd373a53b18d0892d12b5b1cc3dd
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
index 1ace1e74cac3..e200e8634792 100644
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ b/dev-python/pillow/pillow-7.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+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 )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-6.2.2.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 97c545afe105..ea2d981f2102 100644
--- a/dev-python/pillow/pillow-6.2.2.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='tk?,threads(+)'
 
-inherit distutils-r1 toolchain-funcs
+inherit distutils-r1 toolchain-funcs virtualx
 
 MY_PN=Pillow
 MY_P=${MY_PN}-${PV}
@@ -18,12 +18,12 @@ 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 tiff tk truetype webp zlib"
-RESTRICT="test"
+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 )"
+RESTRICT="!test? ( test )"
 
-RDEPEND="
-	dev-python/olefile[${PYTHON_USEDEP}]
+DEPEND="
 	imagequant? ( media-gfx/libimagequant:0 )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
@@ -31,14 +31,18 @@ RDEPEND="
 	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}]
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		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.
@@ -53,6 +57,7 @@ python_configure_all() {
 		$(use_enable imagequant)
 		$(use_enable webp)
 		$(use_enable webp webpmux)
+		$(use_enable xcb)
 		$(use_enable zlib)
 	)
 
@@ -68,6 +73,16 @@ 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}"
+}
+
 python_install() {
 	python_doheader src/libImaging/*.h
 	distutils-r1_python_install