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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 10:04:54
  Author: fyan
Revision: 176695

upgpkg: haskell-hashtables 1.2.1.0-6

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

----------------------------+
 PKGBUILD                   |   11 +++++------
 haskell-hashtables.install |   35 -----------------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 08:03:31 UTC (rev 176694)
+++ PKGBUILD	2016-05-25 08:04:54 UTC (rev 176695)
@@ -5,15 +5,13 @@
 _hkgname=hashtables
 pkgname=haskell-hashtables
 pkgver=1.2.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Mutable hash tables in the ST monad"
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-options=('staticlibs')
-depends=('ghc=7.10.3' 'sh' 'haskell-hashable' 'haskell-primitive' 'haskell-vector')
+depends=('ghc=8.0.1' 'sh' 'haskell-hashable' 'haskell-primitive' 'haskell-vector')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
 md5sums=('2ee6506e6bda88f6b85a343609ad90c4')
 
 build() {
@@ -26,6 +24,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
 }
 
@@ -32,8 +31,8 @@
 package() {
     cd "${srcdir}/${_hkgname}-${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/${_hkgname}"
     runhaskell Setup copy --destdir="${pkgdir}"

Deleted: haskell-hashtables.install
===================================================================
--- haskell-hashtables.install	2016-05-25 08:03:31 UTC (rev 176694)
+++ haskell-hashtables.install	2016-05-25 08:04:54 UTC (rev 176695)
@@ -1,35 +0,0 @@
-pkgname=haskell-hashtables
-
-_register() {
-  usr/share/haskell/${pkgname}/register.sh
-}
-
-_unregister() {
-  usr/share/haskell/${pkgname}/unregister.sh
-}
-
-_gen_contents() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_install() {
-  _register
-  _gen_contents
-}
-
-pre_upgrade() {
-  _unregister
-}
-
-post_upgrade() {
-  _register
-  _gen_contents
-}
-
-pre_remove() {
-  _unregister
-}
-
-post_remove() {
-  _gen_contents
-}