gentoo resync : 15.12.2019

6 files changed, 16 insertions, 19 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c0ad259167d2..49e5ff161c49 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -7,10 +7,10 @@ DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69
 DIST pillow-6.1.0.tar.gz 33523149 BLAKE2B 305613aa1f444327c0a70a9e88b51035dc87c17af9d0dd4be47192eeef1b496ba0da3675d9fed5dbaed1bd9a5f2c739370bfd7d1292d7db27230c7ad60b4db14 SHA512 b531644d7214f624369ada12a953c773a0009eaa50217e91aeae30b1ea065c685c7ad331bd9d5e952cb25edfaaf4e8255025004b4c83624ecd2dc06f3501d60a
 DIST pillow-6.2.0.tar.gz 37404132 BLAKE2B 3f86f7fcf4695f152f021fda629df182846e33e7031e1b6bb8f71b0cc1bd7e8039bb94ea8e480afa29324c3015902839cdcaaa359fe58f2bcd8c287a3eb13417 SHA512 9de48d9acdb4367325fb16f970bb533dc369b895615169e0ec77155b400d878e3ebb67f706243ff3e81cc957f9b5360ca8206d4f7fb2d00e9474abb9925bf9d5
 DIST pillow-6.2.1.tar.gz 37405020 BLAKE2B bf3592bcc159902acc35899463c8949daf7cc31f03283684dc55d5f1517fdfbc07e1feb73b65b0b9cb4052ee1d5281558b38f9bd08240d0fc5727909b98da158 SHA512 ee757ec2b8382d6d56fd0f0cdd4cd36440cc37f05741e27fc661449a16dc7c868966772060adb283de1b1b5ebc49b8eec46e0bdcdad9f5f4d5ebd77feab7ad31
-EBUILD pillow-3.4.2-r1.ebuild 2483 BLAKE2B 4b191b6e39b3abc6a96c1ec052d7d172bccaab10a8ef5c279b45774179dccc8a6dd446a733567fa20429189b909c42e0f735a56c6b099f34822d30bd035be0cb SHA512 d9c2e10d90f81856ad1b5f9c97cc84c369f028a99090e9a3deedb70d2f4f7cb2a9954529d160440e5c5b7d234c256e85f700aa7e052c75809b2179b589bd23ad
-EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
-EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
-EBUILD pillow-6.1.0.ebuild 2783 BLAKE2B dbe85b17382d85e30fed56c9bbfea8807a42e0edff06f7d8d53e2cfab69e42182a232328d046fcd394ff1e8e28e854132422d0f573ac2efe22a780e2d7f60956 SHA512 1f8d6408f63a6f5bc2bd182eee1c9cb1c1b6d455b182a91167c502b2033d058fa9bb88d59ad078ac6fce1cbbd8709a4161371d13d9cf5ee4dcd579254afc6ad7
+EBUILD pillow-3.4.2-r1.ebuild 2510 BLAKE2B 46fea0d8573139395d0d3a1a3e4457c63900c8422a111d9975b7d6a16666961a1a269ddc143927f04455628adf83f6e886c13af489917f98de5e6e7446d13553 SHA512 6a9de5aa86cba1ebb93ad4269d1077bde0a47f8928194dbff2bb463a2cd78bcca7e7d6f288b4280e14dc5026fc1895ea98c4d3b33f5b25cb4fae20cc04c6e346
+EBUILD pillow-5.4.1.ebuild 2797 BLAKE2B 6d2196bbc49b0b160a27811837bac3ac636ca60c953451adc060f9c1c699f9c9fa369dac18286622232eb4668d01af29ebc68af98d6929f67cc6289eeca7913d SHA512 aa12b638c49a224aba341c2bbef40c25be6761706391b91f19dc7a58969e4b3358d1f323973cad0ef622c4d2b6ca37f585ca6c90d4cb6878c5003e2cf4ec3a0e
+EBUILD pillow-6.0.0.ebuild 2800 BLAKE2B ee3282b7f19849e8921180b871a9acd56e166f7371f5c3c237367daf78f91073cb8634b395ec2b4471418f5e6d96b2b0a086a020b7132eb33ce34555195d02ed SHA512 8f0897b09bb3999db596127d92336a6b6bdd181f3a5e863e60597a60e83ac0990b8907504faa22ac7415fa74d6c2876eddd856f9fe613c6d686e3bfff038f054
+EBUILD pillow-6.1.0.ebuild 2810 BLAKE2B 5ad74bc69f30510864919cd957522ebf11b7acbf4f3fdb3023b2a720a023243a1040d3b269abc1958baaaee86f1643a54d9a32750f244d4691bcfe919de12af9 SHA512 3d0f3dfbb2d581e85417079575ba5164988507b009234b2ab2ffe22de52c5ce8b3740eee1170700f8f2ad699dfaf251971e3861073a3e55a8543782946fab9a0
 EBUILD pillow-6.2.0.ebuild 2809 BLAKE2B a1815519b845c7991d927275b429cbec0150fecbd58d65c0419e0c95e62a409e051e497e727ac3c331e4ee529086d176718db7c19688e37d5449090ea932c68f SHA512 7d226398eafa43935a293474a15ab2eddc972cd6844e3fe0b701c0ca49ca44a1e2f8ae72d3bb3d006f09710fe66ab54f67a54efc179f5dae03a6f108b7b231ca
