Version Bump; drop old

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

11 files changed, 70 insertions, 1524 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 02863c6b4a36..fda828505bdc 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.159 2015/02/08 23:24:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.160 2015/02/28 12:53:04 jlec Exp $
+
+*ipython-3.0.0 (28 Feb 2015)
+
+  28 Feb 2015; Justin Lecher <jlec@gentoo.org> +ipython-3.0.0.ebuild,
+  -ipython-0.12-r1.ebuild, -ipython-0.13.2.ebuild, -ipython-1.1.0-r1.ebuild,
+  -ipython-1.1.0-r2.ebuild, -ipython-1.1.0.ebuild, -ipython-1.2.0.ebuild,
+  -ipython-2.1.0.ebuild, -ipython-2.3.0.ebuild, -ipython-2.3.1.ebuild:
+  Version Bump; drop old
 
   08 Feb 2015; Kacper Kowalik <xarthisius@gentoo.org> ipython-2.4.0.ebuild:
   Simplify check if pandoc is installed. Thanks to Arfrever for a suggestion
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0880dedfd322..9537fc12f475 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 2.1.0-disable-tests.patch 1219 SHA256 e57afec15a63758a53bc8243cdcbeb0f5bdc3809fd3a47bd3328e5eb3246a996 SHA512 e049c8ba0b20ee57d9290e4a92378cd0cf4d323d90d199bca7bbf442ab158bbb31e1e2258c154bc26ff3fac08b7b0d19d56eb66e404d179d04178cd5aeeb9105 WHIRLPOOL 1b77f98bc754af7e7b0c510c618e61e546d306b0c3f14bd0e1410eb03239fd2dcb294c60a76c26da0dd39ab7899251180d6536c97400f63bd243fdc909009c71
 AUX 2.1.0-substitute-files.patch 1017 SHA256 5547660171b6a92145aed499bc0ccfafd079a1f86db86eac05baf60b39f6a15e SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542 WHIRLPOOL 581a456407b325d554689c9ad99ce6ee969468a41351e80f81b846267a97dca6cdf1052ab87088b42cd7d8445d73c17d5a99093f385e5e5e3640b5a10547ffe9
@@ -9,47 +9,35 @@ AUX ipython-0.13-umlaut.patch 754 SHA256 d14ec97d769397d1f915dcc766e1696c254796b
 AUX ipython-0.9.1-globalpath.patch 332 SHA256 3e27dc5fce4f5ec594a389960e63e4707687c2306cfb6f4148b4d6d5b7176fcc SHA512 c0a69a0eaa5879f5e6fdddbdec416a8a90b7cec7932aecdd4fad8c3a207ec7b7b619a4612d46dbe35e620ef9c63eaf208897d62a80a3bcc2d3bcc35e52123c95 WHIRLPOOL 7f134f425dbc27d71421062c5da47f2a5223066348ac9e8286b6dd4abeee65b6e2048c0800e05657845c3c23fce3160a611e68125fd8184ebdd80719feb42dd0
 AUX ipython-1.0.0-setuptools.patch 348 SHA256 81711d843550b3f2954a0f9af51d4c4c328fac45e7e8544ea7554b9ae5151f09 SHA512 071521066f3b3a2e7d9e43c9c8861f89fc133f237facfa056d4f9bc8316eee0eb3bcb1b50291638390ec9b1d57a3baae98fa652a948af6ff9dcd712e564507ca WHIRLPOOL 1e8a39fa81476c449fc631e80869b9aad5db398aa92ae18b4eac24c5dee49692d8a2fd2b8e1bbe64e06a7d08cc24f2d95cfbab83e13715ee57d30ae85ba8ae65
 DIST ipython-0.10.2.tar.gz 5842688 SHA256 9ed5fe693d92e6ba9ecc3e367ae5607b80d66db53b0a636fa39fe15ae3df8c47 SHA512 fa53052d22455123530cffb3bfaae2f748c7759712a5dcc85f334995b7f345f78b2c9ae89ccd30c4d9d0d6fc7da02188d13090e9d3c7a61d064033ff19e85fe2 WHIRLPOOL 5c25d62838b63882a93e64338ebf9b56892a20f20e8dac2424ea51cad80b12b9304389fddfd438552513e74ac8fb2d8eae01787bd7b1d7324f84642a0402eef9
-DIST ipython-0.12.tar.gz 9316219 SHA256 261fb1ad6e8e60b19efbcde76636b71dd83cf894096c49b84f303963a60f95d8 SHA512 ffc5c9e0c8c8ea66479abd467e442419bd1c867e6dbd180be6a032869467955dc570cfdf1388452871303a440738f302d3227ab7728878c4a114cfc45d29d23c WHIRLPOOL da82ef9bd9a41865977dc8b99612961a979e7ce538941bb4d9a0dcd1f67e105a25cd3e7511e242ea0fbbcd200d8aea524bdf7c4dc58068bcb8858e378345b811
-DIST ipython-0.13.2.tar.gz 5982733 SHA256 17fbeea1dff2318d617d90fdf7af4eb35dc48c61389a2dffaab8ff100fb100ea SHA512 9ce36c77b8796fb6b990e32fe63ba1f3f2d78eb0440ff5b62597a1c033fd7c6d04ba9d3d4a4171c38c5623b6deeee87b48297f816a9d053f2c3096fc075e28a9 WHIRLPOOL feea5758e2478c1f582f0f56b1d0b106e01a3a3c902dcf7ea3199c1cacd3059f313839fe6d27ad532d1748525b12e4eaba5ff2af7b85f39e204150c38fe26a03
 DIST ipython-1.0.0.tar.gz 8658118 SHA256 0d07521b4784e1b1f676b4b32c1f708a026cf398a0e6c3f095fce41f1402911c SHA512 1b309c08009583e66d1725a2d2051e6de934db246129568fa6d5ba33ad6babd3b443e7c2782d817128d2b112e21bcdd71e66be34fbd528badd900f1d0ed3db56 WHIRLPOOL a330c1838f6ab0f288cec8ab994fb1daf6511388e1e9e208c5875968cee2c62da258a7f6497a1acca59eaf0a917a9d0fb0fb19914475b2f434cebc1cc2b189e1
