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

Conflicts:
	community/aspell-ca/PKGBUILD
	community/corkscrew/PKGBUILD
	cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/libxi/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/mpc/PKGBUILD
	extra/poppler/PKGBUILD
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/vte3/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/lib32-libpciaccess/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	testing/grep/PKGBUILD
	testing/sudo/PKGBUILD
	testing/xf86-input-joystick/PKGBUILD
	testing/xf86-input-wacom/PKGBUILD

2 files changed, 84 insertions, 36 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 4d9a12809..875e6bb0a 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -1,53 +1,59 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Based on haskell-pandoc
-# custom variables
-_hkgname=pandoc
-_licensefile=COPYING
 
-# PKGBUILD options/directives
 pkgname=pandoc
-pkgver=1.8.2.1
+pkgver=1.9.1.2
 pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
-url='http://johnmacfarlane.net/pandoc'
+url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=('ghc' 'sh' 'haskell-http' 'haskell-base64-bytestring'
-'haskell-bytestring' 'haskell-citeproc-hs' 'haskell-containers'
-'haskell-directory' 'haskell-dlist' 'haskell-extensible-exceptions'
-'haskell-filepath' 'haskell-json' 'haskell-mtl' 'haskell-network'
-'haskell-old-time' 'haskell-pandoc-types' 'haskell-parsec' 'haskell-process'
-'haskell-random' 'haskell-syb' 'haskell-tagsoup' 'haskell-texmath'
-'haskell-utf8-string' 'haskell-xhtml' 'haskell-xml' 'haskell-zip-archive')
+makedepends=('ghc' 'sh' 'cabal-install')
 options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha256sums=('f1025377b2c78043b06d7963eb61ce66c2290d2580f2488a8186c82c24f09433')
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig})
 conflicts=('haskell-pandoc')
 
 # PKGBUILD functions
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-        --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-        --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
+    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    for _hkpkg in $(grep -v ${pkgname}-${pkgver} BUILDORDER); do
+        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg}
+
+        HOME=${srcdir}/${pkgname}-${pkgver} \
+        cabal install --prefix=${srcdir}/build/usr
+
+        popd
+    done
+
+    cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+
+   HOME=${srcdir}/${pkgname}-${pkgver} \
+   cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library"
+   HOME=${srcdir}/${pkgname}-${pkgver} \
+   cabal build
+
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-
-    msg2 "Removing Haskell libs"
-    rm -rvf ${pkgdir}/usr/lib
+
+   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+
+   runghc Setup.hs copy --destdir=${pkgdir}/
+
+#   runghc Setup.hs configure --prefix=DIR --bindir=DIR --libdir=DIR \
+#   --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \
+#   --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \
+#   --mandir=DIR --flags=FLAGSPEC
+
+# Copy everything, but remove docs and haskell-libs
+#   rm -r ${pkgdir}/usr/{lib,share/*}
+
+#   cp -a ${srcdir}/build/usr/share/man ${pkgdir}/usr/share/
+#   cp -a ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+    find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
+    find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('f377f51be658821876e49e5485d47219'
+         'd08ee033440f16c30b2b8b6b80ae12c7')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
new file mode 100644
index 000000000..09b154d7a
--- /dev/null
+++ b/~fauno/pandoc/SRCBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Based on haskell-pandoc
+
+pkgname=pandoc
+pkgver=1.9.1.2
+pkgrel=2
+pkgdesc='Conversion between markup formats (no Haskell libs)'
+url='http://johnmacfarlane.net/pandoc/'
+license=('GPL')
+arch=('any')
+makedepends=('ghc' 'sh' 'cabal-install')
+source=()
+
+# 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 ${pkgname}-${pkgver}
+
+    msg2 "Getting the dependency build order"
+# Ignore the cabal messages
+    HOME=${srcdir}/${pkgname}-${pkgver} \
+    cabal install --dry-run ${pkgname}-${pkgver} | tail -n+3 > BUILDORDER
+}
+
+package() {
+  export PKGEXT=.src.tar.xz
+  export PKGDEST=${startdir}
+
+  mkdir -p ${pkgdir}/${pkgname}-${pkgver}
+  cd ${pkgdir}/${pkgname}-${pkgver}
+
+  find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
+      bsdtar xvf '{}' \;
+
+  cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .
+}