-EBUILD pillow-6.2.1.ebuild 2809 BLAKE2B a1815519b845c7991d927275b429cbec0150fecbd58d65c0419e0c95e62a409e051e497e727ac3c331e4ee529086d176718db7c19688e37d5449090ea932c68f SHA512 7d226398eafa43935a293474a15ab2eddc972cd6844e3fe0b701c0ca49ca44a1e2f8ae72d3bb3d006f09710fe66ab54f67a54efc179f5dae03a6f108b7b231ca
+EBUILD pillow-6.2.1.ebuild 2658 BLAKE2B 4d9550bc49fbc1caaffa7ea4fac533020201e64debbcb38db97b1cc96c6b5cf679ebb0dff740100fb18864ed8884717fe3692d6766569ceb91277a280d596505 SHA512 e7de1fa305ea822fa00cf098782054aa5acb35a745f5db2c77166eff2c98d4ecedb5e34ba352a5522bee773e9a61c99590927b50cbb1c97bf3d6c09e48574702
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
index 4c8bf8eeeb8c..b5c3c3a06952 100644
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -19,6 +19,7 @@ LICENSE="HPND"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( jpeg tiff )"
 
diff --git a/dev-python/pillow/pillow-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index 66b869574641..b9f8496d9ad4 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -19,6 +19,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 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
index d2c78a8bf301..fd37a520efdd 100644
--- a/dev-python/pillow/pillow-6.0.0.ebuild
+++ b/dev-python/pillow/pillow-6.0.0.ebuild
@@ -19,6 +19,7 @@ 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"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( jpeg tiff )"
 
diff --git a/dev-python/pillow/pillow-6.1.0.ebuild b/dev-python/pillow/pillow-6.1.0.ebuild
index cbb40c52feb7..64b1c01eb7e1 100644
--- a/dev-python/pillow/pillow-6.1.0.ebuild
+++ b/dev-python/pillow/pillow-6.1.0.ebuild
@@ -19,6 +19,7 @@ LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="test? ( jpeg tiff )"
 
diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
index dbe4d52efc2f..d274e9829a3d 100644
--- a/dev-python/pillow/pillow-6.2.1.ebuild
+++ b/dev-python/pillow/pillow-6.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
 PYTHON_REQ_USE='tk?,threads(+)'
 
 inherit distutils-r1 toolchain-funcs virtualx
@@ -14,11 +14,12 @@ 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="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+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 )"
 
@@ -34,17 +35,14 @@ RDEPEND="
 	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}"
+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
@@ -75,16 +73,12 @@ python_configure_all() {
 	tc-export PKG_CONFIG
 }
 
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
 src_test() {
 	virtx distutils-r1_src_test
 }
 
 python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	"${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}"
 }
@@ -95,7 +89,6 @@ python_install() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
 	if use examples ; then
 		docinto example
 		dodoc docs/example/*