Thu Nov 22 02:27:52 PST 2012

2 files changed, 45 insertions, 41 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 3d7d1fa9f..d3b88d3a0 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -4,8 +4,8 @@
 # Run `makepkg -srp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4.2
-pkgrel=2
+pkgver=1.9.4.5
+pkgrel=3
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -15,53 +15,54 @@ 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')
-md5sums=('15f522c6bd0e26c709579b0a0fcfdcea'
-         'e86da5aad2a7dfc6d53d2a2a0c562baa'
-         '415bbf263863c5cbc7c672ec1f497893')
 
 # PKGBUILD functions
 build() {
     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 --flags="embed_data_files" --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 embed_data_files"
-   HOME=${srcdir}/${pkgname}-${pkgver} \
-   cabal build
+   while read _hkpkg; do
+       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+
+       extra="--prefix=${srcdir}/build/usr"
+       case $_hkpkg in
+        $pkgname-$pkgver)
+          extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;;
+        citeproc-hs-*)
+          extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;;
+       esac
+
+       msg2 "Configuring $_hkpkg with $extra"
+       if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal install $extra
+       else 
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal configure $extra
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal build
+       fi
+
+       popd >/dev/null
+   done <BUILDORDER
 
 }
 
 package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
 
-   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  runghc Setup.hs copy --destdir=${pkgdir}/
 
-   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
-
-#   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/*}
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
 
-#   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 {} \;
+  find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
+  find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('912abc4574aea3c5203eff1b02ceafa9'
+         '7ac798d62f253535a2e194af5aa1c3c3'
+         'e632f8c06be8284e17329a5d1c459e3b')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index 29c5f25ae..ebe1a0552 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -2,14 +2,17 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.4.2
-pkgrel=2
+pkgver=1.9.4.5
+# 0.3.6 fails with embed_data_files
+_citeproc=0.3.5
+pkgrel=3
 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() {
@@ -20,22 +23,22 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed 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 ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER
+    cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
   export PKGEXT=.src.tar.xz
-  export PKGDEST=${startdir}
+  export PKGDEST=${SRCDEST}
 
   mkdir -p ${pkgdir}/${pkgname}-${pkgver}
   cd ${pkgdir}/${pkgname}-${pkgver}
 
-  find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
+  find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
       bsdtar xvf '{}' \;
 
   cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .