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

Conflicts:
	community-testing/perl-berkeleydb/PKGBUILD
	community/egoboo/PKGBUILD
	community/kdenlive/PKGBUILD
	community/postgis/PKGBUILD
	core/lvm2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pixman/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/system-config-printer/PKGBUILD
	extra/xorg-server/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	testing/imagemagick/PKGBUILD
	testing/php/PKGBUILD
	testing/php/logrotate.d.php-fpm
	testing/php/php-fpm.conf.in.patch
	testing/php/rc.d.php-fpm
	testing/xf86-video-intel/PKGBUILD

1 files changed, 0 insertions, 70 deletions

diff --git a/testing/libcanberra/PKGBUILD b/testing/libcanberra/PKGBUILD
deleted file mode 100644
index 890b6fc19..000000000
--- a/testing/libcanberra/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 159972 2012-05-27 13:10:57Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=5
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra.xinit)
-sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
-            '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package_libcanberra() {
-  install=libcanberra.install
-  optdepends=("$pkgbase-pulse: PulseAudio driver"
-              "$pkgbase-gstreamer: GStreamer driver")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
-
-  install -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
-
-  install -D "${srcdir}/libcanberra.xinit" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
-
-  # Split plugins
-  for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
-  done
-}
-
-package_libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}
-
-package_libcanberra-gstreamer() {
-  pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}