gentoo resync : 29.10.2017

4 files changed, 13 insertions, 15 deletions

diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 210298c96b41..a75ccd4f555b 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,9 +1,10 @@
 AUX pillow-3.4.2-no-scripts.patch 411 SHA256 597223119626ccd36a0427df401ab9e2ff330099afc307162ddf58f62be07f46 SHA512 51ac7df4e9c6b76bbaf20e243cb171f9d824c94e183f4bbe5047c6932efe6913527a0a4d328266a8984d51d07aaa18cbdbb98de92dc8f027a3d392d0355cdd70 WHIRLPOOL 1863f9eeca9470a072d4cdab1c7c8eab8de242f35fdaeafce469df71b417cc8ae2e9d9122450d6283d9e749d429c53b393f789ce11f4ba7bfedbde44609cb931
 DIST Pillow-3.4.2.zip 11042238 SHA256 85b237840ad8b30a1572bf9e3898a26c77910a56554d73ed4f58a42197c2e4c2 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 WHIRLPOOL f92d4320ca5fd3e004a2ace41d14f0816dbea6fcfc9b10739a59d2dd393725a47c28f5b9f643d0b3243b9003701094ee953b38118412647155e8ba13fafe0582
 DIST Pillow-4.2.1.tar.gz 12673417 SHA256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073 SHA512 8a1c691f067c1127b941a94ae991c728c94eab876fe2a511ed0ad8af9702d4969325bd565b11e656ffefe867bf385725a5c14e3c28f8945730fa21986f934f69 WHIRLPOOL af93b67a60843d9f853921d5dd1332209cefc87a9680201cca5010f935527abcacac57e9d2afeac6bd3ccf8ab6636ffc2321e0888b73babfdb9ff0a933a77951
+DIST Pillow-4.3.0.tar.gz 13874155 SHA256 a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb WHIRLPOOL 60b418d8e549f72a295c632a5caee148179d8bb931f63959fb4ee383db43e68bcab92789791fa912b74386410ac6023cc8232f3cdb0b7e7eb5a92467b8611034
 EBUILD pillow-3.4.2-r1.ebuild 2501 SHA256 7e2cc471d164b3fc8bb238eba6aec9644b60d2288158c6c16766e6fb5b8ad6ee SHA512 73e98674e3faef57e55fd5ea3703ec5de7a6c20e1d359ea13582629c6af07cb3f051d60d3313c6661faa1a76ce194e680b1d4324313015a618813953b8e38c39 WHIRLPOOL 71fef3416f125a3e4cd74d137e0238c304fe8389f9b430e997687ea3999366871662fbd72e2e16a4dfc9f70cca8753d4965098e4170a030a6f48b6b25e5bf140
-EBUILD pillow-4.2.1-r1.ebuild 1976 SHA256 20797c58b3cc00e9f919e2a4f026968d253deeba30e9b1f6e317526096790af4 SHA512 c4a27b1010ddc01e12ddb04f65cc69c164ff4ea58be7901caf85d19dba279dc9d1a36d33b6a43a5b1c86cca805c665a6ed38e7726f5f2f143d6f0331b8af97d4 WHIRLPOOL 1c443259ae0a59975bfc0edd376964dff417affd46ac15a11fd24390dc7613021e9d2ce84543a54e7044a557aa77e492b8bb5e097d497e458269a6b81b872766
-EBUILD pillow-4.2.1.ebuild 1989 SHA256 ce2c4034da7fff485477f337c46237805cb12a6b228ecf01d2fafad4126f10ef SHA512 36be85c1eec1ed794332847c279107f2f6f8d1d44b3f78d1c9b1555cf165e64cbf31f4338fa495f9b7cd7488de8ec4d3551112a1e1fd8d4b01276366f95df733 WHIRLPOOL 5405019de1a4627f2c36b16bb5d8eb33e93c3949e3bb2def6829ba6a0b9b90d152a7d4926f678a9e73239ff7a4ad6b015ade77733cccafbd7f0a66e0ac9b72f4
+EBUILD pillow-4.2.1-r2.ebuild 1932 SHA256 59f2d201d2e97570d99258d871a226cf9e3e270e0f2f479157bde64b34ad750e SHA512 d0f149bf96ad4ee1bb094d4e09d1c991d9786cdbafdc5b0016f8ebdc63988ba8f7741a5d7701ba1b93bd27d5a65e396547847df8f205f5e045ec7817d6e729fe WHIRLPOOL ec2f63117b7068321dc00a3d2e6e6c5d690c63206d42c748947a59551494fd3ce2f83bff17e80233cf8d2b554c7275565cb81a52007588d920d36b4849061c73
+EBUILD pillow-4.3.0.ebuild 1932 SHA256 59f2d201d2e97570d99258d871a226cf9e3e270e0f2f479157bde64b34ad750e SHA512 d0f149bf96ad4ee1bb094d4e09d1c991d9786cdbafdc5b0016f8ebdc63988ba8f7741a5d7701ba1b93bd27d5a65e396547847df8f205f5e045ec7817d6e729fe WHIRLPOOL ec2f63117b7068321dc00a3d2e6e6c5d690c63206d42c748947a59551494fd3ce2f83bff17e80233cf8d2b554c7275565cb81a52007588d920d36b4849061c73
 MISC ChangeLog 11134 SHA256 59cebb3fd3d3d36e347a01a92f22824998406266e856d17f959cb6326b47fdcd SHA512 9e0f14954055628779deebf09171c4c28eb4384128d72e525888389e347e498929da9f36be7a5da5816244899e1a3f841742295973227fd1e5c138d2e7ee9e9f WHIRLPOOL 4e1daf48638a419d0e168b6c5c1ce0ebf3c724a2786d41cc0b79f376cda6e122663c0b0e8ab188d9188cde20d1e269101184da201dabdc6ec885f1ab4188d15e
 MISC ChangeLog-2015 8100 SHA256 e35d62d80a480830916fc6661fc0b2f63d96ce6092ae7a440a88e4a388e03b8b SHA512 3508c7477f1ffcf8497a41c5b316dd1d2f4b98a51a01d09da6263c998320e9e8077073f5ff7d9cb2626a254f5d97c334fdeeb24443cb7e95967a845489c3115d WHIRLPOOL 56c7be042a7f508b1b6c168673d0dbe8deda2c3febad678301fb9db0ea911e627ac8855240e99d96778d4308c7da9f2433dba96f6d5c4ee1d85ac5747bade472
