Merge ssh://parabolagnulinux.org:1863/abslibre

2 files changed, 53 insertions, 31 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 4d9a12809..d5ecf698c 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -6,48 +6,37 @@ _licensefile=COPYING
 
 # PKGBUILD options/directives
 pkgname=pandoc
-pkgver=1.8.2.1
-pkgrel=2
+pkgver=1.9.1.2
+pkgrel=1
 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')
+md5sums=('8b71e4a113f5b3bf456cf335d4f365f1'
+         '01f99b7d67d0726fe6b80396ead780d1')
 
 # PKGBUILD functions
 build() {
+    mkdir -p ${srcdir}/{build,${_hkgname}-${pkgver}}
     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
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} \
+    cabal install --prefix=${srcdir}/build/usr \
+                  --enable-shared \
+                  ${_hkgname}-${pkgver}
 }
 
 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}
+# Copy everything, but remove docs and haskell-libs
+    cp -a ${srcdir}/build/usr ${pkgdir}/
+    rm -r ${pkgdir}/usr/{lib,share/*}
 
-    msg2 "Removing Haskell libs"
-    rm -rvf ${pkgdir}/usr/lib
+    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 {} \;
 }
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
new file mode 100644
index 000000000..fd2172ffc
--- /dev/null
+++ b/~fauno/pandoc/SRCBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Based on haskell-pandoc
+# custom variables
+_hkgname=pandoc
+_licensefile=COPYING
+
+# PKGBUILD options/directives
+pkgname=pandoc
+pkgver=1.9.1.2
+pkgrel=1
+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,${_hkgname}-${pkgver}}
+    cd ${srcdir}/${_hkgname}-${pkgver}
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 update
+
+    HOME=${srcdir}/${_hkgname}-${pkgver} cabal --verbose=3 fetch ${_hkgname}-${pkgver}
+}
+
+package() {
+  export PKGEXT=.src.tar.xz
+  export PKGDEST=${startdir}
+
+  mv ${srcdir}/${_hkgname}-${pkgver} ${pkgdir}/
+}