Version bump.

Package-Manager: portage-2.2.0_alpha90_p1/cvs/Linux x86_64

4 files changed, 83 insertions, 6 deletions

diff --git a/dev-haskell/cabal-install/ChangeLog b/dev-haskell/cabal-install/ChangeLog
index 817c0b46c8d4..795a1a4171d8 100644
--- a/dev-haskell/cabal-install/ChangeLog
+++ b/dev-haskell/cabal-install/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cabal-install
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.8 2011/08/01 20:56:47 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.9 2012/03/10 18:10:14 slyfox Exp $
+
+*cabal-install-0.13.3 (10 Mar 2012)
+
+  10 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +cabal-install-0.13.3.ebuild, +files/cabal-install-0.13.3-nopref.patch:
+  Version bump.
 
 *cabal-install-0.10.2-r1 (01 Aug 2011)
 
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 264a35211a3a..2448687789e0 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cabal-install-0.13.3-nopref.patch 775 RMD160 8303fc74e7a017529a90b336b4e803f0ea7fd747 SHA1 3d3c99e190d50ab836908459092eba887dbe6651 SHA256 a6c5fbf367fd0f5854036a046f1a20e738ff09afeb547e83767522025fe688bc
 AUX cabal-install-0.8-nopref.patch 921 RMD160 074455face91f9bb2bf7164cd67142017a036a87 SHA1 1b7854e2e0f3c80136a5aeb1e6acf1b4c7195340 SHA256 bab33862d10326fbbc7d9b9978bb70ad4c9f961aa648bbd8d7ff363b5e8a6a24
 DIST cabal-install-0.10.2.tar.gz 150699 RMD160 d8a5942a3b318e045857b13a45f5b22f44c3456e SHA1 fd81e8f7d97be24934c92ef19c4e0fcb7f5cff5a SHA256 6357c8b984d193a30bb2a05e03dbd551650a0ddea17f7d1033e6564f5b7ff515
+DIST cabal-install-0.13.3.tar.gz 185898 RMD160 e07310887175338f742292a26c206341893389f2 SHA1 8e59337524c65229709a5049497423bde60faa48 SHA256 f4bc32aff1a306c7e9a675399d78c2296288b0534a32f30427390481adbe0d43
 DIST cabal-install-0.8.2.tar.gz 139391 RMD160 46c639e41ce92aa4462dab3b0e810c3b4b6ace58 SHA1 17d45d25923e577f6d8b9d98fd7a69bfa8ba4b29 SHA256 8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b
 EBUILD cabal-install-0.10.2-r1.ebuild 1081 RMD160 5a382bfecf9d7f706af792503030dbbc62c7b827 SHA1 ca7be6b52a12e700cd68c4e0b706fad481763e9f SHA256 ab4037ea00514321ae2f71b6400ec068cb1370b8e19dc9b096aa1d4874b598ec
+EBUILD cabal-install-0.13.3.ebuild 1303 RMD160 82af42b48c42d278af96b61c3d4fc934056de802 SHA1 ccb84e2ab1164876817737b1e5db739410838ef6 SHA256 ecfc8e0a51fcc17a1a2aa130db96edea0087209cbb45afc474febb9652d90c54
 EBUILD cabal-install-0.8.2.ebuild 1043 RMD160 f9c2fc7d8a6ba52933a2843921e50f92467686e4 SHA1 e82692a7ddf6add73f4d5243cbc12530cf1dbb74 SHA256 e7515e0e8a96d17f10c9dee367adc04f98cee56e4b391efefb8bf49c99bb6e6b
-MISC ChangeLog 1330 RMD160 8f468a59e10d4103b793eb3890a2e9006917455f SHA1 2205afc4f24f523bcbac12ba0621700046a91bf7 SHA256 a06e505dbd1ebcdfa696e8ff9f4bb50a4c62b0e8af4520b571c3511f298b8727
+MISC ChangeLog 1512 RMD160 6a38c49efa9cf70697bd2fd43c1798b1bea4dbf7 SHA1 9ddff3c4107c9afb951d7cdbf90c5bdb837bb16c SHA256 f79d812306debb2e6b66bf96c035a119fb58057198f730a7ef1cef078f313cd1
 MISC metadata.xml 565 RMD160 103f8fcb478ebe081e13271999ac845d3c5ef06d SHA1 513705be96e8df28f8fc2712603bbd220039e130 SHA256 d86372e92cba9d376ce1b33b6ccd6433baf32903a37d2dba3880ca81d147614e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk43E98ACgkQcaHudmEf86oBdACfXXnfr1tMyjcCCjPXrCDzL7V8
-LyEAn2bFxK8gyh75Z5HLWgfWXSNZ97Py
-=TApU
+iEYEARECAAYFAk9bmiEACgkQcaHudmEf86otCACfdaY0wO15ZRIUekDTdTMtZtli
+8WoAn0/RK1mqvDyKulbcMhhM00hHkckW
+=KTjV
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cabal-install/cabal-install-0.13.3.ebuild b/dev-haskell/cabal-install/cabal-install-0.13.3.ebuild
new file mode 100644
index 000000000000..08ed89f7cdd3
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-0.13.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/cabal-install-0.13.3.ebuild,v 1.1 2012/03/10 18:10:14 slyfox Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal bash-completion eutils
+
+DESCRIPTION="The command-line interface for Cabal and Hackage."
+HOMEPAGE="http://www.haskell.org/cabal/"
+#SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="http://code.haskell.org/~slyfox/snapshots/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="+noprefs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.13.3 <dev-haskell/cabal-1.15
+		>=dev-haskell/http-4000.0.2 <dev-haskell/http-4001
+		>=dev-haskell/mtl-1.1 <dev-haskell/mtl-3
+		>=dev-haskell/network-1 <dev-haskell/network-3
+		>=dev-haskell/time-1.1 <dev-haskell/time-1.5
+		>=dev-haskell/zlib-0.4 <dev-haskell/zlib-0.6
+		>=dev-lang/ghc-6.10.1"
+
+src_prepare() {
+	if use noprefs; then
+		epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
+	fi
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	dobashcompletion "${S}/bash-completion/cabal"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+
+	bash-completion_pkg_postinst
+}
diff --git a/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
new file mode 100644
index 000000000000..c36582680a56
--- /dev/null
+++ b/dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch
@@ -0,0 +1,20 @@
+diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
+index 48d8d49..3a38ee1 100644
+--- a/Distribution/Client/IndexUtils.hs
++++ b/Distribution/Client/IndexUtils.hs
+@@ -312,10 +312,15 @@ extractPkg entry = case Tar.entryContent entry of
+ 
+ extractPrefs :: Tar.Entry -> Maybe [Dependency]
+ extractPrefs entry = case Tar.entryContent entry of
++{-
++ -- get rid of hackage's preferred-versions
++ -- I'd like to have bleeding-edge packages in system and I don't fear of
++ -- broken packages with improper depends
+   Tar.NormalFile content _
+      | takeFileName (Tar.entryPath entry) == "preferred-versions"
+     -> Just . parsePreferredVersions
+      . BS.Char8.unpack $ content
++-}
+   _ -> Nothing
+ 
+ parsePreferredVersions :: String -> [Dependency]