Patch darcs 2.5.2 for ghc 7.4.1, patches sent upstream and applied to darcs repo.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

6 files changed, 358 insertions, 41 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 48e89f48f1ff..bb66da2fcde4 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,14 +1,25 @@
 # ChangeLog for dev-vcs/darcs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.23 2011/12/08 20:42:47 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.24 2012/03/04 07:20:25 gienah Exp $
+
+*darcs-2.5.2-r1 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@gentoo.org> darcs-2.5.2-r1.ebuild,
+  +files/darcs-2.5.2-ghc-7.4.patch,
+  +files/darcs-2.5.2-relax-http-libs-deps.patch:
+  Patch darcs 2.5.2 for ghc 7.4.1, patches sent upstream and applied to darcs
+  repo. Remove ia64 keyword.
+
+*darcs-2.5.2 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@gentoo.org> darcs-2.4.4-r1.ebuild,
+  Add [profile?] to haskell library dependencies.
 
   08 Dec 2011; Sergei Trofimovich <slyfox@gentoo.org> darcs-2.4.4-r1.ebuild,
   darcs-2.5.2.ebuild:
   Drop tests/external.sh from tests as it reloes on ecample.com layout.
   Partially fixes bug #392647 by Paweł Hajdan, Jr.
 
-*darcs-2.5.2 (04 Aug 2011)
-
   04 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> +darcs-2.5.2.ebuild,
   +files/darcs-2.5.2-ghc-7.2.patch,
   +files/darcs-2.5.2-relax-regex-libs-deps.patch,
@@ -71,7 +82,10 @@
   darcs-2.0.2.ebuild, darcs-2.1.0-r1.ebuild, darcs-2.2.1.ebuild:
   Drop support for ghc and darcs.
 
-*darcs-2.4.4-r1 (28 Jun 2010)
+*darcs-2.4.4-r1 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@gentoo.org> darcs-2.4.4-r1.ebuild,
+  Add [profile?] to haskell library dependencies.
 
   28 Jun 2010; Lennart Kolmodin <kolmodin@gentoo.org>
   +darcs-2.4.4-r1.ebuild,
diff --git a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild b/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
index 0df0f85a5ad3..36a632498986 100644
--- a/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
+++ b/dev-vcs/darcs/darcs-2.4.4-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.14 2011/12/08 20:42:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.4.4-r1.ebuild,v 1.15 2012/03/04 07:20:25 gienah Exp $
 
 EAPI="3"
 CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit haskell-cabal eutils bash-completion
+inherit haskell-cabal eutils bash-completion-r1
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
@@ -23,17 +23,17 @@ IUSE="doc test"
 # 4) Use the same bounds for mmap as hashed-storage.
 
 COMMONDEPS=">=dev-lang/ghc-6.8
-		>=dev-haskell/hashed-storage-0.4.13
-		=dev-haskell/haskeline-0.6*
-		=dev-haskell/html-1.0*
-		=dev-haskell/mmap-0.4*
-		<dev-haskell/mtl-1.2
-		>=dev-haskell/network-2.2
-		>=dev-haskell/parsec-2.0
-		<dev-haskell/regex-compat-0.94
-		=dev-haskell/terminfo-0.3*
-		=dev-haskell/utf8-string-0.3*
-		<dev-haskell/zlib-0.6.0.0
+		>=dev-haskell/hashed-storage-0.4.13[profile?]
+		=dev-haskell/haskeline-0.6*[profile?]
+		=dev-haskell/html-1.0*[profile?]
+		=dev-haskell/mmap-0.4*[profile?]
+		<dev-haskell/mtl-1.2[profile?]
+		>=dev-haskell/network-2.2[profile?]
+		>=dev-haskell/parsec-2.0[profile?]
+		<dev-haskell/regex-compat-0.94[profile?]
+		=dev-haskell/terminfo-0.3*[profile?]
+		=dev-haskell/utf8-string-0.3*[profile?]
+		<dev-haskell/zlib-0.6.0.0[profile?]
 		net-misc/curl"
 
 DEPEND="${COMMONDEPS}
@@ -41,9 +41,9 @@ DEPEND="${COMMONDEPS}
 		dev-util/pkgconfig
 		doc?  ( virtual/latex-base
 				dev-tex/latex2html )
-		test? ( dev-haskell/test-framework
-				dev-haskell/test-framework-hunit
-				dev-haskell/test-framework-quickcheck2 )
+		test? ( dev-haskell/test-framework[profile?]
+				dev-haskell/test-framework-hunit[profile?]
+				dev-haskell/test-framework-quickcheck2[profile?] )
 		"
 
 # darcs also has a library version; we thus need $DEPEND
