Bump dev-haskell/cabal to 1.6.0.2

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

3 files changed, 67 insertions, 5 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 2feb52b546ff..5dbba156e07d 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.45 2009/03/08 19:26:34 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.46 2009/03/08 19:31:30 kolmodin Exp $
+
+*cabal-1.6.0.2 (08 Mar 2009)
+
+  08 Mar 2009; Lennart Kolmodin <kolmodin@gentoo.org> +cabal-1.6.0.2.ebuild:
+  Version bump
 
   08 Mar 2009; Lennart Kolmodin <kolmodin@gentoo.org> cabal-1.6.0.1.ebuild:
   Add CABAL_CORE_LIB_GHC_PV="6.10.1" to make this a dummy package
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index e59305d8937f..f0ab8d32d292 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -4,24 +4,27 @@ Hash: SHA1
 AUX cabal-1.1.3-ghc622.patch 678 RMD160 ed7decfd967a12476ad83892015767a37c5ce5ae SHA1 138db22abd979e08f4ff02060a30bc63d575a257 SHA256 d3524545844724687cf3377708d8cc381c06dbe71e618af884bac86361ea5479
 AUX cabal-1.1.4-make.patch 1972 RMD160 390e17aab566eadb0acda9777b6e2d36cc3bcef5 SHA1 e21972cf75fe5eabf24ea9864845228898bee0b5 SHA256 cee8833ac195f6da00bcdfdac0afe1805b44a4568b8f202f6e5f1cf591618d84
 DIST Cabal-1.6.0.1.tar.gz 189333 RMD160 5037a66e161ec08abf04630b0927d4af0e73e33b SHA1 a1f9a6597ab3ac4b0ad5fed25a9b7841a1769da3 SHA256 e70be80194e3fbd7e67e924566fbbe11f016b56679b396c8104d0fbe39918a45
+DIST Cabal-1.6.0.2.tar.gz 194005 RMD160 8cd4145518302ed1f1bda2d11037588928dca379 SHA1 ea8fdf447e0975427569700d8fe67afd4f48490b SHA256 44f3cb4e0ce744bb2413f581f364fd9d3e4b2e48f7dfc67f652c73ae55aba22c
 DIST cabal-1.1.3.tar.gz 382024 RMD160 e361b676184d2f553cf5761c544ac4c32eefcb69 SHA1 e86f41403ea2d02b5d409195647ff97dec7557da SHA256 5c45f0c5f58ba2c16140b72221798a604242f59a155a75111b4cfd31092f836c
 DIST cabal-1.1.4.tar.gz 406169 RMD160 0c2b1a33af4512174cc6df6645662046427e9135 SHA1 e1091bd40d40f85b6836a17417f1a907fec20bad SHA256 1740abf0db8a6d18703e315a30ff81c51a06ec4a5f3a6c1927fa1530a0835b66
 DIST cabal-1.1.6.1.tar.gz 440851 RMD160 82e85e57f2747f7b38f68e6d11883252e83838e8 SHA1 7a0d052a2d3d7c56fb728798f9bc1c1063ba6010 SHA256 b59ce863c31bee561ca5d5ab2aa996856f8fc1b6297848868fc4f635d716b04e
 DIST cabal-1.1.6.2.tar.gz 549071 RMD160 de6ba431220670736e4fa2e407e59b60b83cddba SHA1 29f18107c25cab3ca6bde3c551b3b7bbcad4be9d SHA256 9c687e4ca1a15958a7fe1caabc3c6d7d8e361e37cc37bbf7c8c80a3e507a7b41
 DIST cabal-1.2.3.0.tar.gz 627016 RMD160 ba50d5c58049314c0a81c54fbca3ea0d6308c29f SHA1 c5605a70b128e19ee84d7cddd75f4bcbf4e58858 SHA256 d837351674dca88574811626ca3205314b43dc3e26e7d6a5a64f37916287cea5
 DIST filepath-1.1.0.0.tar.gz 7548 RMD160 deecc7cedc1ef803d6bb289b52de8139aa475ff3 SHA1 2eb5ec0ac09718be70806633535bc10c9c54c328 SHA256 3732be8c2f3d0ba63347b772a605614967c573416340ca6382cce0c7dccf92ee
