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

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

3 files changed, 13 insertions, 43 deletions

diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index a302459ee..33b84d17c 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -1,28 +1,21 @@
-# $Id: PKGBUILD 90944 2013-05-16 03:44:23Z eric $
+# $Id: PKGBUILD 96818 2013-09-05 20:51:50Z eric $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Rouslan Solomakhin <rouslan@localnet.com>
 
 pkgname=prelink
-pkgver=20111012
-pkgrel=2
-pkgdesc='ELF prelinking utility to speed up dynamic linking.'
+pkgver=20130503
+pkgrel=1
+pkgdesc='ELF prelinking utility to speed up dynamic linking'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://people.redhat.com/jakub/prelink/'
 license=('GPL')
 depends=('elfutils')
 backup=('etc/prelink.conf')
 source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2"
-        'prelink.conf'
-        'arch-x86_64-dynamic_linker.patch')
-md5sums=('f5aaf347432d677c293e5e3399ba4fdf'
-         '0793ed49e9b31c125cba4d936c333cf6'
-         'b347580536e078b34c547742d36a3e9d')
-
-prepare() {
-  cd ${pkgname}
-  patch -Np0 -i ../arch-x86_64-dynamic_linker.patch
-}
+        'prelink.conf')
+sha1sums=('eff86cb26f0cc174486769527286cc388d5216b0'
+          'b83bd2d3505076151aa13d40de3d5c08a04440c7')
 
 build() {
   cd ${pkgname}
@@ -30,6 +23,11 @@ build() {
   make
 }
 
+check() {
+  cd ${pkgname}
+  make check
+}
+
 package() {
   cd ${pkgname}
   make DESTDIR="${pkgdir}" install
diff --git a/community/prelink/arch-x86_64-dynamic_linker.patch b/community/prelink/arch-x86_64-dynamic_linker.patch
deleted file mode 100644
index bceb9b2dc..000000000
--- a/community/prelink/arch-x86_64-dynamic_linker.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup ../prelink.orig/src/arch-x86_64.c ./src/arch-x86_64.c
---- ../prelink.orig/src/arch-x86_64.c	2010-12-22 12:03:06.725004002 +0100
-+++ ./src/arch-x86_64.c	2010-12-22 12:04:08.193712039 +0100
-@@ -532,7 +532,7 @@ PL_ARCH = {
-   .R_COPY = R_X86_64_COPY,
-   .R_RELATIVE = R_X86_64_RELATIVE,
-   .rtype_class_valid = RTYPE_CLASS_VALID,
--  .dynamic_linker = "/lib64/ld-linux-x86-64.so.2",
-+  .dynamic_linker = "/lib/ld-linux-x86-64.so.2",
-   .adjust_dyn = x86_64_adjust_dyn,
-   .adjust_rel = x86_64_adjust_rel,
-   .adjust_rela = x86_64_adjust_rela,
diff --git a/community/prelink/prelink.conf b/community/prelink/prelink.conf
index a242269ad..f48d7f9f8 100644
--- a/community/prelink/prelink.conf
+++ b/community/prelink/prelink.conf
@@ -1,24 +1,8 @@
 # System
 /usr/lib
 /usr/bin
-/lib
-/bin
-/usr/sbin
 
-# Gnome
-/opt/gnome/lib
-/opt/gnome/bin
-/opt/gnome/share
-
-# KDE/Qt
-/opt/qt/lib
-/opt/qt/bin
-/opt/qt/share
+# KDE3
 /opt/kde/lib
 /opt/kde/bin
 /opt/kde/share
-
-# XFCE
-/opt/xfce4/lib
-/opt/xfce4/bin
-/opt/xfce4/share