-DIST ipython-1.1.0.tar.gz 8658909 SHA256 6c4e4a65225ab45be923f6bd0b71b604ddf8acd769c4e2818fac89793cdf91be SHA512 46b8ae25df2ced674b3b3629070aafac955ba3aa2a5e749f8e63ef1f459126e1c4a9a03661406151622590a90c73b527716ad71bc626f57f52b51abfae0f43ca WHIRLPOOL 3952b2588f798bcd24cc54cba1eea2b3c1f7e3550311672f445ef530f176fe198c983e0fb01e84e0351f694c53783009a616bd554eef0f3b66bf7cf2e0d0cc1d
-DIST ipython-1.2.0.tar.gz 8665978 SHA256 c4b4e250d2a68ded2ef267d8deae2a972f5f94481d2e4015bd5c1922b5f318d7 SHA512 4f27c43bc756c4a802d690e84964a897a225eef96a11cb49ea1a5f6148ff7f46dd11691920f8b6acfb41723dd889b4af4a5592616c3487557745a665e3869be3 WHIRLPOOL 5ae405e82b3fe7722d4b6136ade36edda49624bf8bd7597aeca28a94b299470e2d1b812921334edc208506da6ad4716ce7891dd522c621d0b3a8fe47caaa71c8
 DIST ipython-1.2.1.tar.gz 8666632 SHA256 c27aeae9b8e5c4a2d28ba0f04b879216d6f96f36380cd465a823b1efb0595874 SHA512 ef0afb15aa211e1ffde8375e1f75dbadb6018d626756952c164f6d2aecd7cd0b663c28cbaea487ff0b02ec0b3406eb0f515efc7de73f94d7a7857430c2529bed WHIRLPOOL 9eaa29b0556380722bc0ecbbdc63f0b958bc440c120fafec5d0ec30d15f153acf68524667b7bf917185c632d4beb04682cfea7cbdaa757cc479eacd264569747
-DIST ipython-2.1.0.tar.gz 11886492 SHA256 ca86a6308c4b53ea8a040ba776066dc9a7af4ac738ad43ab2059a016c09b0c2d SHA512 68c15f6402cacfd623f8e2b70c22d06541de3616fdb2d502ce93cd2fdb4e7507bb5b841a414a4123264221ee5ffb0ebefbb8541f79e647fcb9f73310b4c2d460 WHIRLPOOL 099f387e00739c641c20e05bb3f23f46ef7ff82c6e273a0307163f0660cb1a92c2f78e1e0737f8be8173226eebeedf499e863538a77bf25f0c58e84f7447a123
 DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8
-DIST ipython-2.3.0.tar.gz 11913980 SHA256 a2f81afe3eca5c8b2e8cf4ec35518fd007a39231770e67e6c2c4f9bd2b857aae SHA512 4639a97c7cd1fda8421e69ea346e64a5975eb8bddadef8b6e5cf19e0b7eb4a1ed7fb9e3bbbb8402406ac258be05403b79ad1fdd79876ae22339f7ae3eb985d72 WHIRLPOOL 4216a22917aade320a6a12a893014c482ac068a3ca026a62aa0bdba5fad10dfb9fe08cdedf9759b128d092187c3f9093fd9fc1a12f3b09da7e22ad2c334813b5
-DIST ipython-2.3.1.tar.gz 11884781 SHA256 3e98466aa2fe54540bcba9aa6e01a39f40110d67668c297340c4b9514b7cc49c SHA512 41e642b5de9e39ebdb3e02b527e80bb305c2e9372689b7744ec80c261f7c886d09c9df6dc8c6f53955ba047f986a07d2155c3e6f032bcac8a2f895c76ffe273e WHIRLPOOL 525cfab35304d2751ca2f806f592e6c69717fa859dc091239dc3ee657bf04816af4c37c09286cbf1a4c40f5f7153249438f777d60482fd351dbd88dee3c6fdda
 DIST ipython-2.4.0.tar.gz 11895397 SHA256 013698a61229c8beaf7182fb3c7132ab70de1ba9b66366e690237cc86e5f7a84 SHA512 aa1d393b66ddca91f9bccd4aebd694bd0db8a0252a913b6834d83df4b1fd55b4291dd63c4e64eee41efca328595fdc45368e813dd6ea7a51f4f81d0ef829867d WHIRLPOOL b1c96f38908218c25bccb1c719ff2f593743f96cf9c0265a37e9cbf9c1bfef316ce4fa3ba9109cc4aa38bb0665c1f26776e557f3255082092f8f7d8ef05782b4
+DIST ipython-3.0.0.tar.gz 10867678 SHA256 86070141110101b6b55e6dc31a40461c437d391a5337a6e5e349357dc18bfbb4 SHA512 47d515416e49590a8a5099d542a1f89a62b4eb6cf481bd29e702d37f87f974b480ea0b808135cae97f7d56bb429399ce190aa7bd03df8bac374dc13f6ec6ef49 WHIRLPOOL 305e766dcc31a0a76035d1532003d21f4d7b659299d0e6bbb896ae56d17fa6050c82e8fdfd7717748fb7ebb0691462f10211c13e419388abe060d407a4e5ced2
 EBUILD ipython-0.10.2.ebuild 3253 SHA256 3c68ff72c40f281c7b83e0205a3a847ba4b61c5ae2647bcc8e45ed5454e0f298 SHA512 b974bb0b5e6e245e93da53a086fe74a67ae94c650febeb5fb24aabc08f02ba69e54cb6fdb6278d4b76eb97c1ea57a29219a3fdd9fee4fc3efbecac0b38d07b3e WHIRLPOOL 2bc7d6309cf8a8d6baa71694c50c2c33999fbf6bed13959decee37f7d8210b650a2b0505e489a0d8392507e772c52a16493a6ad2f55d22ec44993f06cffb9867
