From 240da32772439fe00482c97e07d16f60351cb9a2 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 2 Dec 2017 03:04:39 +0000
Subject: [PATCH] community/ghc to 8.2.2-1

---
 community/ghc/PKGBUILD            | 35 ++++++++++++++++---------------
 community/ghc/ghc-register.hook   |  2 +-
 community/ghc/ghc-unregister.hook |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/community/ghc/PKGBUILD b/community/ghc/PKGBUILD
index 1d0642430..13db2c87c 100644
--- a/community/ghc/PKGBUILD
+++ b/community/ghc/PKGBUILD
@@ -17,10 +17,10 @@ shopt -s extglob
 
 pkgbase=ghc
 pkgname=(ghc-libs ghc ghc-static)
-pkgver=8.2.1
-pkgrel=3
+pkgver=8.2.2
+pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://www.haskell.org/ghc/'
 license=('custom')
 makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskell-hscolour'
@@ -28,10 +28,10 @@ makedepends=('ghc-static' 'perl' 'libxslt' 'docbook-xsl' 'python-sphinx' 'haskel
 source=("https://downloads.haskell.org/~ghc/$pkgver/$pkgbase-${pkgver}-src.tar.xz"
         ghc-rebuild-doc-index.hook ghc-register.hook ghc-unregister.hook)
 noextract=("$pkgbase-${pkgver}-src.tar.xz")
-md5sums=('8942b6fb393984aeb8304d09bc326851'
-         '4966d798a2868b289022aea8b655bf17'
-         '700bcd96afd059d668e50b51c19650d5'
-         '2355771881c91cb46e6249a81352aea2')
+sha512sums=('6549416f470b599973d409fa45f59c25b07e6a94798cef1a19ad432547dc225338cf4dbc4a4793114b4a417798a3b59b122b92b020251074405c5302b7ffe799'
+            'afb119e4f665770c5704b97034d2488504eaa7afcddca2fb6b554079921cd2330599bcb5c36669f0d0e7856dd99ae1deeca1b0e97e2371a783f26e5ef9776ba9'
+            'bd65a369b618ec9bee46c028c2b6acff8f883f60f6cad6e5be8561fbcef6118278abec11bb86f9e6f92cb2e05ad74ec54611c1788e8ed95187d0091fcbbf8767'
+            'd4bfdd4c8ad9ac612cf187fec150850e9f4068a4a4202503c00dba07ba26f804bc11d7181249f7e3452d7ede60dc5dedea34e73fdb584ac2953068b51c6fd5ad')
 
 prepare() {
   # Need to extract this tarball with a UTF-8 locale instead of a chroot's "C"
@@ -62,7 +62,7 @@ package_ghc-static() {
 
   cd ghc-$pkgver
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -j1 install
 
   mv "$pkgdir"/usr/lib/ghc-$pkgver/package.conf.d "$srcdir"/static-package.conf.d
   find "$pkgdir"/usr/lib ! \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -type f -delete
@@ -80,7 +80,7 @@ package_ghc() {
   depends=('ghc-libs')
 
   cd ghc-$pkgver
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -j1 install
 
   # Remove static libs
   find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
@@ -102,18 +102,17 @@ package_ghc-libs() {
   install='ghc.install'
   depends=('gcc' 'gmp' 'libffi' 'perl' 'llvm39')
   provides=('haskell-array=0.5.2.0'
-            'haskell-base=4.10.0.0'
+            'haskell-base=4.10.1.0'
             'haskell-binary=0.8.5.1'
             'haskell-bytestring=0.10.8.2'
             'haskell-containers=0.5.10.2'
             'haskell-deepseq=1.4.3.0'
             'haskell-directory=1.3.0.2'
             'haskell-filepath=1.4.1.2'
-            'haskell-ghc-boot=8.2.1'
-            'haskell-ghc-boot-th=8.2.1'
+            'haskell-ghc-boot=8.2.2'
+            'haskell-ghc-boot-th=8.2.2'
             'haskell-ghc-compact=0.1.0.0'
-            'haskell-ghci=8.2.1'
-            'haskell-ghc-prim=0.5.1.0'
+            'haskell-ghc-prim=0.5.1.1'
             'haskell-haskeline=0.7.4.0'
             'haskell-hoopl=3.10.2.2'
             'haskell-hpc=0.6.0.3'
@@ -126,7 +125,7 @@ package_ghc-libs() {
             'haskell-transformers=0.5.2.0'
             'haskell-unix=2.7.2.2'
             'haskell-xhtml=3000.2.2'
-            'haskell-cabal=2.0.0.2')
+            'haskell-cabal=2.0.1.0')
   replaces=('haskell-array'
             'haskell-base'
             'haskell-binary'
@@ -138,7 +137,6 @@ package_ghc-libs() {
             'haskell-ghc-boot'
             'haskell-ghc-boot-th'
             'haskell-ghc-compact'
-            'haskell-ghci'
             'haskell-ghc-prim'
             'haskell-haskeline'
             'haskell-hoopl'
@@ -154,9 +152,12 @@ package_ghc-libs() {
             'haskell-xhtml'
             'haskell-cabal')
 
+  provides+=("haskell-ghci=$pkgver")
+  conflicts+=('haskell-ghci')
+
   cd ghc-$pkgver
 
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -j1 install
 
   # Remove static libs
   find "$pkgdir"/usr/lib \( -name "*.a" -o -name "*.p_hi" -o -name "*.hi" \) -delete
diff --git a/community/ghc/ghc-register.hook b/community/ghc/ghc-register.hook
index 160b75521..ea44f1fa3 100644
--- a/community/ghc/ghc-register.hook
+++ b/community/ghc/ghc-register.hook
@@ -7,6 +7,6 @@ Target = usr/share/haskell/register/*.sh
 [Action]
 Description = Registering Haskell modules...
 When = PostTransaction
-Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" 2>&1 >/dev/null ; done'
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/tmp/haskell-register.log 2>&1 ; done'
 Depends = ghc-libs
 NeedsTargets
diff --git a/community/ghc/ghc-unregister.hook b/community/ghc/ghc-unregister.hook
index 0fa1a129a..77a5e6ad2 100644
--- a/community/ghc/ghc-unregister.hook
+++ b/community/ghc/ghc-unregister.hook
@@ -7,6 +7,6 @@ Target = usr/share/haskell/unregister/*.sh
 [Action]
 Description = Unregistering Haskell modules...
 When = PreTransaction
-Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" 2>&1 >/dev/null ; done'
+Exec = /bin/sh -c 'while read -r f; do /bin/sh "/$f" >>/tmp/haskell-register.log 2>&1 ; done'
 Depends = ghc-libs
 NeedsTargets