gentoo resync : 26.11.2017

4 files changed, 15 insertions, 19 deletions

diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 654119b8a6da..7bfa2b19631a 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,16 +1,14 @@
-AUX 2.1.0-substitute-files.patch 1017 SHA256 5547660171b6a92145aed499bc0ccfafd079a1f86db86eac05baf60b39f6a15e SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542 WHIRLPOOL 581a456407b325d554689c9ad99ce6ee969468a41351e80f81b846267a97dca6cdf1052ab87088b42cd7d8445d73c17d5a99093f385e5e5e3640b5a10547ffe9
-AUX ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch 2004 SHA256 776b54af81f6323ce19e83ef8faac148ebf616b6589aa093cc151387fcf42111 SHA512 8d519f154ff60038348896814cd2464a52f31e172d7660acc4f9b818ad1415717ad48df7197c6509416c7dd7a86fda3420188c05aae3db6947a4add1d07390fe WHIRLPOOL 6212ec73cf9ce11d964dc76463cdb4f856c51f35635cb7ce36be768c30058c841b8c28fc7320c2b1e757825e99d30ddc31b04c7335d4b12b35edcb162093ee37
-AUX ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch 1311 SHA256 2d6724c52b3c0537af7afca2bf2d07037c9e8cd9a8dbcf5779e85f183b4fefbb SHA512 ff6f5ba68baa455565aabd6de403bb1d8d52183bacf068fdffd3e7e2b1dcd37267915316eae11f781f6107703c2bcdda7007c0a0b06e9888f7a69ae752994ee1 WHIRLPOOL 0e29ba597ad0320569a29290041a20357b4d930d1c893c18f4f1da944cc488f93161135b3a0d865cc488190087df60547a34b1b5401826a6f1aea91c057c3102
-AUX ipython-3.2.1-set-mime-type-on-files.patch 1175 SHA256 95b700a914c0490787f876bff4efc59de6e5e583bc700354f50a8b3c2cba3828 SHA512 d4791082b2b784bfe4998ad135ccfe0aa7e39f66e26125b75b15ab0b2474ba079c718e913853c709b2cb4e1def620d185918a063f3afc21dca474497f5982b4d WHIRLPOOL b9c18a38f21906bc97908f934d71e8e990bdc36cfc8171371a96b210a4f9e66c18a797fb5548bb1238ab5e422bc7272827eedeef9f9812b03438c10508a035d3
-AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 SHA256 20c2fce0d118fc5c88088009960bda114ded6c0ec44544fd511f96722f443112 SHA512 6b6efe04677cbf09fd9b42e2bc981779371a5cbec2ddaeee911b5246756300b75b54f540f246c98c84868c5abae4ca2d60787a168d2bd95dc2db35e16d5d98f4 WHIRLPOOL 8adb5098acab56d87f94eafb94d9437d510e6a58efdda58a822c98f6cd08749287ad7f798b7f7299635a609bdbf1871f2b71bf23946504591f246d19deed59a3
+AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
+AUX ipython-3.2.1-Don-t-redirect-from-edit-to-files.patch 2004 BLAKE2B 75a9f899b7a0533c9db71cc6c649fc8ed0e66bad0b2d2363e05e8259afe75691b316a79e9013f013845ed3d97eca2563add76875ab7e6317c34e5df68bb41bcb SHA512 8d519f154ff60038348896814cd2464a52f31e172d7660acc4f9b818ad1415717ad48df7197c6509416c7dd7a86fda3420188c05aae3db6947a4add1d07390fe
+AUX ipython-3.2.1-only-redirect-to-editor-for-text-documents.patch 1311 BLAKE2B 9a1b4ceaa1f0c9747363ac33a40755c062d43297068bb978a3047d45ccb0d9e6214e155c871c7d214648efe875c07a475b4dcda9d5a4e66a7e6a157a6e67038d SHA512 ff6f5ba68baa455565aabd6de403bb1d8d52183bacf068fdffd3e7e2b1dcd37267915316eae11f781f6107703c2bcdda7007c0a0b06e9888f7a69ae752994ee1
+AUX ipython-3.2.1-set-mime-type-on-files.patch 1175 BLAKE2B 892d05a922d594400501583bb9b19f36b539220c851a5958d928d8efe631b696046fba3a7a3b14bb688de44f82d3e331ed5cf791bbc0f232c30ce8c6ae1872a9 SHA512 d4791082b2b784bfe4998ad135ccfe0aa7e39f66e26125b75b15ab0b2474ba079c718e913853c709b2cb4e1def620d185918a063f3afc21dca474497f5982b4d
+AUX ipython-3.2.1-set-model-mimetype-even-when-content-False.patch 2329 BLAKE2B 30ada82abf662ed84ff64be786b1cd9292c0b1507aa8e3ea2accd509fbd5dd7808074cee10a5b05bda62e04c1a6f97abfab12fa0ece9ce6d25e9e5032e5ebdb9 SHA512 6b6efe04677cbf09fd9b42e2bc981779371a5cbec2ddaeee911b5246756300b75b54f540f246c98c84868c5abae4ca2d60787a168d2bd95dc2db35e16d5d98f4
 DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
 DIST ipython-5.3.0.tar.gz 4967956 SHA256 bf5e615e7d96dac5a61fbf98d9e2926d98aa55582681bea7e9382992a3f43c1d SHA512 41706d7521cc84f36f5580dc44cd91832a60aa8a7a946d15a9ec9563649b9ae97931b9f135f1fdbaecbcb0b9b925d467edfd6eec7f8c82309872047be77b598d WHIRLPOOL 96478b15fd4928d11da35dbbaba6492ff12cf739c06b6f9cf8fdd827060baf5c07d093c3e340792b62102f85ada0b6ea29adc742b784ad21e5292cde09a6fa25
 DIST ipython-5.4.1.tar.gz 4973571 SHA256 afaa92343c20cf4296728161521d84f606d8817f963beaf7198e63dfede897fb SHA512 b37dae27a558585ec4f42fa22e86380ac81990207ec680fc7b0e6f97ac81c99d915cfe77488bc0b91a61c34e0c00b323df08aa06b142ce0fc88ce30203102907 WHIRLPOOL e91e719a681c29e8ecd3e08ade470adcefb957ffddfa601f89306c19b6f6e80fa793a603948fb9fd697884474f2559ece30456be27d9034448cb618217a8cfa1
 DIST ipython-6.1.0.tar.gz 5066094 SHA256 5c53e8ee4d4bec27879982b9f3b4aa2d6e3cfd7b26782d250fa117f85bb29814 SHA512 6b1d9713b5e8c3870ac8cd8bea9d3a6f0c0302e3983017516128ede9f0baba21372890873df29fbba3f9d2f47ba16bfadb1c611f9de23b71595c0ab8f917695b WHIRLPOOL 9b579922060a1d37487bb294314fae4ac19c8d98509c856c117c17f6eb8d617cd29b7d7fa5e44bb2b1004a70f893b0e83571f69149729b6f6ebcbaa162f257fa