-EBUILD ipython-0.12-r1.ebuild 3957 SHA256 be079a770254887faf9ac1d36a1bef2353384433effc5f5796d5ba3620157b1d SHA512 fe6d6d9f86e98170acc1633b3168a277fff2dbf9b1df359fdbb40ddd6f998a601cedcad7dcc68dcdd48e7ff08868b22e4bef3b15d717492dec346c13ed04f6f9 WHIRLPOOL 1ffbfa1708695e1f052d25421c51c44b6e8d38062aa7d544c978185d5da442341163e955768d6cfeaaa23b1bfdfac8d949ea87533360f20e2cfe13150452fe1d
-EBUILD ipython-0.13.2.ebuild 5388 SHA256 6c341a85fca7622aee9f79374286accf700a46922ee11d80e507a1cc6fb61a7d SHA512 91a1be5286c0d8cc6434e98d66b7f33bccd6e96e7cd4208bc83aecfec663c8310c239287de3663409d08b83df6156889bba8cc40c429b197b223b7f459206ded WHIRLPOOL 5c85ea8def79c0c71eb86e1d61054d9cf66090e9e37c6e0d654aa9e50dfb60ca08c15ca66ec38d121b6e452e62453b9a3e90d8677372caed3ac096b1d73f8d1d
 EBUILD ipython-1.0.0.ebuild 5685 SHA256 cd8c504b0e7151a53e16cb89e46a8a424cc1c310e62a5677109150dfd259043e SHA512 96849a22454c2c22a6960615bc095296e6f7684685d9d216a64c86728bfeddae6aedf50e4b3d040b4edd9c0e8c4da3780f946c72bee4cf9f8c3093f201423cdd WHIRLPOOL 5b2cb6178b28ccabcd10d013bf3c5cd5661e08d96804e2b5d6cdad60ad4e24164820766bcb2030817725daac6d0e1bc42e7b945ed34e90ffe154813445e20fd3
-EBUILD ipython-1.1.0-r1.ebuild 5693 SHA256 64e9287ea3e803ce625859530acba3b0cfc39f50aabc4778ecb967937d40b218 SHA512 7507b5dc363e18d564df34e81a1ae90849704ebbd48982f0243f05851677b9e31b958f9f2e343ed1907dc3bb1469007b832e47ad4f14e26c7f97108bd99cdd87 WHIRLPOOL 9b3d6ec64f816f7d867d71e60975e82a30782eda52fe06feefe3a98ca596e4cdf2ccd12c6e90b46470d538694b4195727906224feb6251b1f7e77c14dcdb304b
-EBUILD ipython-1.1.0-r2.ebuild 5953 SHA256 cd1ef66dd330d44cf77cd8a72b0f34985ef77538a54d5a58b3468c7a804a00da SHA512 e1f0645fec4f476adc8b63a2de957d34e856f11f9a6b0c91e3820e216bb5fe79001daf9dca0bf5076d42ee65604a774efa22c2d86d688954bbea8be906066713 WHIRLPOOL c554dee486fa306b0c28ab44dfd75d95d8af8668269eddb026d9e0b16b649950f45fb00cbde3815ae9594d1477429caaa6a0361c4f8f6f4ae553f8a039eef36b
-EBUILD ipython-1.1.0.ebuild 5687 SHA256 e5d3e4dea2bf5a8b6fe760d52afae3c4a7247871c07b7bef23f94f2e2bbd7138 SHA512 3dd897c5b635ace3f49f19ecb8ff30ff1ff44a20bac992be05cd9e41269886991e463331b2b774d5b74f7521f035ec0b05ef84bd0f2a4ac63fa797141aae5eef WHIRLPOOL 6f3a8b66ebfb42fbf80168e74f5426defe3a04156c557712e52138305565d584f7d2706e4dff95d7289f9afbd019d9506346d6ae5b7ffb314c458989e948510f
-EBUILD ipython-1.2.0.ebuild 5948 SHA256 c3ba4266e244c0d0d84dc5a016a6fe3826c7efcb4c3cdf8363b8623d9ae669d7 SHA512 a434a2c20523654a3563f85103cccdd203b18de705e13ecd116d93501ce2fdedfa9d0a1a52fa37ed819b82fb8ebfe205bf50b5fea69f006cfe6652ca4333877e WHIRLPOOL 6692b53847ff15c9d0b96dacd1697fb2cc6fc3ca9f5d32913ad3a45731abeb577287a491edab68ef30afe57d8b45ea3f537f424f3a0c8947e79e8e65239f636a
 EBUILD ipython-1.2.1.ebuild 6114 SHA256 4e5cced309c855ab6d75aff5631e09dacd37c3202e9dd5d6b458b8b8080cb56c SHA512 d402992b5798ad0c9a0bd0aeb0204ed0f952e835316133fb5ca6e00ffc9fd98f163bf8771a39e4a09be4791d41d7d6ba2c2a80da0900231390508d7ff6dc6497 WHIRLPOOL 32e3e434b0dcba0e7ddab85ffdb46ff4f06f67923a9ba07618d0026f854ce167b5391072cda23dd0f7d8fd6ef630324447695f9a3f3644d529b12bd87cf3e1ea
-EBUILD ipython-2.1.0.ebuild 3929 SHA256 f852ccdca52d339c803ee782ef375227cf35629aefd3647a886b6a150f4dd5d8 SHA512 7e569d14ebbda7e28e3a5698603823f605cabf392c4901aaf7c47c5759f63cdc9ca34988630894b5fb6783099db204ea9a8038d6b376a1a01c3746908df5e8bb WHIRLPOOL 0e40b1fad05834e323d0ac1234961ce8f7169616ab9f1cfb94f8906510ccf12d9ebd576a44e7c9bb769a022366549c5875d7dc2f9fa719bb79db33682e736a91
 EBUILD ipython-2.2.0.ebuild 3928 SHA256 06659d8c8884ccf4b3f9084667ef018304cd51789402e9b26b8ce237aff7b770 SHA512 b7b69dc0dd0e96dca2d8b21842cb9696f457cfce44732dcd88165fed58fb0baa45a1186a05e50aa454df32e17aecf048cf6a7a54b6dea228dfb3a0f28db5e748 WHIRLPOOL 1ed665e125b201e9b06d2738677f2287578074414d10dfcbe731cac1d164d4ccd013000cf5cf7bcf5a7359da8ca8a2161d4af44daeca15db1b385700bb6ec5a9
