gentoo resync : 08.06.2019

4 files changed, 2 insertions, 124 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 5753b49b9532..0e98a996b92d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,13 +1,10 @@
 AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
-AUX pillow-5.2.0-fix-lib-paths.patch 675 BLAKE2B 88c552a5b4db246bd63297ebc9f002aa4ed541cc9521e8f651194609d4040e22375149f1d5ce0957e8d4b69ceb5a5cc425894f7c40ba86db4204de4888528f06 SHA512 7ac1e4611e81cc80fd37dbf348fda1ca2707ca9b28c95c328614b91167ae70e477afd1730a585a2834d31d5826ac68d9816c9ecd227670b81af4e7dea238eef3
 AUX pillow-5.4.1-pkg-config.patch 790 BLAKE2B 702af0f1901834f13f4731fbc78989ee56c1b1dc6bc65227aeb55c9074b2318462ff1447597b75a269107ccf223363054b310ede3771448e813589b71a220eed SHA512 a53a5ed25c18f1c5a8db01dde5d2c51dd34387d66c4cdbdb624454d0a2a19f4e09a771490114744de0299231d95ed02360223db5c227cdc540752a1c60bccc92
 AUX pillow-5.4.1-toolchain-paths.patch 516 BLAKE2B e794866ebfb5db41cba72def4690721f2f1254d16932a89f8ef5f28095a07df3a928aa7fc90c96e5a57983e8421369fd7495fa30a677831761801a639f22a91b SHA512 48bc736101fae55bf7da666e7b82c05c9a0a549f6892f8dbedb64d6db8a9bcfae34950847189209ab3acbbc5c357633a0102fd298f12590e678c7ad1b2dbffde
 DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5
 EBUILD pillow-3.4.2-r1.ebuild 2493 BLAKE2B 01326658c00545bcd6162167e735c4805b3b4ceb159a24f2b76c993edba56bfee27ea51b5bcd3db401f07f3ec794286042f603bc03e9a4c41934fd0073ddcd43 SHA512 88c6758dbd10f8c9e5ad8637c3bd14cabf8c66d9ea8fafa5e7d824d460c1eb4e2ca209832018acfc654c17550199df6fddbc14fc3b44c725dfe0690a70ed520f
-EBUILD pillow-5.2.0.ebuild 2730 BLAKE2B 66971c9af9b80aec5c5ae0350ff662f5713d0c710d157e002e717c9a40241c41480549f81c2a73490601003d95f9106e4131d940acfdf847dae6fc7066ddb4ab SHA512 7a7eb96105c19d993fc94c4f7fcbd1b514322ed5f360438c78a668483625bbbc0ebeabfbff74a44ba10646302f889807958075fb2d215a81b230fa4ecea5508f
-EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B 1d30c0e4ce03b07c85809a92ed4e38660269dc2bf3b0948fc90a1e914575c2e03deacdee8dc4f409e6afa5c91268184a1bf1f63a0c1b7066f9e99f4562fd7fde SHA512 82944ed9e754a04b8507e606b7bb7933d045f9f59eedf7129fadbdf9aa2933920105f9f733f28132a45d29aa751ac6c27d27b606fecd2ed7f463e64a9428b72f
+EBUILD pillow-5.4.1.ebuild 2770 BLAKE2B e3a3b8f2ae0ff3aca9e881f6355651125cb3d606a0332d614d68be02cb8f5a81a4ce002d1676f9ece74bc8a120076ed9e2f9b741ae30996da6e4d1de85975f1b SHA512 bbf551cadcd03fde029c19678b47267c0558b42e0c7b93a64c634f5ddd576c05bea04b26e568bb3d632d0c18505eec4f4a1d0e797f9a66caed2de8e8d8dcba3a
 EBUILD pillow-6.0.0.ebuild 2773 BLAKE2B 9332930703d43e2600618b3ecf24471a52288348ea1067c2508948cdb2addbc22ee37ca077e2c5773e8335949ed0331dea1ecd57b43e9152abb70c9ab48af3a0 SHA512 89cb0af57b9fd3347a88418b65943d5c2569598bd4a2fa822c3fef9a2a538150506581342124080fb5a64f52f331aac65662947c0d514de6840e3c48cf4ce8a6
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
deleted file mode 100644
index b73681831a6f..000000000000
--- a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 761d552c..c4a55092 100755
---- a/setup.py
-+++ b/setup.py
-@@ -435,6 +435,11 @@ class pil_build_ext(build_ext):
-                 _add_directory(include_dirs,
-                                os.path.join(best_path, 'include'))
- 
-+        # The logic above fails in many cases (such as pypy builds) and we fix
-+        # it here by making sure we look in standard places first.
-+        library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs
-+        include_dirs = ['/usr/include'] + include_dirs
-+
-         #
-         # insert new dirs *before* default libs, to avoid conflicts
-         # between Python PYD stub libs and real libraries
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
deleted file mode 100644
index 3eb0933a358f..000000000000
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-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}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		<dev-python/pytest-3.10[${PYTHON_USEDEP}]
-		media-gfx/imagemagick[png]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch"
-)
-
-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)
-	)
-}
-
-python_compile() {
-	# Pillow monkeypatches distutils to achieve parallel compilation. This
-	# conflicts with distutils' builtin parallel computation (since py35)
-	# and make builds hang. To avoid that, we set MAX_CONCURRENCY=1 to
-	# disable monkeypatching. Can be removed when/if
-	# https://github.com/python-pillow/Pillow/pull/3272 is merged.
-	MAX_CONCURRENCY=1 distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	virtx pytest -vx Tests/test_*.py -p no:relaxed
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	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-5.4.1.ebuild b/dev-python/pillow/pillow-5.4.1.ebuild
index cb21964b2e22..66b869574641 100644
--- a/dev-python/pillow/pillow-5.4.1.ebuild
+++ b/dev-python/pillow/pillow-5.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+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"
 
 REQUIRED_USE="test? ( jpeg tiff )"