-EBUILD ipython-3.2.1-r1.ebuild 5044 SHA256 7898fc3eda7730ca788b241cd34b4b4318828c0e9e5c7bb360b055115faf59bb SHA512 2d786c8dcc972b6231884a0a874e371642bc8c01ee588988d26989b251277b344b1373525ce6be713931c69c56ec83bd70e5aa29379113e593cb75eae470f69c WHIRLPOOL dda5302c02a1fc45da05b8fca0ce849b8e07c7f9ba107b01c3dcb6b1b3da1d0514e0f3edb137c1e4c59ec3f4d5eb087f8bd1d63c8cd993a5d8343bf04e534234
-EBUILD ipython-5.3.0.ebuild 4324 SHA256 ede259fcb1065f074ad5f1262f5511d86cd222a4405d969bf5c57fbd412b8623 SHA512 cd06a1a43545b8ded7dbdfae4be0c66291718337d7e83047988c5aeba313bda2a983f4b5714e685bfba1f0908b2e0d375b91aafc7d677562fb92715a89510fa8 WHIRLPOOL 738042cb9b82045379bde8c7fcba41d0e214f3dfd0fd903958756fcdc1da31fcec4de29cfec7fc777409d3e811b84c80abed7bacdbdd2eda2f0aae39128add3b
-EBUILD ipython-5.4.1.ebuild 3698 SHA256 235fd89996d9f3ccd303d458c9950f8fe5fc91d98a41684a0dbf4b35401d036f SHA512 8f27826f9ac163b1fe48e37caa8c904ae4320ba6adeb186f0f970fa163d078097ee486468aa280b0440cca4bfe7e24929f8866a4dc48a4e07e411ca072569ba2 WHIRLPOOL c312de3bf14a6533c673b9ac2b5aa7d2f4fb2fb3a0a1bbe0d62521bf0df03e7b33db5a2e339268f63fcb121abb3e9afe167386c5385b1ded5759952ebb6761d2
-EBUILD ipython-6.1.0.ebuild 3440 SHA256 ab042cac1af84d9839a07ee35631ed69ff64440b97e9b8ebd74fcf99209a600d SHA512 1251ed84c81edc211cf8d389bfa79e4b3df30c6fa2cf4446b6b04b4d36119d112ed9a677ea4b43cb21743f102ff6c11626ebc2530762250f7486adcd33b62292 WHIRLPOOL 626f276aa95ee6867bccbb6dec4afb671241b2c16dcaa5c72d61222631a188874737635db08b9363e2d13817253b7101fe0822c8bb7a22ce4af35d6b1939214c
-MISC ChangeLog 10996 SHA256 1d0f52575701c78ed1d41c4f2acd87058a6ce424ee43a7905580d2738bdfd956 SHA512 f28dbf25970065284e0ed2b726d2b35f6484f68c98f7c62b7aa4d607e9421c140ea2d9cdd83a25cdfe92a88b5f25ca5e0f290e571def0b5627738ae0a3a1617a WHIRLPOOL bacb3e444412adb8153ae63b599b331432346dff17011641721b02f5d498f37661810779394459b62c1de85a3f8f9378c59f4207ce6311354560ec84cdec5af9
-MISC ChangeLog-2015 28077 SHA256 09abe93b0e7fe824a90d0b25f87ad1c30afceb2d37c5cc869ea134ca917d926a SHA512 1478e71c72ff28766debc68e6037e9cb2c8f402e7fe95150ae8790c0bf087d48f624e652197bbd4706f8732a02328924aea26efff2be0babe20cda5b236ab380 WHIRLPOOL 985235b1a87e05eba5d9638f94da47a09623c3e4dca5fa7fe9c60c2b2dc4f9be04228a40dd81b4d0e851062309725b7902cfcb002f3070e27722d1a4b4303d82
-MISC metadata.xml 3035 SHA256 3a29f5250cd022aa4037445be5873713e9f5019d3adfa9c06fcbc845fc085000 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb WHIRLPOOL d172ada3d31cefd932ebb263a99bf458577f244092f7b68f10550097900d03182c75c543ded54318390bead56d81ec33fdf0007a4e8e446efa51783752571cb5
+EBUILD ipython-3.2.1-r1.ebuild 5044 BLAKE2B 26d3414f0390f53df72271d6faeefc95bf6a7e76cc67f535bb4374abd572300247ae5c436f82d34cab1ae2502b0984cc28c6c4e8e4e2c60a0346358934a6ba22 SHA512 2d786c8dcc972b6231884a0a874e371642bc8c01ee588988d26989b251277b344b1373525ce6be713931c69c56ec83bd70e5aa29379113e593cb75eae470f69c
+EBUILD ipython-5.3.0.ebuild 4324 BLAKE2B f9168b70f6f28d4b9b76aefd8bd3f87ac5057c269d4678da115552c9742da3268e89f1f607efc12ea6b9b75b174dd23cfb0c432b60670e9180e0077f383d3101 SHA512 d2c1b88c148df62fa9444f5300ddc85e74131594c4e16b49a2ea3d938ffca582e5ace8b10adfdfea583e3d6eaa44bd35d2281e23b7946625b13a6e0981c39fec
+EBUILD ipython-5.4.1.ebuild 3645 BLAKE2B 42e25bb5e0277e79af42cea13c17ab0a9e061928b3bf7676f645528ebbc432a5f48bcab0d7f9fdec048c3988c2b18a8773f6532fdefbcdde3094da011f323429 SHA512 db674c38e00c44a040bd90432a869e142fe138d00ec06144522de5f91db3e6c1cbf1e73fec262b59b2968be527e2600f39d628b844c42457f793a6a8df86c4c1
+EBUILD ipython-6.1.0.ebuild 3387 BLAKE2B 546e96ad93f0e43c8f433f4cd6f8c17a0336edd8194d355a41e7333774f32dc881b0eaa24a648bc5249a7ca72ef7a2612bf7a433b0538941801bfc0eb5b77758 SHA512 b8a6305d6f8de92ddafedbdfa695b51275349c2a1e1da03f674d94e67a5e62d48d0c38c84c9ecebd5fc5d11ce394fdb384d7a6807cf413855dec0516e5dbcd9c
+MISC metadata.xml 3035 BLAKE2B 02b40c2c8b11edf3e5d24f4fcec3e99369924cf1067e72c5a64d3a8e2373e318e2d8131b3b47e09527051fb6027af833f29488cab833dc7b71d2a76367b5e5f7 SHA512 a841d52fc997a447ec98335dad7cbb2971a0498754eb86942d6a9aa9f14cdb3b8687f78e882adc8b84c1967a16f75239e8fda6bfedc58622b052bdadda719dcb
diff --git a/dev-python/ipython/ipython-5.3.0.ebuild b/dev-python/ipython/ipython-5.3.0.ebuild
index 6da17185aa7d..d20428e2e2c8 100644
--- a/dev-python/ipython/ipython-5.3.0.ebuild
+++ b/dev-python/ipython/ipython-5.3.0.ebuild
@@ -15,10 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc examples matplotlib mongodb notebook nbconvert qt4 +smp test wxwidgets"
+IUSE="doc examples matplotlib mongodb notebook nbconvert qt5 +smp test wxwidgets"
 
 REQUIRED_USE="
