Added patch fixing recurring WindowsError, doc install cleaning.

Package-Manager: portage-2.1.4.4

4 files changed, 112 insertions, 5 deletions

diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index 20b621c9b924..007195e8ff1e 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/ipython
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.45 2008/06/26 14:12:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.46 2008/07/06 08:41:03 bicatali Exp $
+
+*ipython-0.8.4-r1 (06 Jul 2008)
+
+  06 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/ipython-0.8.4-jobctrl.patch, +ipython-0.8.4-r1.ebuild:
+  Added patch fixing recurring WindowsError, doc install cleaning.
 
 *ipython-0.8.4 (26 Jun 2008)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 04f2e60def55..14f5bfdaf4e7 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 62ipython-gentoo.el 127 RMD160 01a862c77ce09ef0d1613504607db4fa5d840dc1 SHA1 a3650b3e477620e4977820d21a93bf68ab18bfa8 SHA256 b5900b95df4f197aedea20432f3c71de5bc7149fa1022f8417be7a606647b449
 AUX ipython-0.8.4-globalpath.patch 332 RMD160 67ed95ce729178967cc9b52004adcb5058d75700 SHA1 7884741daa94850aaf527b2a8a953d493ac4c808 SHA256 87cb169d26567f8b4eabc4d4337307e07f7ee780fb7da716350677208ef5a15e
+AUX ipython-0.8.4-jobctrl.patch 826 RMD160 ec925350efc1eb82da1939754585ee9c54b6a2dc SHA1 7a2933175cbe3dd034f7fb87a2b4e13b40257950 SHA256 613080f5511647adb449fbd4f2f48d64550c99d90802a22ec47a8cc453d64853
 DIST ipython-0.6.15.tar.gz 888905 RMD160 cb9cb2fe3e4ae5fdc4017fc6b03ea719516611b2 SHA1 c15cfdf957d46f17d23af6cf53d5b08dca15d93d SHA256 99a3aad3d4e30aca1050343ff4410782ab47f94a33bff568fbc3a841981e2980
 DIST ipython-0.8.1.tar.gz 1127745 RMD160 974a7584471c3559a8c56d60bc85715f3fd3e079 SHA1 90320436c7c09f778c904553520327cbbfd2d8c6 SHA256 7d1cbcee101434d56dcc989fcb4e16f1eade060ededa982d0491031206dc6dbe
 DIST ipython-0.8.2.tar.gz 1172098 RMD160 976d8512d68ed4e1bf28ab50e90bcb7777c34e53 SHA1 2923c1f790d41aeacd2442af5de8ab61c43f6167 SHA256 cc673c7cdef38f7ab21ee22e7be5a591b6b6eda590b82f71a74ff8b5103831c4
@@ -10,13 +11,14 @@ DIST ipython-0.8.4.tar.gz 1161945 RMD160 345c3461f4166ec495eb84c582cf65c5bb11d6e
 EBUILD ipython-0.6.15.ebuild 564 RMD160 5f6618c525a0ee3d5eea01679c4b0669fa36c06a SHA1 90a9fffd9668881174fb8bccb56a3346c12a0280 SHA256 dc4ad87b322484a575740e69cf1b28b6f11e4dc921f2ba6a368f6eb5dda24704
 EBUILD ipython-0.8.1-r1.ebuild 1548 RMD160 94aaf9043e355582c72bdce4a561289112611dee SHA1 f07cdf46f5dae391d4fee7b9611b87e78392b296 SHA256 279108b12282a3aa110b753d0b3f8c2be6ed45c54a6811538e2d86fbb145e8df
 EBUILD ipython-0.8.2.ebuild 1546 RMD160 492f270c3de30ab0189ba5efa3739afb869f2da8 SHA1 fd212b9045f6d17751f738b96d89b5136884147c SHA256 46e760d9c9905e9e85a48ca7468481b1c752aa4d8501d450d94d7c8f25621126
+EBUILD ipython-0.8.4-r1.ebuild 1683 RMD160 41cedc3c77e728b64e8e744daf9312125c54c923 SHA1 15ec8cc99fa0e842319c470b65ce842bf5dd4a9c SHA256 af90d9bfe5585287982c397121b5ef16fde2a2f5db474e98d269c5f64dbb23e0
 EBUILD ipython-0.8.4.ebuild 1633 RMD160 65e9dbf2d1d7de0e87dbaaba6d7152e8bc6745bb SHA1 e4a4cec9bc13c8b0fdf1d6be0ad5bc32066260cb SHA256 851b3e39e9d6d62e3869ec9598379dae4ba79d1bef0ab7294c6f80f7303f851b
