.*-

This patch updates ipython-0.7.1.1 to ipython-0.7.2, a bugfix
release. This release no longer assumes the presence of GNU/color ls
(thanks to Alexander). It also adds the script 'irunner', which
allows users to more easily run scripts as if they had been typed in
IPython's interactive environment for debugging. 'irunner' requires
devel/py-pexepect.

Patch pasted after my .sig; an updated tarball is also attached.

Thanks!

-- 

o--------------------------{ Will Maier }--------------------------o
| jabber:[EMAIL PROTECTED] | [EMAIL PROTECTED] |
| freenode:..............lt_kije | freenode:........#madlug,#wilug |
*------------------[ BSD Unix: Live Free or Die ]------------------*


diff -urN ../ipython-old/Makefile ./Makefile
--- ../ipython-old/Makefile     Wed Jun  7 11:14:28 2006
+++ ./Makefile  Wed Jun  7 11:10:22 2006
@@ -2,8 +2,8 @@
 
 COMMENT=       "enhanced interactive Python shell"
 
-DISTNAME=      ipython-0.7.1.fix1
-PKGNAME=       ipython-0.7.1.1
+DISTNAME=      ipython-0.7.2
+PKGNAME=       ipython-0.7.2
 CATEGORIES=    devel
 
 HOMEPAGE=      http://ipython.scipy.org/
@@ -22,14 +22,13 @@
 
 NO_REGRESS=    Yes
 
+RUN_DEPENDS=   ::devel/py-pexpect
+
 DOC_DIR=       ${PREFIX}/share/doc/ipython
 EXAMPLE_DIR=   ${PREFIX}/share/examples/ipython
 
 post-extract:
        @cd ${WRKSRC}/doc && gunzip *.1.gz
