Mark cabal-1.16 as bundled with ghc-7.4.2 (reported by DemonWitch).

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

3 files changed, 18 insertions, 5 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 31e2580c88a0..e5c8705c2d6a 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,9 @@
 # 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.79 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.80 2012/11/14 14:29:55 slyfox Exp $
+
+  14 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> cabal-1.14.0.ebuild:
+  Mark cabal-1.16 as bundled with ghc-7.4.2 (reported by DemonWitch).
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> cabal-1.10.2.0.ebuild,
   cabal-1.14.0.ebuild, cabal-1.8.0.6-r1.ebuild:
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index ca0c2a8a0514..a79d7cd916e4 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST Cabal-1.10.2.0.tar.gz 256433 SHA256 b399dc19e22b43a9d1b97fed8025fbb2e2e533d6c66323b22c886a9065b391c8 SHA512 5c79e829ee42b0093b074ee0ff5b328a721bf897155fa58c21453c41b34fb1a2d8e34cc209d650f2d7a596ffa8bd218d67b64746aa3c4f3d3826909d8201f82c WHIRLPOOL 648efcc8a2077caa513a073781e54dcb20d9b31136111d5a918120e15f1727e14f463a1384b1bd7770d0954fa47abf59a4402aefc2261bdb666ed9a11231f952
 DIST Cabal-1.14.0.tar.gz 276517 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4 SHA512 6e31f44cfafd44e1e3987ed0b116a52e12495228cb1de89e9f4ded8dbc06a0d1537bf647c4576c606d623b7d58d10367d243258b500b8c8329db6c48afd9eee3 WHIRLPOOL 22225d5923bc454e2fa24bcc9fe845b07c41c56ea67f45a0815597f0dffc4d60027117d38bdd1eccd4e61cd24d682bd8b3f4026cfaf62481712234fc9cea5321
 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.14.0.ebuild 1391 SHA256 177805e0feaead107fc8e4af73e5b6c0b9ff14d8c4ca0117c5f820349b3ea7a6 SHA512 eafeb9e64b435670ca71eff8788a9b8051cfb5bb06c7c26c7c21c347fa45026e2083a80dbb3139955262d3e00b949a1ec38599522eb00650cd7ee3929a64ec24 WHIRLPOOL d44beddeb0d08cdf6cb85b9bc364f648dd30432f65e5efb46f3fc8b919c3d006898ebf906b40cc452666d861cad00d0dd4738334a3c56f5c789cd5845fb8fe14
+EBUILD cabal-1.14.0.ebuild 1397 SHA256 ede40333f773a767da5c6113175a9465b49b7ce0cd63ed44beb23810e18781f0 SHA512 5d744c7e9180b76d0323d8f1b0c02a8951bdb43504f9820905436a31cb66c7d4ba413eba5d9422e470c37b358958509428806fd32ed17af5baedea7ddb05607b WHIRLPOOL fa21771cbf8eab64fe9a7f07ccf6b056d2119ef900099d0f5d6ccf9993dd538e649e0a5b771593e342820ab2413a6746e0a5a5c37d8a8c43ffb76ce86b6e1fd7
 EBUILD cabal-1.8.0.6-r1.ebuild 1331 SHA256 efed079f4664588e4582a4833122f9a743b43e0351f8d5f55bcc82e98d43490f SHA512 ae8779b82bb0fe6cd06a8286188040b5f54277088020f3d21df8991817d283d2bbe28bd913ad276cde73333424083d16d9d7c38286806a7f4e14d74338c9a017 WHIRLPOOL ef549131bcd1bf06d66849ad1d3147b46e800b8eb8cb2da46cf117750da170b001dffe0e72a921da1a9de4eeb3e81ed9c6ac4a7de0a12098ac85c54bc395d6c4
-MISC ChangeLog 10708 SHA256 45118a65cc1053b2f3f918f459b9601b34f6125b100ce4c62950e458d762b100 SHA512 f223dfc1d87dec6c50418f22232dd720e348ac3eb710321671c218335259923e8b6b30b76862dbe5324885203701e3410cb6995bb8615c51aac09f93bbfeabaf WHIRLPOOL a21ac4d5cf4abf1c048281dcd4bea06d2c071bc3a5ed946e445cd6ad331592bfbd8c78588678a6ef1603b5512a6f920404ca37eef9fcd03010a326d969d51141
+MISC ChangeLog 10854 SHA256 b66bb249f7b9b6264364ff8475e4f16e69d8c5fc7d7a425ab57c311a04659480 SHA512 627fa6492afe9739be753357d995fcb8c7b35e0e8de7217909ebc507199a68b05df7477accd33348d939e66b8e92be99e19013db9077dd2ca4df8e10f1ee69e6 WHIRLPOOL ca6018a63bd73badbe8512a5c37bafdb49460d72e9a4a4265feb5d7cef709e996c1aa337ba85e03f23d2c51f8ac95d4853b87f443c5a77dacbf6b8809a29e825
 MISC metadata.xml 231 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34 SHA512 22e25963ad8954ee117efcd37bb2bb9cd0cd8e24a801509b93c320e36ff5feb4b192b61c4a4c8132822651e125a37058cf51efe661229af11159313831a09554 WHIRLPOOL 6ce3a763671d06fe156b4a57eb66b1d888bf33cfd29826884b3d34c724a300dcfd0a527217e0525c3f7806a07e7fdee85289ac3ef202234298f630845803c194
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCjqucACgkQcaHudmEf86qXMgCfZvY62Cd4UUu5bUzatDg/Vx2+
+U90AnR8JqhZ7wuP7YoZEg7KaGeZ4M0xA
+=+NoA
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.14.0.ebuild b/dev-haskell/cabal/cabal-1.14.0.ebuild
index 9a1e80b9cd77..5733d326ce22 100644
--- a/dev-haskell/cabal/cabal-1.14.0.ebuild
+++ b/dev-haskell/cabal/cabal-1.14.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.14.0.ebuild,v 1.8 2012/09/12 15:13:07 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.14.0.ebuild,v 1.9 2012/11/14 14:29:55 slyfox Exp $
 
 # ebuild generated by hackport 0.2.12
 
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1 7.4.2"
 
 src_configure() {
 	if ! cabal-is-dummy-lib; then