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

[Sven-Hendrik Haase]

    Date: Tuesday, July 14, 2020 @ 00:45:59
  Author: svenstaro
Revision: 663561

upgpkg: uwsgi 2.0.19.1-3: Remove Python 2 support

Modified:
  uwsgi/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 00:10:15 UTC (rev 663560)
+++ PKGBUILD	2020-07-14 00:45:59 UTC (rev 663561)
@@ -11,7 +11,6 @@
          uwsgi-plugin-rack
          uwsgi-plugin-psgi
          uwsgi-plugin-cgi
-         uwsgi-plugin-python2
          uwsgi-plugin-python
          uwsgi-plugin-pypy
          uwsgi-plugin-php
@@ -22,15 +21,15 @@
          uwsgi-plugin-zabbix
          uwsgi-plugin-notfound)
 pkgver=2.0.19.1
-pkgrel=2
+pkgrel=3
 arch=(x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
 backup=('etc/uwsgi/emperor.ini')
 conflicts=(python-$pkgbase)
-makedepends=(gcc python python2 ruby python2-greenlet python-greenlet php-embed curl libxml2 libyaml
+makedepends=(gcc python ruby python-greenlet php-embed curl libxml2 libyaml
              perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
-             jansson classpath pypy mono python2-gevent systemd)
+             jansson classpath pypy mono python-gevent systemd)
 optdepends=('systemd: daemon scripts')
 source=("https://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz"
         uwsgiplugin.py::https://raw.githubusercontent.com/unbit/uwsgi/9787f6882c2475aa9873e400988160b17dd04545/plugins/systemd_logger/uwsgiplugin.py
@@ -84,12 +83,9 @@
     python uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
     python uwsgiconfig.py --plugin plugins/gevent archlinux gevent
     python uwsgiconfig.py --plugin plugins/asyncio archlinux asyncio
-    python2 uwsgiconfig.py --plugin plugins/python archlinux python2
-    python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet2
-    python2 uwsgiconfig.py --plugin plugins/gevent archlinux gevent2
-    python2 uwsgiconfig.py --plugin plugins/pypy archlinux pypy
-    python2 uwsgiconfig.py --plugin plugins/zabbix archlinux zabbix
-    python2 uwsgiconfig.py --plugin plugins/notfound archlinux notfound
+    python uwsgiconfig.py --plugin plugins/zabbix archlinux zabbix
+    python uwsgiconfig.py --plugin plugins/pypy archlinux pypy
+    python uwsgiconfig.py --plugin plugins/notfound archlinux notfound
 }
 
 package_uwsgi() {
@@ -128,17 +124,6 @@
     install -Dm755 $pkgbase-$pkgver/psgi_plugin.so $pkgdir/usr/lib/uwsgi/psgi_plugin.so
 }
 
-package_uwsgi-plugin-python2() {
-    depends=(uwsgi python2-gevent python2-greenlet)
-    pkgdesc="Plugin for Python2 support"
-    install -Dm755 $pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
-    install -Dm755 $pkgbase-$pkgver/greenlet2_plugin.so $pkgdir/usr/lib/uwsgi/greenlet2_plugin.so
-    install -Dm755 $pkgbase-$pkgver/gevent2_plugin.so $pkgdir/usr/lib/uwsgi/gevent2_plugin.so
-    install -Dm644 $pkgbase-$pkgver/uwsgidecorators.py $pkgdir/usr/lib/python2.7/site-packages/uwsgidecorators.py
-    python2 -m compileall $pkgdir/usr/lib/python2.7/site-packages/
-    python2 -O -m compileall $pkgdir/usr/lib/python2.7/site-packages/
-}
-
 package_uwsgi-plugin-python() {
     depends=(uwsgi python python-greenlet)
     pkgdesc="Plugin for Python support"