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

Conflicts:
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-syb/PKGBUILD
	community/cantata/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/less/PKGBUILD
	extra/alsa-plugins/PKGBUILD
	extra/avfs/PKGBUILD
	extra/cups/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mysql/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vim/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	multilib/lib32-alsa-lib/PKGBUILD
	multilib/lib32-alsa-plugins/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	staging/ghc/PKGBUILD
	staging/ghc/build.mk
	staging/haskell-http/PKGBUILD
	staging/haskell-mtl/PKGBUILD
	staging/haskell-network/PKGBUILD
	staging/haskell-parsec/PKGBUILD
	staging/haskell-random/PKGBUILD
	staging/haskell-text/PKGBUILD
	staging/haskell-transformers/PKGBUILD
	staging/haskell-zlib/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/coreutils/coreutils.install
	testing/dhcpcd/PKGBUILD
	testing/kactivities/PKGBUILD
	testing/kdeaccessibility-jovie/PKGBUILD
	testing/kdeaccessibility-kaccessible/PKGBUILD
	testing/kdeaccessibility-kmag/PKGBUILD
	testing/kdeaccessibility-kmousetool/PKGBUILD
	testing/kdeaccessibility-kmouth/PKGBUILD
	testing/kdeadmin/PKGBUILD
	testing/kdeartwork/PKGBUILD
	testing/kdebase-konsole/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase/PKGBUILD
	testing/kdebindings-kimono/PKGBUILD
	testing/kdebindings-korundum/PKGBUILD
	testing/kdebindings-kross/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdebindings-qtruby/PKGBUILD
	testing/kdebindings-qyoto/PKGBUILD
	testing/kdebindings-smokegen/PKGBUILD
	testing/kdebindings-smokekde/PKGBUILD
	testing/kdebindings-smokeqt/PKGBUILD
	testing/kdeedu-analitza/PKGBUILD
	testing/kdeedu-blinken/PKGBUILD
	testing/kdeedu-cantor/PKGBUILD
	testing/kdeedu-kalgebra/PKGBUILD
	testing/kdeedu-kalzium/PKGBUILD
	testing/kdeedu-kanagram/PKGBUILD
	testing/kdeedu-kbruch/PKGBUILD
	testing/kdeedu-kgeography/PKGBUILD
	testing/kdeedu-khangman/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-kiten/PKGBUILD
	testing/kdeedu-klettres/PKGBUILD
	testing/kdeedu-kmplot/PKGBUILD
	testing/kdeedu-kstars/PKGBUILD
	testing/kdeedu-ktouch/PKGBUILD
	testing/kdeedu-kturtle/PKGBUILD
	testing/kdeedu-kwordquiz/PKGBUILD
	testing/kdeedu-marble/PKGBUILD
	testing/kdeedu-pairs/PKGBUILD
	testing/kdeedu-parley/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/kdeedu-step/PKGBUILD
	testing/kdegames/PKGBUILD
	testing/kdegraphics-gwenview/PKGBUILD
	testing/kdegraphics-kamera/PKGBUILD
	testing/kdegraphics-kcolorchooser/PKGBUILD
	testing/kdegraphics-kgamma/PKGBUILD
	testing/kdegraphics-kolourpaint/PKGBUILD
	testing/kdegraphics-kruler/PKGBUILD
	testing/kdegraphics-ksaneplugin/PKGBUILD
	testing/kdegraphics-ksnapshot/PKGBUILD
	testing/kdegraphics-mobipocket/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/kdegraphics-svgpart/PKGBUILD
	testing/kdegraphics-thumbnailers/PKGBUILD
	testing/kdemultimedia-audiocd-kio/PKGBUILD
	testing/kdemultimedia-dragonplayer/PKGBUILD
	testing/kdemultimedia-ffmpegthumbs/PKGBUILD
	testing/kdemultimedia-juk/PKGBUILD
	testing/kdemultimedia-kmix/PKGBUILD
	testing/kdemultimedia-kscd/PKGBUILD
	testing/kdemultimedia-mplayerthumbs/PKGBUILD
	testing/kdenetwork/PKGBUILD
	testing/kdepim-runtime/PKGBUILD
	testing/kdepim/PKGBUILD
	testing/kdepimlibs/PKGBUILD
	testing/kdeplasma-addons/PKGBUILD
	testing/kdesdk-kate/PKGBUILD
	testing/kdesdk/PKGBUILD
	testing/kdetoys/PKGBUILD
	testing/kdeutils-filelight/PKGBUILD
	testing/kdeutils-kcalc/PKGBUILD
	testing/kdeutils-kcharselect/PKGBUILD
	testing/kdeutils-kdf/PKGBUILD
	testing/kdeutils-kfloppy/PKGBUILD
	testing/kdeutils-kgpg/PKGBUILD
	testing/kdeutils-kremotecontrol/PKGBUILD
	testing/kdeutils-ktimer/PKGBUILD
	testing/kdeutils-kwallet/PKGBUILD
	testing/kdeutils-superkaramba/PKGBUILD
	testing/kdeutils-sweeper/PKGBUILD
	testing/kdewebdev/PKGBUILD
	testing/kmod/PKGBUILD
	testing/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/libmpc/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/procps-ng/PKGBUILD
	testing/sudo/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

1 files changed, 7 insertions, 6 deletions

diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index 88eddf819..af3987c78 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 159779 2012-05-26 19:57:17Z daniel $
+# $Id: PKGBUILD 166463 2012-09-08 07:14:12Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gimp
-pkgver=2.8.0
-pkgrel=2
+pkgver=2.8.2
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
          'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl')
+makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
             'libwebkit: for the help browser'
             'poppler-glib: for pdf support'
             'alsa-lib: for MIDI event controller module'
-            'curl: for URI support')
+            'curl: for URI support'
+            'ghostscript: for postscript support')
 options=('!libtool' '!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
         uri-backend-libcurl.patch)
-md5sums=('28997d14055f15db063eb92e1c8a7ebb'
+md5sums=('b542138820ca3a41cbd63fc331907955'
          'bb27bc214261d36484093e857f015f38'
          'e894f4b2ffa92c71448fdd350e9b78c6')