Sun Feb 5 17:25:01 UTC 2012

author: Parabola <dev@list.parabolagnulinux.org> 2012-02-05 17:25:05 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2012-02-05 17:25:05 +0000
commit: 359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch)
tree: eeed5f77c8417a98fe5b8538d3c019d1cea00c04 /multilib-testing
parent: cdc66cc7110e78bf1197f9effc70422114f9341b (diff)
44 files changed, 0 insertions, 2076 deletions
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
deleted file mode 100644
index 6888c5181..000000000
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 62099 2012-01-16 01:54:07Z heftig $
-# Maintainer: Jan "heftig" Steffens <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=4.1
-_date=20111227
-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.14' 'zlib')
-makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --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
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  make -k -j1 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
-
-  # 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-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-testing/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-testing/chuck/PKGBUILD b/multilib-testing/chuck/PKGBUILD
deleted file mode 100644
index 2250f2e39..000000000
--- a/multilib-testing/chuck/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62100 2012-01-16 01:54:11Z heftig $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-
-pkgname=chuck
-pkgver=1.2.1.3
-pkgrel=5.1
-pkgdesc="Concurrent, on-the-fly audio programming language."
-arch=('i686' 'x86_64')
-url="http://chuck.cs.princeton.edu/"
-license=('GPL')
-depends=('gcc-libs' 'libsndfile' 'alsa-lib')
-makedepends=('bison' 'flex')
-source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz)
-md5sums=('ac8459b4067c2491fbdeb61d122a5985')
-
-if [[ $CARCH == x86_64 ]]; then
-	depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib')
-	makedepends+=('gcc-multilib')
-fi
-
-build() {
-	if [[ $CARCH == x86_64 ]]; then
-		export CC='gcc -m32'
-		export CXX='g++ -m32'
-		export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-	fi
-
-	cd $srcdir/$pkgname-$pkgver/src
-	CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-	# This can be linux-alsa linux-jack linux-oss osx win32
-	make linux-alsa
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver/src
-	install -D -m 755 chuck $pkgdir/usr/bin/chuck
-}
diff --git a/multilib-testing/dev86/PKGBUILD b/multilib-testing/dev86/PKGBUILD
deleted file mode 100644
index bde7ba3be..000000000
--- a/multilib-testing/dev86/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-# Contributor: Suat SARIALP <muhendis.suat@gmail.com>
-
-pkgname=dev86
-pkgver=0.16.18
-pkgrel=3
-pkgdesc="Simple C compiler to generate 8086 code"
-arch=('i686' 'x86_64')
-url="http://www.debath.co.uk/dev86/"
-license=(GPL)
-if [ "${CARCH}" == "x86_64" ]; then
-  depends=('lib32-glibc')
-  makedepends=('bin86' 'gcc-multilib')
-else
-  makedepends=('bin86')
-fi
-options=('!libtool' '!strip' '!makeflags')
-source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz
-	dev86-pic.patch
-	dev86-0.16.17-fortify.patch)
-md5sums=('f2e06b547397383b2b2650b9c4fd9bab'
-         '1b750c5561a4bde5f83f65e5827feb73'
-         '07238f9203c6528ea1e34198e771ea12')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i $srcdir/dev86-pic.patch
-  patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch
-  if [ "${CARCH}" = "x86_64" ]; then
-    # x86_64 fix
-    sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \
-		-e 's,install-lib install-emu,install-lib,' \
-		$srcdir/$pkgname-$pkgver/makefile.in
-    sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in
-    sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in
-  fi
-
-  unset CFLAGS
-  unset LDFLAGS
-  unset CPPFLAGS
-  unset CXXFLAGS
-
-  make PREFIX=/usr DIST="$pkgdir"
-  make install-all DIST="$pkgdir"
-  mkdir -p $pkgdir/usr/share
-  mv $pkgdir/usr/man $pkgdir/usr/share
-  # remove all the stuff supplied by bin86
-  rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86
-  rm $pkgdir/usr/share/man/man1/{as,ld}86.1
-}
diff --git a/multilib-testing/dev86/dev86-0.16.17-fortify.patch b/multilib-testing/dev86/dev86-0.16.17-fortify.patch
deleted file mode 100644
index 715d0c4ca..000000000
--- a/multilib-testing/dev86/dev86-0.16.17-fortify.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- dev86-0.16.17/bcc/bcc.c
-+++ dev86-0.16.17/bcc/bcc.c
-@@ -19,6 +19,7 @@
- #ifdef __STDC__
- #include <stdlib.h>
- #ifndef MSDOS
-+#include <limits.h>
- #include <unistd.h>
- #endif
- #else
-@@ -596,12 +597,17 @@
-    }
- }
- 
--void
--command_reset()
--{
- #ifndef MAXPATHLEN
-+#ifdef PATH_MAX
-+#define MAXPATHLEN PATH_MAX
-+#else
- #define MAXPATHLEN 1024
- #endif
-+#endif
-+
-+void
-+command_reset()
-+{
-    char buf[MAXPATHLEN];
-    char ** prefix;
-    char * saved_cmd;
-@@ -1308,11 +1314,7 @@
- 
-       for(d=s=ptr; d && *s; s=d)
-       {
--#ifdef MAXPATHLEN
-          char buf[MAXPATHLEN];
--#else
--         char buf[1024];
--#endif
- 
- 	 free(temp);
-          d=strchr(s, ':');
diff --git a/multilib-testing/dev86/dev86-pic.patch b/multilib-testing/dev86/dev86-pic.patch
deleted file mode 100644
index 439c2648b..000000000
--- a/multilib-testing/dev86/dev86-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- elksemu/elks.c.orig	2005-11-04 01:35:37.000000000 +0100
-+++ elksemu/elks.c	2005-11-04 01:45:28.000000000 +0100
-@@ -129,8 +129,17 @@
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- 	int __res;
-+#ifndef __PIC__
- 	__asm__ __volatile__("int $0x80\n"
- 	:"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+	__asm__ __volatile__(
-+		"movl	%%ebx,%%ecx\n\t"
-+		"movl	%2,%%ebx\n\t"
-+		"int	$0x80\n\t"
-+		"movl	%%ecx,%%ebx\n\t"
-+		:"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- 	return __res;
- } 
- #endif
diff --git a/multilib-testing/jack2-multilib/40-hpet-permissions.rules b/multilib-testing/jack2-multilib/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/multilib-testing/jack2-multilib/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/multilib-testing/jack2-multilib/99-audio.conf b/multilib-testing/jack2-multilib/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/multilib-testing/jack2-multilib/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/multilib-testing/jack2-multilib/PKGBUILD b/multilib-testing/jack2-multilib/PKGBUILD
deleted file mode 100644
index 6c45b64d6..000000000
--- a/multilib-testing/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,143 +0,0 @@
-# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-# This one is in response to a need for an equivalent to lib32-jack for
-# jack2. A lib32-jack2 would require much patching and invading the pure
-# jack2 package, and what's more, the buildsystem provides a flag just to
-# build a hybrid jack2 in full. As such, we have opted to provide multilib
-# users with a replacement package instead of the usual lib32 add-on.
-#
-# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html
-
-pkgbase=jack2-multilib
-pkgname=('jack2-multilib' 'jack2-dbus-multilib')
-#pkgname= # single build (overrides split)
-_tarname=jack
-pkgver=1.9.8
-pkgrel=1
-arch=('x86_64')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
-             'libsamplerate' 'lib32-dbus-core' 'lib32-celt'
-             'gcc-multilib')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
-        '99-audio.conf'
-        '40-hpet-permissions.rules')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef')
-
-_pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
-}
-
-_wafconf() {
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --firewire \
-                        --mixed \
-                        --doxygen $@
-}
-
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-_mklinks() {
-  ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0"
-  ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so"
-}
-
-build() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  export LINKFLAGS="$LDFLAGS"
-
-  # fix doxygen building
-  sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript
-
-  # we may do 2 different builds
-  cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver
-
-  # mixed dbus/classic build
-  if _isbuild jack2-multilib; then
-    cd $_tarname-$pkgver
-    msg2 "Running Mixed D-Bus/Classic build"
-    _wafconf --classic --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-
-  # dbus-ONLY build
-  if _isbuild jack2-dbus-multilib; then
-    cd $_tarname-dbus-$pkgver
-    msg2 "Running D-Bus-only build"
-    _wafconf --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-}
-
-package_jack2-multilib() {
-  ! _isbuild jack2-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode"
-  depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs')
-  optdepends=('libffado: FireWire support'
-              'lib32-dbus-core: jackdbus'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack')
-  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus'
-            'jack2' 'lib32-jack' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  # fix for major python transition
-  _pyfix
-
-  # configure realtime access/scheduling
-  # see https://bugs.archlinux.org/task/26343
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  # should be done by upstream
-  # see http://trac.jackaudio.org/ticket/200
-  _mklinks
-}
-
-package_jack2-dbus-multilib() {
-  ! _isbuild jack2-dbus-multilib && return 0
-
-  pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)"
-  depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs')
-  optdepends=('libffado: FireWire support'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib')
-  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus'
-            'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2')
-
-  cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver"
-
-  python2 waf install --destdir="$pkgdir"
-
-  _pyfix
-
-  install -Dm644 "$srcdir/99-audio.conf" \
-    "$pkgdir/etc/security/limits.d/99-audio.conf"
-
-  install -Dm644 "$srcdir/40-hpet-permissions.rules" \
-    "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD
deleted file mode 100644
index 3dce5033d..000000000
--- a/multilib-testing/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 62105 2012-01-16 01:54:43Z heftig $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.30.2
-pkgrel=2
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename)
-makedepends=('gcc-multilib' python2)
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz)
-sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-  rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0}
-}
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index a14489c72..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,186 +0,0 @@
-# $Id: PKGBUILD 62757 2012-01-26 04:37:18Z 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.15
-pkgrel=4
-_glibcdate=20111227
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
-        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
-        glibc-__i686.patch
-        glibc-2.12.2-ignore-origin-of-privileged-program.patch
-        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
-        glibc-2.14-reexport-rpc-interface.patch
-        glibc-2.14-reinstall-nis-rpc-headers.patch
-        glibc-2.15-regex.patch
-        glibc-2.15-lddebug-scopes.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.15-strcmp-disable-avx.patch
-        lib32-glibc.conf)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'b3526cbd5e29773560dba725db99af5a'
-         '3c219ddfb619b6df903cac4cc42c611d'
-         '7ae3e426251ae33e73dbad71f9c91378'
-         '7a44dd821835e4984aa75ad44fad3baf'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/glibc
-
-  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
-  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
-  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
-  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
-  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
-  # Fix up regcomp/regexec
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
-  patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
-
-  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=769421
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # Disable AVX in strcmp as this breaks Xen
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13583
-  patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch
-
-  # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13618
-  rm sysdeps/x86_64/fpu/multiarch/*
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  export CC="gcc -m32"
-
-  # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-  export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/glibc/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-kernel=2.6.27 \
-      --with-tls --with-__thread \
-      --enable-bind-now --without-gd \
-      --without-cvs --disable-profile \
-      --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 "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
-
-  # some errors are expected - manually check log files
-  make -k check || true
-}
-
-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}-${pkgver}.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/lib
-  ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/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-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
--	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
--	cfi_startproc;
--	/* Clearing frame pointer is insufficient, use CFI.  */
--	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
--	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
- 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
- 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
--	      crypt nss localedata timezone rt conform debug		    \
-+	      crypt nss localedata rt conform debug		    \
- 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
- 
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
-     out:
-       new->l_origin = origin;
-     }
-+  else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+    /* The origin of a privileged program cannot be trusted.  */
-+    new->l_origin = (char *) -1;
- 
-   return new;
- }
--- 
-1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
-   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
-       || dl_close_state != not_pending)
-     {
--      if (map->l_direct_opencount == 0)
--	{
--	  if (map->l_type == lt_loaded)
--	    dl_close_state = rerun;
--	  else if (map->l_type == lt_library)
--	    {
--	      struct link_map **oldp = map->l_initfini;
--	      map->l_initfini = map->l_orig_initfini;
--	      _dl_scope_free (oldp);
--	    }
--	}
-+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+	dl_close_state = rerun;
- 
-       /* There are still references to this object.  Do nothing more.  */
-       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- 		  nneeded * sizeof needed[0]);
- 	  atomic_write_barrier ();
- 	  l->l_initfini = l_initfini;
-+	  l->l_free_initfini = 1;
- 	}
- 
-       /* If we have no auxiliary objects just go on to the next map.  */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
-   l_initfini[nlist] = NULL;
-   atomic_write_barrier ();
-   map->l_initfini = l_initfini;
-+  map->l_free_initfini = 1;
-   if (l_reldeps != NULL)
-     {
-       atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
-       _dl_scope_free (old_l_reldeps);
-     }
-   if (old_l_initfini != NULL)
--      map->l_orig_initfini = old_l_initfini;
-+    _dl_scope_free (old_l_initfini);
- 
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
- 
-   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
-     {
--      /* Remove all additional names added to the objects.  */
-       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- 	{
- 	  struct libname_list *lnp = l->l_libname->next;
- 
- 	  l->l_libname->next = NULL;
- 
-+	  /* Remove all additional names added to the objects.  */
- 	  while (lnp != NULL)
- 	    {
- 	      struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- 	      if (! old->dont_free)
- 		free (old);
- 	    }
-+
-+	  /* Free the initfini dependency list.  */
-+	  if (l->l_free_initfini)
-+	    free (l->l_initfini);
- 	}
- 
-       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 	      lnp->dont_free = 1;
- 	      lnp = lnp->next;
- 	    }
-+	  l->l_free_initfini = 0;
- 
- 	  if (l != &GL(dl_rtld_map))
- 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
-    loaded ELF shared objects.
--   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- 						 during LD_TRACE_PRELINKING=1
- 						 contains any DT_SYMBOLIC
- 						 libraries.  */
-+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+				       freed, ie. not allocated with
-+				       the dummy malloc in ld.so.  */
- 
-     /* Collected information about own RPATH directories.  */
-     struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
- 
-     /* List of object in order of the init and fini calls.  */
-     struct link_map **l_initfini;
--    /* The init and fini list generated at startup, saved when the
--       object is also loaded dynamically.  */
--    struct link_map **l_orig_initfini;
- 
-     /* List of the dependencies introduced through symbol binding.  */
-     struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- 				    des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir	:= nis
- 
- aux			:= nis_hash
- 
-+headers			:= $(wildcard rpcsvc/*.[hx])
- distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
--			   nisplus-parser.h nis_xdr.h nss \
--			   $(wildcard rpcsvc/*.[hx])
-+			   nisplus-parser.h nis_xdr.h nss
- 
- # These are the databases available for the nis (and perhaps later nisplus)
- # service.  This must be a superset of the services in nss.
--- 
-1.7.5.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
--			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
--			if (recvresp1 || (buf2 != NULL && recvresp2)) {
--			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
--			}
- 			if (buf2 != NULL)
- 			  {
--			    /* No data from the first reply.  */
--			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	      char *copy = malloc (len);
- 	      if (copy == NULL)
- 		_dl_fatal_printf ("out of memory\n");
--	      l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+	      l->l_libname->name = memcpy (copy, dsoname, len);
-+	      if (GLRO(dl_debug_mask))
-+		l->l_name = copy;
- 	    }
- 
- 	  /* Add the vDSO to the object list.  */
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch b/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- 			s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
--	.type	__ceil, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__ceil_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__ceil_c(%rip), %rax
--2:	ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
--	roundsd	$2, %xmm0, %xmm0
--	ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
--   The GNU C Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Lesser General Public
--   License as published by the Free Software Foundation; either
--   version 2.1 of the License, or (at your option) any later version.
--
--   The GNU C Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Lesser General Public License for more details.
--
--   You should have received a copy of the GNU Lesser General Public
--   License along with the GNU C Library; if not, write to the Free
--   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
--   02111-1307 USA.  */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
--	.type	__floor, @gnu_indirect_function
--	call	__get_cpu_features@plt
--	movq	%rax, %rdx
--	leaq	__floor_sse41(%rip), %rax
--	testl	$bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
--	jnz	2f
--	leaq	__floor_c(%rip), %rax
--2:	ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
--	roundsd	$1, %xmm0, %xmm0
--	ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __cos_fma4 ((void *) 0)
--#  define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--#  undef HAS_FMA4
--#  define HAS_FMA4 0
--#  define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-regex.patch b/multilib-testing/lib32-glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-regex.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/posix/regex_internal.c b/posix/regex_internal.c
-index bc19243..124f8cc 100644
---- a/posix/regex_internal.c
-+++ b/posix/regex_internal.c
-@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx)
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +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 <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
--	cmpq	$-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
--	cmpq	$-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
--	movq	dep_mutex(%rdi), %r8
--	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:
- 
- 
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
deleted file mode 100644
index 7f1f5b8f2..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strcasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
- 	jne	1f
- 	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
- 	leaq	__strncasecmp_sse42(%rip), %rax
- 	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
- 	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
- 
- 
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
- 	.type STRCMP_SSE2, @function; \
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile	2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile	2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think).  Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX  -U __i686
- 
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index 9b08c3f43..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib32
diff --git a/multilib-testing/lib32-gtk2/PKGBUILD b/multilib-testing/lib32-gtk2/PKGBUILD
deleted file mode 100644
index c941bab84..000000000
--- a/multilib-testing/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 62107 2012-01-16 01:55:04Z heftig $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=gtk2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.8
-pkgrel=2
-pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-install=gtk2.install
-depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gdk-pixbuf2>=2.22.1'}
-         lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage}
-         $_pkgbasename)
-makedepends=('pkgconfig' 'gcc-multilib')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch
-        gtk-modules-32.patch)
-sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-  patch -p1 -i ${srcdir}/gtk-modules-32.patch
-
-  CXX=/bin/false ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libdir=/usr/lib32 \
-      --with-xinput=yes
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd "${srcdir}/gtk+-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32
-  rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache
-}
diff --git a/multilib-testing/lib32-gtk2/gtk-modules-32.patch b/multilib-testing/lib32-gtk2/gtk-modules-32.patch
deleted file mode 100644
index a2530c3bf..000000000
--- a/multilib-testing/lib32-gtk2/gtk-modules-32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c
---- gtk+-2.20.1/gtk/gtkrc.c	2010-05-03 01:28:21.000000000 +0200
-+++ gtk+-2.20.1-32/gtk/gtkrc.c	2010-08-26 07:22:42.316920033 +0200
-@@ -450,7 +450,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL);
-     }
- 
-   return result;
diff --git a/multilib-testing/lib32-gtk2/gtk2.install b/multilib-testing/lib32-gtk2/gtk2.install
deleted file mode 100644
index 49f86f550..000000000
--- a/multilib-testing/lib32-gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null
-}
diff --git a/multilib-testing/lib32-gtk2/xid-collision-debug.patch b/multilib-testing/lib32-gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/multilib-testing/lib32-gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index d5c5c69f7..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 61806 2012-01-07 23:05:50Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.30
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=('lib32-libpciaccess' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
-        no-pthread-stubs.patch)
-#	git_fixes.diff)
-md5sums=('9f57a68b2c0836b55ebcbc241f6ca175'
-         '0c423f6f886a3a8d6a8834224de95bcf')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
-
-  # git fixes - currently none
-  # patch -Np1 -i ${srcdir}/git_fixes.diff
-
-  # libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --enable-udev \
-      --enable-intel \
-      --enable-radeon \
-      --enable-vmwgfx-experimental-api \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libdrm/git_fixes.diff b/multilib-testing/lib32-libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/multilib-testing/lib32-libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 6ad4a48ee..000000000
--- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
- AC_SUBST(PCIACCESS_CFLAGS)
- AC_SUBST(PCIACCESS_LIBS)
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
-	@PCIACCESS_LIBS@ \
-	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/multilib-testing/lib32-libpulse/PKGBUILD b/multilib-testing/lib32-libpulse/PKGBUILD
deleted file mode 100644
index dc5875fc0..000000000
--- a/multilib-testing/lib32-libpulse/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 61429 2011-12-31 00:45:02Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-_pkgbasename=libpulse
-pkgname=lib32-$_pkgbasename
-pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)"
-pkgver=1.1
-pkgrel=2
-arch=(x86_64)
-url="http://pulseaudio.org/"
-license=(GPL LGPL)
-depends=(lib32-dbus-core lib32-json-c 
-         lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile
-         $_pkgbasename)
-makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex lib32-gtk2)
-optdepends=('lib32-alsa-plugins: ALSA support')
-provides=("lib32-pulseaudio=$pkgver")
-conflicts=(lib32-pulseaudio)
-replaces=(lib32-pulseaudio)
-options=(!emptydirs !libtool)
-source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz")
-sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee')
-
-_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la"
-
-build() {
-  cd "$srcdir/pulseaudio-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libdir=/usr/lib32 \
-    --libexecdir=/usr/lib32 \
-    --localstatedir=/var \
-    --disable-hal \
-    --disable-tcpwrap \
-    --disable-rpath \
-    --disable-default-build-tests
-
-  # fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make -C src $_libs
-}
-
-package() {
-  cd "$srcdir/pulseaudio-$pkgver"
-  make -j1 -C src DESTDIR="$pkgdir" \
-    lib_LTLIBRARIES="$_libs" install-libLTLIBRARIES
-  make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA
-}
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
deleted file mode 100644
index 42d8435a5..000000000
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 62186 2012-01-17 19:44:58Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.8
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' '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=('18b76759d5bbb863777f37bf3aec23ebaa31d5be'
-          '3455e84642283bc91c8313af319002a20bbcbdf4')
-
-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
-  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-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index f17de1b1d..000000000
--- a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
---- libxcb-1.1/configure.ac.pthread-stubs	2007-11-04 18:17:11.000000000 -0500
-+++ libxcb-1.1/configure.ac	2007-11-12 10:27:06.000000000 -0500
-@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/multilib-testing/lib32-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD
deleted file mode 100644
index 6b91c7ba3..000000000
--- a/multilib-testing/lib32-udev/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 62945 2012-01-29 12:24:25Z lcarlier $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=('lib32-udev')
-pkgver=180
-pkgrel=1
-arch=('x86_64')
-pkgdesc="The userspace dev tools (udev) (32-bit)"
-url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
-license=('GPL')
-options=(!makeflags !libtool)
-depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev')
-makedepends=('gcc-multilib' 'gperf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz)
-md5sums=('1cf124ab5a124ea35d4748ea414926ec')
-
-build() {
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd $srcdir/udev-$pkgver
-
-  ./configure --libdir=/usr/lib32 --disable-introspection
-  make
-}
-  
-package() {
-  
-  cd $srcdir/udev-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share}
-  rm -rf ${pkgdir}/usr/lib32/girepository*
-}
diff --git a/multilib-testing/lib32-zlib/PKGBUILD b/multilib-testing/lib32-zlib/PKGBUILD
deleted file mode 100644
index 0233e90ab..000000000
--- a/multilib-testing/lib32-zlib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63029 2012-01-30 16:33:32Z pschmitz $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=zlib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.6
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
-arch=('x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('618e944d7c7cd6521551e30b32322f4a')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32
-	make
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test -j 1
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-
-	rm -rf "${pkgdir}"/usr/{include,share,bin}
-	mkdir -p "$pkgdir/usr/share/licenses"
-	ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index 54b26abc4..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 62110 2012-01-16 01:55:19Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuild with each new gcc version
-
-pkgbase=libtool-multilib
-pkgname=(libtool-multilib lib32-libltdl)
-pkgver=2.4.2
-pkgrel=2.1
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.6.2
-makedepends=("gcc-multilib=$_gccver")
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd "$srcdir"
-
-  rm -rf libtool-64 libtool-32
-  mv libtool-$pkgver libtool-64
-  cp -a libtool-64 libtool-32
-
-  msg2 "Building libtool-64..."
-  cd "$srcdir/libtool-64"
-  ./configure --prefix=/usr
-  make
-
-  msg2 "Building libtool-32..."
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-
-  cd "$srcdir/libtool-32"
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-check() {
-  cd "$srcdir/libtool-64"
-  make check
-  cd "$srcdir/libtool-32"
-  make check
-}
-
-package_libtool-multilib() {
-  depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver")
-  groups=('multilib-devel')
-  install=libtool.install
-  provides=("libtool=$pkgver-$pkgrel")
-  conflicts=(libtool)
-
-  cd "$srcdir/libtool-64"
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_lib32-libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)"
-  depends=(lib32-glibc libltdl)
-  replaces=(lib32-libtool)
-  provides=("lib32-libtool=$pkgver-$pkgrel")
-  conflicts=(lib32-libtool)
-
-  cd "$srcdir/libtool-32"
-  make DESTDIR="$pkgdir" install-libLTLIBRARIES
-}
diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install
deleted file mode 100644
index 424c8cb88..000000000
--- a/multilib-testing/libtool-multilib/libtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/nspluginwrapper/PKGBUILD b/multilib-testing/nspluginwrapper/PKGBUILD
deleted file mode 100644
index 7e88d8712..000000000
--- a/multilib-testing/nspluginwrapper/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 62111 2012-01-16 01:55:23Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=nspluginwrapper
-pkgver=1.4.4
-pkgrel=2.1
-pkgdesc="Cross-platform NPAPI compatible plugin viewer"
-arch=('i686' 'x86_64')
-url="http://nspluginwrapper.davidben.net/"
-license=('GPL')
-depends=(
-  'curl'
-  'libxt' 'lib32-libxt'
-  'gcc-libs' 'lib32-gcc-libs'
-  'gtk2' 'lib32-gtk2'
-)
-makedepends=('gcc-multilib')
-install="install"
-source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz
-        'fix_missing_lib.patch')
-md5sums=('36f3e290fc4ce56f65ee695078961188'
-         'd40ad2f55d9989e04e3ef0cf4326b1df')
-
-if [[ $CARCH == i686 ]]; then
-  # Strip lib32 etc. on i686
-  depends=(${depends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*32-*/})
-  makedepends=(${makedepends[@]/*-multilib*/})
-  optdepends=(${optdepends[@]/*32-*/})
-fi
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -p0 -i "$srcdir/fix_missing_lib.patch"
-
-  configure_args=""
-  if [[ $CARCH == x86_64 ]]; then
-    configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib"
-  fi
-
-  ./configure $configure_args
-  make -j1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/nspluginwrapper/fix_missing_lib.patch b/multilib-testing/nspluginwrapper/fix_missing_lib.patch
deleted file mode 100644
index f239053f1..000000000
--- a/multilib-testing/nspluginwrapper/fix_missing_lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2012-01-15 13:25:28.922775770 +0100
-+++ Makefile.new	2012-01-15 13:25:09.185815643 +0100
-@@ -142,7 +142,7 @@
- npplayer_LDFLAGS  = $(LDFLAGS)
- npplayer_LDFLAGS += $(libpthread_LDFLAGS)
- npplayer_LIBS     = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS)
--npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS)
-+npplayer_LIBS    += $(libpthread_LIBS) $(libsocket_LIBS) -ldl
- 
- libnoxshm_LIBRARY = libnoxshm.so
- libnoxshm_RAWSRCS = libnoxshm.c
diff --git a/multilib-testing/nspluginwrapper/install b/multilib-testing/nspluginwrapper/install
deleted file mode 100644
index 78e196fdb..000000000
--- a/multilib-testing/nspluginwrapper/install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  for i in `nspluginwrapper -l | grep -v "^ "`; do
-    /usr/bin/nspluginwrapper -u "$i"
-  done
-}
diff --git a/multilib-testing/q4wine/PKGBUILD b/multilib-testing/q4wine/PKGBUILD
deleted file mode 100644
index 6bcafffa1..000000000
--- a/multilib-testing/q4wine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 62112 2012-01-16 01:55:29Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
-
-pkgname=q4wine
-pkgver=0.121
-pkgrel=3
-pkgdesc="A Qt4 GUI for Wine"
-arch=("i686" "x86_64")
-url="http://sourceforge.net/projects/${pkgname}/"
-license=("GPL3")
-depends=("qt" "wine" "sqlite3" "which" "icoutils")
-makedepends=("cmake")
-optdepends=("winetricks" "fuseiso")
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2)
-md5sums=('2de5de62f57ba6b26247198df339d81a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_WINETRIKS=ON \
-    -DLIBS_ENTRY_PATH=/usr/lib/$pkgname .
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/multilib-testing/q4wine/q4wine.desktop b/multilib-testing/q4wine/q4wine.desktop
deleted file mode 100644
index 2b1415848..000000000
--- a/multilib-testing/q4wine/q4wine.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Q4Wine
-GenericName=A Qt4 GUI for Wine
-Comment=A Qt4 GUI for Wine
-#Version=0.1
-Type=Application
-Categories=KDE;Qt;Settings
-Terminal=false
-Encoding=UTF-8
-Icon=wine
-Exec=q4wine
-#ServiceTypes=inode/directory
-#Actions=Create;
-#X-KDE-Submenu=
-#X-KDE-Priority=TopLevel
-#X-KDE-Icon=tgz
-X-KDE-StartupNotify=true
-#X-DCOP-ServiceType=Unique
author	Parabola <dev@list.parabolagnulinux.org>	2012-02-05 17:25:05 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2012-02-05 17:25:05 +0000
commit	359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch)
tree	eeed5f77c8417a98fe5b8538d3c019d1cea00c04 /multilib-testing
parent	cdc66cc7110e78bf1197f9effc70422114f9341b (diff)