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

Conflicts:
	community-testing/blender/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/root/PKGBUILD
	community-testing/ted/PKGBUILD
	extra/cpufrequtils/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/re2c/PKGBUILD
	extra/zip/PKGBUILD
	multilib/lib32-expat/PKGBUILD
	multilib/lib32-flac/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	multilib/lib32-giflib/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib/PKGBUILD
	multilib/lib32-json-c/PKGBUILD
	multilib/lib32-lcms/PKGBUILD
	multilib/lib32-libao/PKGBUILD
	multilib/lib32-libasyncns/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libice/PKGBUILD
	multilib/lib32-libmikmod/PKGBUILD
	multilib/lib32-libsm/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	multilib/lib32-libstdc++5/PKGBUILD
	multilib/lib32-libvorbis/PKGBUILD
	multilib/lib32-libxau/PKGBUILD
	multilib/lib32-libxcomposite/PKGBUILD
	multilib/lib32-libxdamage/PKGBUILD
	multilib/lib32-libxdmcp/PKGBUILD
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-libxinerama/PKGBUILD
	multilib/lib32-libxml2/PKGBUILD
	multilib/lib32-libxmu/PKGBUILD
	multilib/lib32-libxrender/PKGBUILD
	multilib/lib32-libxss/PKGBUILD
	multilib/lib32-libxt/PKGBUILD
	multilib/lib32-libxtst/PKGBUILD
	multilib/lib32-libxv/PKGBUILD
	multilib/lib32-libxvmc/PKGBUILD
	multilib/lib32-libxxf86vm/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-openal/PKGBUILD
	multilib/lib32-speex/PKGBUILD
	testing/kdelibs3/PKGBUILD
	testing/kmod/PKGBUILD
	testing/php/PKGBUILD
	testing/systemd/PKGBUILD

1 files changed, 21 insertions, 22 deletions

diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index e19e19418..a2dbb31b8 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 92392 2010-09-29 14:51:01Z ronald $
+# $Id: PKGBUILD 149629 2012-02-08 20:53:42Z pierre $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=1
-pkgdesk="compat version of Qt Assistant"
+pkgrel=2
+pkgdesc="compat version of Qt Assistant"
 url="http://qt.nokia.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('qt')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
-	'debian_patches_01_build_system.diff')
+        'debian_patches_01_build_system.diff')
 md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
          '1b55290dc9fab0c035797e9301d2fa61')
 
@@ -18,38 +18,37 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
 build() {
 	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
- 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
-        
+	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
+
 	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
-        rm -f translations/assistant_adp_*.qm
+	rm -f translations/assistant_adp_*.qm
 
 	qmake CONFIG+=create_prl
-        make
-        cd  ../translations; lrelease assistant_adp_*.ts
-        cd ..
-        qmake CONFIG+=create_prl
-        make
+	make
+	cd  ../translations; lrelease assistant_adp_*.ts
+	cd ..
+	qmake CONFIG+=create_prl
+	make
 }
 
-package(){
-        cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
+package() {
+	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
-      	make install INSTALL_ROOT=${pkgdir}
-        cd lib
-        make install INSTALL_ROOT=${pkgdir}
-        cd ..
+	make install INSTALL_ROOT=${pkgdir}
+	cd lib
+	make install INSTALL_ROOT=${pkgdir}
+	cd ..
 
 	# Fix wrong path in prl file
 	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
-	    ${pkgdir}/usr/lib/libQtAssistantClient.prl
+		${pkgdir}/usr/lib/libQtAssistantClient.prl
 
 	# Install translations
 	install -d ${pkgdir}/usr/share/qt/translations/
 	install -p -m0644 translations/assistant_adp_*.qm \
-	    ${pkgdir}/usr/share/qt/translations/
+		${pkgdir}/usr/share/qt/translations/
 
 	# Install prf file
 	install -D -p -m0644 features/assistant.prf \
-	    ${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
-
+		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
 }