From aa132cea0803a04ed1053e221c071a690fca24be Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 13 Mar 2015 15:10:25 +0000 Subject: [PATCH] Version Bump, bug #539578; fix SLOT operators loosen USE constraints for USE=doc, bug #542426; don't build API docs for iypthon-3 due to missing buildtime deps, bug #541832; drop old fixes CVE-2014-3429 bug #517222 and obsolets bug #486880, bug #489372, bug #489384, bug #428170, bug #407823, bug #407715, bug #490166, bug #456960, bug #483580, bug #530324, bug #536386 and bug #481726 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-python/ipython/ChangeLog | 17 +- dev-python/ipython/Manifest | 43 ++-- dev-python/ipython/files/62ipython-gentoo.el | 4 - .../files/ipython-0.12-globalpath.patch | 16 -- .../ipython/files/ipython-0.13-umlaut.patch | 12 - .../files/ipython-0.9.1-globalpath.patch | 11 - .../files/ipython-1.0.0-setuptools.patch | 15 -- dev-python/ipython/ipython-0.10.2.ebuild | 109 --------- dev-python/ipython/ipython-1.0.0.ebuild | 211 ---------------- dev-python/ipython/ipython-1.2.1.ebuild | 226 ------------------ dev-python/ipython/ipython-2.2.0.ebuild | 33 ++- ...thon-2.4.0.ebuild => ipython-2.4.1.ebuild} | 33 ++- dev-python/ipython/ipython-3.0.0.ebuild | 16 +- 13 files changed, 88 insertions(+), 658 deletions(-) delete mode 100644 dev-python/ipython/files/62ipython-gentoo.el delete mode 100644 dev-python/ipython/files/ipython-0.12-globalpath.patch delete mode 100644 dev-python/ipython/files/ipython-0.13-umlaut.patch delete mode 100644 dev-python/ipython/files/ipython-0.9.1-globalpath.patch delete mode 100644 dev-python/ipython/files/ipython-1.0.0-setuptools.patch delete mode 100644 dev-python/ipython/ipython-0.10.2.ebuild delete mode 100644 dev-python/ipython/ipython-1.0.0.ebuild delete mode 100644 dev-python/ipython/ipython-1.2.1.ebuild rename dev-python/ipython/{ipython-2.4.0.ebuild => ipython-2.4.1.ebuild} (88%) diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog index 2a497e8453ef..f54a03a443bf 100644 --- a/dev-python/ipython/ChangeLog +++ b/dev-python/ipython/ChangeLog @@ -1,6 +1,21 @@ # 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.164 2015/03/08 23:51:07 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.165 2015/03/13 15:10:24 jlec Exp $ + +*ipython-2.4.1 (13 Mar 2015) + + 13 Mar 2015; Justin Lecher +ipython-2.4.1.ebuild, + -files/62ipython-gentoo.el, -files/ipython-0.12-globalpath.patch, + -files/ipython-0.13-umlaut.patch, -files/ipython-0.9.1-globalpath.patch, + -files/ipython-1.0.0-setuptools.patch, -ipython-0.10.2.ebuild, + -ipython-1.0.0.ebuild, -ipython-1.2.1.ebuild, -ipython-2.4.0.ebuild, + ipython-2.2.0.ebuild, ipython-3.0.0.ebuild: + Version Bump, bug #539578; fix SLOT operators loosen USE constraints for + USE=doc, bug #542426; don't build API docs for iypthon-3 due to missing + buildtime deps, bug #541832; drop old fixes CVE-2014-3429 bug #517222 and + obsolets bug #486880, bug #489372, bug #489384, bug #428170, bug #407823, bug + #407715, bug #490166, bug #456960, bug #483580, bug #530324, bug #536386 and + bug #481726 08 Mar 2015; Pacho Ramos ipython-2.2.0.ebuild: x86 stable, bug 540290 diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest index becfcda280ed..f1fbdac112da 100644 --- a/dev-python/ipython/Manifest +++ b/dev-python/ipython/Manifest @@ -1,31 +1,32 @@ -----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 -AUX 62ipython-gentoo.el 127 SHA256 b5900b95df4f197aedea20432f3c71de5bc7149fa1022f8417be7a606647b449 SHA512 83b8c1da29f954856f0c74521b2a58c3476eedce4ba8c2294c94bb8be63e2e87cf768a4769a6441509337f843b0c69d4e41e6e2041aa161fa8a3ffae11a5edf3 WHIRLPOOL 8c283ad947a4a6fee2976ff0da2075ae7f1c6a75bb4ed03895392e20053580205978457c24c24f6cc9d4f8a6f3031924e365a83c035603b739f734353386df45 -AUX ipython-0.12-globalpath.patch 430 SHA256 f0b2dbc53aa20dc1350af956a40ab748e092d0a471e0ac49e5ede75619658713 SHA512 1872dd568520e66ef88ac01050ceb4272cd7e666b27decc5d9fd2557d53f392c72385c6ccc9a2e34c1425d50e3608b34e3246e50344948f401b234499ad9f7f2 WHIRLPOOL 48d8a981f555dfb3c32eaccf24fc9f8f806bf22b5a8356dba3921acfde6c6f8a9d64212285bd5c6a1707d36b6dce4bc477a895bd50de6e5f64b7cdd17dfbc0a2 -AUX ipython-0.13-umlaut.patch 754 SHA256 d14ec97d769397d1f915dcc766e1696c254796bb0a03492171d8936b40c3cf37 SHA512 680f744dc603086928f8f8838d16b51633f29e7f96b75e37875816ae3248b21255f8f55420a6129b0f728202a7e601cda68641bdf5b067dbdfae81fb18b6a89c WHIRLPOOL 3e69fd4750905cd78391f51973a6dedab6536c80aeadfa8d8934768f791d6a60fd029fbea0bc6be0e690f5a6bebbe2979e0818169551fe07dcce0bc854542dc6 -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-1.0.0.tar.gz 8658118 SHA256 0d07521b4784e1b1f676b4b32c1f708a026cf398a0e6c3f095fce41f1402911c SHA512 1b309c08009583e66d1725a2d2051e6de934db246129568fa6d5ba33ad6babd3b443e7c2782d817128d2b112e21bcdd71e66be34fbd528badd900f1d0ed3db56 WHIRLPOOL a330c1838f6ab0f288cec8ab994fb1daf6511388e1e9e208c5875968cee2c62da258a7f6497a1acca59eaf0a917a9d0fb0fb19914475b2f434cebc1cc2b189e1 -DIST ipython-1.2.1.tar.gz 8666632 SHA256 c27aeae9b8e5c4a2d28ba0f04b879216d6f96f36380cd465a823b1efb0595874 SHA512 ef0afb15aa211e1ffde8375e1f75dbadb6018d626756952c164f6d2aecd7cd0b663c28cbaea487ff0b02ec0b3406eb0f515efc7de73f94d7a7857430c2529bed WHIRLPOOL 9eaa29b0556380722bc0ecbbdc63f0b958bc440c120fafec5d0ec30d15f153acf68524667b7bf917185c632d4beb04682cfea7cbdaa757cc479eacd264569747 DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8 -DIST ipython-2.4.0.tar.gz 11895397 SHA256 013698a61229c8beaf7182fb3c7132ab70de1ba9b66366e690237cc86e5f7a84 SHA512 aa1d393b66ddca91f9bccd4aebd694bd0db8a0252a913b6834d83df4b1fd55b4291dd63c4e64eee41efca328595fdc45368e813dd6ea7a51f4f81d0ef829867d WHIRLPOOL b1c96f38908218c25bccb1c719ff2f593743f96cf9c0265a37e9cbf9c1bfef316ce4fa3ba9109cc4aa38bb0665c1f26776e557f3255082092f8f7d8ef05782b4 +DIST ipython-2.4.1.tar.gz 11896092 SHA256 6d350b5c2d3e925b0ff6167658812d720b891e476238d924504e2f7f483e9217 SHA512 a9cffc08ba10c47b0371b05664e55eee0562a30ef0d4bbafae79e52e5b9727906c45840c0918122c06c5672ac65e6eb381399f103e1a836aca003eda81b2acde WHIRLPOOL 08fa111b1f3c2a1ba055cd8e84c3a0eaa2efccd7509e1c752506bebe255d139f54182bd7ab194cce71091b85cc9492afbfd6337dcd5eb5a44353a6d9cf301472 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-1.0.0.ebuild 5685 SHA256 cd8c504b0e7151a53e16cb89e46a8a424cc1c310e62a5677109150dfd259043e SHA512 96849a22454c2c22a6960615bc095296e6f7684685d9d216a64c86728bfeddae6aedf50e4b3d040b4edd9c0e8c4da3780f946c72bee4cf9f8c3093f201423cdd WHIRLPOOL 5b2cb6178b28ccabcd10d013bf3c5cd5661e08d96804e2b5d6cdad60ad4e24164820766bcb2030817725daac6d0e1bc42e7b945ed34e90ffe154813445e20fd3 -EBUILD ipython-1.2.1.ebuild 6114 SHA256 4e5cced309c855ab6d75aff5631e09dacd37c3202e9dd5d6b458b8b8080cb56c SHA512 d402992b5798ad0c9a0bd0aeb0204ed0f952e835316133fb5ca6e00ffc9fd98f163bf8771a39e4a09be4791d41d7d6ba2c2a80da0900231390508d7ff6dc6497 WHIRLPOOL 32e3e434b0dcba0e7ddab85ffdb46ff4f06f67923a9ba07618d0026f854ce167b5391072cda23dd0f7d8fd6ef630324447695f9a3f3644d529b12bd87cf3e1ea -EBUILD ipython-2.2.0.ebuild 3923 SHA256 0ac10cba0cac91c19392a57c3fe9ce51a3ef04bdeb64d6397d2caf0cc0fbdafe SHA512 e88be5b7ee0d2cf4fed5ed51bc7ff808279b661db7ed9022ff8dbf255becec5cf007f4850b0a9cc28a73daf0d8375912282e1136dabc9e19d1ea3d9b1cda4d75 WHIRLPOOL 832e2c35f26b4b894a57d58316390c9adaa569c56b86f1c91edd3f45098dbef99882561efe7f2514f0d7b73285e836a6ca4e8665e19fda6f1bae8d79ba3e523e -EBUILD ipython-2.4.0.ebuild 4381 SHA256 bfaaef4c3e4ddfd4650caa4e7b57390d8092d741e91a48613368ef79b32012cd SHA512 1eb3df95abc4f13506e821c01785ffd1ab1c92b9eaac1f4f3f639ea7a0cd5027955838f0eba1b6c2eb163c88f993b3973714158cf5278f478cfc9a07b1d207e1 WHIRLPOOL 912fed95b98de462d4892b62a147b9dbcf705ebc50333b90e2b36317dc55d0994c9c84a231512086e86805c0507dcfafacfd0c4c366d24d47ad60524590b2077 -EBUILD ipython-3.0.0.ebuild 4525 SHA256 09ac766f6b655f2af9bb920780123dd4c1da6abe9c5a10b00e240cf342304f40 SHA512 d20ed9df9b574668d35585067e241bd4a075727afaf84f78ace4a0f45643ca1556f2b089609f34f5448762efb2fa7c02b92f52bec166e5793c4eb82bc159daee WHIRLPOOL add0b459c8a7b1e4a7d1e4ab1c1a4fdaa378c9c104151e67dae684cf5974155b361cfd85db7eee258ded448d29e90beff90981f1d08bc64b4906033e84ea293f -MISC ChangeLog 24820 SHA256 9a4b611a8c36ebbfba131cfa70a883f2af44eb9f1111691d6b6c7e34525c0abc SHA512 1777f1fc9595629948dc9b584e118eeaa689353ba4b47ee11ee310336533f95eaf84aece0a3c6bbdc280bfb5e97f08818c408c50020c1a3eb9d1b74ac1b1635a WHIRLPOOL 1cef60e005d936c9f302bffe82f9db10a73b121903004ad97d1c5cf1248631d61f3e1bde7a963a744a81454c40cbf47b6dd6f62c54e26961eb373a5a0fbc26a4 +EBUILD ipython-2.2.0.ebuild 3977 SHA256 df3bfd28c877aee2c2d43c99f30e7ef5619d8cc31310c46aa8cf6156d84b8bb3 SHA512 8c7ebb76c982b8329e7d9c6614c960c854b4c83d1465ebc49310ee0e4da78bdb36f0a871f4e0a560b59753277142a6fe97be8b3e36eeaf6e67c5a1ae5694b4b4 WHIRLPOOL b8b222b964c431c22e6f4c4b843149b73514e1ea0672528a98f9b32fc8eb2e7fb6ef175a84335427878cfad7f356679118313e1217bf3862769d786124c0f328 +EBUILD ipython-2.4.1.ebuild 4425 SHA256 2fd959f6462291529555396a9c2b27767fca22e2505b8be28fa62488af6be08c SHA512 d254ccb8a94dcd6fe4544df4298a3663e044e8a8f3b5e33079f52436be4ed9f804d5154b339ee81d99448122025f001cf54172df2197850af097ef16eb3f34f3 WHIRLPOOL 177647e84b0c9739fba332b961538a8220f768464fa1d1520f083998012f4637cdffb13ed4e3585dfa69b2cf8117d71f0a19c4ca4df5a2b0815cc0e4b315813d +EBUILD ipython-3.0.0.ebuild 4613 SHA256 a19566ea55b63a447f5a24aa4e3706d9e89acb022351a6c6133018e8e936619d SHA512 913d0eb333b97863b523944b82399a97a6668f4f7a6c323bfd92621d0158233ef17f2d8756d07d0520a63344e6ec8d99806c77fb96fdef7164d8d254efee8051 WHIRLPOOL cc382d2992a4d143cc073119515ffc497c397b5b4ab642d4e1ce24fd26f75ab06d26c7a723321043ccc43a7c699926e4e4d7502fb963561fec9097547d6a3db0 +MISC ChangeLog 25643 SHA256 97281bcb804af88211d2bb228301a5e94ef9fcbc22b50630816b23ccce25117e SHA512 b5e9e6e13a36b00962e3af3161324cfdb8610f5cfb81cdfda7b3376756a8b501df5230ed1da242636a7f9be8b8e57856102fb8b406a2b3e50bb53c8a48e01099 WHIRLPOOL 41e11c4a43f3aa096424c7d2cff1484abbb5b6ccb988bfc211ec3c7c4525518b8ed46c76c6af3697e53d88c7f4fc6620432c9e90ef4d16bfdd4a2bc5f15a7b95 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlT84GgACgkQCaWpQKGI+9R/3ACbBVI4hqNSrvcLIJLYvFkrmv6r -sqMAn0RBNLlsEgXvhaKTK5f24krImx7f -=io9G +iQJ8BAEBCgBmBQJVAv3hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVireVYP/12Xu62EsMPbTSjgJcRieFvb +AdIlLE3tebKJsWRYsfkBxRQljBfAfFEPmxQPDZtYOzJUiIqKVE8OmanmPH7XfKPr +UJXTesdOgvdL2xdRa40jDMh8UsKvU6Yv2gd1KFpSdmInVEMFeiEYlOhwqyNwt49W +kbYsTxT42K63thUNIKcWdHEdyCXRVmU69IrMRXProEV7e9h1pEvuS9sQAEvgPGo9 +GCmjZEmpRXMoVTZnFBJx1fdWLGaoQrWZCGenkDJx6MBVnqcQUAyJYbipnZRcEhxM +e0cEgbdsBP0k6p2TzcKMl7/ZTG14rIJ+Ijccnik83foiap7mfSibE7dyBS2nCOo/ +7as/hn5yRW9BWCvhqToIK0WPOX+jPgfuIGhvwDwPxMD814p/cu7v5WD08KB3Z5zb +kObCClQsySQrNfM/AmDaY1j/24d24GztCdhG4KB7O8P2P1zDD4MCXVwvijAov4Vi ++zWxBr7DpOXmGnNbc2GDtClBOqfSNA9A05iMG2lwedxOTRy8k9nbDOn8B/VufsFd +u7m2vHRrIXQsPh8x9DoaaXDAKjoFD47C+A4RjCcHlYqC+1N9iv7todzBVXMYl5p8 +XiDG3WOERefoErAD4g0k4XM1Xf00bNwlzb0oegvgucFqxcfDPiZtidaAVyxo/Bdb +2MknolSmr2dWakeVllUQ +=gGCd -----END PGP SIGNATURE----- diff --git a/dev-python/ipython/files/62ipython-gentoo.el b/dev-python/ipython/files/62ipython-gentoo.el deleted file mode 100644 index 37b057dea3a8..000000000000 --- a/dev-python/ipython/files/62ipython-gentoo.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; ipython site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(eval-after-load "python-mode" '(require 'ipython)) diff --git a/dev-python/ipython/files/ipython-0.12-globalpath.patch b/dev-python/ipython/files/ipython-0.12-globalpath.patch deleted file mode 100644 index fa7bbdc14fe8..000000000000 --- a/dev-python/ipython/files/ipython-0.12-globalpath.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- IPython/quarantine/ipy_gnuglobal.py.orig 2012-01-10 20:16:35.153515474 +0000 -+++ IPython/quarantine/ipy_gnuglobal.py 2012-01-10 20:18:30.196504374 +0000 -@@ -7,10 +7,11 @@ - - from IPython.core import ipapi - ip = ipapi.get() --import os -+import os -+import sys - - # alter to your liking --global_bin = 'd:/opt/global/bin/global' -+global_bin = os.path.join(sys.prefix,'bin','global') - - def global_f(self,cmdline): - simple = 0 diff --git a/dev-python/ipython/files/ipython-0.13-umlaut.patch b/dev-python/ipython/files/ipython-0.13-umlaut.patch deleted file mode 100644 index 5576699b50ca..000000000000 --- a/dev-python/ipython/files/ipython-0.13-umlaut.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN /tmp/ipython-0.13.orig/IPython/core/release.py /tmp/ipython-0.13/IPython/core/release.py ---- /tmp/ipython-0.13.orig/IPython/core/release.py 2012-06-29 22:40:24.000000000 -0400 -+++ /tmp/ipython-0.13/IPython/core/release.py 2012-08-13 23:50:19.000000000 -0400 -@@ -114,7 +114,7 @@ - 'Brian' : ('Brian E Granger', 'ellisonbg@gmail.com'), - 'Min' : ('Min Ragan-Kelley', 'benjaminrk@gmail.com'), - 'Thomas' : ('Thomas A. Kluyver', 'takowl@gmail.com'), -- 'Jörgen' : ('Jörgen Stenarson', 'jorgen.stenarson@bostream.nu'), -+ 'Jorgen' : ('Jorgen Stenarson', 'jorgen.stenarson@bostream.nu'), - 'Matthias' : ('Matthias Bussonnier', 'bussonniermatthias@gmail.com'), - } - diff --git a/dev-python/ipython/files/ipython-0.9.1-globalpath.patch b/dev-python/ipython/files/ipython-0.9.1-globalpath.patch deleted file mode 100644 index 6c779d45f845..000000000000 --- a/dev-python/ipython/files/ipython-0.9.1-globalpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- IPython/Extensions/ipy_gnuglobal.py.orig 2008-09-16 17:09:05.000000000 -0400 -+++ IPython/Extensions/ipy_gnuglobal.py 2008-09-16 17:09:34.000000000 -0400 -@@ -13,7 +13,7 @@ - import os - - # alter to your liking --global_bin = 'd:/opt/global/bin/global' -+global_bin = '/usr/bin/global' - - def global_f(self,cmdline): - simple = 0 diff --git a/dev-python/ipython/files/ipython-1.0.0-setuptools.patch b/dev-python/ipython/files/ipython-1.0.0-setuptools.patch deleted file mode 100644 index 7b965149edc2..000000000000 --- a/dev-python/ipython/files/ipython-1.0.0-setuptools.patch +++ /dev/null @@ -1,15 +0,0 @@ -Import setuptools unconditionally to ensure consistent egg-info behavior. - ---- a/setup.py -+++ b/setup.py -@@ -53,9 +53,7 @@ - - from distutils.core import setup - --# On Python 3, we need distribute (new setuptools) to do the 2to3 conversion --if PY3: -- import setuptools -+import setuptools - - # Our own imports - from setupbase import target_update diff --git a/dev-python/ipython/ipython-0.10.2.ebuild b/dev-python/ipython/ipython-0.10.2.ebuild deleted file mode 100644 index 56f2c90f9d68..000000000000 --- a/dev-python/ipython/ipython-0.10.2.ebuild +++ /dev/null @@ -1,109 +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.10.2.ebuild,v 1.9 2014/12/12 23:23:16 mgorny Exp $ - -EAPI="3" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -# When a new version of this package supports Python 3, then 3.* Python ABIs should be unrestricted in dev-python/ipdb. -RESTRICT_PYTHON_ABIS="3.* *-jython" - -inherit distutils elisp-common eutils - -DESCRIPTION="An interactive computing environment for Python" -HOMEPAGE="http://ipython.scipy.org/ http://pypi.python.org/pypi/ipython" -SRC_URI="http://ipython.scipy.org/dist/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc emacs examples gnuplot readline smp test wxwidgets" - -RDEPEND="dev-python/pexpect - emacs? ( - app-emacs/python-mode - virtual/emacs - ) - gnuplot? ( dev-python/gnuplot-py ) - readline? ( sys-libs/readline ) - smp? ( - dev-python/foolscap - dev-python/pyopenssl - dev-python/zope-interface - ) - wxwidgets? ( dev-python/wxpython )" -DEPEND="${DEPEND} - test? ( dev-python/nose )" - -DOCS="docs/source/changes.txt" -PYTHON_MODNAME="IPython" - -SITEFILE="62ipython-gentoo.el" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.9.1-globalpath.patch" - sed -e "s:share/doc/ipython:share/doc/${PF}:" -i setupbase.py || die "sed failed" - - if ! use doc; then - sed \ - -e "/extensions/d" \ - -e "s/+ manual_files//" \ - -i setupbase.py || die "sed failed" - fi - - if ! use examples; then - sed -e "s/+ example_files//" -i setupbase.py || die "sed failed" - fi - - # Don't install files requiring Numeric. - rm -f IPython/numutils.py IPython/UserConfig/ipythonrc-numeric - - # Disable failing test. - sed -e "s/test_obj_del/_&/" -i IPython/tests/test_magic.py || die "sed failed" - - # Disable tests requiring foolscap when foolscap is unavailable. - sed -e "/^if not have_twisted:$/i if not have_foolscap:\n EXCLUDE.append(pjoin('IPython', 'kernel'))\n" -i IPython/testing/iptest.py || die "sed failed" -} - -src_compile() { - distutils_src_compile - - if use emacs; then - elisp-compile docs/emacs/ipython.el || die "elisp-compile failed" - fi -} - -src_test() { - testing() { - "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --home="${WORKDIR}/test-${PYTHON_ABI}" > /dev/null || die "Installation for tests failed with $(python_get_implementation) $(python_get_version)" - pushd "${WORKDIR}/test-${PYTHON_ABI}" > /dev/null - # First initialize .ipython stuff. - PATH="${WORKDIR}/test-${PYTHON_ABI}/bin:${PATH}" PYTHONPATH="${WORKDIR}/test-${PYTHON_ABI}/lib/python" ipython > /dev/null <<-EOF - EOF - # Run tests (-v for more verbosity). - PATH="${WORKDIR}/test-${PYTHON_ABI}/bin:${PATH}" PYTHONPATH="${WORKDIR}/test-${PYTHON_ABI}/lib/python" iptest -v || return 1 - popd > /dev/null - } - python_execute_function testing -} - -src_install() { - distutils_src_install - - if use emacs; then - pushd docs/emacs > /dev/null - elisp-install ${PN} ${PN}.el* || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - 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-1.0.0.ebuild b/dev-python/ipython/ipython-1.0.0.ebuild deleted file mode 100644 index 558f70211ae9..000000000000 --- a/dev-python/ipython/ipython-1.0.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.0.0.ebuild,v 1.19 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 || 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.1.ebuild b/dev-python/ipython/ipython-1.2.1.ebuild deleted file mode 100644 index 21c7c744599c..000000000000 --- a/dev-python/ipython/ipython-1.2.1.ebuild +++ /dev/null @@ -1,226 +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.1.ebuild,v 1.5 2014/08/27 12:19:41 blueness Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) -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 ~ia64 ~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() { - # Skip py3.4 for now, refine later - if [[ "${EPYTHON}" == python3.4 ]];then - einfo "python3.4 has a problem with nose and its own testrunner" - return 0 - fi - - # 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 || 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.2.0.ebuild b/dev-python/ipython/ipython-2.2.0.ebuild index 562ad2d5d493..3d8f35c461df 100644 --- a/dev-python/ipython/ipython-2.2.0.ebuild +++ b/dev-python/ipython/ipython-2.2.0.ebuild @@ -1,10 +1,10 @@ # 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.2.0.ebuild,v 1.9 2015/03/08 23:51:07 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0.ebuild,v 1.10 2015/03/13 15:10:24 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 @@ -23,14 +23,14 @@ 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}] ) - wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )" + wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )" RDEPEND="${CDEPEND} notebook? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] @@ -45,7 +45,11 @@ RDEPEND="${CDEPEND} 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}] )" DEPEND="${CDEPEND} @@ -53,19 +57,22 @@ DEPEND="${CDEPEND} 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}] + doc? ( dev-python/cython[${PYTHON_USEDEP}] - dev-python/rpy[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7) + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpydoc[${PYTHON_USEDEP}] + dev-python/pymongo[${PYTHON_USEDEP}] + dev-python/rpy[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] >=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 ) +PATCHES=( + "${FILESDIR}"/2.1.0-substitute-files.patch + "${FILESDIR}"/2.1.0-disable-tests.patch + ) DISTUTILS_IN_SOURCE_BUILD=1 diff --git a/dev-python/ipython/ipython-2.4.0.ebuild b/dev-python/ipython/ipython-2.4.1.ebuild similarity index 88% rename from dev-python/ipython/ipython-2.4.0.ebuild rename to dev-python/ipython/ipython-2.4.1.ebuild index 7960dda90c75..c95d0e490e55 100644 --- a/dev-python/ipython/ipython-2.4.0.ebuild +++ b/dev-python/ipython/ipython-2.4.1.ebuild @@ -1,10 +1,10 @@ # 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.4.0.ebuild,v 1.2 2015/02/08 23:24:05 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.4.1.ebuild,v 1.1 2015/03/13 15:10:24 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 @@ -23,14 +23,14 @@ 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}] ) - wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )" + wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )" RDEPEND="${CDEPEND} notebook? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] @@ -45,7 +45,11 @@ RDEPEND="${CDEPEND} 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}] )" DEPEND="${CDEPEND} @@ -56,19 +60,22 @@ DEPEND="${CDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] dev-python/jinja[${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) + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/numpydoc[${PYTHON_USEDEP}] + dev-python/pymongo[${PYTHON_USEDEP}] + dev-python/rpy[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] >=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" ) +PATCHES=( + "${FILESDIR}"/2.1.0-substitute-files.patch + "${FILESDIR}"/2.1.0-disable-tests.patch + ) DISTUTILS_IN_SOURCE_BUILD=1 diff --git a/dev-python/ipython/ipython-3.0.0.ebuild b/dev-python/ipython/ipython-3.0.0.ebuild index 91aaf86221cb..6e0aba202e3a 100644 --- a/dev-python/ipython/ipython-3.0.0.ebuild +++ b/dev-python/ipython/ipython-3.0.0.ebuild @@ -1,6 +1,6 @@ # 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-3.0.0.ebuild,v 1.1 2015/02/28 12:53:04 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-3.0.0.ebuild,v 1.2 2015/03/13 15:10:24 jlec Exp $ EAPI=5 @@ -29,7 +29,7 @@ CDEPEND=" mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) octave? ( dev-python/oct2py[${PYTHON_USEDEP}] ) smp? ( >=dev-python/pyzmq-13[${PYTHON_USEDEP}] ) - wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython[${PYTHON_USEDEP}]' python2_7) )" + wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )" RDEPEND="${CDEPEND} notebook? ( dev-libs/mathjax @@ -50,7 +50,10 @@ RDEPEND="${CDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] ) qt4? ( - || ( dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/pyside[${PYTHON_USEDEP}] ) + || ( + dev-python/PyQt4[${PYTHON_USEDEP}] + dev-python/pyside[${PYTHON_USEDEP}] + ) dev-python/pygments[${PYTHON_USEDEP}] >=dev-python/pyzmq-13[${PYTHON_USEDEP}] )" DEPEND="${CDEPEND} @@ -65,15 +68,16 @@ DEPEND="${CDEPEND} doc? ( dev-python/cython[${PYTHON_USEDEP}] $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7) + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/nose-0.10.1[${PYTHON_USEDEP}] dev-python/numpydoc[${PYTHON_USEDEP}] + dev-python/pymongo[${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 ) @@ -93,7 +97,7 @@ python_prepare_all() { } python_compile_all() { - use doc && emake -C docs html + use doc && emake -C docs html_noapi } src_test() { -- 2.26.2