Add dev-lang/ghc upper bounds to cabal-1.8.0.6-r1 and cabal-1.10.2.0

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 15 insertions, 11 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 0108fff2e7f1..0991b54e2da0 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.81 2012/11/14 22:35:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.82 2012/12/29 11:27:56 gienah Exp $
+
+  29 Dec 2012; Mark Wright <gienah@gentoo.org> cabal-1.10.2.0.ebuild,
+  cabal-1.8.0.6-r1.ebuild:
+  Add dev-lang/ghc upper bounds to cabal-1.8.0.6-r1 and cabal-1.10.2.0
 
 *cabal-1.16.0.3 (14 Nov 2012)
 
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 1ca0f934730c..76bbf49e6f6f 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -5,16 +5,16 @@ DIST Cabal-1.10.2.0.tar.gz 256433 SHA256 b399dc19e22b43a9d1b97fed8025fbb2e2e533d
 DIST Cabal-1.14.0.tar.gz 276517 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4 SHA512 6e31f44cfafd44e1e3987ed0b116a52e12495228cb1de89e9f4ded8dbc06a0d1537bf647c4576c606d623b7d58d10367d243258b500b8c8329db6c48afd9eee3 WHIRLPOOL 22225d5923bc454e2fa24bcc9fe845b07c41c56ea67f45a0815597f0dffc4d60027117d38bdd1eccd4e61cd24d682bd8b3f4026cfaf62481712234fc9cea5321
 DIST Cabal-1.16.0.3.tar.gz 284665 SHA256 ef27629d540e46c77cabac08c008583abee4e4a04ed5a5ecb1a84725dbc39f86 SHA512 7dd365c44b5ea489fcc990e0deca8ffcfdd6b867a35b85b422fc0fe9e3c70739df393cacf425575e5e4977729ef875eb0737aaa13a0f20cfaff9d22b39027a85 WHIRLPOOL 84fbe4c41c14377685c89a93b79e03920d19e65c3c8c51a4ef590bfb8ad331e1ae85d224c1cd820e90262a579131c823510a2e62f4566d452af8e67d5cf26be2
 DIST Cabal-1.8.0.6.tar.gz 227268 SHA256 8f34b102990931ed7a0296dc235622000b69e4a8a74810e258e8c00b16da472b SHA512 64ea0538d030fd128d3b2828c2afe0b1fe9b26c6c3ed6fe74fc5055eeac4f0448263f1e8b04c28226fc6d67a656a89a96bc59a40d1708ba3fb2ce17debafc2f9 WHIRLPOOL fdcde3154635216f23b043e49d6372d44ce120315987ac964faf69e54d5acb8a3e4d3127a09a8b3b0b62ac1a66d4ffdbb2fd6f93a5b449ca45775e27bf29b8c8
-EBUILD cabal-1.10.2.0.ebuild 1259 SHA256 61b8f046f0bd061768d145c3c4aa694dd66ebcf6987eb3f7b6005e6d8fa50b7f SHA512 71786dcf912e7bfddd374393e229c12a0b7c3533cfc3c71b09eb40289e9d93bcdae90e9792c0e8ca1a72b4be67155963efc2acb652bfb6c281a616f257f5425b WHIRLPOOL d1a1c2320cc749302d19b44bb23eea37c292730afd418c9404d2d12f368e552f0967b75c98e74f63acdd9a1215257ab6b583643c46e3d1556c09f1890d2aced4
+EBUILD cabal-1.10.2.0.ebuild 1277 SHA256 f6aff9f0630df090439299affa891860c3cd883020284991ab09ba61211f5641 SHA512 7372fa70dc9aa4e810ae228cc2acc151f0e2a00edd2d6c9ceca6c2f18f92b4f5afc355bb52cfcfd546395aa0b958a0f0d4f3b4945d726381061838ca4bbb11d8 WHIRLPOOL 6237e7e73317af0fb1f8cb66a8a7f7d9f03b3ec33ed6bc4ecc89cff584f88148bd2914eaa3d6be0aac6aa951b7406b4d4a0664fcfb07ca1cc75071daec1a4400
 EBUILD cabal-1.14.0.ebuild 1397 SHA256 ede40333f773a767da5c6113175a9465b49b7ce0cd63ed44beb23810e18781f0 SHA512 5d744c7e9180b76d0323d8f1b0c02a8951bdb43504f9820905436a31cb66c7d4ba413eba5d9422e470c37b358958509428806fd32ed17af5baedea7ddb05607b WHIRLPOOL fa21771cbf8eab64fe9a7f07ccf6b056d2119ef900099d0f5d6ccf9993dd538e649e0a5b771593e342820ab2413a6746e0a5a5c37d8a8c43ffb76ce86b6e1fd7
 EBUILD cabal-1.16.0.3.ebuild 1598 SHA256 e6be7eb00755ce3de146b82eea090f771529f3d27083ff1c597c1d4102331185 SHA512 24d13a6d9a1cbddb09db1a49484a11fe2c6a33cfe303f0ae23c2226c23fb2d1bdaf5f93d9734b1cc140ae0fceee3500d4b317a7d99c803847e6fa1d900d5dcf3 WHIRLPOOL 5daa9877e0709cab207c8beba7853ba579191bd81db1f5ec37d639cee6de73faaa5c9b417eae957b7b38f72b0ea96c9289f1a8761a8d75ee1f696f3846c31ef4
