Fri Aug 2 01:30:56 PDT 2013

3 files changed, 16 insertions, 17 deletions

diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index 093f938c0..f71d6310a 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94832 2013-07-30 22:31:20Z dwallace $
+# $Id: PKGBUILD 94867 2013-07-31 22:32:58Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -25,7 +25,7 @@ pkgname=(uwsgi
         uwsgi-plugin-zergpool
         )
 pkgver=1.9.14
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
 license=(GPL2)
@@ -41,6 +41,14 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi_fix_rpath.patch
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
+md5sums=('ec9cf333534604f17ef4e24051d9d65d'
+         '73a3ad84736c8f2f3d077c43b24cf1b7'
+         'b05ba1d796e1ea608a40635bc4f3ec67'
+         '0b79320fbae92715c96086cf51e60bc8'
+         'db70315bbc8cb886a278ba59d5fd8d57'
+         '1a4516d5cdcf5b95b036f4eae2d0c152'
+         '4d09535ce379c8acd76160f35d5d6b55'
+         '0c09a52fdb88f08c36a8b380f451ce6d')
 
 prepare(){
     cd $srcdir/$pkgbase-$pkgver
@@ -51,13 +59,14 @@ prepare(){
     done
     rm -rf plugins/ruby
     mv plugins/ruby{19,}
-    cp -a plugins/python{,2}
     sed -i 's:\(ruby\)19:\1:' plugins/ruby/uwsgiplugin.py
 
 }
 build() {
   pushd $srcdir/$pkgbase-$pkgver
-  python uwsgiconfig.py --build archlinux.ini
+  python uwsgiconfig.py --build archlinux
+  python2 uwsgiconfig.py --plugin plugins/python archlinux python2
+  python2 uwsgiconfig.py --plugin plugins/greenlet archlinux greenlet
 }
 
 package_uwsgi() {
@@ -97,10 +106,9 @@ package_uwsgi-plugin-python2(){
     depends=(uwsgi-plugin-common)
     pkgdesc="Plugin for Python2 support"
     cd $srcdir/$pkgbase-$pkgver
-    python2 uwsgiconfig.py --plugin plugins/python archlinux python
     install -dm755 $pkgdir/usr/bin
     ln -s uwsgi $pkgdir/usr/bin/uwsgi_python2
-    install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
+    install -Dm755 $srcdir/$pkgbase-$pkgver/python2_plugin.so $pkgdir/usr/lib/uwsgi/python2_plugin.so
 }
 
 package_uwsgi-plugin-python(){
@@ -108,7 +116,6 @@ package_uwsgi-plugin-python(){
     pkgdesc="Plugin for Python support"
     install -dm755 $pkgdir/usr/bin
     cd $srcdir/$pkgbase-$pkgver
-    python3 uwsgiconfig.py --plugin plugins/python archlinux python
     ln -s uwsgi $pkgdir/usr/bin/uwsgi_python
     install -Dm755 $srcdir/$pkgbase-$pkgver/python_plugin.so $pkgdir/usr/lib/uwsgi/python_plugin.so
 }
@@ -163,7 +170,6 @@ package_uswgi-plugin-greenlet(){
     depends=(python2-greenlet uwsgi-plugin-common)
     pkgdesc="Plugin for Python Greenlet support"
     cd $srcdir/$pkgbase-$pkgver
-    python2 uwsgiconfig.py --plugin plugins/greenlet archlinux.ini greenlet
     install -dm755 $pkgdir/usr/bin
     ln -s uwsgi $pkgdir/usr/bin/uwsgi_greenlet
     install -Dm755 greenlet_plugin.so $pkgdir/usr/lib/uwsgi/greenlet_plugin.so
@@ -225,11 +231,3 @@ package_uwsgi-plugin-zergpool(){
     ln -s uwsgi $pkgdir/usr/bin/uwsgi_zergpool
     install -Dm755 $pkgbase-$pkgver/zergpool_plugin.so $pkgdir/usr/lib/uwsgi/zergpool_plugin.so
 }
-md5sums=('ec9cf333534604f17ef4e24051d9d65d'
-         '1816524eb13705c20f6abc00557f4ea9'
-         'b05ba1d796e1ea608a40635bc4f3ec67'
-         '0b79320fbae92715c96086cf51e60bc8'
-         'db70315bbc8cb886a278ba59d5fd8d57'
-         '1a4516d5cdcf5b95b036f4eae2d0c152'
-         '4d09535ce379c8acd76160f35d5d6b55'
-         '0c09a52fdb88f08c36a8b380f451ce6d')
diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini
index 791d4208f..36841b267 100644
--- a/community/uwsgi/archlinux.ini
+++ b/community/uwsgi/archlinux.ini
@@ -14,4 +14,4 @@ yaml_implementation = auto
 malloc_implementation = libc
 embedded_plugins = echo, ping, corerouter, http
 plugin_dir = /usr/lib/uwsgi
-plugins = rack, python2, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
+plugins = rack, python, nagios, fastrouter, admin, lua, ruby, cache, cgi, rpc, ugreen, php, carbon, rrdtool, erlang, pam, jvm, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter, systemd_logger
diff --git a/community/uwsgi/uwsgi.install b/community/uwsgi/uwsgi.install
index 605d7fe2d..0002ec42e 100644
--- a/community/uwsgi/uwsgi.install
+++ b/community/uwsgi/uwsgi.install
@@ -9,3 +9,4 @@ post_update(){
     echo "\tserver touches the socket. You will also not need to specify the socket in"
     echo "\tthe .ini file or in the .service file.  Systemd will handle listening to"
     echo "\tthe socket for you."
+}