Bump darcs to 2.8.0.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 172 insertions, 2 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 68675e20b9fa..953b464f2f10 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/darcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.30 2012/05/03 02:57:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.31 2012/05/05 13:34:17 gienah Exp $
+
+*darcs-2.8.0 (05 May 2012)
+
+  05 May 2012; Mark Wright <gienah@gentoo.org> +darcs-2.8.0.ebuild,
+  +files/darcs-2.8.0-mtl-2.1.patch:
+  Bump darcs to 2.8.0.
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> darcs-2.4.4-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 56f26dbcf9b9..acad34b48dda 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 SHA1 1abf5c0477169eb0109a0dd7ecfb2c38dfee15ff SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6
 AUX darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch 1617 RMD160 6cd0fdcae04518cb8d701f0db89ce7cad4a51c61 SHA1 10cd5b15ffcb9678e0fc8700b9059244a12bf06a SHA256 9716fad28813bae04e06c8a039c9e5cb094cbd0c4907855142e14c49334d387e
 AUX darcs-2.4.4-tests-emailformat.patch 1177 RMD160 fee2084eeb08f23e6b8ee771a369137e0cea8746 SHA1 8d74f367140e5300d663db7c77e0794419672a6b SHA256 6bd35d0c790d4fc583f650cccc433f5005036c06f4de3f139f685e5957b35835
@@ -7,10 +10,20 @@ AUX darcs-2.5.2-mtl-2.1.patch 1865 RMD160 59bae682f3cb6bdc5126a43377731d5bbf7e6a
 AUX darcs-2.5.2-relax-http-libs-deps.patch 1237 RMD160 bbc3070b39c66fd75fbf9a2bf8336b9315a3ea1e SHA1 926b9c6e9efe2fadb22c594ac5eddcadbd7982d0 SHA256 300450943c78c12929ea7a5005b9927d9d9fa33a70aea8634709442652880736
 AUX darcs-2.5.2-relax-regex-libs-deps.patch 2840 RMD160 48319d80de4e55709d238e69bf14b06388e640a2 SHA1 b32c417c352dc57d85a7d7be33ea2aa7793cd0a8 SHA256 fe32930704bbd411b0a65a6a378c7a9700257f165e8edad889b53ad227620b1a
 AUX darcs-2.5.2-tests-ghc-7.2.patch 708 RMD160 406b9caddc080596eee52276f0ae445cdc01a1e9 SHA1 edda5d6a60d10f4b669126a790f7817f6439a42f SHA256 f54f02114b5ca6477f750d0fb1712d79de61712e97480e54a94b35b6fa660104
+AUX darcs-2.8.0-mtl-2.1.patch 1289 RMD160 219b2fa4c219d8896a77ebab976f1987a9e6c016 SHA1 01bfbf7c5e3226036f613c9c62956870f6d9b559 SHA256 50798b5d69b4600c3c9d15acdf4476b8a3764afb4d746e28eb79c9381bc3ae7b
 DIST darcs-2.4.4.tar.gz 1193126 RMD160 cec11127740f350d25de7d4f9c7d7df115ebed6a SHA1 96a1907d3b8fd5676074a860359484f251d36e2f SHA256 97cde35ae4b74488f8b98b487bc0498069eaa74fe035903394f3d4aff1da9f9e
 DIST darcs-2.5.2.tar.gz 1231903 RMD160 53e357fb802a72f4b787bf1ca4a6e95e118b08af SHA1 da43ebf64ca4f41b456d5b1fd2038ae0ec5a36da SHA256 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386
+DIST darcs-2.8.0.tar.gz 1297733 RMD160 5cb7116cf277e212895b8e444615f967cc9919ad SHA1 4fcf46943e9fc72af1d4e299c67cd81ae9552f64 SHA256 1415c2a1a99db8cf76d5f31f6a3490a2a9d3e13f2abfcc67fc108885cf52ce83
 EBUILD darcs-2.4.4-r1.ebuild 4882 RMD160 134919f29f01c02684932fbd74d036d512c6d946 SHA1 1c6c218d20548c329de2a0e6253f9c5ee92085f9 SHA256 258a8a6de358369d74b59ee0d5d98d9213f6c871ca468f89e86e97e1801b842b
 EBUILD darcs-2.5.2-r1.ebuild 4200 RMD160 aa4789ba1efc31655cc204f98c053cd36000b7af SHA1 aeaf7fae0e5b7073d98d79784ae95d62eb5aa084 SHA256 fcf62c1e15da10910a68d1bfa023c85c2adfa9af68a14878a53a0b2d4c447867
 EBUILD darcs-2.5.2-r2.ebuild 4248 RMD160 50618993288b27bd98f0c9ab7c3991602ddf1bc2 SHA1 9dcb383e2c928bd61a6514c31a2c3ee049292b15 SHA256 2e06ade8a41beabe9d95e516632521e3a68f825b252eafbcbe0f83c066d94221
