Disable tests requiring foolscap when foolscap is unavailable (bug #366749).

Package-Manager: portage-2.2.0_alpha32_p13/cvs/Linux x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 05dc4dc51f59..f7d363313745 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/ipython
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.81 2011/04/09 17:08:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.82 2011/05/10 14:42:26 arfrever Exp $
+
+  10 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  ipython-0.10.2.ebuild:
+  Disable tests requiring foolscap when foolscap is unavailable (bug #366749).
 
 *ipython-0.10.2 (09 Apr 2011)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 8f6f378105ca..4f205ac91797 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -7,24 +7,24 @@ DIST ipython-0.10.1.tar.gz 5837840 RMD160 c4f0177f466f6bfb32d98e73b5235885bc4708
 DIST ipython-0.10.2.tar.gz 5842688 RMD160 365a4eb9b534df1a9aa8717f173e9a032224ea01 SHA1 d45b97b0f458fd517cb2bfa9ebb3c671c46a21c0 SHA256 9ed5fe693d92e6ba9ecc3e367ae5607b80d66db53b0a636fa39fe15ae3df8c47
 DIST ipython-0.10.tar.gz 5829939 RMD160 819609298bb000aa01c3af6ad2717d91d46e39d8 SHA1 175bbacf74d94336e3fe06e390e04ad2bfff6fd4 SHA256 60d602637dc5f078b083a4ca5ab64364ba816bd72439844012ed11a30f88228c
 EBUILD ipython-0.10.1.ebuild 2830 RMD160 fa3b66842c965c04363a35a95aff112f8975772b SHA1 66c7d7545ab55bfe0b56e1d7653b1ac034192025 SHA256 14018fee0d0543003ae46932e475c2b6360f7d4278dd82ab483c5b162df5f3c2
-EBUILD ipython-0.10.2.ebuild 3033 RMD160 2ce7342ddee2baec0463c69437ed000bd829a3e0 SHA1 6a47a39611ef2a2af49582a6cf47ec7e7131a8cb SHA256 b59276e31150c479d9a2c574eeaab07811d9ed2bd9c9f6956361f49508033958
+EBUILD ipython-0.10.2.ebuild 3257 RMD160 7301f422b90db9a180232b6ad26fcc8d96695675 SHA1 2faed897e0861ad2cf1e392f3c1df8a49754f9c9 SHA256 ef1235232ec1a9474529f8339a1f671a2aff1e463a24adc3d12ebd1dc5f984d4
 EBUILD ipython-0.10.ebuild 2660 RMD160 442e9f8025eb1e43c8c55f6d457319fde4382b18 SHA1 a1a721b5a278df278c1509a1243f24f39c5d5168 SHA256 0bf2dd1d7db7455e61aaf11b03ce990bcd96efe0b608f095ea6e5846d9944bef
-MISC ChangeLog 12205 RMD160 88d3fbb855231e86fb8af2c7c16568ce4eb1c6d1 SHA1 800859eb40e544a3449da2dd66fc8e30e29c4d9a SHA256 715b5608d8e2e938ff5b2be31cae1d0b6be47198efde75955601e39c325c9194
+MISC ChangeLog 12383 RMD160 5226a08ea3ae9370a744e9e3930146ac57d64dad SHA1 1f738e2a61282b3c830416200287d245c9000680 SHA256 f05d0e6b975b1f375c65fd22ee59302dc9913a8dc4ad31e2e4ac2f850152f09a
 MISC metadata.xml 3270 RMD160 dd5bc6bf36e4cb9594cec539c782c6939299285f SHA1 8b4405d401095acb17021e9b39dbea3ad3102153 SHA256 610b95f90f8d0d0f20db39e8f1e5b71f1236fc6fa518df4bd32afa15806d00eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNoJKLAAoJENgZr6v6gHY0HW4P/idvfbvmgm75JkwEGcursYE3
-jLT2GLclYPxuXGYsCbBWQ8LsIi3NHZ/qx4cyO4gURhzUq7CAek01ocZT2wpnVU7y
-4n1UkvJQs5E8eIn8PdRkw8krvbpljj2+30rghfM6KM5WPOTxwfGrHi8VzG4h2sSM
-T/B5Vm+JddEWRZ8+nwLKXztCZc5iniTHEK4f5TYRuaMHvMyGkIpwxSGhnqGjDqOp
-PieSgKux3ZlYBjUYAvwbppU67c3vYl0vH4GV7EAlBNNrlb8wlvZ7VBVYa5O8jlzv
-O8vdyd5nF1HTDgwoG+oaOtvOAtnGNCs+2h5hOCR0KVVNaWEreneQDlhu76SWvDLB
-AXlcvyakxE23oGlyMgVNkFnQ8x1SCAIGejRRb6bAxKEtYQOJJqeQ3nYrzFiyYy0W
-VnIT45/JHvjvCfJIjp8kaNuXNYyCmm8mTjqvhFhUMSMIQjKyxGQhIszPPZE0yNjK
-3xILR6f/LGwxA414gS9bVNBQMSGPk/XBTOCCI6NsWZzm8SbSI0YQdxdpE1W1N9V6
-5VBdg4T8rKt8Z4bzuTpBR12wsGQDyFTlZz4p/WeduTcH/bckz2cDtBr89j/PPm2V
-dFko6Ya8dxASqZGfKtHQga8i6VfFZPASRSjIQCdcLPCo4S2IEJQw/v8qIPLnLvt4
-kOJpESooBijvCgEOVWsz
-=VvJU
+iQIcBAEBAgAGBQJNyU7kAAoJENgZr6v6gHY05tsP/3E9T1DyJXi8Ar1O03ulLyfn
+n5oMe0YIIm5k47jNgvfMzz34y2CUPc48PZKPVqL6ikxxdoyW7UchKWELelXWLJYa
+c8AsfJHQLx6BwebvkcdBqFKF+56P2nxHMFqCXrhba1otl7tJZdbJhGiaBOdKgqnA
+gA7/O+HEQgJSSz+K6lug6m44xLFqYFvZsO5HatCVxkmZQyrRKaT9tNuxtw7aw6YU
+Ib3AGGpN08YNY++RRTvC3G1B70b+Y1c3MoORiso2soO8YztIlgbmYBNerYlhIduu
+0WUiA5TCuZV0SCY5HWBGxhdPG/4cLIn+RzEzWEaMGZUKbZyoHxoyhwUvQubcmX8U
+XQrRjbqRrdxZP4aihgTiSKf1apmIa8xctgofKuFljtXvq2QPNQzuCs6AJweGcBKb
+Lvz24WzIKaBn6PFTN9sHV1n0AihCs6HQs4PSwR/AggHirirOrydqbcWQb3W1eFKx
+QY1bOXQ4Z7jXQHqsWP9R7mXhsVcmeMQjkmq+Z4M3L61s9JlCgEVAPnHRkV4UY7wD
+LrQfeyTS9fxEeTk4lfI84TXeLTw8hSPUGNjoODaIuqWxRUKn90k57gDerKamdIB7
+xQ30ysNFAmXTW120Ca4+Q2swWBMA4ou+nO9587/lWzXZYQqEJmOr27WKqxoSPD5K
+u3e2VCm1Btb4b7zSu0U2
+=91no
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-0.10.2.ebuild b/dev-python/ipython/ipython-0.10.2.ebuild
index 0cfefcccb702..dcf22b3785c5 100644
--- a/dev-python/ipython/ipython-0.10.2.ebuild
+++ b/dev-python/ipython/ipython-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/04/09 17:08:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.10.2.ebuild,v 1.2 2011/05/10 14:42:26 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -60,6 +60,9 @@ src_prepare() {
 
 	# 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() {