-MISC metadata.xml 538 SHA256 43641f5debac619035cc1382ffb1f09ccbae80556a4b576d9fe3bb620ae90208 SHA512 ad0b456ee31c3b1be536d665158886d788b3abd78f6900d944f7a98ee9a3b90abe410f2d2b03d5e343b335e7c5d88a74209a13482f9af244fda18bba28facab3 WHIRLPOOL 6cb936f3faefa89ae91729dbef9393acad13c5cb524c89f56e182f99bd7b4bea221cb779b069bf45177cb2c59f5e8f5464d77caae8d26c4dc95a5982afd8d4dc
+MISC metadata.xml 476 SHA256 b0e79671d5a5a621d84cbb720eff7145d699b10e1d29b5e0c6835b36094cd3dd SHA512 a3de4e446d11e115ff85062a12866ebc5988079eabb658927fe2f319df5b0e944ca751d1070b051f44733ab22533496b2b006ec831b99e04f81fef55900cab6a WHIRLPOOL 9e916371bc62116dbd476a519ce95822cdad5f081176cf67c66661a3400f337a86a7e8b999a7b3ab204613be09e4370d263d0279ed93714d91be4cbc68ab7653
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index d641c40047bf..c3f74b982665 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -6,7 +6,6 @@
     <name>Python</name>
   </maintainer>
   <use>
-    <flag name="ole">Add support for OLE2 image format</flag>
     <flag name="imagequant">Build with Image Quantization Library support</flag>
   </use>
   <upstream>
diff --git a/dev-python/pillow/pillow-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r2.ebuild
index 1621cc8edf34..785dfedc3b93 100644
--- a/dev-python/pillow/pillow-4.2.1-r1.ebuild
+++ b/dev-python/pillow/pillow-4.2.1-r2.ebuild
@@ -18,17 +18,17 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
 
-REQUIRED_USE="test? ( jpeg tiff )"
+REQUIRED_USE="test? ( tiff )"
 
 RDEPEND="
 	dev-python/olefile[${PYTHON_USEDEP}]
 	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
+	virtual/jpeg:0
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:0=[jpeg?] )
+	tiff? ( media-libs/tiff:0=[jpeg] )
 	truetype? ( media-libs/freetype:2= )
 	webp? ( media-libs/libwebp:0= )
 	zlib? ( sys-libs/zlib:0= )"
@@ -48,7 +48,6 @@ src_compile() {
 	distutils-r1_src_compile \
 		--disable-raqm \
 		$(use_enable truetype freetype) \
-		$(use_enable jpeg) \
 		$(use_enable jpeg2k jpeg2000) \
 		$(use_enable lcms) \
 		$(use_enable tiff) \
diff --git a/dev-python/pillow/pillow-4.2.1.ebuild b/dev-python/pillow/pillow-4.3.0.ebuild
index a22b7b1fd8b9..785dfedc3b93 100644
--- a/dev-python/pillow/pillow-4.2.1.ebuild
+++ b/dev-python/pillow/pillow-4.3.0.ebuild
@@ -18,17 +18,17 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib"
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib"
 
-REQUIRED_USE="test? ( jpeg tiff )"
+REQUIRED_USE="test? ( tiff )"
 
 RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
 	imagequant? ( media-gfx/libimagequant:0 )
-	jpeg? ( virtual/jpeg:0 )
+	virtual/jpeg:0
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lcms? ( media-libs/lcms:2= )
-	ole? ( dev-python/olefile[${PYTHON_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[jpeg?] )
+	tiff? ( media-libs/tiff:0=[jpeg] )
 	truetype? ( media-libs/freetype:2= )
 	webp? ( media-libs/libwebp:0= )
 	zlib? ( sys-libs/zlib:0= )"
@@ -48,7 +48,6 @@ src_compile() {
 	distutils-r1_src_compile \
 		--disable-raqm \
 		$(use_enable truetype freetype) \
-		$(use_enable jpeg) \
 		$(use_enable jpeg2k jpeg2000) \
 		$(use_enable lcms) \
 		$(use_enable tiff) \