-EBUILD ipython-2.3.0.ebuild 3976 SHA256 38b82127245f9124edac6c73363e6a74ab2f6e930fcf80ee52aa6819e53c0954 SHA512 f69306ad7a28fff501c09300e2a9827a92fe2929ab32c8251316f4ae17049c0fcb76e829dd04a4228c3b48b8c3afb40b214bfb4a487d477d41576def1bdfa457 WHIRLPOOL 09dea517426ac107a962b1086b825baca3ffdeef083bd4f24fbbf256eef539f2cf02a3982497632af7c1806cc97328913a28224ff61390568b003f277262ce87
-EBUILD ipython-2.3.1.ebuild 4060 SHA256 cfc77108d62d137adca3603f52a9689d5eba389b96f862ee687cf6408bb29ebc SHA512 ae8cef0d955e7cac019ec635c725ed8561797f30563de385b2cb7d922c39113cb27e3b5cd4ec107547e8cc9df2e9ff1604c2dc9ee5fcc54dccf86d56dfc10816 WHIRLPOOL 1510ad5b0ec8f262342e657ea38f5fa65e4e0e8b1659bb82bc27bfe52a3e0ccf67c1b57ec8f9ebc90563ba885f8f35a14e6715634afb9b718e6bef3bb1171498
 EBUILD ipython-2.4.0.ebuild 4381 SHA256 bfaaef4c3e4ddfd4650caa4e7b57390d8092d741e91a48613368ef79b32012cd SHA512 1eb3df95abc4f13506e821c01785ffd1ab1c92b9eaac1f4f3f639ea7a0cd5027955838f0eba1b6c2eb163c88f993b3973714158cf5278f478cfc9a07b1d207e1 WHIRLPOOL 912fed95b98de462d4892b62a147b9dbcf705ebc50333b90e2b36317dc55d0994c9c84a231512086e86805c0507dcfafacfd0c4c366d24d47ad60524590b2077
-MISC ChangeLog 24097 SHA256 9998ac4152d7d984f1466990e945d1b7bffdc46ae61ff5613e9dd20c1690ca86 SHA512 46cbe7f9f7412ba49294bd84b966d6be12fe933432c1b1eed96c35914d6191625e8297a0b6726ada423c9a6105526295f7129fb76da8ef2b0dd9c07bdc14336f WHIRLPOOL f73f663d3b5120533d57ab60be795b84a23cd25b1b1d6aaae45abc32e3ded985270af83ae2ee59805435a91482e61b3447231b49916db1e26bb3946273273b5a
+EBUILD ipython-3.0.0.ebuild 4525 SHA256 09ac766f6b655f2af9bb920780123dd4c1da6abe9c5a10b00e240cf342304f40 SHA512 d20ed9df9b574668d35585067e241bd4a075727afaf84f78ace4a0f45643ca1556f2b089609f34f5448762efb2fa7c02b92f52bec166e5793c4eb82bc159daee WHIRLPOOL add0b459c8a7b1e4a7d1e4ab1c1a4fdaa378c9c104151e67dae684cf5974155b361cfd85db7eee258ded448d29e90beff90981f1d08bc64b4906033e84ea293f
+MISC ChangeLog 24439 SHA256 8ac87ad909554d03fe7a091bd33e49fa5445bd6288c615f854bd1ddb4ebe7245 SHA512 564f81a3d23a28316a805853e16c16269502d0a5828ef37eb8efab5903ee3ddb8218a62af0f6cdadb5cbcf968fe421dcdcffcd99f963997796b73d86c2f1bdc3 WHIRLPOOL 1fabb73bb3cd7c65ecb8eb3126af59f4be0342fedec2caaf7deeb98ef4463deb8ad0254cb1fa876c76e9a5505f1a4db7f953ae0781566b5056fb35314cb5c543
 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU1/AaAAoJEF0huFKJUZL5zZcQAIjKhUWqE8LmqBkVWwrnEzGF
