[arch-commits] Commit in pandoc/trunk (PKGBUILD haskell-pandoc.install)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 10:48:04
  Author: fyan
Revision: 176710

upgpkg: pandoc 1.17.0.3-16

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1

Modified:
  pandoc/trunk/PKGBUILD
Deleted:
  pandoc/trunk/haskell-pandoc.install

------------------------+
 PKGBUILD               |   16 +++++++++-------
 haskell-pandoc.install |   18 ------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 08:38:17 UTC (rev 176709)
+++ PKGBUILD	2016-05-25 08:48:04 UTC (rev 176710)
@@ -5,12 +5,12 @@
 pkgbase=pandoc
 pkgname=(pandoc haskell-pandoc)
 pkgver=1.17.0.3
-pkgrel=15
+pkgrel=16
 pkgdesc="Conversion between markup formats"
 url="http://pandoc.org"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
+makedepends=("ghc=8.0.1" "haskell-http" "haskell-juicypixels" "haskell-sha" "haskell-aeson"
              "haskell-base64-bytestring" "haskell-blaze-html" "haskell-blaze-markup"
              "haskell-cmark" "haskell-data-default" "haskell-mtl" "haskell-extensible-exceptions"
              "haskell-filemanip" "haskell-haddock-library" "haskell-highlighting-kate"
@@ -20,12 +20,14 @@
              "haskell-scientific" "haskell-tagsoup" "haskell-temporary" "haskell-network-uri"
              "haskell-unordered-containers" "haskell-zip-archive" "haskell-vector" "haskell-xml"
              "haskell-yaml" "haskell-zlib")
-options=('staticlibs')
 source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32')
 
 prepare() {
-    sed -i 's/data-default >= 0.4 && < 0.6,/data-default >= 0.4 \&\& < 0.7,/' ${pkgname}-${pkgver}/${pkgname}.cabal
+    sed -e 's/data-default >= 0.4 && < 0.6,/data-default >= 0.4 \&\& < 0.8,/' \
+        -e 's/haddock-library >= 1.1 && < 1.3,/haddock-library >= 1.1 \&\& < 1.5,/' \
+        -e 's/time >= 1.5 && < 1.6/time >= 1.5 \&\& < 1.7/' \
+        -i ${pkgname}-${pkgver}/${pkgname}.cabal
 }
 
 build() {
@@ -41,6 +43,7 @@
 
     runhaskell Setup register --gen-script
     runhaskell Setup unregister --gen-script
+    sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
@@ -59,11 +62,10 @@
 package_haskell-pandoc() {
     pkgdesc="Conversion between markup formats (docs and libraries)"
     depends=("${makedepends[@]}" 'pandoc')
-    install="haskell-pandoc.install"
 
     cd "${srcdir}/${pkgbase}-${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 -m744 register.sh   "${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+    install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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/${pkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-pandoc.install
===================================================================
--- haskell-pandoc.install	2016-05-25 08:38:17 UTC (rev 176709)
+++ haskell-pandoc.install	2016-05-25 08:48:04 UTC (rev 176710)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-pandoc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}