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

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 16:06:00
  Author: fyan
Revision: 176906

upgpkg: haskell-bytestring-show 0.3.5.6-8

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

---------------------------------+
 PKGBUILD                        |   13 +++++++------
 haskell-bytestring-show.install |   24 ------------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 14:05:51 UTC (rev 176905)
+++ PKGBUILD	2016-05-25 14:06:00 UTC (rev 176906)
@@ -3,14 +3,12 @@
 
 pkgname=haskell-bytestring-show
 pkgver=0.3.5.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://hackage.haskell.org/package/bytestring-show"
 license=('BSD')
 arch=('i686' 'x86_64')
 depends=("ghc")
-options=('staticlibs')
-install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
 md5sums=('c9041eed86a52e17e6b53a415967f7cb')
 
@@ -18,7 +16,9 @@
   cd ${srcdir}/bytestring-show-${pkgver}
 
   # update outdated dependency
-  sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal
+  sed -e 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' \
+      -e 's/binary < 0.8/binary < 0.9/' \
+      -i bytestring-show.cabal
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
 	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
@@ -27,6 +27,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
 }
 
@@ -34,8 +35,8 @@
   depends=("ghc=`pacman -Q ghc | cut -f2 -d\ |cut -f1 -d-`")
 
   cd ${srcdir}/bytestring-show-${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/bytestring-show
   runhaskell Setup copy --destdir=${pkgdir}

Deleted: haskell-bytestring-show.install
===================================================================
--- haskell-bytestring-show.install	2016-05-25 14:05:51 UTC (rev 176905)
+++ haskell-bytestring-show.install	2016-05-25 14:06:00 UTC (rev 176906)
@@ -1,24 +0,0 @@
-pkgname=haskell-bytestring-show
-HS_DIR=usr/share/haskell/${pkgname}
-
-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)
-}