Put upper bound on ghc version for older packages.

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

5 files changed, 25 insertions, 20 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index df0cac9a953a..bdfa1163fd67 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.117 2015/08/01 21:23:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.118 2015/08/01 21:42:46 slyfox Exp $
+
+  01 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.10.0-r2.ebuild,
+  haddock-2.13.1-r2.ebuild, haddock-2.13.2-r1.ebuild:
+  Put upper bound on ghc version for older packages.
 
 *haddock-2.16.1 (01 Aug 2015)
 
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 6d1c872e8abf..076b57a184b7 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -14,19 +14,19 @@ DIST haddock-2.13.2.1.tar.gz 208851 SHA256 c9cfe2bd2e8e1201870f88bc9a2ccdb017331
 DIST haddock-2.13.2.tar.gz 174973 SHA256 25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3 SHA512 6b70f4cc659858e86919cd35a4e936215a53d23767262e25c7add5986cf21d04a761dc3581fe97c6510b3cb0c9867df3e6fa9668732b55e0e9d56b4932dca330 WHIRLPOOL ff06c0d092cdeaf2ddbffd225d30f53239523cd7d482c73f4b7a20100ebcc4e6b6c329bab5cf828ae2730503cff7709061b04cda29ea034939c5acc59191ac52
 DIST haddock-2.14.3.0.7.8.3.tar.gz 230282 SHA256 8bcdea48e3fbba6e38d2e629edf230da39d07421424bb1c615198c77623ff2c4 SHA512 62ae4a29c877c3b9742828fcda2f1f045357f41b4a2c495a4791a42d412d41b3d206cdcb73e2d1bd4e95c40371dae865f4eaa37031cda6c1bada5dfed963c2be WHIRLPOOL afd36c8f04aa29c007d83d7c7731098347836daa4e8307710b839ecbc764e191624075df5c3e353c8bcd9f640dfe560a07477bf7909d53ed7e13b34a806efc9a
 DIST haddock-2.16.1.tar.gz 216323 SHA256 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6 SHA512 709af410f8746819c8c067f3549d79ba0ecaa312fb6b19acf670a9a3e4c94e94b8e546493e08293eceeb488bc0891a8ebe033a58411c4af935b445cd7f3014b8 WHIRLPOOL 0f60978d1e4303d6586b164ab40236f949c14308a0b0ddec9e63ff9b332835ca846187b65de8c122203ace666450f40d55955a3c287f576611d7df2bc6c9161c
