From 4c764846856fe3ee17868d4f90d3c722f1fea225 Mon Sep 17 00:00:00 2001
From: Kacper Kowalik <xarthisius@gentoo.org>
Date: Sun, 8 Feb 2015 23:24:16 +0000
Subject: [PATCH] Simplify check if pandoc is installed. Thanks to Arfrever for
 a suggestion

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9
---
 dev-python/ipython/ChangeLog            |  5 ++++-
 dev-python/ipython/Manifest             | 30 ++++++++++++-------------
 dev-python/ipython/ipython-2.4.0.ebuild |  4 ++--
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index ad30911d7a1a..02863c6b4a36 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,9 @@
 # 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.158 2015/02/08 19:05:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.159 2015/02/08 23:24:05 xarthisius Exp $
+
+  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
 
 *ipython-2.4.0 (08 Feb 2015)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 97dfb3f541ae..0880dedfd322 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -33,23 +33,23 @@ EBUILD ipython-2.1.0.ebuild 3929 SHA256 f852ccdca52d339c803ee782ef375227cf35629a
 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 4392 SHA256 c617da87123ec9cfe373667b4cbfe90267f29dc3be7db5f6d98e3d4bab16518c SHA512 666eba53e858cd5f2b3b8a81368a41d0767547ffc481d6638a5679a20d680fb02822db93c9e8fe54452cbcbcff69fcfdc20b468b99f9c1e5070a2f9d410e3f42 WHIRLPOOL 0cbe84745e23c26fef3b91639ec6dc9872c3f11768f32ffaa80024d1bdb14438bd9ca58c21313203547cd0f9ecd0246b6e3e7b20e1bb8463f45824c9ceffd23f
-MISC ChangeLog 23943 SHA256 c27d8adebd3d145630c4de6f43983539f84935a8259a3acb035490cefa6fcdfa SHA512 39cbed52586c01fb044d55c9762f8115cadde22cc3bfaddfaae62a866ca70ff5168e72cb24baf1647f06186d40bc36b65ea8367ecdaec436b0e948a25b47fa95 WHIRLPOOL e9edb0507d6739c3a1960d9bfb148669e28242016c169586da3a7748f7bf651f5f6b27927ac9e5978981f4f45cdb4bb0d2d093f67c50481468c692269d9ff00a
+EBUILD ipython-2.4.0.ebuild 4381 SHA256 bfaaef4c3e4ddfd4650caa4e7b57390d8092d741e91a48613368ef79b32012cd SHA512 1eb3df95abc4f13506e821c01785ffd1ab1c92b9eaac1f4f3f639ea7a0cd5027955838f0eba1b6c2eb163c88f993b3973714158cf5278f478cfc9a07b1d207e1 WHIRLPOOL 912fed95b98de462d4892b62a147b9dbcf705ebc50333b90e2b36317dc55d0994c9c84a231512086e86805c0507dcfafacfd0c4c366d24d47ad60524590b2077
+MISC ChangeLog 24097 SHA256 9998ac4152d7d984f1466990e945d1b7bffdc46ae61ff5613e9dd20c1690ca86 SHA512 46cbe7f9f7412ba49294bd84b966d6be12fe933432c1b1eed96c35914d6191625e8297a0b6726ada423c9a6105526295f7129fb76da8ef2b0dd9c07bdc14336f WHIRLPOOL f73f663d3b5120533d57ab60be795b84a23cd25b1b1d6aaae45abc32e3ded985270af83ae2ee59805435a91482e61b3447231b49916db1e26bb3946273273b5a
 MISC metadata.xml 2954 SHA256 457f227688ed9110571933da9e2f0774257805e65a2b1b9f1db649cef9ec66ef SHA512 552276198c31917583e30767f72be5f5d4614440f32ddb364c30a71f214329707d5034476961d85514dad0fd2ea42d3b1325fc131f50f2f620205e5a471a5a8c WHIRLPOOL 65056671f494f2a2614bb12463e7e50255d482bb454178bf43f06baf8cc2ba0478fc1baae20dd2fb241ba5f3047f7f2cdd4e96099db754d9d34b6ea0c78cb0a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU17NyAAoJEF0huFKJUZL5dRQP/019xsvberpNjZOATwfyAjiY
-kohNxjJb0AhKmOZSuyRkiaKAe5IKT8mG+TsQ5qglEcy0L4Mdb7m/6nk3vvviPmTk
-arL076MwAMiC74eKa3yU2FO0I0tmlme5jQb5V8uEbCbOh3j2JsxkRPxkTEBpkTly
-2KjqBWFbANK303viPvZeBQzhUkB4E+Mr8zGK8WzsfdtKEIRWxOLJ/2acejriLz3e
-TiLazf6mW/m8BlcLoYSLbE9shEtLtCBirfon0CAN0XOlt+OZRPZ0WrIOVl8dbmYf
-Ooy0UoNssxNieflqVuXGHspIcUfPe1qLAQ9yRgY/5aCSlvwW3tjbl1M1s5U74BSQ
-hUdLhCcHTTAYCbeubA7MGrpP0hoHgWzgtRUHLD+v1q0tsFB98mkguT1E/rwNM9Pj
-rz6BQv8Gd83vk+VWXNIurWwsZGRkxkehBiGp/ocvodh9qfYXN/ok9ULVp5VwLdFA
-Q7oPzFBNLALECza4OD3757wmf+/3xUUEY11SCSfxWuuscCAF8FUBqg6gPSOqjKre
-HIEmioCE70lPhN+4rtld9zYItoXf4Rzli5rmqU6rKuLbNqxsM+xifo7VlwVZ9esv
-Yi7Wy72YkFNbTky65tZ4z/2lH+uSbhk88HWuOT9puHJwntdBfamAznv3OISbDJzY
-UmH6zO4lZewytk8ug5JG
-=tYKi
+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
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-2.4.0.ebuild b/dev-python/ipython/ipython-2.4.0.ebuild
index 247fc900820a..7960dda90c75 100644
--- a/dev-python/ipython/ipython-2.4.0.ebuild
+++ b/dev-python/ipython/ipython-2.4.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-2.4.0.ebuild,v 1.1 2015/02/08 19:05:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.4.0.ebuild,v 1.2 2015/02/08 23:24:05 xarthisius Exp $
 
 EAPI=5
 
@@ -131,7 +131,7 @@ pkg_postinst() {
 	elog "To enable sympyprinting, it's required to emerge sympy"
 	elog "To enable cythonmagic, it's required to emerge cython"
 	if use nbconvert; then
-		if [[ -z $(best_version app-text/pandoc) ]] ; 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."
-- 
2.26.2