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

Conflicts:
	community/distcc/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libtorrent/PKGBUILD
	community/picard/PKGBUILD
	community/rtorrent/PKGBUILD
	community/ushare/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/metacity/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/x2x/PKGBUILD
	kde-unstable/kdeaccessibility/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-korundum/PKGBUILD
	kde-unstable/kdebindings-perlkde/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-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-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-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdelibs/PKGBUILD
	kde-unstable/kdemultimedia/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/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	libre/libretools/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/wine/PKGBUILD
	testing/alex/PKGBUILD
	testing/ghc/PKGBUILD
	testing/haskell-cgi/PKGBUILD
	testing/haskell-deepseq/PKGBUILD
	testing/haskell-fgl/PKGBUILD
	testing/haskell-glut/PKGBUILD
	testing/haskell-haskell-src/PKGBUILD
	testing/haskell-html/PKGBUILD
	testing/haskell-http/PKGBUILD
	testing/haskell-hunit/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-opengl/PKGBUILD
	testing/haskell-parallel/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-platform/PKGBUILD
	testing/haskell-quickcheck/PKGBUILD
	testing/haskell-regex-base/PKGBUILD
	testing/haskell-regex-compat/PKGBUILD
	testing/haskell-regex-posix/PKGBUILD
	testing/haskell-stm/PKGBUILD
	testing/haskell-syb/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-xhtml/PKGBUILD
	testing/haskell-zlib/PKGBUILD
	testing/perl/ChangeLog
	testing/perl/PKGBUILD
	testing/perl/perlbin.sh
	testing/pidgin/PKGBUILD
	testing/spamassassin/PKGBUILD

6 files changed, 158 insertions, 0 deletions

diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD
new file mode 100644
index 000000000..d669fc325
--- /dev/null
+++ b/community-testing/xmonad/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
+# Contributor: shild <shildv@gmail.com>
+
+pkgname=xmonad
+pkgver=0.9.2
+pkgrel=2.1
+pkgdesc="A lightweight X11 tiled window manager written in Haskell"
+arch=('i686' 'x86_64')
+url="http://xmonad.org/"
+license=('BSD')
+depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
+install='xmonad.install'
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
+        xmonad.desktop xmonad.session xmonad.svg)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
+             --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
+  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
+  runhaskell Setup.lhs copy --destdir=$pkgdir
+#  runhaskell util/GenerateManpage.hs
+
+  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
+
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
+
+  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop
+  install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session
+  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
+}
+md5sums=('5a4117f798664d772d2a834ea6c90f1c'
+         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
+         '9d1bc84a7f32897d32f3fc71ef76228e'
+         '72bfa5e62e4e44fe7fa59b6a7593d993')
diff --git a/community-testing/xmonad/xmonad.desktop b/community-testing/xmonad/xmonad.desktop
new file mode 100644
index 000000000..0af0f2d9b
--- /dev/null
+++ b/community-testing/xmonad/xmonad.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Xmonad GNOME
+Comment=Tiling window manager
+TryExec=/usr/bin/gnome-session
+Exec=gnome-session --session=xmonad
+Type=XSession
+Icon=/usr/share/pixmaps/xmonad.svg
diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install
new file mode 100644
index 000000000..6659247db
--- /dev/null
+++ b/community-testing/xmonad/xmonad.install
@@ -0,0 +1,22 @@
+HS_DIR=/usr/share/haskell/xmonad
+
+post_install() {
+    ${HS_DIR}/register.sh
+    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
+    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
+    echo 
+    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
+    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
+}
+
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+
+post_upgrade() {
+  ${HS_DIR}/register.sh
+}
+
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
diff --git a/community-testing/xmonad/xmonad.png b/community-testing/xmonad/xmonad.png
new file mode 100644
index 000000000..d957f62f8
--- /dev/null
+++ b/community-testing/xmonad/xmonad.png
diff --git a/community-testing/xmonad/xmonad.session b/community-testing/xmonad/xmonad.session
new file mode 100644
index 000000000..c0bd16781
--- /dev/null
+++ b/community-testing/xmonad/xmonad.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Xmonad session
+RequiredComponents=gnome-panel;gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=xmonad
+DefaultProvider-notifications=notification-daemon
diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg
new file mode 100644
index 000000000..5fc884213
--- /dev/null
+++ b/community-testing/xmonad/xmonad.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2211"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="47"
+   height="73"
+   version="1.0"
+   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
+   sodipodi:docname="logo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <metadata
+     id="metadata2216">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2214" />
+  <sodipodi:namedview
+     inkscape:window-height="778"
+     inkscape:window-width="1278"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="4"
+     inkscape:cx="23.5"
+     inkscape:cy="22.689137"
+     inkscape:window-x="0"
+     inkscape:window-y="20"
+     inkscape:current-layer="g3208" />
+  <g
+     id="g3208"
+     transform="translate(-44.517797,4.0967298)">
+    <g
+       id="g3212"
+       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
+      <path
+         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
+         id="text2220"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         id="path3206"
+         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
+         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <path
+       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
+       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
+       id="text3216"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
+  </g>
+</svg>