-EBUILD haddock-2.10.0-r2.ebuild 2574 SHA256 1af5f024cae97db2cd07a2a94bf09080494c903c606512ffb0f24c57b4c79e93 SHA512 33361afaa6e9995457553067873c968f3e02332541540ffbb4ddeca518bda0c6912b17114aab380abf1dc2ff920c7e219a8f39fc5a6f0a6ed7a378809053eb06 WHIRLPOOL 90009c143458f1a6a1446aeceab7da48c10c3bb63ce97890f6cf31272a538a32a737e4aa7b046080cf87059653bbab37ff00ea69d69a267b1bfbd62d946945c1
-EBUILD haddock-2.13.1-r2.ebuild 2213 SHA256 96db7ad74c8993114c6a9f303026d2a979d851b8131353982e2ac224cdf46412 SHA512 cf433a5d2b533048bcf050cd3abcc42815710927bdfc183e95ce36aa771eaf57bb13d519d1453601034b123e7c8888d94304f01b6ff3b673bc27a78572e1c0dc WHIRLPOOL 8de8aede5da17bd1c8b270015479d9c7ad2f1b9a3e777f77066ca1333532bd6382e689c2926c00d445c20e7b2aeb7b14a7540523e1dfe81eaec9fd3ce9b7bdc8
-EBUILD haddock-2.13.2-r1.ebuild 2525 SHA256 1d50c77699b3cb3137a1a8be6aa63debc4cf85a4231918236ca112e11c24e7c0 SHA512 722e33053606298af9db296a98a3884c44102cde228c15142d7173c09a396cd0130381e063948c5def2cd732b4c0a2ab430bc44910c0e4597a12c9e5ab46198a WHIRLPOOL 236f030d33088dea8cccd4fb22f8efa2f6e03d5cb3851a35449127b82ba4498d576868b41def6ac723fdd83f2ac1ba0b99fb205200e71a923af2986e6557a1a8
+EBUILD haddock-2.10.0-r2.ebuild 2603 SHA256 47b437abc1aad85aec340e01486290639c9047e357b5c3ff3465728cac5565ef SHA512 3f6ae9654aff581845a823317768a7bd8e1c277f25cfada6793b22ab8ba2de18577a16241387a366a78897379dbfcc25165ef282e73d46f739dcc19effb86e89 WHIRLPOOL 451d5ea3b4e24e83e96d0546f2d6ac40da111abcec583308ccf3698859c52e034eae5fa20990ad4da729dfdffeb6193f6dd2c416ba75cc74de9648837f466d65
+EBUILD haddock-2.13.1-r2.ebuild 2268 SHA256 4b0cbc020a69a13359bbdc476299ed5571e18ecb55cb4904dc89b5733cea7683 SHA512 8a68bf0b3ded2f22b697bf21c3cc4d0f9313225f0047b3eb9b3ea981ba67eb2e21c783e75885296dc38109032a19916aba0d5b7dc7a5448beaca8a94a930f3a8 WHIRLPOOL a5e1be4fce9a9775a3dbb7298cccf4becd032bf14464846f8047c5685c0e54592edd6533669dfc1420ac92b90c1e19d7fd9fef282320068d80d0582e248456f4
+EBUILD haddock-2.13.2-r1.ebuild 2548 SHA256 91b19669e24e6fa894ba718665c244775ca224e0e89a2cdd3ca00ab24c2eb1dd SHA512 07648dcfa2bbdc43d913c8e44740f783a4dd81ef109b796ec8f1840d2ebe5932cdad5589aa7199ef4baf5a169c418e60fde78635be97ed41c30d15d14a9633be WHIRLPOOL 4b8fd0f5d1ca0779514cbb1c8657750e939604d4911fca25bbdae08e19b0b5bf2606e0b538aae4372c56da47d082e220e0c5d26179834aed3fba70a0bac4527c
 EBUILD haddock-2.13.2.1.ebuild 2550 SHA256 8884878afedd104a4e71b34f1ae50a84b03b40e50394084e0ef0150f18035237 SHA512 8d3f9dede29920e4a805aa8467c988d4b595df0cb82c2ca6b5288c3af6bf935afa60db53a85367823e0321820fd79b0ab984b834a6542ebe8a58f7c9649ef56e WHIRLPOOL de560e8d224961285553eaaba000aabe228257a303f547ec654cf6a3afbed02605a40e6183f4d114a9071716822d3701185d43bf9f020453cf2cbe44e76f7b05
 EBUILD haddock-2.13.2.ebuild 2402 SHA256 0bf2de9ca32bbc484ca1889b01021428d650660a95d6263c315e24cd32738b2b SHA512 f4bd1db42164531af49daeda88a3633559fd07b1c704fb4402ab5566336f70288689776d4fc855f90d5d720d3b93341e32fe6c84a721e09918737c1c5829f2a9 WHIRLPOOL 18e479da37fdc1c0a929397aa560dbae0eee09cbdb32081d88478895d60d485265d548d840e0593865eddd3552c0a3e091590202539c5ffa9d6e5f1118bbbac0
 EBUILD haddock-2.14.3.0.7.8.3.ebuild 2191 SHA256 2aa9bbd9a3b759f3af1c7c7790d41f884621c99f0fd806727e5277ee45a1acb7 SHA512 642928bdf1fc66b2d656f16bb5d81ea7e3630fd3bfafec88ff87d1095d7a2ac93fa8d15f9006c932ec0a9e956130026267796aadc08ec33751ea9843ce3fa35d WHIRLPOOL 2bf167c69e8395c1e172d87b399a9b790ab3b47d8432672263fcaba4ba7f88f4603d714f5fd580392da56051dda52312d8271517033e4bac3685243d0f931627
 EBUILD haddock-2.16.1.ebuild 2042 SHA256 4ace6ff6331248a5830a5b32ebb348b55d2012a0b334738a1bf55766dd9e66b4 SHA512 244bb99f9d0e91da5581e7d17b4051c9b53662dcfe725a6fc138137e3dc2ddb0a02c992987a08eb4e6e42575c5d86f932d82eb9d100eba7527efc7205871d411 WHIRLPOOL d5410fe966451aa9b6f29031769428cb755f44fa7914502d31154a7060be9d7f867a4dd5a2bf32bfd8ce8a7a66630d8f34b130b646ec745752dd6838c22a93b3
