[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Florin Braescu]

commit 1aae477af2ea6b84718726a9b3f2b6f9be0e7492
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 19 Oct 2014 18:24:10 +0300
URL: https://github.com/lunar-linux/moonbase-other/commit/1aae477af2ea6b84718726a9b3f2b6f9be0e7492

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  libs/gdal/BUILD                 | +1/-1     
  python/Jinja2/BUILD             | +8/-9     
  python/Twisted/BUILD            | +1/-5     
  python/lxml/BUILD               | +1/-2     
  python/paramiko/BUILD           | +1/-5     
  python/pygments/BUILD           | +1/-1     
  python/pyopenssl/BUILD          | +1/-5     
  python/python-poppler-qt4/BUILD | +1/-3     
  python/tornado/BUILD            | +1/-1     
  9 files changed, 16 insertions(+), 32 deletions(-)

--- a/libs/gdal/BUILD
+++ b/libs/gdal/BUILD
@@ -20,7 +20,7 @@
     python setup.py install --root=/
   fi &&
 
-  if in_depends $MODULE Python ; then
+  if in_depends $MODULE Python-3 ; then
     python3 setup.py build &&
     python3 setup.py install --root=/
   fi
--- a/python/Jinja2/BUILD
+++ b/python/Jinja2/BUILD
@@ -1,12 +1,11 @@
-
 # Do the python2 part first
- python setup.py build    &&
- prepare_install          &&
- python setup.py install --optimize=1 &&
+python setup.py build    &&
+prepare_install          &&
+python setup.py install --optimize=1 --root=/ &&
 
 # Can live side by side with the Python2 stuff
- if in_depends $MODULE Python-3 ; then
-   python3 setup.py build    &&
-   prepare_install          &&
-   python3 setup.py install --optimize=1
- fi
+if in_depends $MODULE Python-3 ; then
+  python3 setup.py build    &&
+  prepare_install          &&
+  python3 setup.py install --optimize=1
+fi
--- a/python/Twisted/BUILD
+++ b/python/Twisted/BUILD
@@ -1,6 +1,2 @@
-(
-
     prepare_install  &&
-    python ./setup.py install
-
-) > $C_FIFO 2>&1
+    python ./setup.py install --root=/
--- a/python/lxml/BUILD
+++ b/python/lxml/BUILD
@@ -1,7 +1,6 @@
-
   python setup.py build &&
   prepare_install &&
-  python setup.py install --optimize=1 &&
+  python setup.py install --optimize=1 --root=/ &&
 
   if in_depends $MODULE Python-3 ; then
       python3 setup.py build    &&
--- a/python/paramiko/BUILD
+++ b/python/paramiko/BUILD
@@ -1,7 +1,3 @@
-(
-
   python setup.py build_ext -i  &&
   prepare_install               &&
-  python setup.py install
-
-) > $C_FIFO 2>&1
+  python setup.py install --root=/
--- a/python/pygments/BUILD
+++ b/python/pygments/BUILD
@@ -1,3 +1,3 @@
 python setup.py config &&
 prepare_install &&
-python setup.py install
+python setup.py install --root=/
--- a/python/pyopenssl/BUILD
+++ b/python/pyopenssl/BUILD
@@ -1,6 +1,2 @@
-(
-
    prepare_install &&
-   python ./setup.py install
-
-) > $C_FIFO 2>&1
+   python ./setup.py install --root=/
--- a/python/python-poppler-qt4/BUILD
+++ b/python/python-poppler-qt4/BUILD
@@ -1,5 +1,3 @@
-
   python setup.py build &&
   prepare_install &&
-  python setup.py install --prefix /usr
-
+  python setup.py install --prefix /usr --root=/
--- a/python/tornado/BUILD
+++ b/python/tornado/BUILD
@@ -1,2 +1,2 @@
 prepare_install  &&
-python ./setup.py install
+python ./setup.py install --root=/