Add dev-haskell/cabal-1.6.0.1, newest version

Package-Manager: portage-2.1.4.4

3 files changed, 78 insertions, 2 deletions

diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index 4ac26bf9dda1..3691425dbcbe 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cabal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.43 2008/10/18 18:01:34 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.44 2008/10/19 17:42:40 kolmodin Exp $
+
+*cabal-1.6.0.1 (19 Oct 2008)
+
+  19 Oct 2008; Lennart Kolmodin <kolmodin@gentoo.org> +cabal-1.6.0.1.ebuild:
+  Bump to latest available.
+  We still bundle filepath-1.1.0.0 because of the cyclic dep.
 
   18 Oct 2008; nixnut <nixnut@gentoo.org> cabal-1.2.3.0.ebuild:
   Stable on ppc wrt bug 239368
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index 7621dc7f361a..1326574aa1bd 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.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
@@ -11,5 +15,13 @@ EBUILD cabal-1.1.4.ebuild 1352 RMD160 8b6b78c34f55fa30fd540ac578a8f9fcee0a6f8c S
 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
-MISC ChangeLog 5657 RMD160 1ff0fe0c175d76c005a50ee7f5cd7f4571a15d41 SHA1 e40c3ea817190b5ce859a30226b79ef300241a09 SHA256 e91a5775a7ada679ce03a62b3b105f436fd82fd0c3973d5a5f6d68717180ec5b
+EBUILD cabal-1.6.0.1.ebuild 1625 RMD160 85152360cc557c9dcab19514fb3eac9f38454b3b SHA1 77ecde0f33022a0468d70aabba6e7ce0e60a2916 SHA256 2aaf282f668457e5f2f5702d588b725599d1d0127cd254aec25b6f2f6eb9f76b
+MISC ChangeLog 5857 RMD160 9787733ae305a90d17b16e58fd078320030a92d5 SHA1 a2bde9bba9ee804f0bfa2419767dbbc7b11cc4cc SHA256 b4477036e114e7e02417f4fc384465b567c82a9bc1677412a8c3d1f7771b188a
 MISC metadata.xml 231 RMD160 8b37a8901d230433c69ffa03eeed903bca89249b SHA1 b77d396c72fd66ec7c09ae8de996a5ba50d9e482 SHA256 b1bacb51e08eb7f067d6a30020b5c45e4f4e48b5ec4640402ecaa34b78e2ae34
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkj7cZkACgkQ1n/CYbXjntJecQCgoTq6AFA3RQFC22k6c9X68tvn
+Yb4An1fjGignKJxJ7EX4nhfJfQhQlBeG
+=wYwc
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal/cabal-1.6.0.1.ebuild b/dev-haskell/cabal/cabal-1.6.0.1.ebuild
new file mode 100644
index 000000000000..a68d424387cd
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.6.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 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.1.ebuild,v 1.1 2008/10/19 17:42:40 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.0
+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
+}
+
+src_install() {
+	cabal_src_install
+}