-MISC ChangeLog 22726 RMD160 0f85cfff791d498e0068e5cf062cc78c99fcee5c SHA1 9299c8ce5535a77c605e91c7406e6f5d6ae8567e SHA256 f4cb8f2b0ae7dc90b50525d12279b98bca1ac15d42e13163d39feb72521e2c2d
+EBUILD darcs-2.8.0.ebuild 3950 RMD160 c1b3b014f9caa1324c5ca1ba89e3c3bc22e8fbf6 SHA1 e7d1565f8e1441017f2f94933702439a6873a1a7 SHA256 a52e8d05fbe92666a5651a819aa2dce6b4409761bfaa77f2aed60cac3c1bcc2d
+MISC ChangeLog 22882 RMD160 c341d1cde9f0331755932556444a3aac9f78b95f SHA1 c81f322ee1ca4e6f6d985d79a9ebe40391f0268a SHA256 b53ed688b64e146f4dcb3b43b20159f0c0edd14c1849e65a02ab0672faf2eb67
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+lLGQACgkQoBEVQmGOlx90/gD+KdVs1RUh2ZRAycNmnRrKTgI7
+SBMGr2clgc+82hPXvwYA/j6tr769mQV/sPsTIStBYq3Oa+5j1u55n4MvMP9j0wxp
+=EKwt
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/darcs/darcs-2.8.0.ebuild b/dev-vcs/darcs/darcs-2.8.0.ebuild
new file mode 100644
index 000000000000..2d5c1d8f9ace
--- /dev/null
+++ b/dev-vcs/darcs/darcs-2.8.0.ebuild
@@ -0,0 +1,122 @@
+# 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.8.0.ebuild,v 1.1 2012/05/05 13:34:17 gienah Exp $
+
+# ebuild generated by hackport 0.2.17.9999
+
+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="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=">=dev-haskell/hashed-storage-0.5.6[profile?]
+		<dev-haskell/hashed-storage-0.6[profile?]
+		>=dev-haskell/haskeline-0.6.3[profile?]
+		<dev-haskell/haskeline-0.7[profile?]
+		=dev-haskell/html-1.0*[profile?]
+		>=dev-haskell/http-4000.0.8[profile?]
+		<dev-haskell/http-4000.3[profile?]
+		=dev-haskell/mmap-0.5*[profile?]
+		>=dev-haskell/mtl-1.0[profile?]
+		<dev-haskell/mtl-2.2[profile?]
+		>=dev-haskell/network-2.2[profile?]
+		<dev-haskell/network-2.4[profile?]
+		>=dev-haskell/parsec-2.0[profile?]
+		<dev-haskell/parsec-3.2[profile?]
+		=dev-haskell/random-1.0*[profile?]
+		>=dev-haskell/regex-compat-0.95.1[profile?]
+		=dev-haskell/tar-0.3*[profile?]
+		=dev-haskell/terminfo-0.3*[profile?]
+		>=dev-haskell/text-0.11.0.6[profile?]
+		<dev-haskell/text-0.12.0.0[profile?]
+		>=dev-haskell/vector-0.7[profile?]
+		>=dev-haskell/zlib-0.5.1.0[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/cmdlib-0.2.1[profile?]
+				<dev-haskell/cmdlib-0.4[profile?]
+				>=dev-haskell/shellish-0.1.3[profile?]
+				<dev-haskell/shellish-0.2[profile?]
+				dev-haskell/test-framework[profile?]
+				dev-haskell/test-framework-hunit[profile?]
+				dev-haskell/test-framework-quickcheck2[profile?]
+		)
+		"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.8.0-mtl-2.1.patch"
+
+	rm "${S}/tests/add_permissions.sh" || die "Could not rm add_permissions.sh"
+	rm "${S}/tests/send-output-v1.sh" || die "Could not rm send-output-v1.sh"
+	rm "${S}/tests/send-output-v2.sh" || die "Could not rm send-output-v2.sh"
+	rm "${S}/tests/utf8.sh" || die "Could not rm utf8.sh"
+}
+
+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=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"
+}
+
+src_install() {
+	cabal_src_install
+	newbashcomp "${S}/contrib/darcs_completion" "${PN}"
+
+	# 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"
+}
+
+pkg_postinst() {
+	ghc-package_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/files/darcs-2.8.0-mtl-2.1.patch b/dev-vcs/darcs/files/darcs-2.8.0-mtl-2.1.patch
new file mode 100644
index 000000000000..ccb7971a4beb
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.8.0-mtl-2.1.patch
@@ -0,0 +1,29 @@
+--- darcs-2.8.0-orig/darcs.cabal	2012-04-23 01:14:14.000000000 +1000
++++ darcs-2.8.0/darcs.cabal	2012-05-05 15:27:31.999138292 +1000
+@@ -364,7 +364,7 @@
+ 
+     build-depends:   extensible-exceptions >= 0.1 && < 0.2,
+                      regex-compat >= 0.95.1,
+-                     mtl          >= 1.0 && < 2.1,
++                     mtl          >= 1.0 && < 2.2,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+                      filepath     >= 1.1.0.0 && < 1.5.0.0,
+@@ -525,7 +525,7 @@
+ 
+   build-depends:   extensible-exceptions >= 0.1 && < 0.2,
+                    regex-compat >= 0.95.1,
+-                   mtl          >= 1.0 && < 2.1,
++                   mtl          >= 1.0 && < 2.2,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+                    filepath     >= 1.1.0.0 && < 1.5.0.0,
+@@ -612,7 +612,7 @@
+ 
+     build-depends:   extensible-exceptions >= 0.1 && < 0.2,
+                      regex-compat >= 0.95.1,
+-                     mtl          >= 1.0 && < 2.1,
++                     mtl          >= 1.0 && < 2.2,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+                      filepath     >= 1.1.0.0 && < 1.5.0.0,