From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Wed, 15 Feb 2017 08:46:13 +0000 (+0000)
Subject: dev-vcs/darcs: bump up to 2.12.5
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=53738130a43910b45cf369588a6bf1f6e445e126;p=gentoo.git

dev-vcs/darcs: bump up to 2.12.5

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 76fe313200fd..e8848e879c10 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -2,4 +2,5 @@ DIST darcs-2.10.1.tar.gz 1509208 SHA256 f1ef65b43780e7593ca1afdae5ecf44ed91d62cc
 DIST darcs-2.10.3.tar.gz 1513296 SHA256 ca00c40d08276f94868c7c1bbc6dbd9b6b41a15c1907c34947aaa51d4dbbf642 SHA512 cf8f34df331d8a47c6a25775c465824e5d71ed00ae6bc477989b4bb0e7fad606b213a4fb4e06b02dca096df2b6b1fe36f394672a112b48c6b56188a7eae8f90e WHIRLPOOL e52fdbe2bd87de7787c0d15ed8d7499a8514d4149a30139c18060139bcbe2ab56f9525b3b4222025cd71afb167b3cc0db265fb1c339eac1336d9cb3fef45eff1
 DIST darcs-2.12.0.tar.gz 1465730 SHA256 17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d SHA512 654f9054dfe8e23e17ae00cdf22153ddaf89d114c5ee0e1ca86f373c1abf62b7bd808965f4d4df695aaba44d1d334d725cc0d57dea5df7cd1992a0ef15e49135 WHIRLPOOL fe95b27590f15259e808a0583ddce415eaca8fdcc67e473d7e35d876de2faaa46fb72996d64807cf7a0139fb10f0a11a8bb6971f1631e961f8e50c4b76c7637c
 DIST darcs-2.12.4.tar.gz 1462383 SHA256 48e836a482bd2fcfe0be499fe4f255925ce50bdcf5ce8023bb9aa359288fdc49 SHA512 52a0b9b8a23b05dc29513c20c3c0fdc0b696da87156ea83a5736ea294618b993d1f3914f82a918e331db5de0746c147244f46d396ee7dbb02fee116825e1dd6a WHIRLPOOL cf3ddcb5c542226865dff34c9f9f57bd8279dcda3fcfcd939fc1cafc944c7735b254d5277a71b330468a78ef9c06b43f5dfbd0764a8e225c8f032fdc60401ff3
+DIST darcs-2.12.5.tar.gz 1460698 SHA256 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553 SHA512 9bda8149269dc23750321f3929e156e32c76de4f5bb8291bc248d0e326bf08b69c82ef7383f9d02dcc65ca199078f6e1ab575197fc2aee225486a8c1b9275542 WHIRLPOOL 7889c5a34f58853db2fadb0197044822af30fc632b58edd33c6eb8ca9249d48c38bb69b2ddfa949aedfd1d27d8de3dc795a5ef24ccf0e683f53a09d1975f3bd1
 DIST darcs-2.8.4.tar.gz 1301464 SHA256 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98 SHA512 c60531bacea43bdd5a18ae461dd390fe64682cac56fa4e6b5153a5da3c003b59d8fb24827bd42b4b30f0d2c61877d36b58eb98317644f9f8a200ab7c5961c48e WHIRLPOOL 128e8e58e219d427928eb8725d9566c1b6b3bb478b3cda69b30ded8798fa104eb8dec0fda8a32701f5d074babf9f11f1b3036388cd15a82118853a566c832430
diff --git a/dev-vcs/darcs/darcs-2.12.5.ebuild b/dev-vcs/darcs/darcs-2.12.5.ebuild
new file mode 100644
index 000000000000..385ea0ed0284
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.12.5.ebuild
@@ -0,0 +1,95 @@
+# 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.1.9999
+#hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl +network-uri +terminfo +threaded"
+
+RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?]
+	>=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
+	>=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?]
+	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
+	>=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?]
+	>=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?]
+	>=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
+	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
+	>=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
+	>=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
+	>=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?]
+	>=dev-haskell/sandi-0.4:=[profile?] <dev-haskell/sandi-0.5:=[profile?]
+	>=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?]
+	>=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
+	>=dev-lang/ghc-7.10.1:=
+	curl? ( net-misc/curl )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+	test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11
+		>=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1
+		>=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.6
+		>=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7
+		>=dev-haskell/split-0.2.2 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 )
+	curl? ( virtual/pkgconfig )
+"
+
+PATCHES=("${FILESDIR}"/${PN}-2.12.4-ghc-8.0.2_rc1.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag curl curl) \
+		--flag=executable \
+		--flag=-hpc \
+		--flag=http \
+		--flag=library \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-optimize \
+		--flag=pkgconfig \
+		--flag=-rts \
+		--flag=-static \
+		$(cabal_flag terminfo terminfo) \
+		$(cabal_flag threaded threaded) \
+		--flag=-warn-as-error
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	# fixup perms in such an an awkward way
+	mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+	doman "${S}/darcs.1"
+}
diff --git a/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch b/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
new file mode 100644
index 000000000000..9602d1d1ccdc
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.12.4-ghc-8.0.2_rc1.patch
@@ -0,0 +1,9 @@
+diff --git a/harness/Darcs/Test/Patch.hs b/harness/Darcs/Test/Patch.hs
+index f50f6b9..f0f4e2a 100644
+--- a/harness/Darcs/Test/Patch.hs
++++ b/harness/Darcs/Test/Patch.hs
+@@ -244,3 +244,3 @@ properties :: forall thing gen. (Show1 gen, Arbitrary (Sealed gen)) =>
+ properties gen prefix genname tests =
+-  [ cond name condition check | (name, condition, check) <- tests ]
++  [ cond name condition check | (name, condition :: TestCondition thing, check :: TestCheck thing testable) <- tests ]
+   where cond :: forall testable. Testable testable