Fri Jun 15 00:01:47 UTC 2012

23 files changed, 160 insertions, 151 deletions

diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index b403b8d80..a89768e62 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 148672 2012-02-05 11:46:26Z ibiru $
+# $Id: PKGBUILD 161645 2012-06-13 05:17:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alsaplayer
 pkgver=0.99.81
-pkgrel=3
+pkgrel=4
 pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64')
 url="http://www.alsaplayer.org/"
diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 072fe3411..30bffb560 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=cabal-install
 pkgver=0.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1')
+makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2')
 depends=('ghc' 'gmp' 'zlib')
 source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
 md5sums=('638514bd1a5792d75866481852148ae5')
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 50dfc9f94..5947712f9 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 156562 2012-04-21 01:56:35Z eric $
+# $Id: PKGBUILD 161773 2012-06-13 17:38:02Z andyrtr $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
 depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint')
+makedepends=('python2' 'gutenprint>=5.2.8')
 optdepends=('python2: for python plug-ins' 
             'gutenprint: for print plug-ins'
             'ghostscript: for pdf plug-ins')
@@ -30,8 +30,10 @@ build() {
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
   sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
 
-  aclocal -I aclocal
-  autoconf
+#  aclocal -I aclocal
+#  autoconf
+  sh autogen.sh
+  
   LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
     --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
   sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 7a7ec85d7..498009ac8 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160812 2012-06-06 15:26:42Z andyrtr $
+# $Id: PKGBUILD 161774 2012-06-13 17:38:37Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.5.3
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -163,9 +163,12 @@ optdepends=('php: for included phpcups.so module'
   # remove client.conf man page
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
   
-  # remove files now part of cups-filters
+  # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions
   rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
-  rm -v ${pkgdir}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
-  rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
+  rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+  rm -v ${pkgdir}/usr/share/cups/banners/*
+  rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs}
+  rm -v ${pkgdir}/usr/share/cups/fonts/*
+  # comment out all conversion rules which use any of the removed filters
+  perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs
 }
diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16
index 57db7916a..01faba047 100644
--- a/extra/cups/PKGBUILD.16
+++ b/extra/cups/PKGBUILD.16
@@ -138,6 +138,9 @@ optdepends=('xdg-utils: xdg .desktop file support')
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
   
   # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
+  rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
+  rm -v ${pkgdir}/usr/share/cups/banners/*
   rm -v ${pkgdir}/usr/share/cups/data/testprint
+  # comment out all conversion rules which use any of the removed filters
+  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
 }
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 864b7fde3..e2152d9db 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 151872 2012-03-03 16:05:55Z tdziedzic $
+# $Id: PKGBUILD 161653 2012-06-13 13:44:00Z tdziedzic $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
 #   ghc places a unique hash for each library when it is built.
 #   Libraries depend on versions specified by those hashes.
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-#   Also, due to dependency loop problems, haskell-ghc-paths and haddock
-#   do not carry version dependencies. You will have to remember to build them too.
 
 pkgname=ghc
-pkgver=7.4.1
-pkgrel=2
+pkgver=7.4.2
+pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
 license=('custom')
-depends=('perl' 'gmp>=5.0' 'gcc' 'libffi')
-makedepends=('ghc' 'happy' 'perl' 'libxslt' 'docbook-xsl')
+# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
+depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
+makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
 checkdepends=('python2')
 install='ghc.install'
-groups=('haskell')
+# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
+options=('!makeflags')
+# missing rtl?
 provides=('haskell-array=0.4.0.0'
-          'haskell-base=4.5.0.0'
+          'haskell-base=4.5.1.0'
           'haskell-binary=0.5.1.0'
           'haskell-bin-package-db=0.0.0.0'
           'haskell-bytestring=0.9.2.1'
@@ -42,11 +43,11 @@ provides=('haskell-array=0.4.0.0'
           'haskell-process=1.1.0.1'
           'haskell-template-haskell=2.7.0.0'
           'haskell-time=1.4'
-          'haskell-unix=2.5.1.0'
+          'haskell-unix=2.5.1.1'
           'haskell-cabal=1.14.0'
          )
 replaces=('haskell-array<0.4.0.0'
-          'haskell-base<4.5.0.0'
+          'haskell-base<4.5.1.0'
           'haskell-binary<0.5.1.0'
           'haskell-bin-package-db<0.0.0.0'
           'haskell-bytestring<0.9.2.1'
@@ -67,25 +68,31 @@ replaces=('haskell-array<0.4.0.0'
           'haskell-process<1.1.0.1'
           'haskell-template-haskell<2.7.0.0'
           'haskell-time<1.4'
-          'haskell-unix<2.5.1.0'
+          'haskell-unix<2.5.1.1'
           'haskell-cabal<1.14.0'
          )
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('5d86c420978b49cc60edea9bd4c36703'
-         '54bc9405c14c3226b6e3de3cd61e2777'
-         '82b67cdd24a2e434a4399f30f14b21a3')
+        'build.mk'
+        'silence-gen_contents_index.diff')
+md5sums=('267462db5c5a7c245fb26361b77007c4'
+         '528005749c761fe6c12a0079bd84fb90'
+         '88ad4108c26f56fc38466d82aaf9a295'
+         '2ac480d025b706fc47acc58c54b246bb')
 
 build() {
   cd ghc-${pkgver}
 
+  # Silence gen_contents_index for the common case.
+  # http://hackage.haskell.org/trac/ghc/ticket/5992
+  patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
+
   cp ${srcdir}/build.mk mk/build.mk
 
   ./configure \
     --prefix=/usr
 
-  make -j4 -l8
+  make
 }
 
 check() {
@@ -96,7 +103,8 @@ check() {
   sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
 
   # note: there is one test failure on i686 only: http://hackage.haskell.org/trac/ghc/ticket/5856
-  make THREADS=9 test
+  #make THREADS=9 test
+  make test
   # might be some failures
   #make fulltest
 }
diff --git a/extra/ghc/build.mk b/extra/ghc/build.mk
index bc26a21fe..73645a957 100644
--- a/extra/ghc/build.mk
+++ b/extra/ghc/build.mk
@@ -117,7 +117,7 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
+LAX_DEPENDENCIES   = YES
 
 endif
 
@@ -134,7 +134,7 @@ HADDOCK_DOCS       = NO
 BUILD_DOCBOOK_HTML = NO
 BUILD_DOCBOOK_PS   = NO
 BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = NO
+LAX_DEPENDENCIES   = YES
 
 # After stage 1 and the libraries have been built, you can uncomment this line:
 
diff --git a/extra/ghc/silence-gen_contents_index.diff b/extra/ghc/silence-gen_contents_index.diff
new file mode 100644
index 000000000..6d835f8fb
--- /dev/null
+++ b/extra/ghc/silence-gen_contents_index.diff
@@ -0,0 +1,10 @@
+--- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
++++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
+@@ -47,7 +47,6 @@
+ esac
+ 
+ # Now create the combined contents and index pages
+-echo $HADDOCK_ARGS
+ $HADDOCK --gen-index --gen-contents -o . \
+          -t "Haskell Hierarchical Libraries" \
+          -p "prologue.txt" \
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index fa41c86b2..e7016c7f4 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143830 2011-11-29 16:30:26Z andyrtr $
+# $Id: PKGBUILD 161772 2012-06-13 17:37:51Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
-pkgver=5.2.7
-pkgrel=3
+pkgver=5.2.8
+pkgrel=1
 pkgdesc="Top quality printer drivers for POSIX systems"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,23 +14,22 @@ optdepends=('cups:		to use cups printer spooler(recommended)'
             'foomatic-db-engine:	to use foomatic spooler'
             'ghostscript:	adds postscript support for ijsgutenprint'
             'gimp:		adds gutenprint plugin to gimp')
-source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2 buildfix.patch)
+source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
 options=('!libtool' '!emptydirs')
-md5sums=('b19029972bf28f6efd693270daf8f5de'
-         '2354cdecf1fbab32eca84266c8c72e7d')
+md5sums=(5ed64c0f994245852da8e9fa6a137060'')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/buildfix.patch
-  ./configure --prefix=/usr --disable-samples --with-cups --with-gimp2 \
-	--disable-translated-cups-ppds --with-gimp2-as-gutenprint \
-	--disable-libgutenprintui  --enable-libgutenprintui2 --disable-gtktest \
-	--enable-cups-ppds --enable-cups-ppds-at-top-level \
-	--with-foomatic --with-foomatic3 --with-ghostscript \
-	--disable-static --disable-static-genppd --with-ijs \
-	--disable-globalized-cups-ppds
+  ./configure --prefix=/usr \
+    --enable-samples \
+	--enable-cups-ppds \
+	--enable-cups-ppds-at-top-level \
+	--disable-translated-cups-ppds \
+	--disable-globalized-cups-ppds \
+	--disable-static \
+	--disable-static-genppd
   make
 }
 
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index 79de205cc..fda58f3c9 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=HTTP
 pkgname=haskell-http
-pkgver=4000.2.2
+pkgver=4000.2.3
 pkgrel=1
 pkgdesc="A library for client-side HTTP"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-network=2.3.0.11-1' 'haskell-parsec=3.1.2-1' 'haskell-mtl=2.0.1.0-4')
+depends=('ghc=7.4.2-1' 'sh' 'haskell-network=2.3.0.14-1' 'haskell-parsec=3.1.2-2' 'haskell-mtl=2.1.1-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('b61ff88ef8d699f73a6ed27c6abf6600')
+md5sums=('872a1e49c3701c61c354f76716d4e3e7')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index 315d81a73..4b2f73533 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -4,16 +4,16 @@
 
 _hkgname=mtl
 pkgname=haskell-mtl
-pkgver=2.0.1.0
-pkgrel=4
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="Monad transformer library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-transformers=0.2.2.0-4')
+depends=('ghc=7.4.2-1' 'sh' 'haskell-transformers=0.3.0.0-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
 install=${pkgname}.install
-md5sums=('934fa813625ef7e88a6a96a09815ff95')
+md5sums=('0654be687f1492a2ff30cf6f3fb7eed0')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 59dc9334b..f3a3cc022 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -5,16 +5,16 @@
 
 _hkgname=network
 pkgname=haskell-network
-pkgver=2.3.0.11
+pkgver=2.3.0.14
 pkgrel=1
 pkgdesc="Networking-related facilities"
 url="http://hackage.haskell.org/package/network"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-parsec=3.1.2-1')
+depends=('ghc=7.4.2-1' 'sh' 'haskell-parsec=3.1.2-2')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
-md5sums=('cfe4922ac85685be9f86d4d34654f481')
+md5sums=('1e45cc731647acff8b9c33bda085bf2a')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index e4f7da1e6..2ab24a745 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -6,12 +6,12 @@
 _hkgname=parsec
 pkgname=haskell-parsec
 pkgver=3.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Monadic parser combinators"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh' 'haskell-mtl=2.0.1.0-4' 'haskell-text=0.11.1.13-1')
+depends=('ghc=7.4.2-1' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-text=0.11.2.1-1')
 source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 install=${pkgname}.install
 md5sums=('c2a75dfd247ae4839e2602b62dc87487')
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 3b929c3d6..56b110289 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -3,13 +3,13 @@
 _hkgname=random
 pkgname=haskell-random
 pkgver=1.0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A basic random number generation library"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.4.2-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
 
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index c4c9664f7..31811e339 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
+
 _hkgname=text
 pkgname=haskell-text
-pkgver=0.11.1.13
+pkgver=0.11.2.1
 pkgrel=1
 pkgdesc="An efficient packed Unicode text type."
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.4.2-1' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
-md5sums=('62b781a5d9d4dab2b2a1dbf2dc1b593f')
+md5sums=('77245df79d10ed5f896a9d3f5b17ee74')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
@@ -35,4 +36,3 @@ package() {
     install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
 }
-
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 067d27b8d..a216083a0 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 151894 2012-03-03 16:06:32Z tdziedzic $
+# $Id: PKGBUILD 161660 2012-06-13 13:44:42Z tdziedzic $
 
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Rémy Oudompheng <remy@archlinux.org>
 
 _hkgname=transformers
 pkgname=haskell-transformers
-pkgver=0.2.2.0
-pkgrel=4
+pkgver=0.3.0.0
+pkgrel=1
 pkgdesc="Concrete functor and monad transformers"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'sh')
+depends=('ghc=7.4.2-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
 install=${pkgname}.install
-md5sums=('3470ac66116900cd1ba84d3744474e49')
+md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index d47562b9d..11767ab97 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -6,13 +6,13 @@
 _hkgname=zlib
 pkgname=haskell-zlib
 pkgver=0.5.3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Compression and decompression in the gzip and zlib formats"
 url="http://hackage.haskell.org/package/zlib"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-depends=('ghc=7.4.1' 'zlib' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+depends=('ghc=7.4.2-1' 'zlib' 'sh')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
 md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
 
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index f16ac0679..0a4a2428a 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158936 2012-05-13 13:26:46Z andyrtr $
+# $Id: PKGBUILD 161769 2012-06-13 16:55:23Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
 _javaver=6
-_icedteaver=1.11.2
+_icedteaver=1.11.3
 _openjdk_version=b24
 _openjdk_date=14_nov_2011
 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -32,8 +32,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	jaxp144_03.zip
 	jdk6-jaxws2_1_6-2011_06_13.zip
 	jdk6-jaf-b20.zip)
-sha256sums=('078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5'
-            '1c4b7ae37498c61b18ac5fcf04b3322b4b82afe7e959e5949f05bf252cdf73c7'
+sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4'
+            '31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978'
             'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
             'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
             '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index d46ff3749..5d35160fb 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $
+# $Id: PKGBUILD 161771 2012-06-13 17:06:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
@@ -6,12 +6,12 @@
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
 pkgver=4.9.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
-             'python-opengl' 'qt-assistant-compat' 'qtwebkit')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+             'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
         'fix-qthelp-build.patch')
 md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c'
@@ -50,7 +50,7 @@ build() {
 
 package_pyqt(){
   pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip')
+  depends=('qtwebkit' 'python-sip' 'python-dbus')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
@@ -64,7 +64,7 @@ package_pyqt(){
 
 package_python2-pyqt(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('pyqt' 'python2-sip' 'dbus-python')
+  depends=('pyqt' 'python2-sip' 'python2-dbus')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'python-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 0392e3bec..648859602 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 161390 2012-06-10 20:21:44Z tpowa $
+# $Id: PKGBUILD 161651 2012-06-13 12:26:10Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -22,13 +22,13 @@ build()
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
-              --enable-docs
+              --enable-docs 
               make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
   rm "${pkgdir}/usr/share/qemu/bios.bin"
 
   install -D -m644 "${srcdir}/65-kvm.rules" \
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index e2e34ebd6..332cb5a36 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,75 +1,59 @@
-# $Id: PKGBUILD 138506 2011-09-26 08:00:12Z guillaume $
+# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
-pkgver=3.7.1
+pkgver=3.7.2
 pkgrel=1
+_date=201202080800
 pkgdesc="An open source widget toolkit for Java"
-_date=201109091335
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.eclipse.org/swt/"
 license=('EPL')
 depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
-#optdepends=('libgnomeui' 'xulrunner' 'mesa')
-#makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'xulrunner>=1.9.1' 'unzip' 'pkgconfig' 'apache-ant')
-optdepends=('libgnomeui' 'mesa')
-makedepends=('openjdk6' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'apache-ant')
+optdepends=('libgnomeui' 'mesa' 'libwebkit')
+makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
 if [ "${CARCH}" = "i686" ]; then
-  source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86.zip
-          build-swt.xml)
-  noextract=(swt-${pkgver}-gtk-linux-x86.zip)
-  md5sums=('b7d6d24e2feb7489b0baa0ce941ea4d2'
+  _carch=x86
+  md5sums=('9a858b11e66de8af41786eaf09fc9ee2'
            'f5e548bc26a0f1f3c18131be76face40')
 fi
 if [ "${CARCH}" = "x86_64" ]; then
-  source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-x86_64.zip
-          build-swt.xml)
-  md5sums=('8816631e7993a783a87e98ba39da7fa6'
+  _carch=x86_64
+  md5sums=('b16ab5c9d274b9488432ebeae6e4af5a'
            'f5e548bc26a0f1f3c18131be76face40')
-  noextract=(swt-${pkgver}-gtk-linux-x86_64.zip)
 fi
+source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
+        build-swt.xml)
+noextract=(swt-${pkgver}-gtk-linux-${_carch}.zip)
+# To test this pkg:
+# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
 
 build() {
-  cd "${srcdir}"
-  . /etc/profile.d/openjdk6.sh
-  . /etc/profile.d/apache-ant.sh
-  unzip -jqo ${srcdir}/swt-${pkgver}-gtk-linux-*.zip "*src.zip"
-  unzip -qo src.zip
-  rm -rf about_files
-  mkdir src
-  mv org src/
-  cp build-swt.xml build.xml
+  cd ${srcdir}
+  unzip -oq swt-${pkgver}-gtk-linux-${_carch}.zip src.zip
+  unzip -oq src.zip -d src
 
-  [ "${CARCH}" = "x86_64" ] && export SWT_PTR_CFLAGS=-DJNI64
+  . /etc/profile.d/jdk.sh
+  . /etc/profile.d/apache-ant.sh
 
-  make -f make_linux.mak make_awt
-  make -f make_linux.mak make_swt
-  make -f make_linux.mak make_atk
-  make -f make_linux.mak make_gnome
-# "XULRunner >= 2.0 is not currently supported"
-#   https://bugs.eclipse.org/bugs/show_bug.cgi?id=327696
-#
-#  export MOZILLA_INCLUDES="`pkg-config --cflags libxul`"
-#  export MOZILLA_LIBS="-Wl,-R`pkg-config libxul --variable=libdir` `pkg-config libxul --libs`"
-#  export XULRUNNER_INCLUDES="${MOZILLA_INCLUDES}"
-#  export XULRUNNER_LIBS="${MOZILLA_LIBS}"
-#  make -f make_linux.mak make_mozilla
-#  make -f make_linux.mak make_xulrunner
+  # Shared objects
+  cd src
+  ./build.sh
 
-  make -f make_linux.mak make_cairo
-  make -f make_linux.mak make_glx
- 
-  ant compile
+  # SWT jar
+  ant -f ../build-swt.xml compile
 }
 
 package() {
-  cd "${srcdir}"
-  cp version.txt build/version.txt
-  cp src/org/eclipse/swt/internal/SWTMessages.properties build/org/eclipse/swt/internal/
+  cd ${srcdir}/src
 
-  ant jar
+  # Shared objects
+  export OUTPUT_DIR=${pkgdir}/usr/lib
+  install -dm755 ${OUTPUT_DIR} 
+  make -f make_linux.mak install
 
-  install -m755 -d "${pkgdir}/usr/share/java"
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m644 swt.jar "${pkgdir}/usr/share/java/"
-  install -m755 *.so "${pkgdir}/usr/lib/"
+  # SWT jar
+  ant -f ../build-swt.xml jar
+  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
+  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
 }
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index e399b0538..db08f1c90 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148483 2012-02-02 13:39:36Z giovanni $
+# $Id: PKGBUILD 161647 2012-06-13 06:49:09Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=tcpdump
-pkgver=4.2.1
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
 pkgdesc="A tool for network monitoring and data acquisition"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org"
@@ -12,8 +12,8 @@ license=('BSD')
 depends=('libpcap' 'openssl')
 source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
         'tcpdump_duplicate_executable.patch')
-md5sums=('c202878c6db054767b52651041b9e60e'
-         'b45c978dff8193ff5529d3566e7dbfa3')
+md5sums=('a3fe4d30ac85ff5467c889ff46b7e1e8'
+         '96c116e5ed51759a029bb6c236d63178')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch
index 705983ccc..bb3e60f1a 100644
--- a/extra/tcpdump/tcpdump_duplicate_executable.patch
+++ b/extra/tcpdump/tcpdump_duplicate_executable.patch
@@ -1,6 +1,6 @@
---- a/Makefile.in	2011-07-24 22:58:55.000000000 +0200
-+++ b/Makefile.in	2011-12-05 12:59:23.000000000 +0100
-@@ -399,7 +399,6 @@
+--- a/Makefile.in	2012-06-12 18:56:20.000000000 +0200
++++ b/Makefile.in	2012-06-13 08:41:09.000000000 +0200
+@@ -409,7 +409,6 @@
  	[ -d $(DESTDIR)$(sbindir) ] || \
  	    (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
  	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)