[gentoo-commits] repo/gentoo:master commit in: dev-haskell/cabal-install/files/, dev-haskell/cabal-install/

[Sergei Trofimovich]

commit:     650334e6903e6c4b3a27450e5ccbec131855c5a6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 08:34:37 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 08:34:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=650334e6

dev-haskell/cabal-install: bump up to 1.24.0.2

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-haskell/cabal-install/Manifest                 |  1 +
 .../cabal-install/cabal-install-1.24.0.2.ebuild    | 79 ++++++++++++++++++++++
 .../files/cabal-install-1.24.0.0-nopref.patch      | 15 ++++
 3 files changed, 95 insertions(+)

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 528c2a73a0..f06e86b7aa 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,3 +1,4 @@
 DIST cabal-install-1.18.1.0.tar.gz 257577 SHA256 d6abb6fef8204780a41aff2e93dfa297883673507cec557348aebf6b37843ae4 SHA512 252304480ebde673fba873b9d7f709e47d1acfc7ab936a2b19f663d8e3c8ef7a20abeaac0cf9bbdb4bf0d1c30688e8a9b1cf1f73c27ce8f47845c3431de6752e WHIRLPOOL 1d2bd46e88a3ac48fcd46cc229f2a90059b0d48ceec9bb04cb91c68adf7690bbe599adc518cce0e76bdffe80eff0cd615f7d25843a7f0f0090d59a34f5b37df2
 DIST cabal-install-1.20.0.3.tar.gz 274779 SHA256 d2bd56f3bcae92b7b97325be5216f94544fbcb30e10e24b40bccc149584b0b14 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f WHIRLPOOL da95f8a386c751c8c83ffa965422ab8fcf047693300f6d7ed39ec046354c8b00753fd3f0936b56eb5a6e854e5176ad2e20282e2bbcc0745f5ef4d462e59f4d0d
 DIST cabal-install-1.22.7.0.tar.gz 302579 SHA256 b30fd14f20fdd11b028cba68fefeed7eeadcacf919e7c29bc4d7289a656d19f3 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766 WHIRLPOOL 2315f7b510456fdc4db7348d67fcf5c3ceb3ee03684297d6f429f4aff62a681c70aeeb34beac48d3481f7920d4b123369a21a4f340b899f7b52431119d3e680b
+DIST cabal-install-1.24.0.2.tar.gz 499937 SHA256 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0 SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0 WHIRLPOOL fd891e023789208d5ea96a1de4ecd20449ec2d39f3214140f70157e26c258c623beaaf9d38f006b683fc8aa80a81ecd9346f31359213f1620f2b51b516b856df

diff --git a/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
new file mode 100644
index 0000000000..b6e6233296
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-1.24.0.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.9999
+
+CABAL_FEATURES="test-suite"
+inherit bash-completion-r1 haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +noprefs"
+
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
+	>=dev-haskell/bytestring-builder-0.10:= <dev-haskell/bytestring-builder-1:=
+	>=dev-haskell/cabal-1.24.2:= <dev-haskell/cabal-1.25:=
+	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-2:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
+	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-3:=
+	>=dev-haskell/old-time-1:= <dev-haskell/old-time-1.2:=
+	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-3:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:= <dev-haskell/network-2.7:=
+			>=dev-haskell/network-uri-2.6:= <dev-haskell/network-uri-2.7:= )
+	!network-uri? ( >=dev-haskell/network-2.4:= <dev-haskell/network-2.6:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/quickcheck-2.8.2
+		dev-haskell/regex-posix
+		dev-haskell/tagged
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+		!network-uri? ( <dev-haskell/network-uri-2.6 ) )
+"
+
+src_prepare() {
+	default
+	if use noprefs; then
+		epatch "${FILESDIR}/${PN}"-1.24.0.0-nopref.patch
+	fi
+
+	# no chance to link to -threaded on ppc64, alpha and others
+	# who use UNREG, not only ARM
+	if ! ghc-supports-threaded-runtime; then
+		cabal_chdeps '-threaded' ' '
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	dobashcomp "${S}/bash-completion/cabal"
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/cabal.1" "${S}/cabal.1" || die
+	doman "${S}/cabal.1"
+}

diff --git a/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
new file mode 100644
index 0000000000..40b281073c
--- /dev/null
+++ b/dev-haskell/cabal-install/files/cabal-install-1.24.0.0-nopref.patch
@@ -0,0 +1,15 @@
+diff --git a/Distribution/Client/IndexUtils.hs b/Distribution/Client/IndexUtils.hs
+index 95545fc..a9c8417 100644
+--- a/Distribution/Client/IndexUtils.hs
++++ b/Distribution/Client/IndexUtils.hs
+@@ -345,2 +345,6 @@ 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 _
+@@ -351,2 +355,3 @@ extractPrefs entry = case Tar.entryContent entry of
+       prefs     = parsePreferredVersions content
++-}
+   _ -> Nothing