Thu Jan 24 00:06:07 PST 2013

1 files changed, 28 insertions, 9 deletions

diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 009d47398..47c9788c9 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -4,15 +4,17 @@
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4.5
-pkgrel=5
+pkgver=1.10.0.4
+pkgrel=1
 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)
+options=(strip !makeflags !distcc !emptydirs)
+source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+        SRCBUILD
+        citeproc-hs-pre-0.3.7.patch)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
 
@@ -21,7 +23,17 @@ build() {
     mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
     cd ${srcdir}/${pkgname}-${pkgver}
 
+# Patches from the next citeproc-hs release
+# These are needed because 0.3.6 with embed_data_files is broken
+# darcs diff --from-tag=0.3.6
+   pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6
+   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
+   popd
+
    while read _hkpkg; do
+# Skip already built
+       [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
+
        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
@@ -59,16 +71,23 @@ package() {
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
+# For some reason the library is installed anyway
+# Remove all files and !emptydirs takes care of the rest
   msg2 "Removing lib files..."
-  rm -rfv ${pkgdir}/build
+  find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex
 
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
+
+  msg2 "Installing licenses"
+  install -d ${pkgdir}/usr/share
+  cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
 }
-md5sums=('af01e55daded42fa54e8a2bb142c0a78'
-         '96d0ba0d9060574e56e3f23c996d0e8e'
-         '54b521d5c3ed5e2b53c4ca3206f6c941')
+md5sums=('94c36d52ee6d7e33b16d75048f6617d3'
+         '2958854a387ea0845720e9456f814845'
+         'd159a34656b7a1e13df5e6149b2f898b'
+         'd389fc323eeaced767cea53edcfc0127')