Version bump.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 82 insertions, 6 deletions

diff --git a/dev-haskell/cabal-install/ChangeLog b/dev-haskell/cabal-install/ChangeLog
index 1c8f1a6d3ec5..c4cff7054373 100644
--- a/dev-haskell/cabal-install/ChangeLog
+++ b/dev-haskell/cabal-install/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/cabal-install
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.5 2010/10/02 21:37:04 slyfox Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal-install/ChangeLog,v 1.6 2011/06/05 12:29:37 slyfox Exp $
+
+*cabal-install-0.8.2 (05 Jun 2011)
+
+  05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  +cabal-install-0.8.2.ebuild, +files/cabal-install-0.8-nopref.patch,
+  metadata.xml:
+  Version bump.
 
   02 Oct 2010; Sergei Trofimovich <slyfox@gentoo.org>
   cabal-install-0.8.0.ebuild:
diff --git a/dev-haskell/cabal-install/cabal-install-0.8.2.ebuild b/dev-haskell/cabal-install/cabal-install-0.8.2.ebuild
new file mode 100644
index 000000000000..511f7634e72c
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-0.8.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 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.8.2.ebuild,v 1.1 2011/06/05 12:29:37 slyfox Exp $
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE="noprefs"
+
+RDEPEND=">=dev-lang/ghc-6.4
+		 >=dev-haskell/cabal-1.8"
+DEPEND="${RDEPEND}
+		>=dev-haskell/http-4000.0.2
+		dev-haskell/network
+		>=dev-haskell/zlib-0.4
+		=dev-haskell/time-1.1*"
+
+src_unpack() {
+	unpack $A
+	cd "${S}"
+	if use noprefs; then
+		epatch "${FILESDIR}/cabal-install-0.8-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.8-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-0.8-nopref.patch
new file mode 100644
index 000000000000..40ede8a71da3
--- /dev/null
+++ b/dev-haskell/cabal-install/files/cabal-install-0.8-nopref.patch
@@ -0,0 +1,19 @@
+diff -rN -u old-cabal-install-0.8/Distribution/Client/IndexUtils.hs new-cabal-install-0.8/Distribution/Client/IndexUtils.hs
+--- old-cabal-install-0.8/Distribution/Client/IndexUtils.hs	2010-06-14 22:16:58.249000098 +0300
++++ new-cabal-install-0.8/Distribution/Client/IndexUtils.hs	2010-06-14 22:16:58.292000097 +0300
+@@ -168,10 +168,15 @@
+ 
+     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
+ 
+     handleNotFound action = catch action $ \e -> if isDoesNotExistError e
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index dde98cf80b95..5feb2e9bdc17 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>haskell</herd>
-  <maintainer>
-    <email>haskell@gentoo.org</email>
-  </maintainer>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		The 'cabal' command-line program simplifies the process of managing
+		Haskell software by automating the fetching, configuration, compilation
+		and installation of Haskell libraries and programs.
+	</longdescription>
+	<use>
+		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
+	</use>
 </pkgmetadata>