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

[Jiachen Yang]

    Date: Wednesday, June 10, 2020 @ 12:00:44
  Author: farseerfc
Revision: 641385

upgpkg: powerline 2.8-2: powerline: remove py2 splitpkgs

Modified:
  powerline/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++---------------------------------------------------
 1 file changed, 6 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-10 11:58:39 UTC (rev 641384)
+++ PKGBUILD	2020-06-10 12:00:44 UTC (rev 641385)
@@ -7,21 +7,21 @@
 
 _pkgname="powerline"
 pkgbase="powerline"
-pkgname=("powerline" "powerline2" "python-powerline" "python2-powerline" "powerline-common" "powerline-vim" "powerline-fonts")
+pkgname=("powerline" "python-powerline" "powerline-common" "powerline-vim" "powerline-fonts")
 pkgdesc='Statusline plugin for vim, and provides statuslines and prompts for several other applications, including zsh, bash, tmux, IPython, Awesome, i3 and Qtile'
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 url="https://github.com/${_pkgname}/${_pkgname}"
 license=('MIT')
 arch=('x86_64')
 makedepends=(
-    'python2-setuptools'
     'python-setuptools'
     'python-sphinx'
+    'git'
     )
 checkdepends=(
     'python-pexpect'
-    'python2-pexpect'
+    'python-tox'
 )
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz"
         "fail-on-binary-error.patch")
@@ -38,12 +38,6 @@
 
     # explicitly fail if building binary usr/bin/powerline has any error
     patch -N <../fail-on-binary-error.patch
-
-    cp -r "${srcdir}/${_pkgname}-${pkgver}"{,-py2}
-    # prepare python2 scripts
-    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-    find scripts -type f -iname "powerline-*" -print0 | xargs -0 sed -i "1s/python/python2/"
-    find "${_pkgname}"/bindings -type f -iname "*.py" -print0 | xargs -0 sed -i "1s/python/python2/"
 }
 
 build(){
@@ -53,10 +47,7 @@
 
     # build C client
     cd "${srcdir}/${_pkgname}-${pkgver}"
-    python setup.py build
-
-    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-    python2 setup.py build
+    LC_ALL=C python setup.py build
 }
 
 
@@ -64,8 +55,6 @@
 check(){
     cd "${srcdir}/${_pkgname}-${pkgver}"
     LC_ALL=C python setup.py test
-    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-    LC_ALL=C python2 setup.py test
 }
 
 package_powerline(){
@@ -91,23 +80,6 @@
     # license is installed by powerline-common
 }
 
-package_powerline2(){
-    pkgdesc='Python2 version of statusline plugin for vim, and provides statuslines and prompts for several other applications, including zsh, bash, tmux, IPython, Awesome, i3 and Qtile'
-    depends=('python2-powerline')
-    conflicts=('powerline' 'python2-powerline<=2.3-1')
-    provides=('powerline')
-    replaces=('python2-powerline<=2.3-1')
-
-    cd "${srcdir}/${_pkgname}-${pkgver}-py2/scripts"
-    install -Dm755 powerline{,-config,-daemon,-lint,-render} -t "${pkgdir}/usr/bin/"
-    install -dm755 "${pkgdir}/usr/share/powerline/"
-    ln -s "$(python2 -c 'import site; print(site.getsitepackages()[0])')/powerline/bindings" "${pkgdir}/usr/share/powerline/bindings"
-
-    install -dm755 "${pkgdir}/usr/share/licenses/"
-    ln -s "/usr/share/licenses/${_pkgname}" "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-
 package_python-powerline() {
     pkgdesc='python library for powerline'
     depends=('python>=3.2' 'powerline-common')
@@ -115,6 +87,7 @@
                 'python-pygit2: improved git support'
                 'powerline-vim: vim plugin'
                 'powerline-fonts: patched fonts for powerline'
+                'which: fish bindings'
                 )
 
     # install by redirect scripts and binaries
@@ -127,25 +100,7 @@
     ln -s "/usr/share/licenses/${_pkgname}" "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
-package_python2-powerline() {
-    pkgdesc='python2 library for powerline'
-    depends=('python2>=2.6' 'powerline-common')
-    optdepends=('python2-psutil: improved system information'
-                'python2-pygit2: improved git support'
-                'powerline-vim: vim plugin'
-                'powerline-fonts: patched fonts for powerline'
-                )
 
-    # install by redirect scripts and binaries
-    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
-    python2 setup.py install --skip-build --root="${pkgdir}" --install-data=tmp --install-scripts=tmp --optimize=1
-    # remove redirected scripts and binaries
-    rm -rf "${pkgdir}/tmp" 
-
-    install -dm755 "${pkgdir}/usr/share/licenses/"
-    ln -s "/usr/share/licenses/${_pkgname}" "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
 package_powerline-common(){
     pkgdesc='common files for python-powerline and python2-powerline'