diff --git a/dev-vcs/darcs/darcs-2.5.2-r1.ebuild b/dev-vcs/darcs/darcs-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..0de2725df57d
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.5.2-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2-r1.ebuild,v 1.1 2012/03/04 07:20:25 gienah Exp $
+
+EAPI="4"
+CABAL_FEATURES="bin lib profile haddock hscolour"
+inherit haskell-cabal bash-completion-r1
+
+DESCRIPTION="a distributed, interactive, smart revision control system"
+HOMEPAGE="http://darcs.net/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
+		=dev-haskell/haskeline-0.6*[profile?]
+		=dev-haskell/html-1.0*[profile?]
+		<dev-haskell/http-4000.3[profile?]
+		=dev-haskell/mmap-0.5*[profile?]
+		<dev-haskell/mtl-2.1[profile?]
+		>=dev-haskell/network-2.2[profile?]
+		<dev-haskell/parsec-3.2[profile?]
+		<dev-haskell/regex-compat-0.96[profile?]
+		=dev-haskell/tar-0.3*[profile?]
+		=dev-haskell/terminfo-0.3*[profile?]
+		=dev-haskell/text-0.11*[profile?]
+		<dev-haskell/zlib-0.6.0.0[profile?]
+		>=dev-lang/ghc-6.10.1
+		net-misc/curl
+		virtual/mta"
+
+# darcs also has a library version; we thus need $DEPEND
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		doc? ( virtual/latex-base
+			|| (	dev-tex/latex2html[png]
+				dev-tex/latex2html[gif]
+			)
+		)
+		test? ( dev-haskell/test-framework[profile?]
+				dev-haskell/test-framework-hunit[profile?]
+				dev-haskell/test-framework-quickcheck2[profile?]
+		)
+		"
+
+src_prepare() {
+	cd "${S}/contrib"
+	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
+	cd ..
+
+	epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
+
+	# hlint tests tend to break on every newly released hlint
+	rm "${S}/tests/haskell_policy.sh"
+	rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
+
+	# use a more recent API, and thus depend on a more recent package
+	sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"
+}
+
+src_configure() {
+	# checking whether ghc supports -threaded flag
+	# Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
+	# contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
+	# It might have interactivity impact.
+
+	threaded_flag=""
+	if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
+		threaded_flag="--flags=threaded"
+		einfo "$P will be built with threads support"
+	else
+		threaded_flag="--flags=-threaded"
+		einfo "$P will be built without threads support"
+	fi
+
+	# Use curl for net stuff to avoid strict version dep on HTTP and network
+	cabal_src_configure \
+		--flags=curl \
+		--flags=-http \
+		--flags=curl-pipelining \
+		--flags=color \
+		--flags=terminfo \
+		--flags=mmap \
+		$threaded_flag \
+		$(cabal_flag test)
+}
+
+src_test() {
+	# run cabal test from haskell-cabal
+	haskell-cabal_src_test || die "cabal test failed"
+
+	# run the unit tests (not part of cabal test for some reason...)
+	# breaks the cabal abstraction a bit...
+	"${S}/dist/build/unit/unit" || die "unit tests failed"
+}
+
+src_install() {
+	cabal_src_install
+	dobashcompletion "${S}/contrib/darcs_completion" "${PN}"
+
+	rm "${ED}/usr/bin/unit" 2> /dev/null
+
+	# 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" || die "failed to register darcs.1 as a manpage"
+
+	# if tests were enabled, make sure the unit test driver is deleted
+	rm -rf "${ED}/usr/bin/unit"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+	bash-completion_pkg_postinst
+
+	ewarn "NOTE: in order for the darcs send command to work properly,"
+	ewarn "you must properly configure your mail transport agent to relay"
+	ewarn "outgoing mail.  For example, if you are using ssmtp, please edit"
+	ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
+}
diff --git a/dev-vcs/darcs/darcs-2.5.2.ebuild b/dev-vcs/darcs/darcs-2.5.2.ebuild
index fca1343234bb..2a64ec4849f2 100644
--- a/dev-vcs/darcs/darcs-2.5.2.ebuild
+++ b/dev-vcs/darcs/darcs-2.5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.2 2011/12/08 20:42:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.3 2012/03/04 07:20:25 gienah Exp $
 
 EAPI="3"
 CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit haskell-cabal bash-completion
+inherit haskell-cabal bash-completion-r1
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
@@ -15,19 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc test"
 
