[arch-commits] Commit in ipython/trunk (PKGBUILD)

[Kyle Keen]

    Date: Monday, January 11, 2016 @ 13:39:54
  Author: kkeen
Revision: 155980

upgpkg: ipython 4.0.1-1  FS#47046

Modified:
  ipython/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-11 12:01:09 UTC (rev 155979)
+++ PKGBUILD	2016-01-11 12:39:54 UTC (rev 155980)
@@ -7,8 +7,8 @@
 
 pkgbase=ipython
 pkgname=(ipython ipython2)
-pkgver=4.0.0
-pkgrel=4
+pkgver=4.0.1
+pkgrel=1
 pkgdesc="An enhanced Interactive Python shell."
 arch=('any')
 url="http://ipython.org"
@@ -20,20 +20,23 @@
 
 # some of these will update rapidly, others never
 # so _vars will be phased in as new updates are released
-_ipykv=4.1.0
+_ipykv=4.2.2
+_traitv=4.1.0b1
 
 source=("https://pypi.python.org/packages/source/i/ipython/$pkgbase-$pkgver.tar.gz"
         "https://pypi.python.org/packages/source/i/ipykernel/ipykernel-$_ipykv.tar.gz"
-        "https://pypi.python.org/packages/source/t/traitlets/traitlets-4.0.0.tar.gz"
+        "https://pypi.python.org/packages/source/t/traitlets/traitlets-$_traitv.tar.gz"
         "https://pypi.python.org/packages/source/i/ipython_genutils/ipython_genutils-0.1.0.tar.gz"
         "https://pypi.python.org/packages/source/p/pickleshare/pickleshare-0.5.tar.gz"
-        "https://pypi.python.org/packages/source/s/simplegeneric/simplegeneric-0.8.1.zip")
-md5sums=('c2fecbcf1c0fbdc82625c77a50733dd6'
-         '966cf6d34f018e6cd844e53945a6688f'
-         '27df56a921848686cf52766177a434f2'
+        "https://pypi.python.org/packages/source/s/simplegeneric/simplegeneric-0.8.1.zip"
+        "http://www.packal.org/sites/default/files/public/styles/icon_large/public/workflow-files/nkeimipynbworkflow/icon/icon.png")
+md5sums=('059841210e12543d50a409cb766120ea'
+         'e920441d231e6b659622033849fb3218'
+         'c5ed6dfa6edf43623e386c615506260e'
          '9a8afbe0978adbcbfcb3b35b2d015a56'
          '25337740507cb855ad58bfcf60f7710e'
-         'f9c1fab00fd981be588fc32759f474e3')
+         'f9c1fab00fd981be588fc32759f474e3'
+         '2901d65f1b1fe354e72850085cd1c072')
 
 # With 4.0 many previously bundled external libraries are no longer bundled
 # Since there are so many and they are so small, they get re-bundled here
@@ -55,7 +58,7 @@
   cp -r ipykernel-$_ipykv      python2-ipykernel-$_ipykv
   cp -r ipython_genutils-0.1.0 ipython2_genutils-0.1.0
   cp -r pickleshare-0.5        python2-pickleshare-0.5
-  cp -r traitlets-4.0.0        python2-traitlets-4.0.0
+  cp -r traitlets-$_traitv     python2-traitlets-$_traitv
   cp -r simplegeneric-0.8.1    python2-simplegeneric-0.8.1
 }
 
@@ -77,7 +80,7 @@
   cd "$srcdir/pickleshare-0.5"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/traitlets-4.0.0"
+  cd "$srcdir/traitlets-$_traitv"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/simplegeneric-0.8.1"
@@ -94,6 +97,8 @@
   sed -i 's/gnome-netstatus-idle/ipython/' *.desktop
   install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython.desktop"
   #install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython-qtconsole.desktop"
+  # FS#47046
+  install -Dm644 "$srcdir/icon.png" "$pkgdir/usr/share/pixmaps/ipython.png"
 
   #cd $srcdir/ipython-$pkgver/IPython/qt/console/resources/icon/
   #install -Dm644 IPythonConsole.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/ipython.svg"
@@ -117,7 +122,7 @@
   cd "$srcdir/python2-pickleshare-0.5"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
-  cd "$srcdir/python2-traitlets-4.0.0"
+  cd "$srcdir/python2-traitlets-$_traitv"
   python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=0
 
   cd "$srcdir/python2-simplegeneric-0.8.1"
@@ -141,6 +146,7 @@
   sed -i 's/gnome-netstatus-idle/ipython2/' *.desktop
   install -Dm644 ipython.desktop "$pkgdir/usr/share/applications/ipython2.desktop"
   #install -Dm644 ipython-qtconsole.desktop "$pkgdir/usr/share/applications/ipython2-qtconsole.desktop"
+  install -Dm644 "$srcdir/icon.png" "$pkgdir/usr/share/pixmaps/ipython2.png"
 
   #cd "$pkgdir/usr/share/man/man1/IPython/qt/console/resources/icon/"
   #install -Dm644 IPythonConsole.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/ipython2.svg"