-8Rsc0/xAraXvO4NxB/PJqxddJ2zYiurizdLPwduajmK9kt4J3JEcqiSEEA3YfSPH
-e0eaedX21S7Oil8rhIDZNjWiaXmRJmsOvXXRrdk9oz7cx6roCuY+0YQWwzwke+Az
-L5VFvqsFQpw9z6ipiaIyweEsl4+IU6hbt/kzVUeGzGsV5ZFr05KszerJ0JPi8096
-BWKj3X633BxjAPT2aXOjzbNbdKqIWUsf076pQGP0iPVI9QMHN8CrIWQSj52EpSqC
-qKKMpx1J3nMYXrXjpbNyAGdnMe0SNfsVwMGQwCWc7LeMFNCKk1uJSGq2t8hw3NBI
-gOTXQxcmOHbol2fI+EAddAGUFGAlSHk5js/TaXzeVvQDqXcOoGE/EgGrffCNjiEB
-TeDduAqmi2mp4NcOoTo/jOF3Kv+W7/7Eldjvr6pB9yd2U1b646AVYinXHHo7AOYw
-O+km97VAJtuSDsOjkg2elL1X7NVjjl43geCNElJmhxrLUfz1BP/ollO4ICYGYIQQ
-qrLJBG/sfV0hyS2/kM+2LU2O0pwj9fDVVHy6XpUgNumUBsc3u0T4kLfdAd/ZicYk
-kXBMePS1T6VfdVkSDdPxYYYxGiejYzuyYNHVDJnJK8b3RVkNWUfJrzjjAonzmU7J
-44JtsW9HYAIYmDmDxtLg
-=IBsp
+iQJ8BAEBCgBmBQJU8bo1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirUlQP/juVJPifkm7tnPYKDiRC/x7l
+LSJ6EIc65p3Wyh1p7ccpFdpJHnynJF9B/jEaqD90eqBpIcubBEAzqZ1clR3qXanQ
+X/1++sk/isTAUZ72RHQFAo3eJxbhpFlX/s8rFrINfaU8G9smaHdw2meGcyj2ZRjY
+JpbA/WhNdff/LGW04QzWqffDNwKuVTFAZoBIPXre9Zj3FhPsaIrjiX6Hv/uOXVcw
+kpeKSxESvZgR65ZE/5o3ydEjsgPj+YdZVLX18aoOhAq0MbJUgtbUkowiKI3JDpmr
+3lh85+89pSve5CmBgIYXXCIQ/57CjrEvr2nW+e7/ceq6CuCz9LL5uBRD8JQNz3zN
+sZG9XUiUmEkVa2UOXbY/zYXrrf+ZxijfTgu7ybL2KgZiDDS2sLcqTEtImci5T3qe
+crX0skRXOvssK8/xljKLXZmEETO1j5yQk/YH6b4VA1pm0zO5uybp6fLkUK7jJLWi
+s+TQSaEMvyhxufBP4z1bw1PXQekmVNkOYgW7XHriEHEaP/ZhNsfq+co1r9159rCJ
+JNZGx+OnUrA5MTiAQYlBtGS7xNmA6+RaknQ/sxCLvb/ZlJiEXqPvDXYF25wh75Qd
+RXHe7wOxs5IAv7kjxHKOnhHj0dFhkca6d1pxCdxewdi4PWenPPvV5vbwPXzFOty5
+4ztX46LHDmnFGMs8VUG/
+=/hmc
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-0.12-r1.ebuild b/dev-python/ipython/ipython-0.12-r1.ebuild
deleted file mode 100644
index 5940ae64e948..000000000000
--- a/dev-python/ipython/ipython-0.12-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.12-r1.ebuild,v 1.10 2014/07/06 12:44:54 mgorny Exp $
-
-EAPI=4
-
-# python eclass cruft
-PYTHON_DEPEND="*:2.6"
-PYTHON_USE_WITH="readline sqlite"
-PYTHON_MODNAME="IPython"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 *-pypy-*"
-
-inherit distutils elisp-common eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc emacs examples matplotlib mongodb notebook +smp qt4 test wxwidgets"
-
-CDEPEND="dev-python/decorator
-	dev-python/pexpect
-	dev-python/pyparsing
-	dev-python/simplegeneric
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib )
-	mongodb? ( dev-python/pymongo )
-	smp? ( dev-python/pyzmq )
-	wxwidgets? ( dev-python/wxpython )"
-RDEPEND="${CDEPEND}
-	notebook? ( >=www-servers/tornado-2.1
-			dev-python/pygments
-			dev-python/pyzmq )
-	qt4? ( || ( dev-python/PyQt4 dev-python/pyside )
-			dev-python/pygments
-			dev-python/pyzmq )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose )"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/${P}-globalpath.patch
-
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/frontend/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup3.py || die
-
-	# failing tests
-	sed -i \
-		-e 's/test_smoketest_aimport/_&/' \
-		-e 's/test_smoketest_autoreload/_&/' \
-		 IPython/extensions/tests/test_autoreload.py || die
-	sed -i \
-		-e 's/test_pylab_import_all_disabled/_&/' \
-		-e 's/test_pylab_import_all_enabled/_&/' \
-		IPython/lib/tests/test_irunner_pylab_magic.py || die
-	sed -i \
-		-e '/test_startup_py/i\\@dec.known_failure_py3' \
-		-e '/test_startup_ipy/i\\@dec.known_failure_py3' \
-		IPython/core/tests/test_profile.py || die
-	sed -i \
-		-e '/test_tclass/i\\    @dec.known_failure_py3' \
-		IPython/core/tests/test_run.py || die
-
-	# installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	rm -rf docs/html/{.buildinfo,_sources,objects.inv} || die
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-}
-
-src_compile() {
-	distutils_src_compile
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	if use mongodb; then
-		mkdir -p "${T}/mongo.db"
-		mongod --dbpath "${T}/mongo.db" --fork --logpath "${T}/mongo.log"
-	fi
-
-	testing() {
-		"$(PYTHON)" setup.py \
-			build -b "build-${PYTHON_ABI}" \
-			install --root="${T}/tests-${PYTHON_ABI}" > /dev/null || die
-		# Initialize ~/.ipython directory.
-		PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \
-			PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \
-			ipython <<< "" > /dev/null || return 1
-		# Run tests (-v for more verbosity).
-		PATH="${T}/tests-${PYTHON_ABI}${EPREFIX}/usr/bin:${PATH}" \
-			PYTHONPATH="${T}/tests-${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)" \
-			iptest -v || return 1
-	}
-	VIRTUALX_COMMAND="python_execute_function" virtualmake testing
-
-	use mongodb && killall -u "$(id -nu)" mongod
-}
-
-src_install() {
-	distutils_src_install
-	if use emacs; then
-		pushd docs/emacs > /dev/null
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-0.13.2.ebuild b/dev-python/ipython/ipython-0.13.2.ebuild
deleted file mode 100644
index 2655c13b490c..000000000000
--- a/dev-python/ipython/ipython-0.13.2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.13.2.ebuild,v 1.11 2014/07/06 12:44:54 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 elisp-common eutils virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="http://archive.ipython.org/release/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc emacs examples matplotlib mongodb notebook octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-CDEPEND="dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PY2_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PY2_USEDEP}] )
-	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
-	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	notebook? ( >=www-servers/tornado-2.1[${PY2_USEDEP}]
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
-REQUIRED_USE="mongodb? ( ${PY2_REQUSE} )
-	notebook? ( ${PY2_REQUSE} )
-	octave? ( ${PY2_REQUSE} )
-	wxwidgets? ( ${PY2_REQUSE} )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.12-globalpath.patch"
-	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/frontend/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup.py || die
-
-	# disable failing tests
-	sed -i \
-		-e 's/test_pylab_import_all_disabled/_&/' \
-		-e 's/test_pylab_import_all_enabled/_&/' \
-		IPython/lib/tests/test_irunner_pylab_magic.py || die
-
-	# fix gentoo installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-
-	# testsuite runs fine with in source
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	# https://github.com/ipython/ipython/issues/2083
-	unset PYTHONWARNINGS
-
-	# ipython skips mongodb tests only if it's not running.
-	# since we want the widest test range, and don't want it to fiddle
-	# with user-running mongodb, we always run it if it's available.
-
-	local DB_IP=127.0.0.1
-	local DB_PORT=-1 # disable
-
-	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
-
-	if has_version dev-db/mongodb; then
-		# please keep in sync with dev-python/pymongo
-
-		local dbpath=${TMPDIR}/mongo.db
-		local logpath=${TMPDIR}/mongod.log
-
-		# prefer starting with non-default one
-		DB_PORT=27018
-
-		mkdir -p "${dbpath}" || die
-		while true; do
-			ebegin "Trying to start mongod on port ${DB_PORT}"
-
-			LC_ALL=C \
-			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-				--bind_ip ${DB_IP} --port ${DB_PORT} \
-				--unixSocketPrefix "${TMPDIR}" \
-				--logpath "${logpath}" --fork \
-			&& sleep 2
-
-			# Now we need to check if the server actually started...
-			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-				# yay!
-				eend 0
-				break
-			elif grep -q 'Address already in use' "${logpath}"; then
-				# ay, someone took our port!
-				eend 1
-				: $(( DB_PORT += 1 ))
-				continue
-			else
-				eend 1
-				ewarn "Unable to start mongod for tests."
-				break
-			fi
-		done
-	fi
-
-	# No support for DB_IP and DB_PORT.
-	# https://github.com/ipython/ipython/pull/2910
-	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
-		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
-		|| die "Unable to sed mongod port into tests"
-
-	local fail
-	run_tests() {
-		# Initialize ~/.ipython directory.
-		"${PYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${PYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use emacs; then
-		cd docs/emacs || die
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-1.1.0-r1.ebuild b/dev-python/ipython/ipython-1.1.0-r1.ebuild
deleted file mode 100644
index 1d988b152b3a..000000000000
--- a/dev-python/ipython/ipython-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0-r1.ebuild,v 1.3 2014/08/27 12:19:41 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 elisp-common eutils virtualx
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-gen_python_deps() {
-	local flag
-	for flag in $(python_gen_useflags '*'); do
-		echo "${flag}? ( ${1}[${flag}(-)] )"
-	done
-}
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
-	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-2.1[${PY2_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-		$(gen_python_deps dev-python/jinja)
-	)
-	nbconvert? (
-		app-text/pandoc
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(gen_python_deps dev-python/jinja)
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
-REQUIRED_USE="
-	mongodb? ( ${PY2_REQUSE} )
-	notebook? ( ${PY2_REQUSE} )
-	octave? ( ${PY2_REQUSE} )
-	wxwidgets? ( ${PY2_REQUSE} )"
-
-PATCHES=(
-	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup.py || die
-
-	# fix gentoo installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	# https://github.com/ipython/ipython/issues/2083
-	unset PYTHONWARNINGS
-
-	# ipython skips mongodb tests only if it's not running.
-	# since we want the widest test range, and don't want it to fiddle
-	# with user-running mongodb, we always run it if it's available.
-
-	local DB_IP=127.0.0.1
-	local DB_PORT=-1 # disable
-
-	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
-
-	if has_version dev-db/mongodb; then
-		# please keep in sync with dev-python/pymongo
-
-		local dbpath=${TMPDIR}/mongo.db
-		local logpath=${TMPDIR}/mongod.log
-
-		# prefer starting with non-default one
-		DB_PORT=27018
-
-		mkdir -p "${dbpath}" || die
-		while true; do
-			ebegin "Trying to start mongod on port ${DB_PORT}"
-
-			LC_ALL=C \
-			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-				--bind_ip ${DB_IP} --port ${DB_PORT} \
-				--unixSocketPrefix "${TMPDIR}" \
-				--logpath "${logpath}" --fork \
-			&& sleep 2
-
-			# Now we need to check if the server actually started...
-			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-				# yay!
-				eend 0
-				break
-			elif grep -q 'Address already in use' "${logpath}"; then
-				# ay, someone took our port!
-				eend 1
-				: $(( DB_PORT += 1 ))
-				continue
-			else
-				eend 1
-				ewarn "Unable to start mongod for tests."
-				break
-			fi
-		done
-	fi
-
-	# No support for DB_IP and DB_PORT.
-	# https://github.com/ipython/ipython/pull/2910
-	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
-		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
-		|| die "Unable to sed mongod port into tests"
-
-	local fail
-	run_tests() {
-		# Initialize ~/.ipython directory.
-		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use emacs; then
-		cd docs/emacs || die
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-1.1.0-r2.ebuild b/dev-python/ipython/ipython-1.1.0-r2.ebuild
deleted file mode 100644
index e9e6cb9891ac..000000000000
--- a/dev-python/ipython/ipython-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0-r2.ebuild,v 1.3 2014/08/27 12:19:41 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 elisp-common eutils virtualx
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-gen_python_deps() {
-	local flag
-	for flag in $(python_gen_useflags '*'); do
-		echo "${flag}? ( ${1}[${flag}(-)] )"
-	done
-}
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
-	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-2.1[${PY2_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-		$(gen_python_deps dev-python/jinja)
-	)
-	nbconvert? (
-		app-text/pandoc
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(gen_python_deps dev-python/jinja)
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
-REQUIRED_USE="
-	mongodb? ( ${PY2_REQUSE} )
-	notebook? ( ${PY2_REQUSE} )
-	octave? ( ${PY2_REQUSE} )
-	wxwidgets? ( ${PY2_REQUSE} )"
-
-PATCHES=(
-	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup.py || die
-
-	# fix gentoo installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	# https://github.com/ipython/ipython/issues/2083
-	unset PYTHONWARNINGS
-
-	# ipython skips mongodb tests only if it's not running.
-	# since we want the widest test range, and don't want it to fiddle
-	# with user-running mongodb, we always run it if it's available.
-
-	local DB_IP=127.0.0.1
-	local DB_PORT=-1 # disable
-
-	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
-
-	if has_version dev-db/mongodb; then
-		# please keep in sync with dev-python/pymongo
-
-		local dbpath=${TMPDIR}/mongo.db
-		local logpath=${TMPDIR}/mongod.log
-
-		# prefer starting with non-default one
-		DB_PORT=27018
-
-		mkdir -p "${dbpath}" || die
-		while true; do
-			ebegin "Trying to start mongod on port ${DB_PORT}"
-
-			LC_ALL=C \
-			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-				--bind_ip ${DB_IP} --port ${DB_PORT} \
-				--unixSocketPrefix "${TMPDIR}" \
-				--logpath "${logpath}" --fork \
-			&& sleep 2
-
-			# Now we need to check if the server actually started...
-			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-				# yay!
-				eend 0
-				break
-			elif grep -q 'Address already in use' "${logpath}"; then
-				# ay, someone took our port!
-				eend 1
-				: $(( DB_PORT += 1 ))
-				continue
-			else
-				eend 1
-				ewarn "Unable to start mongod for tests."
-				break
-			fi
-		done
-	fi
-
-	# No support for DB_IP and DB_PORT.
-	# https://github.com/ipython/ipython/pull/2910
-	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
-		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
-		|| die "Unable to sed mongod port into tests"
-
-	local fail
-	run_tests() {
-		# Initialize ~/.ipython directory.
-		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy?
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	if [[ ${EPYTHON} == python* ]]; then
-		dosym ../lib/python-exec/${EPYTHON}/ipython \
-			/usr/bin/ipython${EPYTHON#python}
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use emacs; then
-		cd docs/emacs || die
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-1.1.0.ebuild b/dev-python/ipython/ipython-1.1.0.ebuild
deleted file mode 100644
index fb3b51e4f1cf..000000000000
--- a/dev-python/ipython/ipython-1.1.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.1.0.ebuild,v 1.5 2014/08/27 12:19:41 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 elisp-common eutils virtualx
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-gen_python_deps() {
-	local flag
-	for flag in $(python_gen_useflags '*'); do
-		echo "${flag}? ( ${1}[${flag}(-)] )"
-	done
-}
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PY2_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
-	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-2.1[${PY2_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-		$(gen_python_deps dev-python/jinja)
-	)
-	nbconvert? (
-		app-text/pandoc
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(gen_python_deps dev-python/jinja)
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
-REQUIRED_USE="
-	mongodb? ( ${PY2_REQUSE} )
-	notebook? ( ${PY2_REQUSE} )
-	octave? ( ${PY2_REQUSE} )
-	wxwidgets? ( ${PY2_REQUSE} )"
-
-PATCHES=(
-	"${FILESDIR}/ipython-1.0.0-setuptools.patch"
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup.py || die
-
-	# fix gentoo installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	# https://github.com/ipython/ipython/issues/2083
-	unset PYTHONWARNINGS
-
-	# ipython skips mongodb tests only if it's not running.
-	# since we want the widest test range, and don't want it to fiddle
-	# with user-running mongodb, we always run it if it's available.
-
-	local DB_IP=127.0.0.1
-	local DB_PORT=-1 # disable
-
-	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
-
-	if has_version dev-db/mongodb; then
-		# please keep in sync with dev-python/pymongo
-
-		local dbpath=${TMPDIR}/mongo.db
-		local logpath=${TMPDIR}/mongod.log
-
-		# prefer starting with non-default one
-		DB_PORT=27018
-
-		mkdir -p "${dbpath}" || die
-		while true; do
-			ebegin "Trying to start mongod on port ${DB_PORT}"
-
-			LC_ALL=C \
-			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-				--bind_ip ${DB_IP} --port ${DB_PORT} \
-				--unixSocketPrefix "${TMPDIR}" \
-				--logpath "${logpath}" --fork \
-			&& sleep 2
-
-			# Now we need to check if the server actually started...
-			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-				# yay!
-				eend 0
-				break
-			elif grep -q 'Address already in use' "${logpath}"; then
-				# ay, someone took our port!
-				eend 1
-				: $(( DB_PORT += 1 ))
-				continue
-			else
-				eend 1
-				ewarn "Unable to start mongod for tests."
-				break
-			fi
-		done
-	fi
-
-	# No support for DB_IP and DB_PORT.
-	# https://github.com/ipython/ipython/pull/2910
-	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
-		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
-		|| die "Unable to sed mongod port into tests"
-
-	local fail
-	run_tests() {
-		# Initialize ~/.ipython directory.
-		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use emacs; then
-		cd docs/emacs || die
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-1.2.0.ebuild b/dev-python/ipython/ipython-1.2.0.ebuild
deleted file mode 100644
index 32571a60c21e..000000000000
--- a/dev-python/ipython/ipython-1.2.0.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-1.2.0.ebuild,v 1.3 2014/08/27 12:19:41 blueness Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 elisp-common eutils virtualx
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/rel-${PV}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc emacs examples matplotlib mongodb notebook nbconvert octave
-	qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-
-gen_python_deps() {
-	local flag
-	for flag in $(python_gen_useflags '*'); do
-		echo "${flag}? ( ${1}[${flag}(-)] )"
-	done
-}
-
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	emacs? ( app-emacs/python-mode virtual/emacs )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PY2_USEDEP}] )
-	smp? ( dev-python/pyzmq[${PYTHON_USEDEP}] )
-	wxwidgets? ( dev-python/wxpython[${PY2_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-2.1[${PY2_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-		$(gen_python_deps dev-python/jinja)
-	)
-	nbconvert? (
-		app-text/pandoc
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		$(gen_python_deps dev-python/jinja)
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-			dev-python/pygments[${PYTHON_USEDEP}]
-			dev-python/pyzmq[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-PY2_REQUSE="|| ( $(python_gen_useflags python2* ) )"
-REQUIRED_USE="
-	mongodb? ( ${PY2_REQUSE} )
-	notebook? ( ${PY2_REQUSE} )
-	octave? ( ${PY2_REQUSE} )
-	wxwidgets? ( ${PY2_REQUSE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.0-setuptools.patch
-)
-
-python_prepare_all() {
-	# fix for gentoo python scripts
-	sed -i \
-		-e "/ipython_cmd/s/ipython3/ipython/g" \
-		IPython/terminal/console/tests/test_console.py \
-		IPython/lib/irunner.py \
-		IPython/testing/tools.py || die
-
-	sed -i \
-		-e "s/find_scripts(True, suffix='3')/find_scripts(True)/" \
-		setup.py || die
-
-	# fix gentoo installation directory for documentation
-	sed -i \
-		-e "/docdirbase  = pjoin/s/ipython/${PF}/" \
-		-e "/pjoin(docdirbase,'manual')/s/manual/html/" \
-		setupbase.py || die "sed failed"
-
-	if ! use doc; then
-		sed -i \
-			-e "/(pjoin(docdirbase, 'extensions'), igridhelpfiles),/d" \
-			-e 's/ + manual_files//' \
-			setupbase.py || die
-	fi
-
-	if ! use examples; then
-		sed -i \
-			-e 's/+ example_files//' \
-			setupbase.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use emacs && elisp-compile docs/emacs/ipython.el
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	# https://github.com/ipython/ipython/issues/2083
-	unset PYTHONWARNINGS
-
-	# ipython skips mongodb tests only if it's not running.
-	# since we want the widest test range, and don't want it to fiddle
-	# with user-running mongodb, we always run it if it's available.
-
-	local DB_IP=127.0.0.1
-	local DB_PORT=-1 # disable
-
-	pushd "${BUILD_DIR}"/../IPython/scripts/ > /dev/null
-
-	if has_version dev-db/mongodb; then
-		# please keep in sync with dev-python/pymongo
-
-		local dbpath=${TMPDIR}/mongo.db
-		local logpath=${TMPDIR}/mongod.log
-
-		# prefer starting with non-default one
-		DB_PORT=27018
-
-		mkdir -p "${dbpath}" || die
-		while true; do
-			ebegin "Trying to start mongod on port ${DB_PORT}"
-
-			LC_ALL=C \
-			mongod --dbpath "${dbpath}" --smallfiles --nojournal \
-				--bind_ip ${DB_IP} --port ${DB_PORT} \
-				--unixSocketPrefix "${TMPDIR}" \
-				--logpath "${logpath}" --fork \
-			&& sleep 2
-
-			# Now we need to check if the server actually started...
-			if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
-				# yay!
-				eend 0
-				break
-			elif grep -q 'Address already in use' "${logpath}"; then
-				# ay, someone took our port!
-				eend 1
-				: $(( DB_PORT += 1 ))
-				continue
-			else
-				eend 1
-				ewarn "Unable to start mongod for tests."
-				break
-			fi
-		done
-	fi
-
-	# No support for DB_IP and DB_PORT.
-	# https://github.com/ipython/ipython/pull/2910
-	sed -i -e "s:Connection(:&host='${DB_IP}', port=${DB_PORT}:" \
-		"${BUILD_DIR}"/lib/IPython/parallel/tests/test_mongodb.py \
-		|| die "Unable to sed mongod port into tests"
-
-	local fail
-	run_tests() {
-		# Initialize ~/.ipython directory.
-		"${EPYTHON}" ipython </dev/null >/dev/null || fail=1
-		# Run tests (-v for more verbosity).
-		PYTHONPATH=${PYTHONPATH}:. "${EPYTHON}" iptest -v || fail=1
-	}
-
-	VIRTUALX_COMMAND=run_tests virtualmake
-
-	[[ ${DB_PORT} != -1 ]] && mongod --dbpath "${dbpath}" --shutdown
-	[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy?
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	if [[ ${EPYTHON} == python* ]]; then
-		dosym ../lib/python-exec/${EPYTHON}/ipython \
-			/usr/bin/ipython${EPYTHON#python}
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use emacs; then
-		cd docs/emacs || die
-		elisp-install ${PN} ${PN}.el*
-		elisp-site-file-install "${FILESDIR}"/62ipython-gentoo.el
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/ipython/ipython-2.1.0.ebuild b/dev-python/ipython/ipython-2.1.0.ebuild
deleted file mode 100644
index d85ed743db2f..000000000000
--- a/dev-python/ipython/ipython-2.1.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.1.0.ebuild,v 1.6 2014/11/29 20:04:31 maekke Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
-	smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-	)
-	nbconvert? (
-		>=app-text/pandoc-1.12.1
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="doc? ( matplotlib mongodb octave )"
-
-PATCHES=( ${FILESDIR}/2.1.0-substitute-files.patch
-	${FILESDIR}/2.1.0-disable-tests.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-	rm IPython/extensions/octavemagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-		[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "To enable sympyprinting, it's required to emerge sympy"
-	elog "To enable cythonmagic, it's required to emerge cython"
-}
diff --git a/dev-python/ipython/ipython-2.3.0.ebuild b/dev-python/ipython/ipython-2.3.0.ebuild
deleted file mode 100644
index 9f271fd23e70..000000000000
--- a/dev-python/ipython/ipython-2.3.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.3.0.ebuild,v 1.3 2014/12/03 01:59:27 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-CDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
-	smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
-	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
-	notebook? (
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-libs/mathjax
-	)
-	nbconvert? (
-		>=app-text/pandoc-1.12.1
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
-		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PY2_USEDEP}]
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
-	)"
-
-REQUIRED_USE="doc? ( matplotlib mongodb octave )"
-
-PATCHES=( ${FILESDIR}/2.1.0-substitute-files.patch
-	${FILESDIR}/2.1.0-disable-tests.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/rmagic.py || die
-	rm IPython/extensions/octavemagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-src_test() {
-	# virtualx has trouble with parallel runs.
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	distutils-r1_src_test
-}
-
-python_test() {
-	distutils_install_for_testing
-	local fail
-	run_tests() {
-		pushd ${TEST_DIR} > /dev/null
-		"${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
-		popd > /dev/null
-	}
-	VIRTUALX_COMMAND=run_tests virtualmake
-		[[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -snf "${EPREFIX}"/usr/share/mathjax \
-		"${D}$(python_get_sitedir)"/IPython/html/static/mathjax || die
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "To enable sympyprinting, it's required to emerge sympy"
-	elog "To enable cythonmagic, it's required to emerge cython"
-}
diff --git a/dev-python/ipython/ipython-2.3.1.ebuild b/dev-python/ipython/ipython-3.0.0.ebuild
index 848e36139f60..91aaf86221cb 100644
--- a/dev-python/ipython/ipython-2.3.1.ebuild
+++ b/dev-python/ipython/ipython-3.0.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.3.1.ebuild,v 1.4 2015/01/31 07:05:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.0.0.ebuild,v 1.1 2015/02/28 12:53:04 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
 PYTHON_REQ_USE='readline,sqlite'
 
-inherit distutils-r1 virtualx
+inherit distutils-r1 eutils virtualx
 
 DESCRIPTION="Advanced interactive shell for Python"
 HOMEPAGE="http://ipython.org/"
@@ -15,67 +15,74 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)
 CDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/simplegeneric[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
 	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
-	smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
+	smp? ( >=dev-python/pyzmq-13[${PYTHON_USEDEP}] )
 	wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )"
 RDEPEND="${CDEPEND}
 	notebook? (
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+		dev-libs/mathjax
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-libs/mathjax
+		>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
 	)
 	nbconvert? (
-		>=app-text/pandoc-1.12.1
+		|| ( >=net-libs/nodejs-0.9.12 >=app-text/pandoc-1.12.1 )
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		>=dev-python/mistune-0.5[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
 	)
-	qt4? ( || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
+	qt4? (
+		|| ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] )
 		dev-python/pygments[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
+		>=dev-python/pyzmq-13[${PYTHON_USEDEP}] )"
 DEPEND="${CDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/mock[${PY2_USEDEP}]
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	)
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+	doc? (
 		dev-python/cython[${PYTHON_USEDEP}]
-		dev-python/rpy[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
-		>=www-servers/tornado-3.1[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+		>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	)"
 
 REQUIRED_USE="doc? ( matplotlib mongodb octave )"
 
-PATCHES=( "${FILESDIR}/2.1.0-substitute-files.patch"
-	"${FILESDIR}/2.1.0-disable-tests.patch" )
+PATCHES=(
+	"${FILESDIR}"/2.1.0-substitute-files.patch
+	)
 
 DISTUTILS_IN_SOURCE_BUILD=1
 
 python_prepare_all() {
 	# Remove out of date insource files
 	rm IPython/extensions/rmagic.py || die
-	rm IPython/extensions/octavemagic.py || die
 
 	# Prevent un-needed download during build
 	if use doc; then
@@ -128,6 +135,13 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "To enable sympyprinting, it's required to emerge sympy"
-	elog "To enable cythonmagic, it's required to emerge cython"
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
 }