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

Conflicts:
	community-staging/hedgewars/PKGBUILD
	community-testing/alex/PKGBUILD
	community-testing/gtk2hs-buildtools/PKGBUILD
	community-testing/haddock/PKGBUILD
	community-testing/happy/PKGBUILD
	community-testing/haskell-bytestring-show/PKGBUILD
	community-testing/haskell-cairo/PKGBUILD
	community-testing/haskell-dataenc/PKGBUILD
	community-testing/haskell-ghc-paths/PKGBUILD
	community-testing/haskell-glib/PKGBUILD
	community-testing/haskell-gtk/PKGBUILD
	community-testing/haskell-haskeline/PKGBUILD
	community-testing/haskell-hslogger/PKGBUILD
	community-testing/haskell-html/PKGBUILD
	community-testing/haskell-pango/PKGBUILD
	community-testing/haskell-quickcheck/PKGBUILD
	community-testing/haskell-regex-base/PKGBUILD
	community-testing/haskell-regex-compat/PKGBUILD
	community-testing/haskell-regex-posix/PKGBUILD
	community-testing/haskell-stm/PKGBUILD
	community-testing/haskell-syb/PKGBUILD
	community-testing/haskell-tar/PKGBUILD
	community-testing/haskell-terminfo/PKGBUILD
	community-testing/haskell-utf8-string/PKGBUILD
	community-testing/haskell-x11-xft/PKGBUILD
	community-testing/haskell-x11/PKGBUILD
	community-testing/haskell-xhtml/PKGBUILD
	community-testing/hedgewars/PKGBUILD
	community-testing/xmobar/PKGBUILD
	community-testing/xmonad-contrib/PKGBUILD
	community-testing/xmonad/PKGBUILD
	community/osdbattery/PKGBUILD
	community/packeth/PKGBUILD
	extra/kdenetwork/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/libgweather/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/mesa/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/btrfs-progs/initcpio-install-btrfs
	testing/ghc/PKGBUILD
	testing/ghc/build.mk
	testing/haskell-http/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-random/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-zlib/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/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/initcpio-install-udev
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

1 files changed, 33 insertions, 0 deletions

diff --git a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
new file mode 100644
index 000000000..2e687db21
--- /dev/null
+++ b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
@@ -0,0 +1,33 @@
+From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 07:43:41 -0700
+Subject: [PATCH] fix incorrect types in documentation/haddock
+
+---
+ src/Documentation/Haddock.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
+index 60bb314..8fd9674 100644
+--- a/src/Documentation/Haddock.hs
++++ b/src/Documentation/Haddock.hs
+@@ -59,6 +59,7 @@ import Haddock.Types
+ import Haddock.Options
+ import Haddock.Utils
+ import Main
++import GHC (Ghc)
+ 
+ 
+ -- | Create 'Interface' structures from a given list of Haddock command-line
+@@ -68,7 +69,7 @@ import Main
+ createInterfaces
+   :: [Flag]         -- ^ A list of command-line flags
+   -> [String]       -- ^ File or module names
+-  -> IO [Interface] -- ^ Resulting list of interfaces
++  -> Ghc [Interface] -- ^ Resulting list of interfaces
+ createInterfaces flags modules = do
+   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
+   return ifaces
+-- 
+1.7.12
+