Disable constructor specialisation on GHCi-less arches (bug #482960).

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

5 files changed, 58 insertions, 15 deletions

diff --git a/dev-haskell/vector/ChangeLog b/dev-haskell/vector/ChangeLog
index 6fab5c1a59a2..ee44482318b6 100644
--- a/dev-haskell/vector/ChangeLog
+++ b/dev-haskell/vector/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/vector
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/ChangeLog,v 1.16 2013/10/19 12:53:20 gienah Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/ChangeLog,v 1.17 2014/01/19 08:26:34 slyfox Exp $
+
+  19 Jan 2014; Sergei Trofimovich <slyfox@gentoo.org> vector-0.10.0.1.ebuild,
+  vector-0.10.9.1.ebuild, vector-0.9.1.ebuild:
+  Disable constructor specialisation on GHCi-less arches (bug #482960).
 
 *vector-0.10.9.1 (19 Oct 2013)
 
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 2d95c562a2f5..ab4ce527c7d6 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST vector-0.10.0.1.tar.gz 102426 SHA256 ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af SHA512 2595bee97295a62471de26748c0b598f40a9c5a75571e645c24a8f2bc4eef1d7a3e29d576e7ba9a9dca0fb071f0c178a5a3757e063219d1cf25d8c484e645754 WHIRLPOOL 24617c62582a4eb490e263dc69289e4b24ad18ab6dc6191b3fff52bbcb816cfda9d909c6a62b388daa1f7dd68d7bc9318d1c7618ff7a1a3db0b9cd631cc0ae4b
 DIST vector-0.10.9.1.tar.gz 101693 SHA256 205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5 SHA512 8eab2fb1d225f7a53d82721147bf78a05714bc1484e9b7bdd1d1bc4720e42d71bda0ffe92e60b8c6c65287b64c3bd738ff597ea8caa5b05e15a822b8563aba3c WHIRLPOOL e490dc6de9e26c7242b233541ce2920ab5000f508db12c75fb073c2eeb7149e703f12fc8a4bc78943fe9c10057b5eaf613eb7c39d0fa682187371d93a748432e
 DIST vector-0.9.1.tar.gz 104997 SHA256 5a2507f633c8b61a203b34ca29a30fca20fde1d6261f1f8417903b447c4bd7d4 SHA512 981fc466212438ca1b4b1f39dbe662e2ab2d6f481b8aea7ddc5dc5655542988842817d5cc3aca46d319020df82908f89bce9ab53aa71a47d8d717224ccc2d8fa WHIRLPOOL acdefbe6df6a80d8595fbd1a5a10fc966cbd1bb26cba4cb3d89cc3e6263cd2a8e5f3fde42de439421579b594ac5ba9ecc1bae03e4d1294e1bbf23bcf94031194
-EBUILD vector-0.10.0.1.ebuild 829 SHA256 9d02224d426a2bba67cd5bbf5225cbe56263bc2203f4d10aca4cb2334e91e486 SHA512 d7de093722eb59b2b58da6dadf156cf537e957f04530015e9d114f93b5d385dac11f1f5ad13ad2f5151845b657d4c7dc0abbf8358121708f48736c23b2232b9f WHIRLPOOL 09774a072d481a1bd2a17b4bb1da6f8037cb4b13766f992bf9916aca1f0e884df366d2ee416df52577783973fafc3e07c9c6ed4d13c24013c38a3794ff06b5c2
-EBUILD vector-0.10.9.1.ebuild 1143 SHA256 041e8141e0adaf4643519043eb8b9cb89a25851c912702673096c2d27a5b0221 SHA512 ce1f66e846cd01fdab434ba7627e14e6cadaa95fcb16cc30e0f7d91c0dd5a843c67d3fc4735f99651d5d0ef856687b8e92606e193e7bc95539dce456470dbf78 WHIRLPOOL c8f72897df062ffc059cc3a4b4256d0159905db8aa40412e7d840857edc07dfd1e29bd1305c96b8f791466e81a3065306aa403e5e787719424f9109b62368cf6
-EBUILD vector-0.9.1.ebuild 768 SHA256 b41730a7473fe07c0fed3ff15961775c9666eae4861dd4ba62563c7efd442780 SHA512 f83101883e650176d58d443443c268a497fca24394b616d8b467ee128219f50d41a04fe4db2c67c6c3e501e4038175d9b7a023dbaae01d12cdadef4151dbfb98 WHIRLPOOL 64830c167cb3c57ea7e96c8f722b636bc730a81f8bbb1f7398736e4f4c689ccb6b351633c8b062855a5169a60a3b3b76d7cf7eb08b3622e6b8658242335c095e
-MISC ChangeLog 2385 SHA256 67edd64c50f87eb3923514a572ca3bcf1742a43f9bceafbdf644dd211144c655 SHA512 99f329ed869099e1e3aedcd3c2326bb0c319646fba308c626ac1affd59f69d302462a02f46e3fa9843386e79276afad09a12d41556b595548ed07b0ac48e4ba3 WHIRLPOOL f24899a8d83cdafb096cb7617897bb41dd3e353ee1c8c5d312ef76c19c9882b5b6c3b94b00ea28596c99b5177de65f5a619543a565d00d65942dc3ed0b476381
+EBUILD vector-0.10.0.1.ebuild 1214 SHA256 0e78fd63f14014fbdfee66175c7ab9542df91b718ea5658f42e9dd1fc42c03ea SHA512 7bcca9622e14280be03d261e7f1316a871b805471b55d8867366e7071ce60aa392c4d974347c2de86fef6a4d454e6fdb3b3cb9257c05001ba6467c3504e3e80b WHIRLPOOL 6d6b5d1571f2661575e0bef134a619e1808134a8cdad16f2587a20852d1dda0fcdbb883d82a9431aac476aaf1977aa910a54b68d1a9d0170e4f8b9215a7e7c99
+EBUILD vector-0.10.9.1.ebuild 1525 SHA256 697a133d0829657d21870f6d35a1ac127151d071f790a63595df8bee5f3eb33a SHA512 2b135b0f37a5ad6411fdb475a35db0a1f90c28094a73b70d89236f9daa3a7f0f87ba92423c7ff70d93a43dc329e6b9ec5a39e594f1c17485a52d99ced4124266 WHIRLPOOL 4d550ecfd636853cf6fb8a79769ff84d9a0e557deeca6f4ab00e563a9d9c2dd286b2f354967b09bc72c500b54a2e83e0544ba73093e99a2f525f985046c946f4
+EBUILD vector-0.9.1.ebuild 1150 SHA256 99abc86e7006f08009359f814d27875979c8c702f5a18c7008ab684f1c56fce1 SHA512 f7b6f8072b3c6410d6715a5eba36b5c9844514b9467e48db5bc2cee00a32e14105cf4e9b29044f9b1265d7b4e9ca7c4188fbb8ce4a878bb02680e5a1b17cff5b WHIRLPOOL be7cefe0deea85f6ac0978212d1b64fecefe6d8514cdfe037f9ae1819c4459e2cd7d14f552d2e5d1390c9f8287509d90461979db48fd223181fe166d78f75539
+MISC ChangeLog 2583 SHA256 1f9eca37918383a545724e4cbbf081ffba9b29d1c53f99394297aca70622d9bd SHA512 926c11885ba36f4b38a4f25de6e5ae015e47d9548f1a15b06a2eef7268be2bcb66a332ba99f1a1ad0e8ce1271b0026bf779ab0ef8c82a735d069ca516375e112 WHIRLPOOL fe5ac9dd9118e801f2e8a4cea3410609478d7660d95022a31fe474ee9cfff6a82ae4e72b2ec05be11202d17553f43f831bd2a7b4f1d86622f676aa10e812cb87
 MISC metadata.xml 2555 SHA256 19d433072f07a46315174244f006c2a4604a51647fe1e8073d11c9246843b7ee SHA512 0e0d002a5d17e3111f77bc7e2ff1a14aec4c728e8846cd5fa429aac0775ab644252621f47eb62286f0a8e7097cfa3534d3e11a2bc72bbf441d54b0533fb9b3fb WHIRLPOOL bd30fe6d62615fd6826cde415f88d420b7fc6ed81dd48fedadb84271ee91219258ee14d69a2073dfb99670c80687112c0f5e9e0a03bc7dd9da0a19577cbaa3f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJif+UACgkQoBEVQmGOlx9G/QD9F8Vx/VVvTHYls9K9vYMXssON
-9YhzbgEKbU1isTisyLgBALWQ7Pk5BHW3Z/2XekcogDXSU3H7/1Xy1y3yxUh8r7dj
-=aEk1
+iEYEAREIAAYFAlLbivIACgkQcaHudmEf86qVywCfT2wmMVIMz4QqInqwDsBCLdbQ
+fsMAniGU6nODDsGeOcV56D5yr9JG2cdZ
+=XjYJ
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/vector/vector-0.10.0.1.ebuild b/dev-haskell/vector/vector-0.10.0.1.ebuild
index c18ab6a604aa..8b03beccbca9 100644
--- a/dev-haskell/vector/vector-0.10.0.1.ebuild
+++ b/dev-haskell/vector/vector-0.10.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.4 2013/09/07 20:13:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.5 2014/01/19 08:26:34 slyfox Exp $
 
 EAPI=5
 
@@ -23,3 +23,16 @@ RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?]
 		>=dev-lang/ghc-6.12.3:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
diff --git a/dev-haskell/vector/vector-0.10.9.1.ebuild b/dev-haskell/vector/vector-0.10.9.1.ebuild
index b67f106496ae..140f53f7955a 100644
--- a/dev-haskell/vector/vector-0.10.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.10.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.1 2013/10/19 12:53:20 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.2 2014/01/19 08:26:34 slyfox Exp $
 
 EAPI=5
 
@@ -26,6 +26,19 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0.3
 "
 
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag boundschecks boundschecks) \
diff --git a/dev-haskell/vector/vector-0.9.1.ebuild b/dev-haskell/vector/vector-0.9.1.ebuild
index bd8ebc69a661..081597b46754 100644
--- a/dev-haskell/vector/vector-0.9.1.ebuild
+++ b/dev-haskell/vector/vector-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.8 2012/12/10 21:53:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.9 2014/01/19 08:26:34 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -22,3 +22,16 @@ RDEPEND="=dev-haskell/primitive-0.4*[profile?]
 		>=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}