From d563a1aeaaf69b504ff3a3da338caf1ea26b5240 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@parabola.nu>
Date: Fri, 7 Jun 2013 12:12:26 -0300
Subject: pandoc: renamed as pandoc-static to avoid conflict with
 haskell-pandoc

---
 pcr/pandoc/PKGBUILD | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'pcr/pandoc/PKGBUILD')

diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 88f951d03..6fe28cc7c 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -3,19 +3,22 @@
 
 # Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
-pkgname=pandoc
+pkgname=pandoc-static
+_pkgname=pandoc
 pkgver=1.11.1
-pkgrel=1
+pkgrel=2
 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 !emptydirs)
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
+source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
 #        citeproc-hs-pre-0.3.7.patch)
-conflicts=('haskell-pandoc')
+replaces=('pandoc')
+provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
 md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
          'SKIP'
@@ -23,13 +26,13 @@ md5sums=('74acd042fcd85bee9edb093cc3fe5c2e'
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
-    cd ${srcdir}/${pkgname}-${pkgver}
+    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
+#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
 #   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
 #   popd
 
@@ -37,29 +40,29 @@ build() {
 # Skip already built
        [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue
 
-       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+       pushd ${srcdir}/${_pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
        msg2 "Building $_hkpkg"
 
        case $_hkpkg in
-        $pkgname-$pkgver)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+        $_pkgname-$pkgver)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal configure --flags='-library blaze_html_0_5' \
                          --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
          ;;
 
         citeproc-hs-*)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --flags='embed_data_files' \
                        --prefix=${srcdir}/build/usr -v
          ;;
 
         *)
-         HOME=${srcdir}/${pkgname}-${pkgver} \
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal install --prefix=${srcdir}/build/usr
          ;;
        esac
@@ -70,7 +73,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
@@ -81,7 +84,7 @@ package() {
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/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 {} \;
-- 
cgit v1.2.3