3 files changed, 7 insertions, 17 deletions
diff --git a/development/ipython/README b/development/ipython/README
index 8cd63f0ddc532..2764278e1b885 100644
--- a/development/ipython/README
+++ b/development/ipython/README
@@ -10,4 +10,3 @@ optional dependencies:
 * notebook: Jinja2, pyzmq, tornado
 * plotting: matplotlib
 * LaTeX in notebooks: ipython-mathjax
-* documentation: matplotlib, Pygments, Sphinx (also set DOCS=yes)
diff --git a/development/ipython/ipython.SlackBuild b/development/ipython/ipython.SlackBuild
index 8f82a702f6520..c0a911d180ff8 100644
--- a/development/ipython/ipython.SlackBuild
+++ b/development/ipython/ipython.SlackBuild
@@ -25,7 +25,7 @@
 # Maintained by Benjamin-Trigona-Harany
 
 PRGNAM=ipython
-VERSION=${VERSION:-1.2.1}
+VERSION=${VERSION:-2.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,10 +59,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 python setup.py install --root="$PKG"
-
-mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/doc/ipython $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \;
+rm $PKG/usr/bin/ipython2
 
 mv $PKG/usr/share/man $PKG/usr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -71,15 +68,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 # Delete now empty directory
 rm -rf $PKG/usr/share
 
-# Build and install optional html docs
-if [ "$DOCS" = "yes" ] ; then
-  cd docs
-    make html
-    cp -r build/html $PKG/usr/doc/$PRGNAM-$VERSION
-  cd ..
-fi
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
-cp COPYING.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp COPYING.rst README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/ipython/ipython.info b/development/ipython/ipython.info
index 69d60a0597d02..8721f0b1befda 100644
--- a/development/ipython/ipython.info
+++ b/development/ipython/ipython.info
@@ -1,8 +1,8 @@
 PRGNAM="ipython"
-VERSION="1.2.1"
+VERSION="2.0.0"
 HOMEPAGE="http://ipython.org"
-DOWNLOAD="http://archive.ipython.org/release/1.2.1/ipython-1.2.1.tar.gz"
-MD5SUM="4ffb36697f7ca8cb4a2de0f5b30bc89c"
+DOWNLOAD="http://archive.ipython.org/release/2.0.0/ipython-2.0.0.tar.gz"
+MD5SUM="dd209ff8c7b08565478e4fc04bdf33ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""