-RDEPEND="=dev-haskell/hashed-storage-0.5*
-		=dev-haskell/haskeline-0.6*
-		=dev-haskell/html-1.0*
-		<dev-haskell/http-4000.2
-		=dev-haskell/mmap-0.5*
-		<dev-haskell/mtl-2.1
-		>=dev-haskell/network-2.2
-		<dev-haskell/parsec-3.2
-		<dev-haskell/regex-compat-0.96
-		=dev-haskell/tar-0.3*
-		=dev-haskell/terminfo-0.3*
-		=dev-haskell/text-0.11*
-		<dev-haskell/zlib-0.6.0.0
+RDEPEND="=dev-haskell/hashed-storage-0.5*[profile?]
+		=dev-haskell/haskeline-0.6*[profile?]
+		=dev-haskell/html-1.0*[profile?]
+		<dev-haskell/http-4000.2[profile?]
+		=dev-haskell/mmap-0.5*[profile?]
+		<dev-haskell/mtl-2.1[profile?]
+		>=dev-haskell/network-2.2[profile?]
+		<dev-haskell/parsec-3.2[profile?]
+		<dev-haskell/regex-compat-0.96[profile?]
+		=dev-haskell/tar-0.3*[profile?]
+		=dev-haskell/terminfo-0.3*[profile?]
+		=dev-haskell/text-0.11*[profile?]
+		<dev-haskell/zlib-0.6.0.0[profile?]
 		>=dev-lang/ghc-6.10.1
 		net-misc/curl
 		virtual/mta"
@@ -40,9 +40,9 @@ DEPEND="${RDEPEND}
 				dev-tex/latex2html[gif]
 			)
 		)
