gentoo resync : 30.06.2018

4 files changed, 51 insertions, 16 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index bd52ebe7367e..a5ab6cb44648 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
-EBUILD pillow-4.3.0.ebuild 1976 BLAKE2B d153c38fbe2f66750b45b80e905140a3ca5556c3184b2dff242a4f22cf1f9b7e802e14a369b672066bc98fba36332865a34baf3d6f9ba23e28a7b3ba6f4fc476 SHA512 80922cedb3d334c813342c5fa70428316c59e62ec0ac9e8b637fe593bf528b589e21ede47260d1bbca7afb386afdb67521e353ab11aa33c0e7bff073b74ead0a
+EBUILD pillow-4.3.0-r1.ebuild 2219 BLAKE2B 04f65cb4bd11f24c1e2bf14f7308f0bf41a42cf94061d8e4c5119a5bbe4cb4134946ef0d8f21edbfe2753ac72a79fb4185b118bd578064812ca41b7a1f5f3f2f SHA512 a4b0161cfbffb9ea90ef658aa119c9b4f9c62e638ee5860ff7a15c4d0aba50946b91987c171f90c26c9f5343e8ead4c9904651132435edc6876547bdfef3d54b
 MISC metadata.xml 476 BLAKE2B cb4b4524b417cf9ab8938074443a4d1519ab16d90d459878b45fdaadf46b75d4454cc6718a2963fc14db0948ada0cc92c89e53ee9a830f43228b54c12cdff28b SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a
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/pillow-4.3.0.ebuild b/dev-python/pillow/pillow-4.3.0-r1.ebuild
index 0106f57a945b..9b35828ba01f 100644
--- a/dev-python/pillow/pillow-4.3.0.ebuild
+++ b/dev-python/pillow/pillow-4.3.0-r1.ebuild
@@ -18,14 +18,14 @@ 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 jpeg2k lcms test tiff tk truetype webp zlib"
+IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
-REQUIRED_USE="test? ( tiff )"
+REQUIRED_USE="test? ( jpeg tiff )"
 
 RDEPEND="
 	dev-python/olefile[${PYTHON_USEDEP}]
 	imagequant? ( media-gfx/libimagequant:0 )
-	virtual/jpeg:0
+	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lcms? ( media-libs/lcms:2= )
 	tiff? ( media-libs/tiff:0=[jpeg] )
@@ -43,19 +43,28 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_configure(){
+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
-	mydistutilsargs=( build_ext \
-		--disable-raqm \
-		--disable-platform-guessing \
-		$(use_enable truetype freetype) \
-		$(use_enable jpeg2k jpeg2000) \
-		$(use_enable lcms) \
-		$(use_enable tiff) \
-		$(use_enable imagequant) \
-		$(use_enable webp) \
-		$(use_enable webp webpmux) \
-		$(use_enable zlib))
+	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() {