-	test? ( doc matplotlib mongodb notebook nbconvert qt4 wxwidgets )
+	test? ( doc matplotlib mongodb notebook nbconvert qt5 wxwidgets )
 	doc? ( mongodb )"
 
 CDEPEND="
@@ -72,7 +72,7 @@ PDEPEND="
 		dev-python/notebook[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 	)
-	qt4? ( dev-python/qtconsole )
+	qt5? ( dev-python/qtconsole )
 	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
diff --git a/dev-python/ipython/ipython-5.4.1.ebuild b/dev-python/ipython/ipython-5.4.1.ebuild
index 0abf3b2a028e..e7a438809ad8 100644
--- a/dev-python/ipython/ipython-5.4.1.ebuild
+++ b/dev-python/ipython/ipython-5.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt4 qt5 +smp test wxwidgets"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets"
 
 CDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
@@ -57,7 +57,6 @@ PDEPEND="
 		dev-python/notebook[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 	)
-	qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
 	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
 	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/ipython/ipython-6.1.0.ebuild b/dev-python/ipython/ipython-6.1.0.ebuild
index 492ab29a655d..ba929e53f699 100644
--- a/dev-python/ipython/ipython-6.1.0.ebuild
+++ b/dev-python/ipython/ipython-6.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt4 qt5 smp test"
+IUSE="doc examples matplotlib notebook nbconvert qt5 smp test"
 
 CDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
@@ -56,7 +56,6 @@ PDEPEND="
 		dev-python/notebook[${PYTHON_USEDEP}]
 		dev-python/ipywidgets[${PYTHON_USEDEP}]
 	)
-	qt4? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
 	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
 	smp? ( dev-python/ipyparallel[${PYTHON_USEDEP}] )
 "