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

Conflicts:
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/mplayer2/PKGBUILD
	community/parcellite/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/kbd/PKGBUILD
	core/systemd/PKGBUILD
	extra/calligra/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libcdio/PKGBUILD
	extra/libtorrent-rasterbar/PKGBUILD
	extra/llvm/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/vcdimager/PKGBUILD
	extra/w3m/PKGBUILD
	extra/xorg-bdftopcf/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xmag/PKGBUILD
	extra/xorg-xmessage/PKGBUILD
	extra/xorg-xvidtune/PKGBUILD
	libre/unzip-libre/PKGBUILD
	social/opentracker/PKGBUILD

4 files changed, 158 insertions, 4 deletions

diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD
index 7e9a5323b..167a806e2 100755
--- a/pcr/mednafen-wip/PKGBUILD
+++ b/pcr/mednafen-wip/PKGBUILD
@@ -6,8 +6,9 @@
 
 pkgbase=mednafen
 pkgname=mednafen-wip
-pkgver=0.9.27
-_pkgver=441
+pkgflag=wip
+pkgver=0.9.28
+_pkgver=450
 pkgrel=1
 pkgdesc='A command-line multi-system gaming emulator, WIP version'
 url="http://$pkgbase.sourceforge.net/"
@@ -32,8 +33,8 @@ makedepends=(
 )
 provides=$pkgbase
 conflicts=$pkgbase
-source='http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&'
-sha1sums=5be7597bb8fc9c47ae434d4a0aab16e13230b916
+source=$pkgbase-$pkgver-$pkgflag.tar.bz2::'http://forum.fobby.net/index.php?t=getfile&id='$_pkgver'&'
+sha1sums=6948b0f06d72f8056690d229581e94408d40c918
 
 build() {
    cd $srcdir/$pkgbase
diff --git a/pcr/mozilla-devscripts/PKGBUILD b/pcr/mozilla-devscripts/PKGBUILD
new file mode 100644
index 000000000..ef7ea7641
--- /dev/null
+++ b/pcr/mozilla-devscripts/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=mozilla-devscripts
+pkgver=0.32
+pkgrel=1
+pkgdesc="Development scripts used by Debian Mozilla's addons packages"
+arch=("any")
+url="http://packages.debian.org/source/unstable/mozilla-devscripts"
+license=('GPL' 'custom')
+depends=("python2" "zip" "unzip")
+_debrepo=http://ftp.debian.org/debian/pool/main/
+source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc"
+        "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz")
+md5sums=("386a5854601f29dca4a293f90f6c2a69"
+         "230126afa15fa654eb254bb4e61b4a93")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # Adapt it to Arch's Python naming.
+  find . -type f | xargs -L1 sed -i "s:#!/usr/bin/python:#!/usr/bin/python2:"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # The Makefile expects the system to have standard Python name, so
+  # do this directly here.
+  python2 setup.py install --root="$pkgdir/"
+  install -Dm644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
new file mode 100644
index 000000000..009d47398
--- /dev/null
+++ b/pcr/pandoc/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Based on haskell-pandoc
+
+# Run `makepkg -sp SRCBUILD` if you want to update the source tarball
+
+pkgname=pandoc
+pkgver=1.9.4.5
+pkgrel=5
+pkgdesc='Conversion between markup formats (no Haskell libs)'
+url='http://johnmacfarlane.net/pandoc/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('ghc' 'sh' 'cabal-install')
+options=(strip !makeflags !distcc)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
+conflicts=('haskell-pandoc')
+optdepends=('texlive-most: for pdf creation')
+
+# PKGBUILD functions
+build() {
+    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+   while read _hkpkg; do
+       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+
+       msg2 "Building $_hkpkg"
+
+       case $_hkpkg in
+        $pkgname-$pkgver)
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal configure --flags='-library' \
+                         --prefix=/usr \
+                         --libdir=${srcdir}/build/usr/lib -v
+
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal build
+         ;;
+
+        citeproc-hs-*)
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal install --flags='embed_data_files' \
+                       --prefix=${srcdir}/build/usr -v
+         ;;
+
+        *)
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal install --prefix=${srcdir}/build/usr
+         ;;
+       esac
+
+       popd >/dev/null
+   done <BUILDORDER
+
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+
+  runghc Setup.hs copy --destdir=${pkgdir}/
+
+  msg2 "Removing lib files..."
+  rm -rfv ${pkgdir}/build
+
+# EC is unfree and makes Parabola TeXLive cry
+# besides, it's unneeded
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
+
+  find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
+  find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
+}
+md5sums=('af01e55daded42fa54e8a2bb142c0a78'
+         '96d0ba0d9060574e56e3f23c996d0e8e'
+         '54b521d5c3ed5e2b53c4ca3206f6c941')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
new file mode 100644
index 000000000..1eb01acc1
--- /dev/null
+++ b/pcr/pandoc/SRCBUILD
@@ -0,0 +1,47 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Based on haskell-pandoc
+
+pkgname=pandoc
+pkgver=1.9.4.5
+# 0.3.6 fails with embed_data_files
+_citeproc=0.3.5
+# 0.4 doesn't work with ghc 7.6 
+_blaze_html=0.5.1.3
+pkgrel=5
+pkgdesc='Conversion between markup formats (no Haskell libs)'
+url='http://johnmacfarlane.net/pandoc/'
+license=('GPL')
+arch=('any')
+makedepends=('ghc' 'sh' 'cabal-install')
+source=()
+options=(!strip)
+
+# PKGBUILD functions
+build() {
+    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal --verbose=3 update
+
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
+
+    msg2 "Getting the dependency build order"
+# Ignore the cabal messages
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
+}
+
+package() {
+  export PKGEXT=.src.tar.xz
+  export PKGDEST=${SRCDEST}
+
+  mkdir -p ${pkgdir}/${pkgname}-${pkgver}
+  cd ${pkgdir}/${pkgname}-${pkgver}
+
+  find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
+      bsdtar xvf '{}' \;
+
+  cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .
+}