[arch-commits] Commit in bpython/trunk (PKGBUILD ungetch.patch)

[Kyle Keen]

    Date: Tuesday, March 18, 2014 @ 13:51:18
  Author: kkeen
Revision: 107670

upgpkg: bpython py3.4 rebuild

Modified:
  bpython/trunk/PKGBUILD
Deleted:
  bpython/trunk/ungetch.patch

---------------+
 PKGBUILD      |   46 ++++++++++++++++++----------------------------
 ungetch.patch |   12 ------------
 2 files changed, 18 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-18 12:35:28 UTC (rev 107669)
+++ PKGBUILD	2014-03-18 12:51:18 UTC (rev 107670)
@@ -5,7 +5,7 @@
 
 pkgname=('bpython' 'bpython2')
 pkgver=0.12
-pkgrel=2
+pkgrel=3
 pkgdesc='Fancy interface to the Python interpreter'
 arch=('any')
 url='http://bpython-interpreter.org/'
@@ -15,12 +15,12 @@
 md5sums=('14cbe92620d386a769b3faa282a1d6c3')
 
 build() {
-  cp -r bpython-${pkgver} bpython2-${pkgver}
+  cp -r bpython-$pkgver bpython2-$pkgver
 
-  cd bpython-${pkgver}
+  cd bpython-$pkgver
   python setup.py build
 
-  cd ${srcdir}/bpython2-${pkgver}
+  cd "$srcdir/bpython2-$pkgver"
   python2 setup.py build
 }
 
@@ -28,17 +28,14 @@
   depends=('python-pygments')
   optdepends=('python-urwid: for bpython-urwid')
 
-  cd bpython-${pkgver}
+  cd bpython-$pkgver
 
-  python setup.py install \
-    --root=${pkgdir} \
-    --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=0
 
-  install -Dm644 LICENSE \
-    ${pkgdir}/usr/share/licenses/bpython/LICENSE
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/bpython/LICENSE"
 
   # pygtk isn't available for python3 (fs#33705)
-  rm $pkgdir/usr/bin/bpython-gtk
+  rm "$pkgdir/usr/bin/bpython-gtk"
 }
 
 package_bpython2() {
@@ -46,27 +43,20 @@
   optdepends=('pygtk: for bpython2-gtk'
               'python2-urwid: for bpython2-urwid')
 
-  cd bpython2-${pkgver}
+  cd bpython2-$pkgver
 
-  python2 setup.py install \
-    --root=${pkgdir} \
-    --optimize=1
+  python2 setup.py install --root="$pkgdir" --optimize=0
 
-  install -Dm644 LICENSE \
-    ${pkgdir}/usr/share/licenses/bpython2/LICENSE
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/bpython2/LICENSE"
 
   # conflicting files with bpython
-  mv ${pkgdir}/usr/bin/bpython \
-    ${pkgdir}/usr/bin/bpython2
-  mv ${pkgdir}/usr/bin/bpython-gtk \
-    ${pkgdir}/usr/bin/bpython2-gtk
-  mv ${pkgdir}/usr/bin/bpython-urwid \
-    ${pkgdir}/usr/bin/bpython2-urwid
-  mv ${pkgdir}/usr/share/applications/bpython.desktop \
-    ${pkgdir}/usr/share/applications/bpython2.desktop
+  mv "$pkgdir/usr/bin/bpython" "$pkgdir/usr/bin/bpython2"
+  mv "$pkgdir/usr/bin/bpython-gtk" "$pkgdir/usr/bin/bpython2-gtk"
+  mv "$pkgdir/usr/bin/bpython-urwid" "$pkgdir/usr/bin/bpython2-urwid"
+  mv "$pkgdir/usr/share/applications/bpython.desktop" \
+     "$pkgdir/usr/share/applications/bpython2.desktop"
 
   # fix the .desktop file for the rename
-  sed \
-    -e 's/bpython/&2/' \
-    -i ${pkgdir}/usr/share/applications/bpython2.desktop
+  sed -e 's/bpython/&2/' \
+    -i "$pkgdir/usr/share/applications/bpython2.desktop"
 }

Deleted: ungetch.patch
===================================================================
--- ungetch.patch	2014-03-18 12:35:28 UTC (rev 107669)
+++ ungetch.patch	2014-03-18 12:51:18 UTC (rev 107670)
@@ -1,12 +0,0 @@
-diff -r 8c7296ca3f1c bpython/cli.py
---- a/bpython/cli.py	Fri Jul 13 21:18:28 2012 +0200
-+++ b/bpython/cli.py	Sat Oct 20 21:20:03 2012 -0400
-@@ -1714,7 +1714,8 @@
-         caller.scr.nodelay(True)
-         key = caller.scr.getch()
-         caller.scr.nodelay(False)
--        curses.ungetch(key)
-+        if key != -1:
-+            curses.ungetch(key)
-     caller.statusbar.check()
-     caller.check()