[arch-commits] Commit in ghc/trunk (PKGBUILD print-provides-replaces.sh)

[Thomas Dziedzic]

    Date: Monday, July 14, 2014 @ 08:24:51
  Author: td123
Revision: 216874

upgpkg: ghc 7.8.3-2

add missing provides due to ticket https://ghc.haskell.org/trac/ghc/ticket/8919 getting fixed

Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/print-provides-replaces.sh

----------------------------+
 PKGBUILD                   |    9 ++++++++-
 print-provides-replaces.sh |    5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-14 04:25:18 UTC (rev 216873)
+++ PKGBUILD	2014-07-14 06:24:51 UTC (rev 216874)
@@ -11,7 +11,7 @@
 
 pkgname=ghc
 pkgver=7.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc='The Glasgow Haskell Compiler'
 arch=('i686' 'x86_64')
 url='http://www.haskell.org/ghc/'
@@ -45,6 +45,10 @@
           'haskell-transformers=0.3.0.0'
           'haskell-unix=2.7.0.1'
           'haskell-cabal=1.18.1.3'
+          'ghc=7.8.3-1'
+          'haskell-haskeline=0.7.1.2'
+          'haskell-terminfo=0.4.0.0'
+          'haskell-xhtml=3000.2.1'
          )
 replaces=('haskell-array'
           'haskell-base'
@@ -70,6 +74,9 @@
           'haskell-transformers'
           'haskell-unix'
           'haskell-cabal'
+          'haskell-haskeline'
+          'haskell-terminfo'
+          'haskell-xhtml'
          )
 source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.xz"
         "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.xz"

Modified: print-provides-replaces.sh
===================================================================
--- print-provides-replaces.sh	2014-07-14 04:25:18 UTC (rev 216873)
+++ print-provides-replaces.sh	2014-07-14 06:24:51 UTC (rev 216874)
@@ -12,11 +12,6 @@
 exclude['Win32']=1
 # no integer-simple because we use integer-gmp
 exclude['integer-simple']=1
-# the rest are installed as dependencies of ghc and some shouldn't even be installed!
-# https://ghc.haskell.org/trac/ghc/ticket/8919
-exclude['haskeline']=1
-exclude['terminfo']=1
-exclude['xhtml']=1
 # extract excluded libraries from ghc.mk
 for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
   exclude[${exclude_pkg}]=1