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

Conflicts:
	community-staging/mlt/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/xmonad/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/cups/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/swt/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus-core/dbus.install

3 files changed, 38 insertions, 20 deletions

diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 548a16f84..eae48b02f 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' 'mips64el')
 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" \