-EBUILD cabal-1.8.0.6-r1.ebuild 1331 SHA256 efed079f4664588e4582a4833122f9a743b43e0351f8d5f55bcc82e98d43490f SHA512 ae8779b82bb0fe6cd06a8286188040b5f54277088020f3d21df8991817d283d2bbe28bd913ad276cde73333424083d16d9d7c38286806a7f4e14d74338c9a017 WHIRLPOOL ef549131bcd1bf06d66849ad1d3147b46e800b8eb8cb2da46cf117750da170b001dffe0e72a921da1a9de4eeb3e81ed9c6ac4a7de0a12098ac85c54bc395d6c4
-MISC ChangeLog 11003 SHA256 91c02ac24b95342f13041eeac1c56386007ff07a33316c9b8d9405681035c75b SHA512 a755cbc17cf7fe88687f8e457e05c522e46c77ce6fed16d93d50bd3cdd2262d3c78a103738d7fbe58c10b638c20fc07489ba9902564400ec3e1432d6791464f9 WHIRLPOOL 12df8ae8bf753ecd1fa9f9791209bd474193fb3fcaf0ad3638d0c617c7922e484884641ea914d5c3179b8e3e3c79ff8fa5345bc7c1e8f4ffda14a4021086c464
+EBUILD cabal-1.8.0.6-r1.ebuild 1348 SHA256 de0a89448c524c0309581b58a617ba8e0b182ab1ee2aea7d0b32ca380c98ab3a SHA512 ed84b22679ae108543fe88eb52571b9a9fc405319273945ccfde15fee28b9d3eff07e32af7e683e5b06ce2fc942725d70924d43189753fd4e669f1137a09f9c7 WHIRLPOOL 97aa36bb94a5b6b9334d014daac962e6be193a2ac130d6d33651b8aae8f78e3e5d2b83ec89d880309cafa4e5656c15a3a965b564718525b487b0188e71180e6e
+MISC ChangeLog 11172 SHA256 d936c08d277b2205d698ad4d8c79ac59c7a9d555cde025023ea55cc82d7be502 SHA512 252b950cde7c35420908ab839620d9fa1dc552e44f45d1c398df6d954a92dee67bcecc29ecc91aeda5e8b3a2ea6cc94fbe1db3d1a8b3b6d3430d639bd6cc0928 WHIRLPOOL d093154c6b9bd1f8b588d51bfb9c2b402397174a41e42b8af56d353ba298708bb6e0208e04e7746dd4fd706383845dd453cb8ab1b39e3e7d80ce85a196f904e4
 MISC metadata.xml 231 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 SHA512 22e25963ad8954ee117efcd37bb2bb9cd0cd8e24a801509b93c320e36ff5feb4b192b61c4a4c8132822651e125a37058cf51efe661229af11159313831a09554 WHIRLPOOL 6ce3a763671d06fe156b4a57eb66b1d888bf33cfd29826884b3d34c724a300dcfd0a527217e0525c3f7806a07e7fdee85289ac3ef202234298f630845803c194
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCkHLYACgkQcaHudmEf86rUHwCfU52O0IADOsx1eLBpcgVtsiA8
-UngAn3OYcJHVAz8tpXaG1CyniiixkBnl
-=Q32o
+iF4EAREIAAYFAlDe08QACgkQoBEVQmGOlx+vogEAxsOgp/BBiHM/zQlLmj8D5KGc
+0k10uVGJU2ukgs7pQEEA/jCBFSAdZ3vFxgDdH4dlxvJoohKtcCDtBLpIK9uAeEwG
+=l+M+
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.10.2.0.ebuild b/dev-haskell/cabal/cabal-1.10.2.0.ebuild
index 4c2315ef2571..3441d0e97fac 100644
--- a/dev-haskell/cabal/cabal-1.10.2.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.10.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.10.2.0.ebuild,v 1.8 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.10.2.0.ebuild,v 1.9 2012/12/29 11:27:56 gienah Exp $
 
 # ebuild generated by hackport 0.2.12
 
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc"
 
-DEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND=">=dev-lang/ghc-6.10.1 <dev-lang/ghc-7.2"
 RDEPEND="${DEPEND}
 		virtual/pkgconfig"
 # cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so
diff --git a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
index c2b597a67294..3a357ce0ab9f 100644
--- a/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
+++ b/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.9 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.8.0.6-r1.ebuild,v 1.10 2012/12/29 11:27:56 gienah Exp $
 
 CABAL_FEATURES="bootstrap lib profile"
 inherit haskell-cabal eutils
@@ -20,7 +20,7 @@ IUSE="doc"
 # Cabal.cabal only depends on base>=1&&<5 and filepath>=1&&<1.2
 # filepath has been a ghc core library since ghc 6.6.1, so let's use that as the
 # lowest possible ghc version
-DEPEND=">=dev-lang/ghc-6.6.1"
+DEPEND=">=dev-lang/ghc-6.6.1 <dev-lang/ghc-7"
 RDEPEND="${DEPEND}
 		virtual/pkgconfig"
 # cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so