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

[Kyle Keen]

    Date: Thursday, February 20, 2020 @ 22:56:19
  Author: kkeen
Revision: 577421

upgpkg: bpython 0.18-3  move bpython2 to AUR

Modified:
  bpython/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-20 22:52:09 UTC (rev 577420)
+++ PKGBUILD	2020-02-20 22:56:19 UTC (rev 577421)
@@ -3,9 +3,9 @@
 # Contributor: Mike Sampson <mike at sambodata dot com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 
-pkgname=('bpython' 'bpython2')
+pkgname=bpython
 pkgver=0.18
-pkgrel=2
+pkgrel=3
 pkgdesc='Fancy ncurses interface to the Python interpreter'
 arch=('any')
 url='https://bpython-interpreter.org/'
@@ -14,7 +14,7 @@
 optdepends=('python-urwid: for bpython-urwid'
             'python-jedi: multiline completion'
             'python-watchdog: module reloading')
-makedepends=('python-distribute' 'python2-distribute')
+makedepends=('python-distribute')
 #source=(https://bpython-interpreter.org/releases/bpython-${pkgver}.tar.gz)  # slow
 #source=("https://github.com/bpython/bpython/archive/$pkgver-release.tar.gz")  # missing version data
 source=("https://files.pythonhosted.org/packages/source/b/bpython/bpython-$pkgver.tar.gz")
@@ -22,19 +22,12 @@
 
 # python-watchdog optdep...
 
-prepare() {
-  cp -r bpython-$pkgver bpython2-$pkgver
-}
-
 build() {
   cd "$srcdir/bpython-$pkgver"
   python setup.py build
-
-  cd "$srcdir/bpython2-$pkgver"
-  python2 setup.py build
 }
 
-package_bpython() {
+package() {
   cd "$srcdir/bpython-$pkgver"
 
   python setup.py install --root="$pkgdir" --optimize=0
@@ -41,34 +34,3 @@
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/bpython/LICENSE"
 }
-
-package_bpython2() {
-  depends=('python2-pygments' 'python2-requests' 'python2-curtsies' 'python2-greenlet' 'python2-six')
-  optdepends=('python2-urwid: for bpython2-urwid'
-              'python2-jedi: multiline completion'
-              'python2-watchdog: module reloading')
-
-  cd "$srcdir/bpython2-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=0
-
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/bpython2/LICENSE"
-
-  # conflicting files with bpython
-  cd "$pkgdir/usr/bin/"
-  mv bpython bpython2
-  mv bpython-urwid bpython2-urwid
-  mv bpython-curses bpython2-curses
-  mv bpdb bpdb2
-
-  cd "$pkgdir/usr/share/applications/"
-  mv org.bpython-interpreter.bpython.desktop org.bpython-interpreter.bpython2.desktop
-  sed -i 's/bpython/&2/' org.bpython-interpreter.bpython2.desktop
-
-  cd "$pkgdir/usr/share/appinfo/"
-  mv org.bpython-interpreter.bpython.appdata.xml org.bpython-interpreter.bpython2.appdata.xml
-  sed -i 's/bpython/&2/' org.bpython-interpreter.bpython2.appdata.xml
-
-  cd "$pkgdir/usr/share/pixmaps/"
-  mv bpython.png bpython2.png
-}