Sun Feb 10 01:12:35 PST 2013

26 files changed, 0 insertions, 1686 deletions

diff --git a/multilib-staging/binutils-multilib/PKGBUILD b/multilib-staging/binutils-multilib/PKGBUILD
deleted file mode 100644
index 53017964d..000000000
--- a/multilib-staging/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 75001 2012-08-11 11:24:40Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils-multilib
-pkgver=2.22
-pkgrel=10
-_date=20120323
-pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('multilib-devel')
-provides=("binutils=$pkgver-$pkgrel")
-conflicts=('binutils')
-depends=('glibc>=2.16' 'zlib')
-makedepends=('gcc-multilib') # Make sure we compile this with gcc-multilib
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared \
-    --enable-64-bit-bfd --enable-multilib
-
-  # check the host environment and makes sure all the necessary tools are available
-  make configure-host
-
-  make tooldir=${pkgdir}/usr
-
-  # Rebuild libiberty.a with -fPIC
-  cp -a libiberty libiberty-pic
-  make -C libiberty-pic clean
-  make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
-  # Rebuild libbfd.a with -fPIC
-  # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
-  cp -a bfd bfd-pic
-  make -C bfd-pic clean
-  make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
-  make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
-       CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
-  # install libraries rebuilt with -fPIC
-  install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
-  install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-  install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
-  # Remove these symlinks, they are not ABI stable.
-  # Programs should compile static to the .a file.
-  rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
-  echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
-  echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/multilib-staging/binutils-multilib/binutils.install b/multilib-staging/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-staging/binutils-multilib/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/multilib-staging/gcc-multilib/PKGBUILD b/multilib-staging/gcc-multilib/PKGBUILD
deleted file mode 100644
index 3de3a535a..000000000
--- a/multilib-staging/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,319 +0,0 @@
-# $Id: PKGBUILD 75002 2012-08-11 11:41:09Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.7.1
-pkgrel=6
-_snapshot=4.7-20120721
-_libstdcppmanver=20120725		# Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
-             'lib32-glibc>=2.16')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64-multilib.patch
-        gcc-4.7.1-libada-pic.patch
-        gcc-4.7.1-libgo-write.patch)
-md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
-         '79c4381f983b71868c02da3379e1e8a2'
-         'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-if [ -n "${_snapshot}" ]; then
-  _basedir="${srcdir}/gcc-${_snapshot}"
-else
-  _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
-  cd ${_basedir}
-
-  # 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
-
-  patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ${srcdir}
-  mkdir gcc-build && cd gcc-build
-
-  ${_basedir}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
-      --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 \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --enable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --enable-checking=release
-  make
-}
-
-check() {
-  cd gcc-build
-
-  # 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 -k check || true
-  ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.16' "lib32-gcc-libs=$pkgver-$pkgrel")
-  provides=("gcc-libs=$pkgver-$pkgrel")
-  conflicts=('gcc-libs')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
-    make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-  make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
-  make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-  make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath  
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -r ${pkgdir}/usr/lib32
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
-  pkgdesc="Runtime libraries shipped by GCC (32-bit)"
-  depends=('lib32-glibc>=2.16' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; do
-    make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
-  done
-
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=${pkgdir} install-target-libgfortran
-  make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
-  # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
-  rm ${pkgdir}/usr/lib32/libgfortran.spec
-
-  # remove stuff in gcc-libs-multilib
-  rm -r ${pkgdir}/usr/lib
-  rm -r ${pkgdir}/usr/share/info
-
-  # remove static libraries
-  find ${pkgdir} -name *.a -delete
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
-  depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl')
-  groups=('multilib-devel')
-  provides=("gcc=$pkgver-$pkgrel")
-  conflicts=('gcc')
-  install=gcc.install
-
-  cd gcc-build
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm $pkgdir/usr/lib{,32}/*.so*
-  rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
-  rm $pkgdir/usr/lib{,32}/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
-
-  # many packages expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
-
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \
-    ${pkgdir}/usr/share/man/man3/
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
-  pkgdesc="Fortran front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-fortran=$pkgver-$pkgrel")
-  conflicts=('gcc-fortran')
-  install=gcc-fortran.install
-
-  cd gcc-build
-  make -j1 DESTDIR=${pkgdir} install-target-libquadmath
-  make -j1 DESTDIR=$pkgdir install-target-libgfortran
-  make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
-  make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
-  install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-  
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
-  rm ${pkgdir}/usr/share/info/libquadmath.info
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
-  pkgdesc="Objective-C front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-objc=$pkgver-$pkgrel")
-  conflicts=('gcc-objc')
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libobjc
-  install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-  install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
-  # remove libraries included in gcc-libs
-  rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
-  pkgdesc="Ada front-end for GCC (GNAT) for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-ada=$pkgver-$pkgrel")
-  conflicts=('gcc-ada')
-  install=gcc-ada.install
-
-  cd gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  cd ../$CHOST/32/libada
-  make -j1 DESTDIR=${pkgdir} INSTALL="install" \
-    INSTALL_DATA="install -m644" install-gnatlib
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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 --git a/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
diff --git a/multilib-staging/gcc-multilib/gcc-ada.install b/multilib-staging/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-staging/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc-fortran.install b/multilib-staging/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-staging/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-staging/gcc-multilib/gcc-go.install b/multilib-staging/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-staging/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc-libs.install b/multilib-staging/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-staging/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc.install b/multilib-staging/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-staging/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch b/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch
deleted file mode 100644
index b5576ae0e..000000000
--- a/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h
---- gcc-4.7.0/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
-+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h	2012-03-24 11:52:58.926204014 +0100
-@@ -29,5 +29,5 @@
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64
---- gcc-4.7.0/gcc/config/i386/t-linux64	2011-11-02 16:23:48.000000000 +0100
-+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64	2012-03-24 11:52:44.119651885 +0100
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
diff --git a/multilib-staging/lib32-glibc/PKGBUILD b/multilib-staging/lib32-glibc/PKGBUILD
deleted file mode 100644
index 23f0b9dff..000000000
--- a/multilib-staging/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# $Id: PKGBUILD 75000 2012-08-11 11:23:15Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.16.0
-pkgrel=3
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-makedepends=('gcc-multilib>=4.7')
-options=('!strip' '!emptydirs')
-source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        lib32-glibc.conf)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0a0383d50d63f1c02919fe9943b82014'
-         'ea6a43915474e8276e9361eed6a01280'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=552960
-  patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-
-  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-  # TODO: make separate glibc-xen package for i686
-  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-multi-arch i686-unknown-linux-gnu
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "/build-programs=/s#no#yes#" configparms
-  echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
-  make
-
-  # remove harding in preparation to run test-suite
-  sed -i '2,4d' configparms
-}
-
-check() {
-  cd ${srcdir}/glibc-build
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-  make install_root=${pkgdir} install
-
-  rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
-
-  # We need one 32 bit specific header file
-  find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
-  # Do not strip the following files for improved debugging support
-  # ("improved" as in not breaking gdb and valgrind...):
-  #   ld-${pkgver}.so
-  #   libc-${pkgver}.so
-  #   libpthread-${pkgver}.so
-  #   libthread_db-1.0.so
-
-  cd $pkgdir
-  strip $STRIP_BINARIES usr/lib32/getconf/*
-
-  strip $STRIP_STATIC usr/lib32/*.a
-
-  strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/usr/lib
-  ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/
-
-  # Add lib32 paths to the default library search path
-  install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
-  # Symlink /usr/lib32/locale to /usr/lib/locale
-  ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
diff --git a/multilib-staging/lib32-glibc/glibc-2.15-fix-res_query-assert.patch b/multilib-staging/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index d8894723a..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S	2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	18f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- 	movl	%ebp, %edx
- 	xorl	%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- 	sete	16(%esp)
- 	je	19f
- 
--	cmpl	$-EAGAIN, %eax
--	je	91f
--
- 	/* Normal and PI futexes dont mix. Use normal futex functions only
- 	   if the kernel does not support the PI futex functions.  */
- 	cmpl	$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- 	call	__lll_unlock_wake
- 	jmp	11b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--
--	/* Get internal lock.  */
--	movl	$1, %edx
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %edx, (%ebx)
--#else
--	cmpxchgl %edx, cond_lock(%ebx)
--#endif
--	jz	92f
--
--#if cond_lock == 0
--	movl	%ebx, %edx
--#else
--	leal	cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_lock_wait
--
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	addl	$1, cond_futex(%ebx)
--	movl	cond_futex(%ebx), %ebp
--
--	/* Unlock.  */
--	LOCK
--#if cond_lock == 0
--	subl	$1, (%ebx)
--#else
--	subl	$1, cond_lock(%ebx)
--#endif
--	je	93f
--#if cond_lock == 0
--	movl	%ebx, %eax
--#else
--	leal	cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
--	xorl	%ecx, %ecx
--#endif
--	cmpl	$-1, dep_mutex(%ebx)
--	setne	%cl
--	subl	$1, %ecx
--	andl	$(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
--	addl	$LLL_PRIVATE, %ecx
--#endif
--	call	__lll_unlock_wake
--
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorl	%ecx, %ecx
--	movl	dep_mutex(%ebx), %edi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- 	.long	.LcleanupEND-.Lsub_cond_futex
- 	.long	__condvar_w_cleanup-.LSTARTCODE
- 	.uleb128  0
--	.long	.LcleanupSTART2-.LSTARTCODE
--	.long	.LcleanupEND2-.LcleanupSTART2
--	.long	__condvar_w_cleanup-.LSTARTCODE
--	.uleb128  0
- 	.long	.LcallUR-.LSTARTCODE
- 	.long	.LENDCODE-.LcallUR
- 	.long	0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S	2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
- #include <stap-probe.h>
- 
- #include <kernel-features.h>
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- 	cmpl	$PI_BIT, %eax
- 	jne	61f
- 
--90:
- 	movl	$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- 	movl	$SYS_futex, %eax
- 	syscall
- 
- 	movl	$1, %r8d
--	cmpq	$-EAGAIN, %rax
--	je	91f
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
- 
- 13:	movq	%r10, %rax
- 	jmp	14b
--
--91:
--.LcleanupSTART2:
--	/* FUTEX_WAIT_REQUEUE_PI returned EAGAIN.  We need to
--	   call it again.  */
--	movq	8(%rsp), %rdi
--
--	/* Get internal lock.  */
--	movl	$1, %esi
--	xorl	%eax, %eax
--	LOCK
--#if cond_lock == 0
--	cmpxchgl %esi, (%rdi)
--#else
--	cmpxchgl %esi, cond_lock(%rdi)
--#endif
--	jz	92f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	callq	__lll_lock_wait
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--92:
--	/* Increment the cond_futex value again, so it can be used as a new
--	   expected value. */
--	incl	cond_futex(%rdi)
--	movl	cond_futex(%rdi), %edx
--
--	/* Release internal lock.  */
--	LOCK
--#if cond_lock == 0
--	decl	(%rdi)
--#else
--	decl	cond_lock(%rdi)
--#endif
--	jz	93f
--
--#if cond_lock != 0
--	addq	$cond_lock, %rdi
--#endif
--	LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi)
--	movl	$LLL_PRIVATE, %eax
--	movl	$LLL_SHARED, %esi
--	cmovne	%eax, %esi
--	/* The call preserves %rdx.  */
--	callq	__lll_unlock_wake
--#if cond_lock != 0
--	subq	$cond_lock, %rdi
--#endif
--93:
--	/* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
--	xorq	%r10, %r10
--	mov	dep_mutex(%rdi), %R8_LP
--	leaq	cond_futex(%rdi), %rdi
--	jmp	90b
--.LcleanupEND2:
--
- 	.size	__pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- 		  GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupSTART-.LSTARTCODE
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
-+	.uleb128  0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
--	.uleb128 0
-+	.uleb128  0
- .Lcstend:
- 
diff --git a/multilib-staging/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib-staging/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/multilib-staging/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/multilib-staging/lib32-glibc/lib32-glibc.conf b/multilib-staging/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index 9b08c3f43..000000000
--- a/multilib-staging/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib-staging/lib32-glu/PKGBUILD b/multilib-staging/lib32-glu/PKGBUILD
deleted file mode 100644
index 47e0f4d2f..000000000
--- a/multilib-staging/lib32-glu/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 76975 2012-10-02 19:05:10Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=lib32-glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL utility library (32 bits)"
-arch=('x86_64')
-url="http://mesa.freedesktop.org/"
-license=('LGPL')
-depends=('lib32-libgl')
-makedepends=('gcc-multilib' 'lib32-mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd ${srcdir}/glu-$pkgver
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32 
-  make
-}
-
-check() {
-  cd "$srcdir/glu-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/glu-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  
-  rm -rf ${pkgdir}/usr/include
-}
diff --git a/multilib-staging/lib32-libphobos-ldc/PKGBUILD b/multilib-staging/lib32-libphobos-ldc/PKGBUILD
deleted file mode 100644
index aa67ac275..000000000
--- a/multilib-staging/lib32-libphobos-ldc/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=lib32-libphobos-ldc
-pkgver=20121225
-pkgrel=1
-pkgdesc="libphobos for ldc (32-bit)"
-arch=('x86_64')
-url="http://www.dsource.org/projects/ldc"
-license=('BSD')
-depends=('llvm' 'libconfig')
-makedepends=('git' 'cmake')
-source=(fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch)
-md5sums=('0dacd8e4b8f88030c107dbb2a35bcc42')
-
-_gitroot=git://github.com/ldc-developers/ldc.git
-_gitname=ldc
-_gitbranch=master
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone --branch "$_gitbranch" "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  # llvm/Support/IRBuilder.h was relocated in LLVM 3.2
-  patch -Np1 -i "$srcdir/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch"
-
-  mkdir build && cd build
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \
-      -DMULTILIB=ON \
-      ..
-  make
-}
-
-package() {
-  cd "$srcdir/$_gitname-build"
-
-  cd build
-  make DESTDIR=$pkgdir install
-  cd ..
-
-  # We don't want anything but the 32-bit libs
-  rm -rf $pkgdir/usr/{share,lib,include,bin} $pkgdir/etc
-
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch b/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
deleted file mode 100644
index f5977e4a4..000000000
--- a/multilib-staging/lib32-libphobos-ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 984207e348fe9ef1444cbec897cb8c429859a9c0 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 25 Dec 2012 04:55:30 +0200
-Subject: [PATCH] Fix llvm/IRBuilder.h include when using LLVM 3.2
-
----
- gen/passes/GarbageCollect2Stack.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp
-index f20bdd4..9927615 100644
---- a/gen/passes/GarbageCollect2Stack.cpp
-+++ b/gen/passes/GarbageCollect2Stack.cpp
-@@ -27,7 +27,7 @@
- #include "llvm/Intrinsics.h"
- #include "llvm/Support/CallSite.h"
- #include "llvm/Support/CommandLine.h"
--#if LDC_LLVM_VER >= 303
-+#if LDC_LLVM_VER >= 302
- #include "llvm/IRBuilder.h"
- #else
- #include "llvm/Support/IRBuilder.h"
--- 
-1.8.0.2
-
diff --git a/multilib-staging/lib32-libxcb/PKGBUILD b/multilib-staging/lib32-libxcb/PKGBUILD
deleted file mode 100644
index faa36ab66..000000000
--- a/multilib-staging/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 77154 2012-10-05 21:31:37Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.9
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename)
-makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib'
-             'autoconf')
-options=('!libtool')
-license=('custom')
-source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  PYTHON=/usr/bin/python2 ./autogen.sh \
-	  --prefix=/usr \
-	  --enable-xinput \
-	  --libdir=/usr/lib32 \
-	  --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" 
-}
diff --git a/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/multilib-staging/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/multilib-staging/lib32-mesa/PKGBUILD b/multilib-staging/lib32-mesa/PKGBUILD
deleted file mode 100644
index e796b9e2b..000000000
--- a/multilib-staging/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,248 +0,0 @@
-# $Id: PKGBUILD 76978 2012-10-02 21:18:44Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') # lib32-libgbm needs udev
-
-_git=true
-_gitdate=20121002
-#_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=8.0.4
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libx11>=1.5.0'
-  'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(mesa-radeon-parallel-make.diff)
-if [ "${_git}" = "true" ]; then
-  # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-  #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-  source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz")
-else
-  source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-fi
-md5sums=('549f6a106686ecab7ec9f9c3602d64c3'
-         'e9fedcc48587dfa14a242bbf339c228e')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  # fix segfault with gfx cards > Ati R700
-  export CFLAGS="${CFLAGS} -O1"
-  export CXXFLAGS="${CXXFLAGS} -O1"
-
-  cd ${srcdir}/?esa-*
-
-  # fix parallel build - http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f
-  # and the next commit - http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b
-  patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff
-
-  COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-texture-float \
-    --enable-osmesa \
-    --enable-32-bit \
-    --libdir=/usr/lib32 "
-    # --enable-gbm disabled because it needs udev
-
-  if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-  fi
-
-  make
-}
-
-package_lib32-libglapi() {
-  depends=('lib32-glibc' 'libglapi')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
-
-  cd ${srcdir}/?esa-*   
-
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi' 'libgl')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  # currently disabled so force the remove
-  conflicts=('lib32-libgbm')
-  replace=('lib32-libgbm')
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C src/glx DESTDIR="${pkgdir}" install
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  # --with-gallium-drivers=swrast
-  make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-mesa() {
-  depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # .pc files
-  make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-osmesa() {
-  depends=('lib32-mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-}
-
-package_lib32-libgbm() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
-  pkgdesc="Mesa gbm library (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C src/gbm DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
-}
-
-package_lib32-libgles() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
-  pkgdesc="Mesa GLES libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # --enable-gles1 --enable-gles2
-  make -C src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  rm -r "${pkgdir}"/usr/include
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}" 'ati-dri')
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa drivers for radeon,r200
-  make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600
-  make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
-}
-
-package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}" 'intel-dri')
-  pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
-}
-
-package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
-}
-
diff --git a/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index 922577aef..000000000
--- a/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
diff --git a/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff b/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff
deleted file mode 100644
index a9ea10fc4..000000000
--- a/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 29 Aug 2012 13:01:15 +0000
-Subject: radeon/llvm: Cleanup makefile
-
-Hopefully, this will fix all the parallel make problems people have
-been having.
----
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 43f668a..7f1c613 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
-
- HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
-
--gen: $(GENERATED_SOURCES)
--
- SIRegisterInfo.td: SIGenRegisterInfo.pl
-	$(PERL) $^ > $@
-
-@@ -38,37 +36,37 @@ endif
- R600RegisterInfo.td: R600GenRegisterInfo.pl
-	$(PERL) $^ > $@
-
--AMDGPUGenRegisterInfo.inc: *.td
-+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-register-info, AMDGPU.td, $@)
-
--AMDGPUGenInstrInfo.inc: *.td
-+AMDGPUGenInstrInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-instr-info, AMDGPU.td, $@)
-
--AMDGPUGenAsmWriter.inc: *.td
-+AMDGPUGenAsmWriter.inc: $(TD_FILES)
-	$(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
-
--AMDGPUGenDAGISel.inc: *.td
-+AMDGPUGenDAGISel.inc: $(TD_FILES)
-	$(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
-
--AMDGPUGenCallingConv.inc: *.td
-+AMDGPUGenCallingConv.inc: $(TD_FILES)
-	$(call tablegen, -gen-callingconv, AMDGPU.td, $@)
-
--AMDGPUGenSubtargetInfo.inc: *.td
-+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-subtarget, AMDGPU.td, $@)
-
--AMDGPUGenEDInfo.inc: *.td
-+AMDGPUGenEDInfo.inc: $(TD_FILES)
-	$(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
-
--AMDGPUGenIntrinsics.inc: *.td
-+AMDGPUGenIntrinsics.inc: $(TD_FILES)
-	$(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
-
--AMDGPUGenCodeEmitter.inc: *.td
-+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
-	$(call tablegen, -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenMCCodeEmitter.inc: *.td
-+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
-	$(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenDFAPacketizer.inc: *.td
-+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
-	$(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
-
- LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 2eb1120..333dd03 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -1,4 +1,30 @@
-
-+TD_FILES := \
-+	AMDGPU.td		\
-+	AMDGPUInstrInfo.td	\
-+	AMDGPUInstructions.td	\
-+	AMDGPUIntrinsics.td	\
-+	AMDGPURegisterInfo.td	\
-+	AMDILBase.td		\
-+	AMDILInstrInfo.td	\
-+	AMDILIntrinsics.td	\
-+	AMDILRegisterInfo.td	\
-+	Processors.td		\
-+	R600InstrInfo.td	\
-+	R600Instructions.td	\
-+	R600Intrinsics.td	\
-+	R600IntrinsicsNoOpenCL.td	\
-+	R600IntrinsicsOpenCL.td	\
-+	R600RegisterInfo.td	\
-+	R600Schedule.td		\
-+	SIInstrFormats.td	\
-+	SIInstrInfo.td		\
-+	SIInstructions.td	\
-+	SIIntrinsics.td		\
-+	SIRegisterInfo.td	\
-+	SISchedule.td
-+
-+
- GENERATED_SOURCES := \
-	R600Intrinsics.td		\
-	R600RegisterInfo.td		\
---
-cgit v0.9.0.2-2-gbebe
-From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Thu, 06 Sep 2012 14:05:22 +0000
-Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES
-
-Fixes build bug introduced by
-cebbdd4ac23725963207bf6f8fc7101150e6065f
----
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 333dd03..f387636 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -10,7 +10,6 @@ TD_FILES := \
-	AMDILIntrinsics.td	\
-	AMDILRegisterInfo.td	\
-	Processors.td		\
--	R600InstrInfo.td	\
-	R600Instructions.td	\
-	R600Intrinsics.td	\
-	R600IntrinsicsNoOpenCL.td	\
---
-cgit v0.9.0.2-2-gbebe