Fix .cabal depends for -f-test mode (bug #444124 by Dennis Lissov)

Package-Manager: portage-2.2.0_alpha142_p23/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 70 insertions, 8 deletions

diff --git a/dev-haskell/sha/ChangeLog b/dev-haskell/sha/ChangeLog
index 39d6a0910ec6..91cdd54110ee 100644
--- a/dev-haskell/sha/ChangeLog
+++ b/dev-haskell/sha/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/sha
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/sha/ChangeLog,v 1.4 2012/11/19 12:20:13 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/sha/ChangeLog,v 1.5 2012/11/21 20:58:20 slyfox Exp $
+
+  21 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/sha-1.6.0-no-tests.patch, sha-1.6.0.ebuild:
+  Fix .cabal depends for -f-test mode (bug #444124 by Dennis Lissov)
 
 *sha-1.6.0 (19 Nov 2012)
 
diff --git a/dev-haskell/sha/Manifest b/dev-haskell/sha/Manifest
index 923671212f33..034b90032704 100644
--- a/dev-haskell/sha/Manifest
+++ b/dev-haskell/sha/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sha-1.6.0-no-tests.patch 1818 SHA256 8e49109e81ceaf952ae6fca5049ecffa8b7a1c9acf7541b707a73d7802eafbaa SHA512 c36c085ad61fb42ffe4dcef0693479ea34e45f69977dd9788c492ff64cc8782d2e60aefabc9c2909b19b1cc09e66ce91a1449dcab996d33ac23f5da119adeccb WHIRLPOOL 2d523f6ab8d3145ca0a86f2550ba493e8b7aed5ea23d8c7065be1159e8ba399e9c5a4d0da56cf6709f6ab571c40b927a7694d9b909769de55a81d0912d1acda1
 DIST SHA-1.5.0.0.tar.gz 2714032 SHA256 9361cf9dffb8640e435b7b61bc4922c7bdf4c26d96bb42de423ede4a570b5f8b SHA512 7899133f0a86807ef7760ffd55e3e43bdc8abd8493f6e9b3fbde76a74a792d6a27e19577258625b3043a03b60b532171d6ed1929081330107ed7250e67555689 WHIRLPOOL 312c037add03fef9ab60f5311d111c82f6b9fc5d438d04466b949e8974688d69880b98987b126f8e7b155d3798910c24607952dae5a988803c830ee99e91a443
 DIST SHA-1.6.0.tar.gz 2714319 SHA256 f37fc02aec825f341847c0e28207c35288af7ddbd87324c825d923307314bd44 SHA512 65fb3b9f6ac2d5806edb53499e290bc1f78aa25354e421723203a5e0099e242d77cc3741f975e81e35daac68b94b429746c33381909c7cb2bcf4cf1e6be553f5 WHIRLPOOL 549924408f71be607ddd3f39f22aa94c72f1aa564a6792036513e3779f87fc44e074ef6a489d3482c0fc3cdbf667f53c46ee5647bb99a6052644f7af7df90b50
 EBUILD sha-1.5.0.0.ebuild 759 SHA256 e2f498954a3a40c0f2c4a5f2717bc4595b3287c159197c634f4fc1ddd72f458e SHA512 d5bbe82e5588f453e28a1d285a6ee91aca206ea2a26393fef014b02a286f20d087d3036dd0cc5a57fe5800f6b85343a83b1653b0f9b0336b5d2211db27037e57 WHIRLPOOL f798215c885222beeb2473e599ed2fcfa3641b5de11ffa3bf9cefadc615a0ea0983844f0d073a7dbe9c55cfd662b4cfb551628c01a8b7cac6930748487a4fdb8
-EBUILD sha-1.6.0.ebuild 777 SHA256 ef7f786d30a293e4e35ee1d331ba8d29a4c05ae68482235d1df95c062750bce5 SHA512 d47c42b5482c5ea4c47f47ddbe72ff5f63d4a7ac31ebf36c0e78a6120ef980f2b1d63d00d2a1c6536b32109243f744840e1bf8923cbc5ec67703cd6907c96944 WHIRLPOOL 973f9f6ed7f8c991a125190d91dd27367d62e268e1773fcd6daa0934022a58c9f04df53702efefb1f1d5ff52764c4725ebdb164336a28ad6428f3da02f336f7f
-MISC ChangeLog 844 SHA256 400719e340d2200cc974b86e5311c0b56d5b4e9ea717f9ec1286ceb9049f7913 SHA512 4ae2f5d9811fae32d6a11943dc67634ba62efc925637d2082ef00847f39957db2fb7cb5b5561c7c7501c907eab6957509977ebc368ec1c2dbff409e8bd6020b9 WHIRLPOOL 7aeea4d439fb7d14392ffb853472d758a1b0eda55b98a63e80c90c174749a04e4dfb5724bbba62629a25b04e25a09e254772f1812f7de47f0798638a25c2e7df
+EBUILD sha-1.6.0.ebuild 827 SHA256 4b964d489c995478b26a2191b18e7aa6caa923e9b38eb02eb6ea6d19cbab5f50 SHA512 de0eca4a4356e815a1139dd77c6fbd3bb22110bdb02ea1df7a42f251b0b234ed6c131e98af90535ffbb4cd745656bd1f2ec9178db920cc94693ea58f210f6e1e WHIRLPOOL fba44b663d2f94d092795774cb586376e00944b0e68a8bb015d3a644e3ac53a2b8301ac495e5f76d7f9adcf5e7d5244586dc63dd85c600f6ed2966f857d0fb08
+MISC ChangeLog 1021 SHA256 035a12fa3a83b3f7ddf185c097504266988550e5db3f508c909b9cfd4c84aec0 SHA512 6f9fac2e223cc777f966a3fc1f4bb5677bdca945748304abb32dd163c8567543c81453268d8075280b1f8d25b407365ba2e2de4b45fd48c91cccd9127feffbd0 WHIRLPOOL 4e0ae0faf3a65afba60439c9280c6cb9a8e24d515f9a57b03a449a9ae9a99e673b3048e13d38edec8f82f170a2c0133b44655650e921425133ff41941062abb8
 MISC metadata.xml 677 SHA256 5fffce9afd721638598f7588485d6ad8757574f2010bfed2c6e205bc68001402 SHA512 871f72a1358ade74d3182ed77ec01a2abc677ccdda4e02a44dfdea2025cc6e52af860accd0ab302a61b22ebd3a9f9d9826b07ab276d425868cf905bfc3630dcc WHIRLPOOL 5270736aeadb77d5a0714eff5dbcf8251d15af68d18d3f020c610f6a9f55646e81a45e1b3f4fab946cb06862c4367c30b2ec916cafa20edbf7b392f88906e033
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCqJAUACgkQoBEVQmGOlx86qwD/QmxJYot3xh27LN/2A7jvKsHY
-z176SPp/yx9IQRP4VlMBAIWOyVKz7s0zCJ12hqUJuR0ODIG7VmW+2SPFNQ3xgP4r
-=OlYj
+iEYEAREIAAYFAlCtQGEACgkQcaHudmEf86pSmgCbBD3EzW5xlXBLszBdLzRNGkA1
+QuYAn1OQKLiwwLYg33Qr8TEhomOCy7XR
+=zX2C
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/sha/files/sha-1.6.0-no-tests.patch b/dev-haskell/sha/files/sha-1.6.0-no-tests.patch
new file mode 100644
index 000000000000..040430b5d7b8
--- /dev/null
+++ b/dev-haskell/sha/files/sha-1.6.0-no-tests.patch
@@ -0,0 +1,55 @@
+From 28704350d7b6148b2edbd5e8883c1c2dfba4f0ba Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Wed, 21 Nov 2012 23:44:33 +0300
+Subject: [PATCH] cabal: make depends on test libraries optional
+
+before the patch 'QuickCheck' and friends were required unconditionally:
+
+    $ runhaskell Setup.hs configure -v -ftest | grep QuickCheck
+    Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
+    $ runhaskell Setup.hs configure -v -f-test | grep QuickCheck
+    Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
+
+the patch fixes it by putting 'build-depends' under condition
+
+    $ runhaskell Setup.hs configure -v -f-test | grep -i quickcheck
+    $ runhaskell Setup.hs configure -v -ftest | grep -i quickcheck
+    Dependency QuickCheck ==2.*: using QuickCheck-2.5.1.1
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ SHA.cabal | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/SHA.cabal b/SHA.cabal
+index a146b52..1ec2624 100644
+--- a/SHA.cabal
++++ b/SHA.cabal
+@@ -37,9 +37,12 @@ Library
+     Ghc-Options: -fregs-graph
+ 
+ Executable test_sha
+-  build-depends: base >= 4 && < 6, bytestring, binary, array,
+-                 QuickCheck == 2.*, test-framework >= 0.3,
+-                 test-framework-quickcheck2 >= 0.2
++  if flag(test)
++      build-depends: base >= 4 && < 6, bytestring, binary, array,
++                     QuickCheck == 2.*, test-framework >= 0.3,
++                     test-framework-quickcheck2 >= 0.2
++  else
++    buildable: False
+   Main-Is: Test.hs
+   Other-Modules: Data.Digest.Pure.SHA
+ 
+@@ -51,8 +54,6 @@ Executable test_sha
+   if impl(ghc >= 6.12)
+     Ghc-Options: -fregs-graph
+ 
+-  if !flag(test)
+-    buildable: False
+ 
+ Executable sha1
+   build-depends: base >= 4 && < 6, bytestring, binary, array, directory
+-- 
+1.8.0
+
diff --git a/dev-haskell/sha/sha-1.6.0.ebuild b/dev-haskell/sha/sha-1.6.0.ebuild
index a38308661c25..b8f93423db51 100644
--- a/dev-haskell/sha/sha-1.6.0.ebuild
+++ b/dev-haskell/sha/sha-1.6.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/sha/sha-1.6.0.ebuild,v 1.1 2012/11/19 12:20:13 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/sha/sha-1.6.0.ebuild,v 1.2 2012/11/21 20:58:20 slyfox Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN="SHA"
 MY_P="${MY_PN}-${PV}"
@@ -27,3 +27,5 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.6"
 
 S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}"/${P}-no-tests.patch)