-
-pre-install:
-       @rm -f ${WRKSRC}/IPython/UserConfig/*.orig
 
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
diff -urN ../ipython-old/distinfo ./distinfo
--- ../ipython-old/distinfo     Wed Jun  7 11:14:28 2006
+++ ./distinfo  Wed Jun  7 10:53:43 2006
@@ -1,4 +1,4 @@
-MD5 (ipython-0.7.1.fix1.tar.gz) = f3a23ea23e68736e6a8f823be70bfacf
-RMD160 (ipython-0.7.1.fix1.tar.gz) = 1e132a20bf0b45b44028a937b8ee330101683586
-SHA1 (ipython-0.7.1.fix1.tar.gz) = b5cf94d6cd557f471ad5759ab526b1c56b5bf466
-SIZE (ipython-0.7.1.fix1.tar.gz) = 949931
+MD5 (ipython-0.7.2.tar.gz) = 3565efcf87c7318c1a3930e278ac9fa5
+RMD160 (ipython-0.7.2.tar.gz) = d0c324cde16b092b1443e60d174d950e11dcbebd
+SHA1 (ipython-0.7.2.tar.gz) = fe73fd5f78c997258ab41d6621a6be25bc2a697e
+SIZE (ipython-0.7.2.tar.gz) = 1085704
diff -urN ../ipython-old/patches/patch-IPython_UserConfig_ipy_user_conf_py 
./patches/patch-IPython_UserConfig_ipy_user_conf_py
--- ../ipython-old/patches/patch-IPython_UserConfig_ipy_user_conf_py    Wed Jun 
 7 11:14:28 2006
+++ ./patches/patch-IPython_UserConfig_ipy_user_conf_py Wed Dec 31 18:00:00 1969
@@ -1,12 +0,0 @@
-$OpenBSD: patch-IPython_UserConfig_ipy_user_conf_py,v 1.1.1.1 2006/05/28 
21:59:20 steven Exp $
---- IPython/UserConfig/ipy_user_conf.py.orig   Sun May 28 15:35:14 2006
-+++ IPython/UserConfig/ipy_user_conf.py        Sun May 28 15:35:32 2006
-@@ -36,7 +36,7 @@ if o.profile == 'pysh':
- 
- # make 'd' an alias for ls -F
- 
--ip.magic('alias d ls -F --color=auto')
-+ip.magic('alias d ls -F')
- 
- # Make available all system commands through "rehashing" immediately. 
- # You can comment these lines out to speed up startup on very slow 
diff -urN ../ipython-old/patches/patch-IPython_iplib_py 
./patches/patch-IPython_iplib_py
--- ../ipython-old/patches/patch-IPython_iplib_py       Wed Jun  7 11:14:28 2006
+++ ./patches/patch-IPython_iplib_py    Wed Dec 31 18:00:00 1969
@@ -1,24 +0,0 @@
-$OpenBSD: patch-IPython_iplib_py,v 1.1.1.1 2006/05/28 21:59:20 steven Exp $
---- IPython/iplib.py.orig      Mon Jan 30 07:34:22 2006
-+++ IPython/iplib.py   Sun May 28 15:49:04 2006
-@@ -576,15 +576,15 @@ class InteractiveShell(object,Magic):
-                           # long ls
-                           'll ls -lF',
-                           # color ls
--                          'lc ls -F -o --color',
-+                          #'lc ls -F -o --color',
-                           # ls normal files only
--                          'lf ls -F -o --color %l | grep ^-',
-+                          'lf ls -F -l %l | grep ^-',
-                           # ls symbolic links 
--                          'lk ls -F -o --color %l | grep ^l',
-+                          'lk ls -F -l %l | grep ^l',
-                           # directories or links to directories,
--                          'ldir ls -F -o --color %l | grep /$',
-+                          'ldir ls -F -l %l | grep /$',
-                           # things which are executable
--                          'lx ls -F -o --color %l | grep ^-..x',
-+                          'lx ls -F -l %l | grep *$',
-                           )
-         elif os.name in ['nt','dos']:
-             auto_alias = ('dir dir /on', 'ls dir /on',
diff -urN ../ipython-old/patches/patch-setup_py ./patches/patch-setup_py
--- ../ipython-old/patches/patch-setup_py       Wed Jun  7 11:14:28 2006
+++ ./patches/patch-setup_py    Wed Jun  7 11:01:34 2006
@@ -1,16 +1,18 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2006/05/28 21:59:20 steven Exp $
---- setup.py.orig      Sun Jan 22 02:14:10 2006
-+++ setup.py   Sun May 28 15:32:47 2006
-@@ -140,11 +140,5 @@ setup(name             = name,
-       packages         = ['IPython', 'IPython.Extensions'],
-       scripts          = scriptfiles,
-       cmdclass         = {'install_data': install_data_ext},
--      data_files       = [('data', docdirbase, docfiles),
+$OpenBSD$
+--- setup.py.orig      Wed Jun  7 11:00:19 2006
++++ setup.py   Wed Jun  7 11:01:22 2006
+@@ -126,13 +126,7 @@ if 'bdist_wininst' in sys.argv:
+         sys.exit(1)
+     scriptfiles.append('scripts/ipython_win_post_install.py')
+ 
+-datafiles = [('data', docdirbase, docfiles),
 -                          ('data', os.path.join(docdirbase, 'examples'),
 -                           examfiles),
 -                          ('data', os.path.join(docdirbase, 'manual'),
 -                           manfiles),
 -                          ('data', manpagebase, manpages),
 -                          ('lib', 'IPython/UserConfig', cfgfiles)]
-+      data_files       = [('lib', 'IPython/UserConfig', cfgfiles)]
-       )
++datafiles = [('lib', 'IPython/UserConfig', cfgfiles),]
+ 
+ if 'setuptools' in sys.modules:
+     # setuptools config for egg building
diff -urN ../ipython-old/pkg/PLIST ./pkg/PLIST
--- ../ipython-old/pkg/PLIST    Wed Jun  7 11:14:28 2006
+++ ./pkg/PLIST Wed Jun  7 11:02:07 2006
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/28 21:59:20 steven Exp $
 bin/ipython
+bin/irunner
 bin/pycolor
 lib/python${MODPY_VERSION}/site-packages/IPython/
 lib/python${MODPY_VERSION}/site-packages/IPython/ColorANSI.py
@@ -23,12 +24,32 @@
 
lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/PhysicalQInteractive.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/astyle.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/astyle.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/clearcmd.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/clearcmd.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rehashdir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rehashdir.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rescapture.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rescapture.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ibrowse.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ibrowse.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipipe.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipipe.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_defaults.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_defaults.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_system_conf.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_system_conf.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/numeric_formats.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/numeric_formats.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/path.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/path.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pickleshare.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pickleshare.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pspersistence.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pspersistence.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/win32clip.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/win32clip.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/FakeModule.py
 lib/python${MODPY_VERSION}/site-packages/IPython/FakeModule.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Gnuplot2.py
@@ -56,6 +77,7 @@
 lib/python${MODPY_VERSION}/site-packages/IPython/Shell.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Shell.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/
+lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipy_profile_sh.py
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipy_user_conf.py
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipythonrc
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipythonrc-math
@@ -88,12 +110,12 @@
 lib/python${MODPY_VERSION}/site-packages/IPython/ipmaker.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/ipstruct.py
 lib/python${MODPY_VERSION}/site-packages/IPython/ipstruct.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/irunner.py
+lib/python${MODPY_VERSION}/site-packages/IPython/irunner.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/macro.py
 lib/python${MODPY_VERSION}/site-packages/IPython/macro.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/numutils.py
 lib/python${MODPY_VERSION}/site-packages/IPython/numutils.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/path.py
-lib/python${MODPY_VERSION}/site-packages/IPython/path.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils.py
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils_dummy.py
@@ -102,8 +124,12 @@
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils_posix.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils_win32.py
 lib/python${MODPY_VERSION}/site-packages/IPython/platutils_win32.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/rlineimpl.py
+lib/python${MODPY_VERSION}/site-packages/IPython/rlineimpl.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/ultraTB.py
 lib/python${MODPY_VERSION}/site-packages/IPython/ultraTB.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/upgrade_dir.py
+lib/python${MODPY_VERSION}/site-packages/IPython/upgrade_dir.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/usage.py
 lib/python${MODPY_VERSION}/site-packages/IPython/usage.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/wildcard.py

Attachment: ipython.tgz
Description: application/tar-gz

Reply via email to