-MISC ChangeLog 17110 SHA256 4ded4b4e5d355568f53f102056ccbb473c707c1f6cf5f7e98079f20d6e235f66 SHA512 c1c48f1817015c2d0163a1629973104a7e96729a339e595fc949cc2da0538fca03cd96254346842d2f94068dce74e93f0df88f4013b97b66da377c4b4eb7b501 WHIRLPOOL 47d49b95c5160c80269e570d56492903e7f5ce0b313791e9883b0138f8961dd1dfcf6f90d060f0a33238229a6e8a9a97fb703b4b6f7873f9227a6635dd0df837
+MISC ChangeLog 17298 SHA256 8212763d87113a97dec8a2a6784fcaea095d39ac0b5114299d2834ee5538910f SHA512 8daee255fc814a90e78965b2e359eddf3e314abe5f688d368c4de5703b575ba71e207e093ec419df0f36a4120d80cd41dc2a57132311b6d798cc6293066ca219 WHIRLPOOL b3c0e06395f52c368ee67e394e979cf6cc60bf3aaf3425eca53e9dc027065e15b21877785f4b8d232cbe467305043fc073dda92ee7bd7dbec06dc52019f2c89d
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlW9ONUACgkQcaHudmEf86pJVwCffoSwGCpOlLVWyuvIxCcb0Hyu
-R2sAn3333wmTgYco9I+WMcLgSl0YgBih
-=ZOTG
+iEYEAREIAAYFAlW9PVcACgkQcaHudmEf86q4kQCcCwPxmNEaz4qVIWWttMGn8Wlg
+76YAn2YS4TuAjbVCAeQO7BICiXFWHYn0
+=wWvN
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index 6d98fd2e7dcd..4d90afcae6ff 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.10 2015/01/02 23:16:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.11 2015/08/01 21:42:46 slyfox Exp $
 
 EAPI="4"
 
@@ -13,19 +13,20 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
+# ia64 lost as we don't have ghc-7 there yet
 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/ghc-paths[profile?]
 		=dev-haskell/xhtml-3000.2*[profile?]
-		>=dev-lang/ghc-7.4 <dev-lang/ghc-7.6"
+		>=dev-lang/ghc-7.4"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.14"
 
 RESTRICT="test" # avoid depends on QC
 
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
 
 src_prepare() {
 	# we would like to avoid happy and alex depends
diff --git a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
index 5e72bd90c12e..741a5c6a1575 100644
--- a/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
+++ b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.1 2013/02/10 14:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.2 2015/08/01 21:42:46 slyfox Exp $
 
 EAPI=5
 
@@ -15,18 +15,18 @@ LICENSE="BSD"
 SLOT="0/${PV}"
 # ia64 lost as we don't have ghc-7 there yet
 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-haskell/ghc-paths:=[profile?]
 		=dev-haskell/xhtml-3000.2*:=[profile?]
-		>=dev-lang/ghc-7.6.1:="
+		>=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.14"
 
 RESTRICT="test" # avoid depends on QC
 
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
 
 src_prepare() {
 	# we would like to avoid happy and alex depends
diff --git a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
index 9c555af182c1..fb86696e130c 100644
--- a/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
+++ b/dev-haskell/haddock/haddock-2.13.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.5 2013/09/22 06:44:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2-r1.ebuild,v 1.6 2015/08/01 21:42:46 slyfox Exp $
 
 EAPI=5
 
@@ -23,13 +23,13 @@ IUSE=""
 
 RDEPEND="dev-haskell/ghc-paths:=[profile?]
 		=dev-haskell/xhtml-3000.2*:=[profile?]
-		>=dev-lang/ghc-7.6.1:="
+		>=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.14"
 
 RESTRICT="test" # avoid depends on QC
 
-CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts"
 
 src_prepare() {
 	# we would like to avoid happy and alex depends