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

Conflicts:
	community-staging/kid3/kid3.install
	community/cherokee/PKGBUILD
	community/supercollider/supercollider.install
	core/libusb/PKGBUILD
	core/systemd/PKGBUILD
	core/udev/PKGBUILD
	extra/gimp-devel/PKGBUILD
	extra/maxima/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	staging/kdebase-workspace/kdm
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdeplasma-addons/kdeplasma-addons-applets.install

30 files changed, 370 insertions, 578 deletions

diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index 21f27d295..2d393ca87 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140690 2011-10-18 03:46:10Z eric $
+# $Id: PKGBUILD 161080 2012-06-08 01:31:13Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
 
 pkgname=allegro4
 pkgver=4.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
-makedepends=('cmake' 'libpng')
+makedepends=('cmake' 'libpng' 'mesa')
 source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
         LICENSE)
 md5sums=('4db71b0460fc99926ae91d223199c2e6'
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 83e598af8..5835a6438 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 153691 2012-03-18 02:01:54Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 160935 2012-06-07 06:29:24Z pierre $
 
 pkgname=fetchmail
 pkgver=6.3.21
-pkgrel=3
+pkgrel=4
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fetchmail.berlios.de/"
@@ -14,13 +13,16 @@ optdepends=('tk: for using fetchmailconf'
             'python2: for using fetchmailconf')
 backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
-install=fetchmail.install
-source=(http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz{,.asc}
-        fetchmail.rc fetchmail.conf)
+install='fetchmail.install'
+source=("http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz"
+        "http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz.asc"
+        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
 sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81'
           'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059'
-          '910ec21ad0a619db67e4665189dc46d2a0634ea5'
-          '30401729386d6f774c6c36ab8530842166de54a8')
+          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
+          '30401729386d6f774c6c36ab8530842166de54a8'
+          '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
+          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,4 +37,6 @@ package() {
   install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
   install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
   install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
+  install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
+  install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
 }
diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install
index 0b1cc6ae3..81b374c57 100644
--- a/extra/fetchmail/fetchmail.install
+++ b/extra/fetchmail/fetchmail.install
@@ -4,6 +4,9 @@ post_install() {
   echo "then 'chown fetchmail /etc/fetchmailrc'"
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
       -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+  if [[ ! -d run/fetchmail ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+  fi
 }
 
 post_upgrade() {
@@ -13,6 +16,9 @@ post_upgrade() {
   if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
     usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
   fi
+  if [[ ! -d run/fetchmail ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+  fi
 }
 
 pre_remove() {
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
index 6d453a223..4d8b98d40 100644
--- a/extra/fetchmail/fetchmail.rc
+++ b/extra/fetchmail/fetchmail.rc
@@ -2,15 +2,14 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-[ -f /etc/conf.d/fetchmail ] && . /etc/conf.d/fetchmail
+. /etc/conf.d/fetchmail
 
 PID=`pidof -o %PPID /usr/bin/fetchmail`
 case "$1" in
   start)
     stat_busy "Starting fetchmail"
-    [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail
     [ -z "$PID" ] &&
-		su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
+      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -24,7 +23,6 @@ case "$1" in
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm -f /var/run/fetchmail.pid
       rm_daemon fetchmail
       stat_done
     fi
diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service
new file mode 100644
index 000000000..3e7da7545
--- /dev/null
+++ b/extra/fetchmail/fetchmail.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A remote-mail retrieval utility
+After=network.target
+
+[Service]
+User=fetchmail
+EnvironmentFile=/etc/conf.d/fetchmail
+ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/fetchmail/fetchmail.tmpfiles b/extra/fetchmail/fetchmail.tmpfiles
new file mode 100644
index 000000000..07945f876
--- /dev/null
+++ b/extra/fetchmail/fetchmail.tmpfiles
@@ -0,0 +1 @@
+d /run/fetchmail 700 fetchmail nobody
diff --git a/extra/gcc4.6/PKGBUILD b/extra/gcc4.6/PKGBUILD
new file mode 100644
index 000000000..81e8f4670
--- /dev/null
+++ b/extra/gcc4.6/PKGBUILD
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 161082 2012-06-08 01:43:52Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+pkgname=gcc4.6
+pkgver=4.6.3
+_ver=${pkgver:0:3}
+pkgrel=1
+pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
+makedepends=('flex' 'bison')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        gcc_pure64.patch
+        gcc-hash-style-both.patch
+        gcc-4.6.2-cloog-0.17.patch)
+md5sums=('773092fe5194353b02bb0110052a972e'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f'
+         '6d9939a2e667376031679ac9f9c49263')
+
+build() {
+  cd gcc-$pkgver
+
+  # Do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+  # Do not run fixincludes
+  sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    patch -p1 -i ${srcdir}/gcc_pure64.patch
+  fi
+  patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
+
+  # compatibility with latest cloog
+  patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
+
+  echo ${pkgver} > gcc/BASE-VER
+
+  cd ..
+  mkdir gcc-build
+  cd gcc-build
+
+  ../gcc-$pkgver/configure --prefix=/usr \
+      --libdir=/usr/lib --libexecdir=/usr/lib \
+      --mandir=/usr/share/man --infodir=/usr/share/info \
+      --datadir=/usr/share/gcc-$_ver \
+      --with-bugurl=https://bugs.archlinux.org/ \
+      --enable-languages=c,c++,lto \
+      --enable-shared --enable-threads=posix \
+      --with-system-zlib --enable-__cxa_atexit \
+      --disable-libunwind-exceptions --enable-clocale=gnu \
+      --disable-libstdcxx-pch --enable-libstdcxx-time \
+      --enable-gnu-unique-object --enable-linker-build-id \
+      --with-ppl --enable-cloog-backend=isl \
+      --enable-lto --enable-gold --enable-ld=default \
+      --enable-plugin --with-plugin-ld=ld.gold \
+      --disable-multilib --disable-libssp \
+      --enable-checking=release \
+      --program-suffix=-$_ver \
+      --enable-version-specific-runtime-libs
+
+  make
+}
+
+check() {
+  # increase stack size to prevent test failures
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+  ulimit -s 32768
+
+  # do not abort on error as some are "expected"
+  make -C gcc-build -k check || true
+  gcc-$pkgver/contrib/test_summary
+}
+
+package()
+{
+  make -j1 -C gcc-build DESTDIR=${pkgdir} install
+
+  # Install Runtime Library Exception
+  install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
+    $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
+
+  # deal with conflicting man and info pages
+  cd $pkgdir
+  rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
+  for i in usr/share/info/*; do
+    mv $i ${i%.info}-$_ver.info
+  done
+}
diff --git a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
new file mode 100644
index 000000000..0503a05ed
--- /dev/null
+++ b/extra/gcc4.6/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
diff --git a/extra/gcc4.6/gcc-hash-style-both.patch b/extra/gcc4.6/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/extra/gcc4.6/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h	2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/i386/linux64.h.orig	2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+  %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/i386/linux.h.orig	2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/linux64.h.orig	2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h	2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+ 
+--- gcc/config/rs6000/sysv4.h.orig	2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h	2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+ 
+--- gcc/config/s390/linux.h.orig	2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig	2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h	2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig	2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h	2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!static: \
diff --git a/extra/gcc4.6/gcc_pure64.patch b/extra/gcc4.6/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/extra/gcc4.6/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64	2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64	2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD
deleted file mode 100644
index 8c6c49682..000000000
--- a/extra/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 158548 2012-05-04 19:12:28Z daniel $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gimp.org/"
-license=('GPL3' 'LGPL3')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
-         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser or web-page plug-ins'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support'
-            'ghostscript: for postscript support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp')
-provides=("gimp=${pkgver}")
-install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('28997d14055f15db063eb92e1c8a7ebb'
-         'bb27bc214261d36484093e857f015f38')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
-    --with-gif-compression=lzw --without-aa --without-gvfs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/gimp-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  rm  "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/extra/gimp-devel/gimp-devel.install b/extra/gimp-devel/gimp-devel.install
deleted file mode 100644
index c317fbaca..000000000
--- a/extra/gimp-devel/gimp-devel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/extra/gimp-devel/linux.gpl b/extra/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/extra/gimp-devel/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 8e4800ce4..6d656782a 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160199 2012-05-30 18:30:33Z dan $
+# $Id: PKGBUILD 160963 2012-06-07 14:20:24Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.10.3
+pkgver=1.7.10.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -99,7 +99,7 @@ package() {
   install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
 }
 
-sha1sums=('172c6ad5a55276213c5e40b83a4c270f6f931b3e'
-          '4ae4f9f0f0dc42ad5cb2de309049c953841bc413'
+sha1sums=('ddc305ab520246790faa72bbaab4b9bf5bcf23fa'
+          '0769f6ff48d89df908cfe2af85fb4072b4178746'
           'f2b41828bd912b72e2cb3e14677739c4f370de66'
           '149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 91235bdd7..862baee9f 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159211 2012-05-18 09:16:01Z andyrtr $
+# $Id: PKGBUILD 160960 2012-06-07 13:35:03Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=49.1.1
-pkgrel=2
+pkgver=49.1.2
+pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.icu-project.org/"
@@ -12,18 +12,14 @@ license=('custom:"icu"')
 depends=('gcc-libs' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
-	    icu.8198.revert.icu5431.patch
-	    fix_broken_regex.diff)
-md5sums=('7c53f83e0327343f4060c0eb83842daf'
-         'ebd5470fc969c75e52baf4af94a9ee82'
-         '5bbcd600fdf9b35cbd89a06cab522f3f')
+	    icu.8198.revert.icu5431.patch)
+md5sums=('bbc609fe5237202d7abf016141012a45'
+         'ebd5470fc969c75e52baf4af94a9ee82')
 
 build() {
   cd ${srcdir}/icu/source
   # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
   patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
-  # patch broken regex  - https://bugs.archlinux.org/task/29700 / http://bugs.icu-project.org/trac/ticket/9276
-  patch -Np0 -i ${srcdir}/fix_broken_regex.diff
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man
diff --git a/extra/icu/fix_broken_regex.diff b/extra/icu/fix_broken_regex.diff
deleted file mode 100644
index 8161a1107..000000000
--- a/extra/icu/fix_broken_regex.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- i18n/regexcmp.cpp
-+++ i18n/regexcmp.cpp
-@@ -3307,8 +3307,29 @@
- 
-         case URX_STRING_I:
--            // TODO:  Is the case-folded string the longest?
--            //        If so we can optimize this the same as URX_STRING.
--            loc++;
--            currentLen = INT32_MAX;
-+            // TODO:  This code assumes that any user string that matches will be no longer
-+            //        than our compiled string, with case insensitive matching.
-+            //        Our compiled string has been case-folded already.
-+            //
-+            //        Any matching user string will have no more code points than our
-+            //        compiled (folded) string.  Folding may add code points, but
-+            //        not remove them.
-+            //
-+            //        There is a potential problem if a supplemental code point 
-+            //        case-folds to a BMP code point.  In this case our compiled string
-+            //        could be shorter (in code units) than a matching user string.
-+            //
-+            //        At this time (Unicode 6.1) there are no such characters, and this case
-+            //        is not being handled.  A test, intltest regex/Bug9283, will fail if
-+            //        any problematic characters are added to Unicode.
-+            //
-+            //        If this happens, we can make a set of the BMP chars that the
-+            //        troublesome supplementals fold to, scan our string, and bump the
-+            //        currentLen one extra for each that is found.
-+            //
-+            {
-+                loc++;
-+                int32_t stringLenOp = (int32_t)fRXPat->fCompiledPat->elementAti(loc);
-+                currentLen = safeIncrement(currentLen, URX_VAL(stringLenOp));
-+            }
-             break;
diff --git a/extra/libxft/git_fixes.diff b/extra/libxft/git_fixes.diff
deleted file mode 100644
index 3a7155271..000000000
--- a/extra/libxft/git_fixes.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-From 84b8b5b46773f9b686d57f28092824b86bffed9d Mon Sep 17 00:00:00 2001
-From: Mikael Magnusson <mikachu@gmail.com>
-Date: Sun, 11 Mar 2012 01:41:55 +0000
-Subject: Fixup for 550b2f76401c2 which broke bold fonts
-
-The commit removed the line
-AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_GlyphSlot_Embolden)
-but failed to remove the #if lines that this commit removes, resulting
-in that code never being executed.
-
-Fixes: https://bugs.freedesktop.org/attachment.cgi?id=58280
-
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/xftglyphs.c b/src/xftglyphs.c
-index 4a3b9d6..2f3dc5a 100644
---- a/src/xftglyphs.c
-+++ b/src/xftglyphs.c
-@@ -24,9 +24,7 @@
- #include <freetype/ftoutln.h>
- #include <freetype/ftlcdfil.h>
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- #include <freetype/ftsynth.h>
--#endif
- 
- /*
-  * Validate the memory info for a font
-@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
- 
- 	glyphslot = face->glyph;
- 
--#if HAVE_FT_GLYPHSLOT_EMBOLDEN
- 	/*
- 	 * Embolden if required
- 	 */
- 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
--#endif
- 
- 	/*
- 	 * Compute glyph metrics from FreeType information
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 0241dde0e..64ff33ff5 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159253 2012-05-19 18:59:08Z ronald $
+# $Id: PKGBUILD 160970 2012-06-07 18:26:20Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.27.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Maxima - a sophisticated computer algebra system"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net"
 if [ "${CARCH}" == "mips64el" ] ; then
     depends=('clisp' 'texinfo' 'sh')
 else
-    depends=('sbcl=1.0.56' 'texinfo' 'sh')
+    depends=('sbcl=1.0.57' 'texinfo' 'sh')
 fi
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
diff --git a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
deleted file mode 100644
index 4e26fd87d..000000000
--- a/extra/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c
---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c	2012-05-26 21:49:27.000000000 +0300
-+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c	2012-05-26 21:55:39.000000000 +0300
-@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_
-     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
- 
--#ifndef WIN32
--    PL_uid  = ids->uid;
--    PL_euid = ids->euid;
--    PL_gid  = ids->gid;
--    PL_egid = ids->egid;
--#endif
--#ifdef MP_MAINTAIN_PPID
--    PL_ppid = ids->ppid;
--#endif
- }
- 
diff --git a/extra/mod_perl/nolfs.patch b/extra/mod_perl/nolfs.patch
deleted file mode 100644
index 3eb345b66..000000000
--- a/extra/mod_perl/nolfs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: mod_perl-2.0.5/lib/Apache2/Build.pm
-===================================================================
---- mod_perl-2.0.5.orig/lib/Apache2/Build.pm	2011-02-02 21:23:47.000000000 +0100
-+++ mod_perl-2.0.5/lib/Apache2/Build.pm	2011-05-26 17:12:46.276946520 +0200
-@@ -2147,7 +2147,8 @@ sub has_large_files_conflict {
-     # with it is that we didn't have such a case yet, but may need to
-     # deal with it later
- 
--    return $perl_lfs64 ^ $apr_lfs64;
-+    return 0;
-+    # $perl_lfs64 ^ $apr_lfs64;
- }
- 
- # if perl is built with uselargefiles, but apr not, the build won't
diff --git a/extra/rsync/ChangeLog b/extra/rsync/ChangeLog
deleted file mode 100644
index d07e4ad5a..000000000
--- a/extra/rsync/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-    * rsync 3.0.8-2
-	* Added call_rsync func to rsyncd to support pass arguments to the daemon
-
-2010-01-01  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.7-1
-	* Upstream update
-
-2009-05-08  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.6-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.5-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.4-1
-	* Upstream update
-
-2008-07-05  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.3-1
-	* Upstream update
-
-2008-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.2-1
-	* Upstream update
-
-2008-03-01  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.0-1
-	* Upstream update
-	* Updated license
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 685558262..dbe19cdb7 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 149915 2012-02-11 20:09:00Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $
+
 pkgname=rsync
 pkgver=3.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="A file transfer program to keep remote files in sync"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://samba.anu.edu.au/rsync/"
 license=('GPL3')
-depends=('acl')
+depends=('perl')
 backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
-changelog=ChangeLog
-source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
-        rsyncd.conf rsyncd rsync.xinetd)
+source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
+        'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service')
 md5sums=('5ee72266fe2c1822333c407e1761b92b'
-         '4395c0591638349b1a7aeaaa4da1f03a'
-         '7a9ce3b5de97f3aae29b906f93e1d157'
-         'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
-          '48be09294134dfed888818872fe552a59c29147a'
-          'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
-          'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
+         'bce64d122a8e0f86872a4a21a03bc7f3'
+         'ba413da4ebca05c57860151fda21efbc'
+         'ea3e9277dc908bc51f9eddc0f6b935c1'
+         'ec96f9089d71109557cdcaa3f0633ed6')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./prepare-source
-	./configure --prefix=/usr --with-included-popt \
-              --enable-acl-support --enable-xattr-support
+	./configure --prefix=/usr --with-included-popt
 	make
 }
 
+check() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make test
+}
+
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd"
 	install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
 	install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
+	install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
 	install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
 }
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
index d7a772e8e..27836d5c4 100644
--- a/extra/rsync/rsyncd
+++ b/extra/rsync/rsyncd
@@ -5,26 +5,20 @@
 
 [ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
 
-function call_rsyncd() {
-	/usr/bin/rsync --daemon $RSYNCD_ARGS
-}
-
 case "$1" in
   start)
     stat_busy "Starting rsyncd"
-    [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
+    [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      #pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid # Removed FS#20942
       add_daemon rsyncd
       stat_done
     fi
     ;;
-
   stop)
     stat_busy "Stopping rsyncd"
-    [ -f /var/run/rsyncd.pid ] && kill `cat /var/run/rsyncd.pid`
+    [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid`
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/extra/rsync/rsyncd.conf b/extra/rsync/rsyncd.conf
index f7161f3f8..152106091 100644
--- a/extra/rsync/rsyncd.conf
+++ b/extra/rsync/rsyncd.conf
@@ -3,14 +3,8 @@ gid = nobody
 use chroot = no
 max connections = 4
 syslog facility = local5
-pid file = /var/run/rsyncd.pid
+pid file = /run/rsyncd.pid
 
 [ftp]
-        path = /home/ftp
+        path = /srv/ftp
         comment = ftp area
-
-#[cvs]
-#        path = /data/cvs
-#        comment = CVS repository (requires authentication)
-#        auth users = tridge, susan
-#        secrets file = /etc/rsyncd.secrets
diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service
new file mode 100644
index 000000000..ea2e32c68
--- /dev/null
+++ b/extra/rsync/rsyncd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A file transfer program to keep remote files in sync
+
+[Service]
+EnvironmentFile=-/etc/conf.d/rsyncd
+ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index b425ac087..f37109401 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 156088 2012-04-13 11:09:01Z juergen $
+# $Id: PKGBUILD 160967 2012-06-07 17:45:43Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.0.56
+pkgver=1.0.57
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
-provides=('common-lisp' 'cl-asdf')
+provides=('common-lisp' 'cl-asdf' 'zlib')
 makedepends=('sbcl' 'texinfo')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('clisp' 'texinfo')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
         "arch-fixes.lisp")
-md5sums=('f9ba54b20f057e6eb5857929bb259142'
+md5sums=('bb0e4f5c2dad3491802197525283f6b0'
          '7ac0c1936547f4278198b8bf7725204d')
 
 build() {
@@ -38,6 +38,7 @@ build() {
   (flet ((enable (x) (pushnew x features))
          (disable (x) (setf features (remove x features))))
   (enable :sb-thread)
+  (enable :sb-core-compression)
   (disable :largefile)))
 EOF
 
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 7ce46fe07..cfa98e178 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,37 +1,29 @@
-# $Id: PKGBUILD 150218 2012-02-15 08:08:05Z juergen $
+# $Id: PKGBUILD 160951 2012-06-07 12:29:27Z juergen $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth')
+depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('aa094c2224aad22d5340a1d2d919c883')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  ./configure --backend=sdl --disable-debug \
-    --with-flac-prefix=/usr \
-    --with-fluidsynth-prefix=/usr \
-    --disable-faad \
+  ./configure --disable-debug \
+    --enable-release \
     --prefix=/usr
   make
 }
 
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  install -Dm755 scummvm "${pkgdir}"/usr/bin/scummvm
-  install -Dm644 dists/scummvm.6 "${pkgdir}"/usr/share/man/man6/scummvm.6
-  # fixes FS#9118 
+  make DESTDIR=$startdir/pkg install
   install -Dm644 dists/${pkgname}.desktop \
 	"${pkgdir}"/usr/share/applications/${pkgname}.desktop
-  install -Dm644  icons/scummvm.xpm \
-	"${pkgdir}"/usr/share/pixmaps/scummvm.xpm
-
-  install -Dm644 gui/themes/scummmodern.zip "${pkgdir}"/usr/share/scummvm/scummmodern.zip
 }
diff --git a/extra/vlc/access_smb_link_to_smbclient.patch b/extra/vlc/access_smb_link_to_smbclient.patch
deleted file mode 100644
index 3891108d4..000000000
--- a/extra/vlc/access_smb_link_to_smbclient.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hp=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=718b1f9901e5077b50c2189604afba883ca87bf7;hpb=84a1a3461adf901ff134a09eb4341cc301fdc6dd
-
-diff --git a/modules/access/Modules.am b/modules/access/Modules.am
-index 81d8e78..be8c47b 100644
---- a/modules/access/Modules.am
-+++ b/modules/access/Modules.am
-@@ -36,7 +36,7 @@ libsdp_plugin_la_DEPENDENCIES =
- 
- libaccess_smb_plugin_la_SOURCES = smb.c
- libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
--libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD)
-+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
- if HAVE_WIN32
- libaccess_smb_plugin_la_LIBADD += -lmpr
- endif
diff --git a/extra/xournal/pdf-export-64.patch b/extra/xournal/pdf-export-64.patch
deleted file mode 100644
index 9f7075c54..000000000
--- a/extra/xournal/pdf-export-64.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -aur old/src/xo-print.c new/src/xo-print.c
---- old/src/xo-print.c	2009-09-28 23:36:54.000000000 +0200
-+++ new/src/xo-print.c	2009-11-15 06:06:00.000000000 +0100
-@@ -761,7 +761,7 @@
- 
-   make_xref(xref, xref->last+1, pdfbuf->len);
-   g_string_append_printf(pdfbuf, 
--    "%d 0 obj\n<< /Length %d /Filter /FlateDecode /Type /Xobject "
-+    "%d 0 obj\n<< /Length %zu /Filter /FlateDecode /Type /Xobject "
-     "/Subtype /Image /Width %d /Height %d /ColorSpace /DeviceRGB "
-     "/BitsPerComponent 8 >> stream\n",
-     xref->last, zpix->len, width, height);
-@@ -840,8 +840,10 @@
-   gboolean fallback, is_binary;
-   guchar encoding[256];
-   gushort glyphs[256];
--  int i, j, num, len1, len2;
--  gsize len;
-+  int i, j, num;
-+  guint32 len1, len2;
-+  guint32 tt_len;
-+  gsize t1_len;
-   TrueTypeFont *ttfnt;
-   char *seg1, *seg2;
-   char *fontdata, *p;
-@@ -862,14 +864,14 @@
-       }
-     font->num_glyphs_used = num-1;
-     if (OpenTTFont(font->filename, 0, &ttfnt) == SF_OK) {
--      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &len, glyphs, encoding, num, 
-+      if (CreateTTFromTTGlyphs_tomemory(ttfnt, (guint8**)&fontdata, &tt_len, glyphs, encoding, num, 
-                    0, NULL, TTCF_AutoName | TTCF_IncludeOS2) == SF_OK) {
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d >> stream\n",
--          nobj_fontprog, (int)len, (int)len);
--        g_string_append_len(pdfbuf, fontdata, len);
-+          "%d 0 obj\n<< /Length %u /Length1 %u >> stream\n",
-+          nobj_fontprog, tt_len, tt_len);
-+        g_string_append_len(pdfbuf, fontdata, tt_len);
-         g_string_append(pdfbuf, "endstream\nendobj\n");
-         g_free(fontdata);
-       }
-@@ -879,7 +881,7 @@
-     else fallback = TRUE;
-   } else {
-   // embed the font file: Type1 case
--    if (g_file_get_contents(font->filename, &fontdata, &len, NULL) && len>=8) {
-+    if (g_file_get_contents(font->filename, &fontdata, &t1_len, NULL) && t1_len>=8) {
-       if (fontdata[0]==(char)0x80 && fontdata[1]==(char)0x01) {
-         is_binary = TRUE;
-         len1 = pfb_get_length((unsigned char *)fontdata+2);
-@@ -898,7 +900,7 @@
-           if (*p=='\n' || *p=='\r') p++;
-           if (*p=='\n' || *p=='\r') p++;
-           len1 = p-fontdata;
--          p = g_strrstr_len(fontdata, len, T1_SEGMENT_3_END);
-+          p = g_strrstr_len(fontdata, t1_len, T1_SEGMENT_3_END);
-           if (p==NULL) fallback = TRUE;
-           else {
-             // rewind 512 zeros
-@@ -936,7 +938,7 @@
-         make_xref(xref, xref->last+1, pdfbuf->len);
-         nobj_fontprog = xref->last;
-         g_string_append_printf(pdfbuf, 
--          "%d 0 obj\n<< /Length %d /Length1 %d /Length2 %d /Length3 0 >> stream\n",
-+          "%d 0 obj\n<< /Length %u /Length1 %u /Length2 %u /Length3 0 >> stream\n",
-           nobj_fontprog, len1+len2, len1, len2);
-         g_string_append_len(pdfbuf, seg1, len1);
-         g_string_append_len(pdfbuf, seg2, len2);
-@@ -1258,7 +1260,7 @@
-       tmpstr = make_pdfprefix(pdfinfo.pages+(pg->bg->file_page_seq-1),
-                               pg->width, pg->height);
-       g_string_append_printf(pdfbuf,
--        "%d 0 obj\n<< /Length %d >> stream\n%s\nendstream\nendobj\n",
-+        "%d 0 obj\n<< /Length %zu >> stream\n%s\nendstream\nendobj\n",
-         n_obj_prefix, tmpstr->len, tmpstr->str);
-       g_string_free(tmpstr, TRUE);
-       g_string_prepend(pgstrm, "Q Q Q ");
-@@ -1276,7 +1278,7 @@
-     
-     make_xref(&xref, xref.last+1, pdfbuf->len);
-     g_string_append_printf(pdfbuf, 
--      "%d 0 obj\n<< /Length %d /Filter /FlateDecode>> stream\n",
-+      "%d 0 obj\n<< /Length %zu /Filter /FlateDecode>> stream\n",
-       xref.last, zpgstrm->len);
-     g_string_append_len(pdfbuf, zpgstrm->str, zpgstrm->len);
-     g_string_free(zpgstrm, TRUE);
diff --git a/extra/xournal/poppler-api.patch b/extra/xournal/poppler-api.patch
deleted file mode 100644
index 9e33c7feb..000000000
--- a/extra/xournal/poppler-api.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -aur old/src/xo-file.c new/src/xo-file.c
---- old/src/xo-file.c	2009-09-29 09:36:05.000000000 +1000
-+++ new/src/xo-file.c	2011-10-06 03:11:17.307822836 +1100
-@@ -975,6 +975,140 @@
-   g_free(req);
- }
- 
-+/*
-+ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617
-+ * as a temporary workaround to poppler removing depreciated functions while we wait for
-+ * upstream to rewrite against cairo
-+ */
-+static void
-+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf)
-+{
-+  int cairo_width, cairo_height, cairo_rowstride;
-+  unsigned char *pixbuf_data, *dst, *cairo_data;
-+  int pixbuf_rowstride, pixbuf_n_channels;
-+  unsigned int *src;
-+  int x, y;
-+
-+  cairo_width = cairo_image_surface_get_width (surface);
-+  cairo_height = cairo_image_surface_get_height (surface);
-+  cairo_rowstride = cairo_image_surface_get_stride (surface);
-+  cairo_data = cairo_image_surface_get_data (surface);
-+
-+  pixbuf_data = gdk_pixbuf_get_pixels (pixbuf);
-+  pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-+  pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-+
-+  if (cairo_width > gdk_pixbuf_get_width (pixbuf))
-+    cairo_width = gdk_pixbuf_get_width (pixbuf);
-+  if (cairo_height > gdk_pixbuf_get_height (pixbuf))
-+    cairo_height = gdk_pixbuf_get_height (pixbuf);
-+  for (y = 0; y < cairo_height; y++)
-+    {
-+      src = (unsigned int *) (cairo_data + y * cairo_rowstride);
-+      dst = pixbuf_data + y * pixbuf_rowstride;
-+      for (x = 0; x < cairo_width; x++)
-+	{
-+	  dst[0] = (*src >> 16) & 0xff;
-+	  dst[1] = (*src >> 8) & 0xff;
-+	  dst[2] = (*src >> 0) & 0xff;
-+	  if (pixbuf_n_channels == 4)
-+	      dst[3] = (*src >> 24) & 0xff;
-+	  dst += pixbuf_n_channels;
-+	  src++;
-+	}
-+    }
-+}
-+
-+static void
-+_poppler_page_render_to_pixbuf (PopplerPage *page,
-+				int src_x, int src_y,
-+				int src_width, int src_height,
-+				double scale,
-+				int rotation,
-+				gboolean printing,
-+				GdkPixbuf *pixbuf)
-+{
-+  cairo_t *cr;
-+  cairo_surface_t *surface;
-+
-+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-+					src_width, src_height);
-+  cr = cairo_create (surface);
-+  cairo_save (cr);
-+  switch (rotation) {
-+  case 90:
-+	  cairo_translate (cr, src_x + src_width, -src_y);
-+	  break;
-+  case 180:
-+	  cairo_translate (cr, src_x + src_width, src_y + src_height);
-+	  break;
-+  case 270:
-+	  cairo_translate (cr, -src_x, src_y + src_height);
-+	  break;
-+  default:
-+	  cairo_translate (cr, -src_x, -src_y);
-+  }
-+
-+  if (scale != 1.0)
-+	  cairo_scale (cr, scale, scale);
-+
-+  if (rotation != 0)
-+	  cairo_rotate (cr, rotation * G_PI / 180.0);
-+
-+  if (printing)
-+	  poppler_page_render_for_printing (page, cr);
-+  else
-+	  poppler_page_render (page, cr);
-+  cairo_restore (cr);
-+
-+  cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER);
-+  cairo_set_source_rgb (cr, 1., 1., 1.);
-+  cairo_paint (cr);
-+
-+  cairo_destroy (cr);
-+
-+  copy_cairo_surface_to_pixbuf (surface, pixbuf);
-+  cairo_surface_destroy (surface);
-+}
-+
-+/**
-+ * poppler_page_render_to_pixbuf:
-+ * @page: the page to render from
-+ * @src_x: x coordinate of upper left corner
-+ * @src_y: y coordinate of upper left corner
-+ * @src_width: width of rectangle to render
-+ * @src_height: height of rectangle to render
-+ * @scale: scale specified as pixels per point
-+ * @rotation: rotate the document by the specified degree
-+ * @pixbuf: pixbuf to render into
-+ *
-+ * First scale the document to match the specified pixels per point,
-+ * then render the rectangle given by the upper left corner at
-+ * (src_x, src_y) and src_width and src_height.
-+ * This function is for rendering a page that will be displayed.
-+ * If you want to render a page that will be printed use
-+ * poppler_page_render_to_pixbuf_for_printing() instead
-+ *
-+ * Deprecated: 0.16
-+ **/
-+void
-+poppler_page_render_to_pixbuf (PopplerPage *page,
-+			       int src_x, int src_y,
-+			       int src_width, int src_height,
-+			       double scale,
-+			       int rotation,
-+			       GdkPixbuf *pixbuf)
-+{
-+  g_return_if_fail (POPPLER_IS_PAGE (page));
-+  g_return_if_fail (scale > 0.0);
-+  g_return_if_fail (pixbuf != NULL);
-+
-+  _poppler_page_render_to_pixbuf (page, src_x, src_y,
-+				  src_width, src_height,
-+				  scale, rotation,
-+				  FALSE,
-+				  pixbuf);
-+}
- /* process a bg PDF request from the queue, and recurse */
- 
- gboolean bgpdf_scheduler_callback(gpointer data)
-diff -aur old/src/xo-file.h new/src/xo-file.h
---- old/src/xo-file.h	2009-09-28 08:45:53.000000000 +1000
-+++ new/src/xo-file.h	2011-10-06 03:11:17.311156160 +1100
-@@ -36,3 +36,10 @@
- void init_config_default(void);
- void load_config_from_file(void);
- void save_config_to_file(void);
-+
-+void poppler_page_render_to_pixbuf (PopplerPage *page,
-+					       int src_x, int src_y,
-+					       int src_width, int src_height,
-+					       double scale,
-+					       int rotation,
-+					       GdkPixbuf *pixbuf);