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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:09:34
  Author: fyan
Revision: 176914

upgpkg: cabal-helper 0.7.1.0-3

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:
  cabal-helper/trunk/PKGBUILD
Deleted:
  cabal-helper/trunk/haskell-cabal-helper.install

------------------------------+
 PKGBUILD                     |   13 ++++++-------
 haskell-cabal-helper.install |   18 ------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:09:23 UTC (rev 176913)
+++ PKGBUILD	2016-05-25 14:09:34 UTC (rev 176914)
@@ -5,13 +5,12 @@
 pkgbase=cabal-helper
 pkgname=(cabal-helper haskell-cabal-helper)
 pkgver=0.7.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple interface to some of Cabals configuration state used by ghc-mod"
 url="http://hackage.haskell.org/package/${pkgbase}"
 license=("AGPL3")
 arch=('i686' 'x86_64')
-makedepends=("ghc=7.10.3" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
-options=('staticlibs')
+makedepends=("ghc=8.0.1" "haskell-mtl" "haskell-temporary" "haskell-utf8-string")
 source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
 sha256sums=('7c78b875b5f246b8422b641923d2ffe593bf65ce9e99373e19ef8372df8db66f')
 
@@ -26,6 +25,7 @@
     runhaskell Setup haddock --hoogle --html
     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
 }
 
@@ -40,11 +40,10 @@
 package_haskell-cabal-helper() {
     pkgdesc="Simple interface to some of Cabal's configuration state used by ghc-mod (docs and libraries)"
     depends=("${makedepends[@]}" 'cabal-helper')
-    install="haskell-cabal-helper.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/${pkgbase}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-cabal-helper.install
===================================================================
--- haskell-cabal-helper.install	2016-05-25 14:09:23 UTC (rev 176913)
+++ haskell-cabal-helper.install	2016-05-25 14:09:34 UTC (rev 176914)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-cabal-helper
-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)
-}