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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 11:14:24
  Author: fyan
Revision: 176744

upgpkg: haskell-cairo 0.13.2.0-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-cairo/trunk/PKGBUILD
Deleted:
  haskell-cairo/trunk/gtk2hs-cairo.install

----------------------+
 PKGBUILD             |   15 +++++++--------
 gtk2hs-cairo.install |   18 ------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 09:13:35 UTC (rev 176743)
+++ PKGBUILD	2016-05-25 09:14:24 UTC (rev 176744)
@@ -2,8 +2,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=haskell-cairo
-pkgver=0.13.1.1
-pkgrel=3
+pkgver=0.13.2.0
+pkgrel=1
 pkgdesc="Binding to the cairo library for Gtk2Hs."
 url="http://hackage.haskell.org/package/cairo"
 license=('LGPL2.1')
@@ -10,14 +10,12 @@
 arch=('i686' 'x86_64')
 # deps adjusted to specific versions in package()
 depends=('ghc' 'cairo' 'haskell-mtl' 'haskell-utf8-string' 'haskell-text')
-makedepends=("gtk2hs-buildtools")
-options=('strip' 'staticlibs')
+makedepends=("haskell-gtk2hs-buildtools")
 conflicts=('gtk2hs-cairo')
 provides=('gtk2hs-cairo')
 replaces=('gtk2hs-cairo')
-install=gtk2hs-cairo.install
 source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('e654f6567321441b84914d37b2f49438')
+md5sums=('e58b87ae5f3dc534a301ce3bbb983b10')
 
 build() {
     cd ${srcdir}/cairo-$pkgver
@@ -28,6 +26,7 @@
     runhaskell Setup 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
 }
 
@@ -45,8 +44,8 @@
     _update_deps haskell-mtl
 
     cd ${srcdir}/cairo-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/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/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
     runhaskell Setup copy --destdir=${pkgdir}

Deleted: gtk2hs-cairo.install
===================================================================
--- gtk2hs-cairo.install	2016-05-25 09:13:35 UTC (rev 176743)
+++ gtk2hs-cairo.install	2016-05-25 09:14:24 UTC (rev 176744)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-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)
-}