Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

1 files changed, 11 insertions, 22 deletions

diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 13e60a270..306bd875e 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,53 +1,42 @@
-# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $
+# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
-pkgver=1.2.1
-pkgrel=1.1
+pkgver=1.3.0
+pkgrel=2
 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libjpeg-turbo.virtualgl.org/"
 license=('GPL' 'custom')
 depends=('glibc')
 makedepends=('nasm')
-provides=('libjpeg=8.0.2')
-conflicts=('libjpeg')
-replaces=('libjpeg')
+provides=('libjpeg=8.0.2' 'turbojpeg')
+conflicts=('libjpeg' 'turbojpeg')
+replaces=('libjpeg' 'turbojpeg')
 options=('!libtool')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # put documentation in a reasonable directory...
-  sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
-  sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in
-
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
   make
 }
 
 check() {
   cd "$srcdir/$pkgname-$pkgver"
-  
   make test
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \
+    exampledir=/usr/share/doc/libjpeg-turbo install
   
   # provide jpegint.h as it is required by various software
   install -m644 jpegint.h "$pkgdir/usr/include/"
   
-  # do not distributre libturbojpeg as it is unversioned
-  rm "$pkgdir"/usr/lib/libturbojpeg.{so,a}
-  rm "$pkgdir/usr/include/turbojpeg.h"
-  rm "$pkgdir/usr/bin/tjbench"
-  
   install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/"
   ln -s ../../doc/libjpeg-turbo/README \
     "$pkgdir/usr/share/licenses/libjpeg-turbo/README"