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

Conflicts:
	community/antiword/PKGBUILD
	community/apcupsd/PKGBUILD
	community/busybox/PKGBUILD
	community/chrpath/PKGBUILD
	community/driftnet/PKGBUILD
	community/emesene/PKGBUILD
	community/fdm/PKGBUILD
	community/fftw2/PKGBUILD
	community/gsynaptics/PKGBUILD
	community/gtk-rezlooks-engine/PKGBUILD
	community/httptunnel/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/libopenraw/PKGBUILD
	community/mashup/PKGBUILD
	community/pcb/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/preload/PKGBUILD
	community/rlog/PKGBUILD
	community/scponly/PKGBUILD
	community/splint/PKGBUILD
	community/wmname/PKGBUILD
	community/xosd/PKGBUILD
	community/xxkb/PKGBUILD
	community/znc/PKGBUILD
	core/glibc/PKGBUILD
	core/libtool/PKGBUILD
	extra/at/PKGBUILD
	extra/autogen/PKGBUILD
	extra/bmp-musepack/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/cdrdao/PKGBUILD
	extra/chkrootkit/PKGBUILD
	extra/cmt/PKGBUILD
	extra/compface/PKGBUILD
	extra/dasher/PKGBUILD
	extra/dcfldd/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/docker/PKGBUILD
	extra/dvd+rw-tools/PKGBUILD
	extra/dvdrtools/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/festival/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gecko-sharp-2.0/PKGBUILD
	extra/gimp-gap/PKGBUILD
	extra/gmetadom/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/gnome-vfsmm/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/graphite/PKGBUILD
	extra/i8kutils/PKGBUILD
	extra/id3/PKGBUILD
	extra/java-access-bridge/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/koffice/PKGBUILD
	extra/ladspa/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libdc1394/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libglademm/PKGBUILD
	extra/libgnomecanvasmm/PKGBUILD
	extra/libsigsegv/PKGBUILD
	extra/libstdc++5/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/lua/PKGBUILD
	extra/mcpp/PKGBUILD
	extra/metalog/PKGBUILD
	extra/mp3wrap/PKGBUILD
	extra/mt-st/PKGBUILD
	extra/naim/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/oxine/PKGBUILD
	extra/php/PKGBUILD
	extra/poppler/PKGBUILD
	extra/pstoedit/PKGBUILD
	extra/qt/PKGBUILD
	extra/speex/PKGBUILD
	extra/sweep/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib-extras/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/ypbind-mt/PKGBUILD
	gnome-unstable/caribou/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/cogl/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/empathy/empathy.install
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gdm/fix_external_program_directories.patch
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-contacts/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/mash/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/pulseaudio/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygobject2/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sushi/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vala/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-gtk/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-mpg123/PKGBUILD
	multilib/lib32-nspr/PKGBUILD
	multilib/lib32-nss/PKGBUILD
	multilib/lib32-nss/add_spi+cacert_ca_certs.patch
	multilib/lib32-openssl/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	testing/util-linux/PKGBUILD

1 files changed, 15 insertions, 15 deletions

diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD
index 756193f4e..289b3825c 100644
--- a/extra/cdrdao/PKGBUILD
+++ b/extra/cdrdao/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102363 2010-12-07 13:51:12Z jgc $
+# $Id: PKGBUILD 137917 2011-09-12 12:45:56Z pierre $
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,15 +6,15 @@
 pkgbase=('cdrdao')
 pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
 makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        cdrdao-1.2.3-autoconf-update.patch
-        cdrdao-1.2.3-k3b.patch
-        cdrdao-1.2.3-stat.patch)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'cdrdao-1.2.3-autoconf-update.patch'
+        'cdrdao-1.2.3-k3b.patch'
+        'cdrdao-1.2.3-stat.patch')
 md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
          '8e53dfc174f7c0882194caa05e68b85e'
          '696f6ca01e1eeb9b6a5be88e535d9398'
@@ -22,16 +22,16 @@ md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
 
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
-  
+
 	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
 	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-  
+	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
+
 	./configure --prefix=/usr \
-	   --mandir=/usr/share/man \
-	   --sysconfdir=/etc \
-	   --with-xdao --with-lame \
-	   --with-ogg-support --with-mp3-support
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--with-xdao --with-lame \
+		--with-ogg-support --with-mp3-support
 	make
 }
 
@@ -54,6 +54,6 @@ package_gcdmaster() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 	make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
-  mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
-  rmdir "${pkgdir}/etc"
+	mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
+	rmdir "${pkgdir}/etc"
 }