summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2012-03-10 18:10:14 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2012-03-10 18:10:14 +0000
commit29e597f8b9a6960f0a6fc5a490c7e86281f14216 (patch)
treebaf16d084aa4ba08e0b2053d3dfc258ee99afa16 /dev-haskell/cabal-install
parentAdd back static-libs USE flag for bug #407663. (diff)
downloadgentoo-2-29e597f8b9a6960f0a6fc5a490c7e86281f14216.tar.gz
gentoo-2-29e597f8b9a6960f0a6fc5a490c7e86281f14216.tar.bz2
gentoo-2-29e597f8b9a6960f0a6fc5a490c7e86281f14216.zip
Version bump.
(Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell/cabal-install')
-rw-r--r--dev-haskell/cabal-install/ChangeLog10
-rw-r--r--dev-haskell/cabal-install/cabal-install-0.13.3.ebuild48
-rw-r--r--dev-haskell/cabal-install/files/cabal-install-0.13.3-nopref.patch20
3 files changed, 76 insertions, 2 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/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]