-		test? ( dev-haskell/test-framework
-				dev-haskell/test-framework-hunit
-				dev-haskell/test-framework-quickcheck2
+		test? ( dev-haskell/test-framework[profile?]
+				dev-haskell/test-framework-hunit[profile?]
+				dev-haskell/test-framework-quickcheck2[profile?]
 		)
 		"
 
diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch
new file mode 100644
index 000000000000..3b51fea4a953
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch
@@ -0,0 +1,139 @@
+--- darcs-2.5.2-orig/darcs.cabal	2011-12-19 20:44:08.644140399 +1100
++++ darcs-2.5.2/darcs.cabal	2011-12-24 10:03:14.325396692 +1100
+@@ -124,7 +124,7 @@
+   else
+     buildable: True
+ 
+-    build-tools: ghc >= 6.10 && < 7.4
++    build-tools: ghc >= 6.10 && < 7.6
+ 
+     hs-source-dirs:   src
+     include-dirs:     src
+@@ -174,17 +174,17 @@
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+-                     filepath     >= 1.1.0.0 && < 1.3.0.0,
++                     filepath     >= 1.1.0.0 && < 1.5.0.0,
+                      haskeline    >= 0.6.2.2 && < 0.7,
+                      hashed-storage >= 0.5.2 && < 0.6,
+                      base >= 3,
+                      bytestring >= 0.9.0 && < 0.10,
+                      text == 0.11.*,
+-                     old-time   == 1.0.*,
++                     old-time   >= 1.0 && < 1.2,
+                      directory  >= 1.0.0.0 && < 1.2.0.0,
+                      process    >= 1.0 && < 1.2,
+                      containers >= 0.1 && < 0.5,
+-                     array      >= 0.1 && < 0.4,
++                     array      >= 0.1 && < 0.5,
+                      random     == 1.0.*,
+                      tar          == 0.3.*,
+                      zlib >= 0.5.1.0 && < 0.6.0.0,
+@@ -208,7 +208,7 @@
+   else
+     buildable: True
+ 
+-    build-tools: ghc >= 6.10 && < 7.4
++    build-tools: ghc >= 6.10 && < 7.6
+ 
+     hs-source-dirs:   src
+     include-dirs:     src
+@@ -379,7 +379,7 @@
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+-                     filepath     >= 1.1.0.0 && < 1.3.0.0,
++                     filepath     >= 1.1.0.0 && < 1.5.0.0,
+                      haskeline    >= 0.6.2.2 && < 0.7,
+                      hashed-storage >= 0.5.2 && < 0.6,
+                      tar          == 0.3.*
+@@ -390,11 +390,11 @@
+     build-depends: base >= 3,
+                    bytestring >= 0.9.0 && < 0.10,
+                    text == 0.11.*,
+-                   old-time   == 1.0.*,
++                   old-time   >= 1.0 && < 1.2,
+                    directory  >= 1.0.0.0 && < 1.2.0.0,
+                    process    >= 1.0 && < 1.2,
+                    containers >= 0.1 && < 0.5,
+-                   array      >= 0.1 && < 0.4,
++                   array      >= 0.1 && < 0.5,
+                    random     == 1.0.*
+ 
+ 
+@@ -483,7 +483,7 @@
+                     src/umask.c
+                     src/Crypt/sha2.c
+ 
+-  build-tools: ghc >= 6.10 && < 7.4
++  build-tools: ghc >= 6.10 && < 7.6
+ 
+   -- We need optimizations, regardless of what Hackage says
+   -- Note: "if true" works around a cabal bug with order of flag composition
+@@ -527,7 +527,7 @@
+                    mtl          >= 1.0 && < 2.1,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+-                   filepath     >= 1.1.0.0 && < 1.3.0.0,
++                   filepath     >= 1.1.0.0 && < 1.5.0.0,
+                    haskeline    >= 0.6.2.2 && < 0.7,
+                    hashed-storage >= 0.5.2 && < 0.6,
+                    tar          == 0.3.*
+@@ -538,11 +538,11 @@
+   build-depends: base >= 3,
+                  bytestring >= 0.9.0 && < 0.10,
+                  text == 0.11.*,
+-                   old-time   == 1.0.*,
++                   old-time   >= 1.0 && < 1.2,
+                    directory  >= 1.0.0.0 && < 1.2.0.0,
+                    process    >= 1.0 && < 1.2,
+                    containers >= 0.1 && < 0.5,
+-                   array      >= 0.1 && < 0.4,
++                   array      >= 0.1 && < 0.5,
+                    random     == 1.0.*
+ 
+   if flag(curl)
+@@ -615,7 +615,7 @@
+   else
+     buildable: True
+ 
+-    build-tools: ghc >= 6.10 && < 7.4
++    build-tools: ghc >= 6.10 && < 7.6
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+@@ -623,7 +623,7 @@
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+-                     filepath     >= 1.1.0.0 && < 1.3.0.0,
++                     filepath     >= 1.1.0.0 && < 1.5.0.0,
+                      QuickCheck   >= 2.1.0.0,
+                      HUnit        >= 1.0,
+                      test-framework             >= 0.2.2,
+@@ -684,11 +684,11 @@
+                    bytestring >= 0.9.0 && < 0.10,
+                    haskeline    >= 0.6.2.2 && < 0.7,
+                    text == 0.11.*,
+-                   old-time   == 1.0.*,
++                   old-time   >= 1.0 && < 1.2,
+                    directory  >= 1.0.0.0 && < 1.2.0.0,
+                    process    >= 1.0 && < 1.2,
+                    containers >= 0.1 && < 0.5,
+-                   array      >= 0.1 && < 0.4,
++                   array      >= 0.1 && < 0.5,
+                    hashed-storage >= 0.5.2 && < 0.6,
+                    random     == 1.0.*
+ 
+--- darcs-2.5.2-orig/src/Darcs/Utils.hs	2011-03-14 09:40:46.000000000 +1100
++++ darcs-2.5.2/src/Darcs/Utils.hs	2011-12-24 10:07:16.125342597 +1100
+@@ -62,7 +62,7 @@
+                            , TreeMonad, tree )
+ import Storage.Hashed.Tree( Tree, listImmediate, findTree )
+ 
+-showHexLen :: (Integral a) => Int -> a -> String
++showHexLen :: (Integral a, Show a) => Int -> a -> String
+ showHexLen n x = let s = showHex x ""
+                  in replicate (n - length s) ' ' ++ s
+ 
diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch
new file mode 100644
index 000000000000..05b1ea20e6a7
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch
@@ -0,0 +1,38 @@
+--- darcs-2.5.2-orig/darcs.cabal	2011-12-19 20:43:28.551322710 +1100
++++ darcs-2.5.2/darcs.cabal	2011-12-19 20:44:08.644140399 +1100
+@@ -195,7 +195,7 @@
+       build-depends: unix >= 1.0 && < 2.6
+     if flag(http)
+         build-depends:    network >= 2.2 && < 2.4,
+-                          HTTP    >= 3000.0 && < 4000.2
++                          HTTP    >= 3000.0 && < 4000.3
+ 
+ 
+ -- ----------------------------------------------------------------------
+@@ -420,7 +420,7 @@
+ 
+     if flag(http)
+         build-depends:    network >= 2.2 && < 2.4,
+-                          HTTP    >= 3000.0 && < 4000.2
++                          HTTP    >= 3000.0 && < 4000.3
+         cpp-options:      -DHAVE_HTTP
+         x-have-http:
+ 
+@@ -554,7 +554,7 @@
+ 
+   if flag(http)
+       build-depends:    network >= 2.2 && < 2.4,
+-                        HTTP    >= 3000.0 && < 4000.2
++                        HTTP    >= 3000.0 && < 4000.3
+       cpp-options:      -DHAVE_HTTP
+       x-have-http:
+ 
+@@ -705,7 +705,7 @@
+ 
+     if flag(http)
+         build-depends:    network >= 2.2 && < 2.4,
+-                          HTTP    >= 3000.0 && < 4000.2
++                          HTTP    >= 3000.0 && < 4000.3
+ 
+     if flag(color)
+       x-use-color: