gentoo resync : 14.07.2018

8 files changed, 344 insertions, 0 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
new file mode 100644
index 000000000000..7886a976cce0
--- /dev/null
+++ b/dev-python/pillow/Manifest
@@ -0,0 +1,10 @@
+AUX pillow-3.4.2-no-scripts.patch 411 BLAKE2B 79a798be9c7fe578a02f25f86cd658c10be36aee581c5d285f21081c17d48cbe0dbacd1098f65f71c4cab147ef77d18b334780810ad8a6c4534f53da2db83345 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70
+AUX pillow-4.3.0-freetype2.9-test-metrics.patch 553 BLAKE2B a5bfdf7789237b583c464f2cbb7cfdf645a272587337da227eeea98e41312bd2a7b3a7f22c182856577350489a849f52271a395f9799410a7a07f77654629197 SHA512 291ced301ee1938dfa19afc7b57285c57e6722e28f3adca492e390b1ac7a0cda43c58fa19b97cac81d2ed6ef928ccfb51de87e60b035e35f923c1a006e80be64
+AUX pillow-4.3.0-no-scripts.patch 392 BLAKE2B 1443119f49b0c76c75d17414851e7f54d673b804d8d268fea79fe9fcc4f6361d6d2e70cfc6d855c8c374bcc28b67672778f310f38442502bf5c7096e26bf0bc7 SHA512 500706b3736e17bbfdcf18d2e3038a96ab16a5ba1015fd2ee9332ae11d8f98594ac4c50dd0f7cfd5288703970d20d0a4f3174a8071442893903888d828a2d2da
+DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
+DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
+DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
+EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
+EBUILD pillow-4.3.0-r2.ebuild 2256 BLAKE2B d38a92c2b4f098eeedb771f3aa9e404128ff9ffbd13c8414f108d57dc3e48229f874ae2ac537dd36227c903243025dd9d869b932582be0c26204c17c6657d89c SHA512 475463912b12ed9f26c5ec4a54f74e3fd41b9aa3b20904f4ceb5f9d67f2bb1a6f4c659b086216bde866f96ed83aebeb6de178efe0bcf815331fbfc7becbe70e1
+EBUILD pillow-5.2.0.ebuild 2035 BLAKE2B beafb6859cd02e821c74faf53833c57241645aea0feb2001e4bd7ca775e4f3d9294282b13be94bbfa0b6833f64dd7769c744566d0ff69d573c2419fd0b139a68 SHA512 059645930443a373cacf0d5b5d5d88cc664e8a2d73c014940f3875d5d370e31751ed4b6ecf0218a9775b185b195617cdcd2ae68c4f1e01feb55766e2d2178a31
+MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
diff --git a/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
new file mode 100644
index 000000000000..a8aa0ecc0d0f
--- /dev/null
+++ b/dev-python/pillow/files/pillow-3.4.2-no-scripts.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.py b/setup.py
+index 5257e748..410ce788 100644
+--- a/setup.py
++++ b/setup.py
+@@ -746,7 +746,6 @@ setup(name=NAME,
+       ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+       include_package_data=True,
+       packages=find_packages(),
+-      scripts=glob.glob("Scripts/*.py"),
+       test_suite='nose.collector',
+       keywords=["Imaging", ],
+       license='Standard PIL License',
diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
new file mode 100644
index 000000000000..211ef7ac58d3
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
@@ -0,0 +1,12 @@
+--- a/Tests/test_imagefont.py
++++ b/Tests/test_imagefont.py
+@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
+                 ('2', '8'): {'multiline': 6.2,
+                              'textsize': 2.5,
+                              'getters': (12, 16)},
++                ('2', '9'): {'multiline': 6.2,
++                             'textsize': 2.5,
++                             'getters': (12, 16)},
+                 'Default': {'multiline': 0.5,
+                             'textsize': 0.5,
+                             'getters': (12, 16)},
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
new file mode 100644
index 000000000000..c30b00d54d70
--- /dev/null
+++ b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/562682
+
+--- a/setup.py
++++ b/setup.py
+@@ -779,7 +779,6 @@ try:
+           ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+           include_package_data=True,
+           packages=find_packages(),
+-          scripts=glob.glob("Scripts/*.py"),
+           install_requires=['olefile'],
+           test_suite='nose.collector',
+           keywords=["Imaging", ],
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
new file mode 100644
index 000000000000..c3f74b982665
--- /dev/null
+++ b/dev-python/pillow/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <use>
+    <flag name="imagequant">Build with Image Quantization Library support</flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">Pillow</remote-id>
+    <remote-id type="github">pillow-dev/pillow</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..e0bec4a91770
--- /dev/null
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.org/project/Pillow/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+
+REQUIRED_USE="test? ( jpeg tiff )"
+
+RDEPEND="
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0= )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-better-theme[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx_rtd_theme-0.2[${PYTHON_USEDEP}]
+	)
+	test? (	dev-python/nose[${PYTHON_USEDEP}] )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+# See _render and _clean in Tests/test_imagefont.py
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/pillow-3.4.2-no-scripts.patch"
+)
+
+python_prepare_all() {
+	# Disable all the stuff we don't want.
+	local f
+	for f in jpeg lcms tiff tk webp zlib; do
+		if ! use ${f}; then
+			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
+		fi
+	done
+	if ! use truetype; then
+		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
+	fi
+	if ! use jpeg2k; then
+		sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
+	fi
+
+	sed \
+		-e "/required/s:=.*:= set():g" \
+		-e "/if f in/s:'jpeg', 'libz'::g" \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx nosetests -vx Tests/test_*.py
+}
+
+python_install() {
+	python_doheader libImaging/{Imaging.h,ImPlatform.h}
+
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc Scripts/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild
new file mode 100644
index 000000000000..803aa344a807
--- /dev/null
+++ b/dev-python/pillow/pillow-4.3.0-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils 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 ~arm64 ~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/nose[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/pillow-4.3.0-no-scripts.patch
+	# can be removed at v5, patch already uptream. See bug 593816.
+	"${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
+)
+
+python_compile() {
+	# raqm not in portage yet
+	local args=(
+		--disable-raqm
+		--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)
+	)
+	distutils-r1_python_compile build_ext "${args[@]}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx nosetests -vx Tests/test_*.py
+}
+
+python_install() {
+	python_doheader libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples ; then
+		docinto examples
+		dodoc Scripts/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
new file mode 100644
index 000000000000..ad0c8bde22b6
--- /dev/null
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 eutils 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 ~arm64 ~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[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	local args=(
+		--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)
+	)
+	distutils-r1_python_compile build_ext "${args[@]}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	virtx pytest -vx Tests/test_*.py
+}
+
+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
+}