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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 07:32:58
  Author: fyan
Revision: 176574

upgpkg: haskell-haddock-library 1.4.1-1

rebuild with MissingH-1.3.0.2, ShellCheck-0.4.4, cabal-helper-0.7.1.0, cryptohash-sha256-0.11.100.0, graphviz-2999.18.1.0, hakyll-4.8.3.1, idris-0.11.2, monad-journal-0.7.2, pandoc-crossref-0.2.1.3, simple-sendfile-0.2.22

Modified:
  haskell-haddock-library/trunk/PKGBUILD
Deleted:
  haskell-haddock-library/trunk/haskell-haddock-library.install

---------------------------------+
 PKGBUILD                        |   18 ++++++++----------
 haskell-haddock-library.install |   20 --------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 05:32:19 UTC (rev 176573)
+++ PKGBUILD	2016-05-25 05:32:58 UTC (rev 176574)
@@ -2,18 +2,15 @@
 # Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
 
 pkgname=haskell-haddock-library
-pkgver=1.2.1
-pkgrel=2
+pkgver=1.4.1
+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")
-options=('strip' 'staticlibs')
-install="${pkgname}.install"
+depends=("ghc=8.0.1")
 source=("http://hackage.haskell.org/packages/archive/haddock-library/${pkgver}/haddock-library-${pkgver}.tar.gz")
-sha256sums=('0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056')
+sha256sums=('40f4be262d3ec74a88e86f2bf9ecfba46ae140d936825c96b3d739acb9469ff1')
 
 build() {
     cd "${srcdir}/haddock-library-${pkgver}"
@@ -25,14 +22,15 @@
     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
 }
 
 package() {
     cd "${srcdir}/haddock-library-${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-library"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-haddock-library.install
===================================================================
--- haskell-haddock-library.install	2016-05-25 05:32:19 UTC (rev 176573)
+++ haskell-haddock-library.install	2016-05-25 05:32:58 UTC (rev 176574)
@@ -1,20 +0,0 @@
-# custom variables
-pkgname=haskell-haddock-library
-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
-}