[arch-commits] Commit in haskell-haddock-api/trunk (2 files)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 12:22:37
  Author: fyan
Revision: 176844

upgpkg: haskell-haddock-api 2.17.2-1

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

-----------------------------+
 PKGBUILD                    |   20 +++++++++-----------
 haskell-haddock-api.install |   20 --------------------
 2 files changed, 9 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 10:21:26 UTC (rev 176843)
+++ PKGBUILD	2016-05-25 10:22:37 UTC (rev 176844)
@@ -2,20 +2,17 @@
 # Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
 
 pkgname=haskell-haddock-api
-pkgver=2.16.1
-pkgrel=3
+pkgver=2.17.2
+pkgrel=1
 pkgdesc="A documentation-generation tool for Haskell libraries"
 url="http://www.haskell.org/haddock/"
 license=("BSD3")
 arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.10.3"
+depends=("ghc=8.0.1"
          "haskell-ghc-paths"
          "haskell-haddock-library")
-options=('strip' 'staticlibs')
 source=("https://hackage.haskell.org/package/haddock-api-${pkgver}/haddock-api-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=('e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea')
+sha256sums=('60df55698ebfb5d0a36c15d789a2d95c789fe0f7e61ef0c3be30ab0183d5261e')
 
 build() {
     cd "${srcdir}/haddock-api-${pkgver}"
@@ -24,17 +21,18 @@
         --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
         --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
-    runhaskell Setup haddock --hoogle --html
+    runhaskell Setup haddock --hoogle --html || warning "Failed to run haddock"
     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
 }
 
 package() {
     cd "${srcdir}/haddock-api-${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/haddock-api"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-haddock-api.install
===================================================================
--- haskell-haddock-api.install	2016-05-25 10:21:26 UTC (rev 176843)
+++ haskell-haddock-api.install	2016-05-25 10:22:37 UTC (rev 176844)
@@ -1,20 +0,0 @@
-# custom variables
-pkgname=haskell-haddock-api
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
-    ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}