revert llvm

multimedia/graphics/jbigkit/actions.py

@@ -9,11 +9,11 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
 def build():
-    autotools.make("-j1 CC=%s CFLAGS='%s'" % (get.CC(), get.CFLAGS()))
+    autotools.make("CC=%s CFLAGS='%s'" % (get.CC(), get.CFLAGS()))
 
 def check():
     autotools.make("-j1 test")
-    
+
 def install():
     pisitools.insinto("/usr/include/", "libjbig/jbig*.h")
     pisitools.insinto("/usr/lib/", "libjbig/libjbig*.so")

programming/build/llvm/pspec.xml

@@ -11,6 +11,7 @@
         <License>NCSA</License>
         <Summary>The Low Level Virtual Machine</Summary>
         <Description>The LLVM Project is a collection of modular and reusable compiler and toolchain technologies. Despite its name, LLVM has little to do with traditional virtual machines, though it does provide helpful libraries that can be used to build them.</Description>
+<<<<<<< HEAD
        <Archive sha1sum="ce801cf456b8dacd565ce8df8288b4d90e7317ff" type="tarxz">http://releases.llvm.org/3.9.1/llvm-3.9.1.src.tar.xz</Archive>
        <Archive sha1sum="95e4be54b70f32cf98a8de36821ea5495b84add8" type="binary">http://releases.llvm.org/3.9.1/cfe-3.9.1.src.tar.xz</Archive>
        <Archive sha1sum="f24e5ceb226a72e781cefde4e30f2d7be09ea305" type="binary">http://releases.llvm.org/3.9.1/clang-tools-extra-3.9.1.src.tar.xz</Archive>
@@ -20,6 +21,13 @@
             <AdditionalFile target="msan-prevent-initialization-failure-with-newer-glibc.patch">msan-prevent-initialization-failure-with-newer-glibc.patch</AdditionalFile>
             <AdditionalFile target="AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch">AMDGPU-Fix-an-interaction-between-WQM-and-polygon-stippling.patch</AdditionalFile>
         </AdditionalFiles>
+=======
+       <Archive sha1sum="723ac918979255706434a05f5af34b71c49c9971" type="tarxz">http://llvm.org/releases/3.8.0/llvm-3.8.0.src.tar.xz</Archive>
+       <Archive sha1sum="2230ef962f2df3c13ec93f5b04b0e3cdff94b2ce" type="binary">http://llvm.org/releases/3.8.0/cfe-3.8.0.src.tar.xz</Archive>
+       <Archive sha1sum="a99d8b6fc5e593c4671424b327779318a1856acf" type="binary">http://llvm.org/releases/3.8.0/clang-tools-extra-3.8.0.src.tar.xz</Archive>
+       <Archive sha1sum="6d503cea94c131b6bfcf5254e62d32fcce1ebcc8" type="binary">http://llvm.org/releases/3.8.0/lldb-3.8.0.src.tar.xz</Archive>  
+       <Archive sha1sum="480ea09e369dac6de1f3759b27fa19417b26b69e" type="binary">http://llvm.org/releases/3.8.0/compiler-rt-3.8.0.src.tar.xz</Archive>
+>>>>>>> parent of 80823be... llvm:v.bump
         <BuildDependencies>
             <Dependency>zlib-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
@@ -204,6 +212,7 @@
     </Package>
 
     <History>
+<<<<<<< HEAD
         <Update release="4">
             <Date>2017-02-05</Date>
             <Version>3.9.1</Version>
@@ -211,6 +220,8 @@
             <Name>Pisi Linux Community</Name>
             <Email>admin@pisilinux.org</Email>
         </Update>
+=======
+>>>>>>> parent of 80823be... llvm:v.bump
         <Update release="3">
             <Date>2016-06-09</Date>
             <Version>3.8.0</Version>

programming/language/python3/python3-pygobject3/actions.py

@@ -11,7 +11,7 @@ from pisi.actionsapi import get
 
 def setup():
     pisitools.dosed("configure", "-Werror=format", "#-Werror=format")
-    shelltools.export("PYTHON", "/usr/bin/python3.6")
+    shelltools.export("PYTHON", "/usr/bin/python3.4")
     shelltools.system("./configure --prefix=/usr \
                        --localstatedir=/var \
                        --disable-static")