+DIST filepath-1.1.0.1.tar.gz 9062 RMD160 d3daf951f06da84b6a819f5d27be1fa8ec2c117a SHA1 c14e817d973da14686d5054cf779cc426daad1ee SHA256 1c6716653a8a26bb8782fae89a7dd61b12830d312efe9b7f8626b8658ef4d9df
 EBUILD cabal-1.1.3-r1.ebuild 2153 RMD160 29c33e400b8110de50b50555d2830949bc7f09b0 SHA1 5b696be1e1e19efebd5bb75433f0cd91f3cf095e SHA256 10ec4ddd1fb6a4f67538ea96ca0b84d75ab1f5e1d26774ce860ccd64bdd3d5be
 EBUILD cabal-1.1.4.ebuild 1352 RMD160 8b6b78c34f55fa30fd540ac578a8f9fcee0a6f8c SHA1 fc7f178139df4a0edefca9e5675ad499856aff3c SHA256 a83b63cd0dadac0c9183e17b0a3803c0fd7ac1e4f8077e871301c1f87ec5bf64
 EBUILD cabal-1.1.6.1.ebuild 1162 RMD160 cdf706867bef044846715233fb14c87be6c2c608 SHA1 fba1954d91bae670cea308228bc4a8c8038b3a87 SHA256 00662ff459bfa90e6b60c368c3c28c00f822b9c86ca0a45089794e08e63844b3
 EBUILD cabal-1.1.6.2.ebuild 1248 RMD160 89bf712dd444e12c2347d254a3001f372e2d5a5e SHA1 48bbc74ee0f49401494674f3e7286e220f5657dc SHA256 90b0ef3d7a419330dce1233239dbc912cdb876961b8fbbad0796837cc9ad1494
 EBUILD cabal-1.2.3.0.ebuild 1794 RMD160 50e15fcc3a87e511cbd51432eceb768243ae8819 SHA1 3bab412125883f32db33ac97b0595c9d9ec7e951 SHA256 cc2378940aa243424ca8568845b53ff3c95a96d321e41f3376aabafb58ff1b50
 EBUILD cabal-1.6.0.1.ebuild 1618 RMD160 ead45103285c7d8671c5d0b045992cfc1aeba46b SHA1 69dad0d7b271f715ebd1a00f0125d8e34347fdcd SHA256 ae6f3e6b0b176989a69ecb227a3d7909466acf6db48d67e8913a37ec753bc7b0
-MISC ChangeLog 6018 RMD160 8bc3b1f4e14019ecb025b0bc3fcab4ec680b380d SHA1 cd2a7555f3aff86cac77136a6acdba3e5ed6cbaa SHA256 eb3c0a33dae8ac8d3cd758d1c223c4b2c8b0d8013c928b1d4bb8018aed4fd996
+EBUILD cabal-1.6.0.2.ebuild 1587 RMD160 95f63ad80f416db35d2d054e6002a568f7947c5f SHA1 65ad6bdc2393cb8a24553bdb1b194c2f98ef6908 SHA256 ffcd578602ac1c1b6c1e5c58e4081af13cbbc99bb1d0cfdf9dbae2f68c556c39
+MISC ChangeLog 6141 RMD160 d73a2564f7de56a921e2e3442c1a0fa73f76a46c SHA1 e86e3487de6790edfd5bf42307e5922c74a4895a SHA256 4f9a8b844c0635538ec2ceaa566d296f90dd74e0ce77398ad1e93db37386b014
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkm0G94ACgkQ1n/CYbXjntIAhQCfTLNZlcYFAVSsFLs0/VvfNzZK
-9wEAmQFZUMn2RAQbE5ZuWYUDpUAgux3W
-=WCs1
+iEYEARECAAYFAkm0HQYACgkQ1n/CYbXjntKz6ACfSc0G97Jj4iSYavR65vq6Vxgv
+Sf0AoKZ71ga4AGkD4MiQBcpgQPYS3H/Z
+=7Z0Q
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.6.0.2.ebuild b/dev-haskell/cabal/cabal-1.6.0.2.ebuild
new file mode 100644
index 000000000000..b2554d890b42
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.6.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.6.0.2.ebuild,v 1.1 2009/03/08 19:31:30 kolmodin Exp $
+
+CABAL_FEATURES="bootstrap lib profile"
+inherit haskell-cabal eutils
+
+MY_PN="Cabal"
+MY_P="${MY_PN}-${PV}"
+
+# Resolve cyclic dep between filepath and Cabal by using a private copy of
+# filepath when building Cabal.
+FP_PN=filepath
+FP_PV=1.1.0.1
+FP_P=${FP_PN}-${FP_PV}
+
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz
+	http://hackage.haskell.org/packages/archive/${FP_PN}/${FP_PV}/${FP_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-lang/ghc-6.4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	# We're using the private copy of filepath:
+	sed -i -e 's/Build-Depends: filepath >= 1 && < 1.2//' \
+		-e '/Other-Modules:/a \
+        System.FilePath System.FilePath.Posix System.FilePath.Windows' \
+		"${S}/Cabal.cabal"
+	# Note: do not replace spaces with tabs on the line above, it'll break
+	# things. You'll just have to put up with the repoman warning.
+
+	echo "  Hs-Source-Dirs: ., ../${FP_P}" >> "${S}/Cabal.cabal"
+}
+
+src_compile() {
+	if ! cabal-is-dummy-lib; then
+		einfo "Bootstrapping Cabal..."
+		$(ghc-getghc) -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+			-o setup || die "compiling Setup.hs failed"
+		cabal-configure
+		cabal-build
+	fi
+}