Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/gcc/PKGBUILD
	extra/shared-mime-info/PKGBUILD
	extra/smb4k/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	testing/xfig/PKGBUILD

2 files changed, 43 insertions, 8 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 32a53b565..f1bf35876 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $
+# $Id: PKGBUILD 148652 2012-02-05 03:55:39Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,7 +10,7 @@ else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
 pkgver=4.6.2
-pkgrel=6
+pkgrel=7
 _snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
@@ -29,12 +29,8 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
 	gcc_pure64.patch
         gcc_mips64el_lib.patch
-	gcc-hash-style-both.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
-         '450772ce32daed97d7383199f8797f33'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '67e337993d821d72fccacbed52d48c34'
-         '4df25b623799b148a0703eaeec8fdf3f')
+	gcc-hash-style-both.patch
+	gcc-4.6.2-cloog-0.17.patch)
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -58,6 +54,9 @@ build() {
   fi
   patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
 
+  # compatibility with latest cloog
+  patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
diff --git a/core/gcc/gcc-4.6.2-cloog-0.17.patch b/core/gcc/gcc-4.6.2-cloog-0.17.patch
new file mode 100644
index 000000000..0503a05ed
--- /dev/null
+++ b/core/gcc/gcc-4.6.2-cloog-0.17.patch
@@ -0,0 +1,36 @@
+diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
+--- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
++++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
+@@ -6049,8 +6049,8 @@
+     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+ 
+     if test "${cloog_org}" = yes ; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
++$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
+ if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+@@ -6061,8 +6061,7 @@
+ main ()
+ {
+ #if CLOOG_VERSION_MAJOR != 0 \
+-    || CLOOG_VERSION_MINOR != 16 \
+-    || CLOOG_VERSION_REVISION < 1
++    || CLOOG_VERSION_MINOR != 17
+     choke me
+    #endif
+   ;
+diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
+--- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
++++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
+@@ -1367,7 +1367,7 @@
+   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
+      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
+      we pass an incomplete program to cloog.  */
+-  options->language = LANGUAGE_C;
++  options->language = CLOOG_LANGUAGE_C;
+ 
+   /* Enable complex equality spreading: removes dummy statements
+      (assignments) in the generated code which repeats the