-MISC ChangeLog 7872 RMD160 8315dbd8a3ae5331cf7b94994695d5b285a77832 SHA1 be76b346533dba034f1bfb6de4ddbdf77228a10e SHA256 82d0a1843eb90622287db90545be6098eb90e071ac7b365b0db900da325904f5
+MISC ChangeLog 8092 RMD160 a37a96d3853b6561dc55570f27ca54ce427d7955 SHA1 6273e49893bf872bbfa94dfe74b3c9bee5f97c5f SHA256 58588e3b33fff0051692e2e7f1a322b4dff60f1633075a16b2a445e6c9a8c0f5
 MISC metadata.xml 2253 RMD160 11b7d3c6141b2b4954c942f490e154fa377af775 SHA1 9fbb4853f4f52d1430fabe006a453e0d26dabbff SHA256 cad8d0fb7419d230ecc674fd8b855926903f2343bc1eaeb6f2e0fd4fe3713827
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhjo70ACgkQ1ycZbhPLE2BtnACggsAIvhAPI3O02RvsNv+3Wyx+
-zaoAmgJNiKykWugkXf0pgANEOgUxA8rs
-=xcBF
+iEYEARECAAYFAkhwhSgACgkQ1ycZbhPLE2BQ3ACcC2ZbSKI4We5uSqS80oM6eHvD
+abUAoIqDSuRc/LqbbABcyoqNP4fUsNkG
+=dy63
 -----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/files/ipython-0.8.4-jobctrl.patch b/dev-python/ipython/files/ipython-0.8.4-jobctrl.patch
new file mode 100644
index 000000000000..a591492b5c1e
--- /dev/null
+++ b/dev-python/ipython/files/ipython-0.8.4-jobctrl.patch
@@ -0,0 +1,24 @@
+--- IPython/Extensions/jobctrl.py.orig	2008-07-05 11:04:11.672812749 +0100
++++ IPython/Extensions/jobctrl.py	2008-07-05 14:12:45.893249659 +0100
+@@ -190,10 +190,11 @@
+         
+ if sys.platform == 'win32':
+     shell_internal_commands = 'break chcp cls copy ctty date del erase dir md mkdir path prompt rd rmdir start time type ver vol'.split()
++    PopenExc = WindowsError
+ else:
+     # todo linux commands
+     shell_internal_commands = [] 
+-
++    PopenExc = OSError
+ 
+ def jobctrl_shellcmd(ip,cmd):
+     """ os.system replacement that stores process info to db['tasks/t1234'] """
+@@ -208,7 +209,7 @@
+     try:
+         try:
+             p = Popen(cmd,shell = use_shell)
+-        except WindowsError:
++        except PopenExc:
+             if use_shell:
+                 # try with os.system
+                 os.system(cmd)
diff --git a/dev-python/ipython/ipython-0.8.4-r1.ebuild b/dev-python/ipython/ipython-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..95678929244f
--- /dev/null
+++ b/dev-python/ipython/ipython-0.8.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.8.4-r1.ebuild,v 1.1 2008/07/06 08:41:03 bicatali Exp $
+
+NEED_PYTHON=2.3
+
+inherit eutils distutils elisp-common
+
+DESCRIPTION="An advanced interactive shell for Python."
+HOMEPAGE="http://ipython.scipy.org/"
+SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~x86"
+IUSE="doc examples emacs gnuplot"
+
+RDEPEND="gnuplot? ( dev-python/gnuplot-py )
+	emacs? ( app-emacs/python-mode virtual/emacs )
+	dev-python/pexpect"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="IPython"
+SITEFILE="62ipython-gentoo.el"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-globalpath.patch
+	epatch "${FILESDIR}"/${P}-jobctrl.patch
+
+	sed -i \
+		-e '/examfiles)/d' \
+		-e '/manfiles)/d' \
+		-e '/manstatic)/d' \
+		-e 's/^docfiles.*/docfiles=""/' \
+		setup.py || die "sed failed"
+}
+
+src_compile() {
+	distutils_src_compile
+	if use emacs ; then
+		cd doc
+		elisp-comp ipython.el || die "elisp-comp failed"
+	fi
+}
+
+src_install() {
+	DOCS="doc/ChangeLog"
+	distutils_src_install
+
+	cd doc
+	insinto /usr/share/doc/${PF}
+
+	if use doc; then
+		doins -r *.pdf manual/* || die "doc install failed"
+	fi
+	if use examples ; then
+		doins -r examples || die "examples install failed"
+	fi
+	if use emacs ; then
+		elisp-install ${PN} ipython.el ipython.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}