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

[Felix Yan]

    Date: Tuesday, May 24, 2016 @ 17:46:06
  Author: fyan
Revision: 176343

upgpkg: haskell-aeson 0.11.2.0-2

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.2 -> 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, wai-3.2.1.1

Modified:
  haskell-aeson/trunk/PKGBUILD
Deleted:
  haskell-aeson/trunk/haskell-aeson.install

-----------------------+
 PKGBUILD              |   18 +++++++++++-------
 haskell-aeson.install |   23 -----------------------
 2 files changed, 11 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-24 15:41:45 UTC (rev 176342)
+++ PKGBUILD	2016-05-24 15:46:06 UTC (rev 176343)
@@ -6,19 +6,21 @@
 pkgname=haskell-aeson
 _hkgname=aeson
 pkgver=0.11.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A JSON parsing and encoding library optimized for ease of use and high performance."
 url="https://github.com/bos/aeson"
 license=("GPL")
 arch=('i686' 'x86_64')
 makedepends=('ghc')
-depends=("ghc=7.10.3" 'haskell-attoparsec' 'haskell-fail' 'haskell-semigroups' 'haskell-unordered-containers'
+depends=("ghc=8.0.1" 'haskell-attoparsec' 'haskell-semigroups' 'haskell-unordered-containers'
          'haskell-mtl' 'haskell-syb' 'haskell-tagged' 'haskell-vector' 'haskell-dlist')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz")
-options=('staticlibs')
-install=$pkgname.install
 md5sums=('aef0c0cd9d3563a5ce17eff36871d47c')
 
+prepare() {
+  sed -i '/fail == 4.9/d' $_hkgname-$pkgver/$_hkgname.cabal
+}
+
 build() {
   cd "$srcdir/$_hkgname-$pkgver"
   runhaskell Setup configure -O --enable-library-profiling --enable-shared \
@@ -28,13 +30,15 @@
   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
 }
 
 package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  cd "${srcdir}/${_hkgname}-${pkgver}"
+
+  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 -dm755 "$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-aeson.install
===================================================================
--- haskell-aeson.install	2016-05-24 15:41:45 UTC (rev 176342)
+++ haskell-aeson.install	2016-05-24 15:46:06 UTC (rev 176343)
@@ -1,23 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-aeson
-
-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)
-}