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

Conflicts:
	community/balsa/PKGBUILD
	community/bitcoin/PKGBUILD
	community/jack2/PKGBUILD
	community/kadu/PKGBUILD
	community/oss/PKGBUILD
	core/sudo/PKGBUILD
	extra/djvulibre/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/samba/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-sdl/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/man-db/PKGBUILD
	testing/postgresql/PKGBUILD
	testing/postgresql/postgresql.install
	testing/postgresql/postgresql.service
	testing/procps-ng/PKGBUILD
	testing/procps-ng/sysctl.conf
	testing/sudo/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nouveau/xf86-video-nouveau.install

3 files changed, 89 insertions, 0 deletions

diff --git a/community-staging/haskell-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD
new file mode 100644
index 000000000..d07e9f435
--- /dev/null
+++ b/community-staging/haskell-cairo/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 76138 2012-09-12 04:01:58Z tdziedzic $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=haskell-cairo
+pkgver=0.12.3.1
+pkgrel=2
+pkgdesc="Binding to the cairo library for Gtk2Hs."
+url="http://hackage.haskell.org/package/cairo"
+license=('LGPL2.1')
+arch=('i686' 'x86_64')
+depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
+makedepends=("gtk2hs-buildtools")
+options=('strip')
+conflicts=('gtk2hs-cairo')
+provides=('gtk2hs-cairo')
+replaces=('gtk2hs-cairo')
+install=gtk2hs-cairo.install
+source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
+md5sums=('9d489fbb6cadb3d109543fe25c50195e')
+
+build() {
+    cd ${srcdir}/cairo-$pkgver
+    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
+      --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
+      --libsubdir=\$compiler/site-local/\$pkgid
+    runhaskell Setup build
+    runhaskell Setup haddock
+    runhaskell Setup register   --gen-script
+    runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+    cd ${srcdir}/cairo-${pkgver}
+    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
+    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
+    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
+    ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
+    runhaskell Setup copy --destdir=${pkgdir}
+}
diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install
new file mode 100644
index 000000000..4ec5096b6
--- /dev/null
+++ b/community-staging/haskell-cairo/gtk2hs-cairo.install
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/gtk2hs-cairo
+post_install() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+  ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+  ${HS_DIR}/register.sh
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+  ${HS_DIR}/unregister.sh
+}
+post_remove() {
+  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
diff --git a/community-staging/pidgin-otr/PKGBUILD b/community-staging/pidgin-otr/PKGBUILD
new file mode 100644
index 000000000..df801a787
--- /dev/null
+++ b/community-staging/pidgin-otr/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 76188 2012-09-13 07:35:32Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Bug <Bug2000@gmail.com>
+# Contributor: Marcel Wysocki <maci@satgnu.net>
+
+pkgname=pidgin-otr
+pkgver=4.0.0
+pkgrel=1
+pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://www.cypherpunks.ca/otr/'
+depends=('libotr>=4.0.0' 'pidgin' 'perlxml')
+makedepends=('intltool')
+source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc})
+md5sums=('eadb953376acc474e56041d4c12aa2c8'
+         '8c70a2fc6f5f0480f32178742ba96498')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}