Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/blender/PKGBUILD
	community/cdfs/PKGBUILD
	community/cdfs/cdfs.install
	community/mc/PKGBUILD
	community/open-vm-tools-modules/PKGBUILD
	community/open-vm-tools-modules/modprobe.conf
	community/open-vm-tools-modules/open-vm-tools-modules.install
	community/open-vm-tools/PKGBUILD
	community/open-vm-tools/open-vm-tools.conf.d
	community/open-vm-tools/open-vm-tools.rc.d
	community/open-vm-tools/scripts-network-FS19541.patch
	community/pekwm/PKGBUILD
	community/r8168-lts/PKGBUILD
	community/simutrans/PKGBUILD
	community/spectrwm/PKGBUILD
	community/supertuxkart/PKGBUILD
	community/tp_smapi/PKGBUILD
	community/tp_smapi/tp_smapi.install
	community/vhba-module/PKGBUILD
	community/vhba-module/vhba-module.install
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/gst-plugins-bad/PKGBUILD
	extra/imap/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/lirc/PKGBUILD
	extra/lirc/lirc.install
	extra/llvm/PKGBUILD
	extra/nvidia-304xx-utils/PKGBUILD
	extra/ruby/PKGBUILD
	extra/xscreensaver/PKGBUILD

2 files changed, 30 insertions, 19 deletions

diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 2deb594a2..9f48c3ece 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171485 2012-11-18 02:09:02Z foutrelis $
+# $Id: PKGBUILD 173988 2012-12-31 11:59:46Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -10,12 +10,12 @@
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.1
-pkgrel=6
+pkgver=3.2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml')
+makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
 source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
         http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz
@@ -25,19 +25,17 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
-        clang-3.1-fix-libprofile_rt.a-location.patch
-        clang-3.1-fix-lwg-2141.patch)
-sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
-            'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
-            '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
+        clang-3.1-fix-libprofile_rt.a-location.patch)
+sha256sums=('125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343'
+            '2aaaf03f7c0f6b16fe97ecc81247dc2bf2d4bec7620a77cc74670b7e07ff5658'
+            'a9a6b73a1bd5fc763f3b3826a6ce796cb150042d37d319e06e72d3d9778aaac1'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
             '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48'
             '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
-            'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
+            'fe3969d9ec93263814d9892a15b6a1eb60ad756fe7c3985a45d8cd82bc9b7a7b'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
-            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137'
-            'a3ac405a983643c9cb9081692a3f4d28e5d19571fa12b0517fb2b1f2acab0ad0')
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
@@ -83,13 +81,13 @@ build() {
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
-  # Fix FS#32731: [clang] 3.1 fails to compile libstdc++ <chrono> 4.7.2
-  patch -d tools/clang -Np0 -i "$srcdir/clang-3.1-fix-lwg-2141.patch"
-
   # Fix FS#31098: LLVM 3.1 produces invalid debug information
   # http://llvm.org/bugs/show_bug.cgi?id=13211
   patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch"
 
+  # Drop "svn" suffix from version string
+  sed -i 's/3\.2svn/3.2/g' configure
+
   # Apply strip option to configure
   _optimized_switch="enable"
   [[ $(check_option strip) == n ]] && _optimized_switch="disable"
@@ -118,6 +116,8 @@ build() {
     --$_optimized_switch-optimized
 
   make REQUIRES_RTTI=1
+  make -C docs -f Makefile.sphinx man
+  make -C docs -f Makefile.sphinx html
 }
 
 package_llvm() {
@@ -166,6 +166,14 @@ package_llvm() {
     done
   fi
 
+  # Install man pages
+  install -d "$pkgdir/usr/share/man/man1"
+  cp docs/_build/man/*.1 "$pkgdir/usr/share/man/man1/"
+
+  # Install html docs
+  cp -r docs/_build/html/* "$pkgdir/usr/share/doc/llvm/html/"
+  rm -r "$pkgdir/usr/share/doc/llvm/html/_sources"
+
   install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
@@ -220,6 +228,11 @@ package_clang-analyzer() {
     ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
   done
 
+  # Relocate man page
+  install -d "$pkgdir/usr/share/man/man1"
+  mv "$pkgdir/usr/lib/clang-analyzer/scan-build/scan-build.1" \
+    "$pkgdir/usr/share/man/man1/"
+
   # Use Python 2
   sed -i \
     -e 's|env python$|&2|' \
diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch
index 3205fbf69..9f43e657e 100644
--- a/extra/llvm/enable-lto.patch
+++ b/extra/llvm/enable-lto.patch
@@ -19,14 +19,12 @@ Index: lib/Driver/Tools.cpp
    // Tell the linker to load the plugin. This has to come before AddLinkerInputs
    // as gold requires -plugin to come before any -plugin-opt that -Wl might
    // forward.
--  if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
+   if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) {
      CmdArgs.push_back("-plugin");
 -    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
 +    std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
      CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
+   }
  
    AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
  }