From 7f58eea2656b216014990b063ad9f3a285284ea8 Mon Sep 17 00:00:00 2001
From: eschwartz <eschwartz@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Jun 14 2018 01:50:40 +0000
Subject: FS#58797 Fix more makedepends build cycles




git-svn-id: file:///srv/repos/svn-community/svn@343031 9fca08f4-af9d-4005-b8df-a31f2cc04f65

---

diff --git a/haskell-colour/trunk/PKGBUILD b/haskell-colour/trunk/PKGBUILD
index 2e0f7e6..0ce1a75 100644
--- a/haskell-colour/trunk/PKGBUILD
+++ b/haskell-colour/trunk/PKGBUILD
@@ -26,13 +26,13 @@ build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
 
     if (( CHECKFUNC )); then
-        opts=('--enable-tests')
+        _opts=('--enable-tests')
     else
-        opts=('--disable-tests')
+        _opts=('--disable-tests')
     fi
 
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" "${opts[@]}" \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" "${_opts[@]}" \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script
diff --git a/haskell-hspec/trunk/PKGBUILD b/haskell-hspec/trunk/PKGBUILD
index 31d4aa1..71273da 100644
--- a/haskell-hspec/trunk/PKGBUILD
+++ b/haskell-hspec/trunk/PKGBUILD
@@ -11,15 +11,22 @@ license=('MIT')
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-hunit' 'haskell-quickcheck' 'haskell-call-stack' 'haskell-hspec-core'
          'haskell-hspec-discover' 'haskell-hspec-expectations')
-makedepends=('ghc' 'haskell-hspec-meta' 'haskell-stringbuilder')
+makedepends=('ghc')
+checkdepends=('haskell-hspec-meta' 'haskell-stringbuilder')
 source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
 sha512sums=('8f680fcf233791a775feda58d51b33067db2de3e63d6e77c0f47fca0a3a442e828b78ccd9bdda5730d92d28151a503af1992c2d6d541ba006016057927285f58')
 
 build() {
     cd $_hkgname-$pkgver
+
+    if (( CHECKFUNC )); then
+        _opts=('--enable-tests')
+    else
+        _opts=('--disable-tests')
+    fi
     
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script
diff --git a/haskell-http-streams/trunk/PKGBUILD b/haskell-http-streams/trunk/PKGBUILD
index 625afc5..8378602 100644
--- a/haskell-http-streams/trunk/PKGBUILD
+++ b/haskell-http-streams/trunk/PKGBUILD
@@ -13,7 +13,8 @@ depends=('ghc-libs' 'haskell-attoparsec' 'haskell-base64-bytestring' 'haskell-bl
          'haskell-case-insensitive' 'haskell-io-streams' 'haskell-hsopenssl'
          'haskell-openssl-streams' 'haskell-unordered-containers' 'haskell-aeson'
          'haskell-http-common' 'haskell-network' 'haskell-network-uri')
-makedepends=('ghc' 'haskell-hunit' 'haskell-aeson-pretty' 'haskell-hspec'
+makedepends=('ghc')
+checkdepends=('haskell-hunit' 'haskell-aeson-pretty' 'haskell-hspec'
              'haskell-hspec-expectations' 'haskell-snap-core' 'haskell-snap-server'
              'haskell-system-fileio' 'haskell-system-filepath')
 source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
@@ -27,8 +28,14 @@ prepare() {
 build() {
     cd $_hkgname-$pkgver
     
+    if (( CHECKFUNC )); then
+        _opts=('--enable-tests')
+    else
+        _opts=('--disable-tests')
+    fi
+
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script
diff --git a/haskell-snap-server/trunk/PKGBUILD b/haskell-snap-server/trunk/PKGBUILD
index 5d0b073..d281a9b 100644
--- a/haskell-snap-server/trunk/PKGBUILD
+++ b/haskell-snap-server/trunk/PKGBUILD
@@ -13,7 +13,8 @@ depends=('ghc-libs' 'haskell-attoparsec' 'haskell-blaze-builder' 'haskell-case-i
          'haskell-clock' 'haskell-io-streams' 'haskell-io-streams-haproxy' 'haskell-lifted-base'
          'haskell-network' 'haskell-old-locale' 'haskell-snap-core' 'haskell-unix-compat'
          'haskell-vector')
-makedepends=('ghc' 'haskell-base16-bytestring' 'haskell-monad-control' 'haskell-random'
+makedepends=('ghc')
+checkdepends=('haskell-base16-bytestring' 'haskell-monad-control' 'haskell-random'
              'haskell-threads' 'haskell-hunit' 'haskell-quickcheck' 'haskell-http-streams'
              'haskell-http-common' 'haskell-parallel' 'haskell-test-framework'
              'haskell-test-framework-hunit' 'haskell-test-framework-quickcheck2')
@@ -28,8 +29,14 @@ prepare() {
 build() {
     cd $_hkgname-$pkgver
     
+    if (( CHECKFUNC )); then
+        _opts=('--enable-tests')
+    else
+        _opts=('--disable-tests')
+    fi
+
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script
diff --git a/haskell-stringbuilder/trunk/PKGBUILD b/haskell-stringbuilder/trunk/PKGBUILD
index 2e6773c..4db704d 100644
--- a/haskell-stringbuilder/trunk/PKGBUILD
+++ b/haskell-stringbuilder/trunk/PKGBUILD
@@ -11,15 +11,22 @@ url="https://github.com/sol/stringbuilder"
 license=("MIT")
 arch=('x86_64')
 depends=('ghc-libs')
-makedepends=('ghc' 'haskell-hspec' 'haskell-quickcheck')
+makedepends=('ghc')
+checkdepends=('haskell-hspec' 'haskell-quickcheck')
 source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 sha512sums=('09cbf01dce82b325393c0d6f0264792695d528a184052f5e1d5dbd3fc181fd11c280e77ba445f1e44c6a8dabc0b267aa90f4a9f1fc34135f1b741d2a5dca9369')
 
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
 
+    if (( CHECKFUNC )); then
+        _opts=('--enable-tests')
+    else
+        _opts=('--disable-tests')
+    fi
+
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script