New version compatible with ghc-6.8. Mark older one as not working with ghc-6.8.

Package-Manager: portage-2.1.3.19

6 files changed, 170 insertions, 13 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 17b0f65f9582..27ffb9b6d758 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.79 2007/10/31 13:17:50 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.80 2007/12/20 13:48:35 dcoutts Exp $
+
+*darcs-1.1.0_pre1 (20 Dec 2007)
+
+  20 Dec 2007; Duncan Coutts <dcoutts@gentoo.org>
+  +files/darcs-1.1.0pre1-ghc68.patch, darcs-1.0.9.ebuild,
+  +darcs-1.1.0_pre1.ebuild:
+  New version compatible with ghc-6.8. Mark older one as not working with
+  ghc-6.8.
 
   31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> darcs-1.0.5.ebuild,
   darcs-1.0.6.ebuild, darcs-1.0.7.ebuild, darcs-1.0.8-r2.ebuild:
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index 2a02b1ac4abc..e0f906bc9f8e 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -9,11 +9,16 @@ AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b
 MD5 4f8642df13c4e3d08370075d46b8dafb files/darcs-1.0.9-bashcomp.patch 510
 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 files/darcs-1.0.9-bashcomp.patch 510
 SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6 files/darcs-1.0.9-bashcomp.patch 510
+AUX darcs-1.1.0pre1-ghc68.patch 1588 RMD160 308f6a8845b2ab4cc6015b515d5974b1817b895e SHA1 97d9b33ff8f7b2c71df0e6158b3025a28f28ecb1 SHA256 8cad221ce2f41dbb578373843ebfa6a523f4e2f24391d362527802711d76222a
+MD5 4d048af3264cdd558cb16807736b0230 files/darcs-1.1.0pre1-ghc68.patch 1588
+RMD160 308f6a8845b2ab4cc6015b515d5974b1817b895e files/darcs-1.1.0pre1-ghc68.patch 1588
+SHA256 8cad221ce2f41dbb578373843ebfa6a523f4e2f24391d362527802711d76222a files/darcs-1.1.0pre1-ghc68.patch 1588
 DIST darcs-1.0.5.tar.gz 944888 RMD160 453dc7282d2751c0b862cf74bd095b63b927e5d7 SHA1 49512ba28c1724adba9eef4a9e3f7e104b7634f9 SHA256 9e71bfdab2be413b43219bdd10f8e79a3b496d542eb447d910b2708f8a6663a9
 DIST darcs-1.0.6.tar.gz 963609 RMD160 271f5f965a1ccd7428877a06349c8d9d39d74658 SHA1 d45bb51718225525b92b0efc57000ce4c50f49ce SHA256 8296f91934cfff4721356549db0d2f403fcc796ae424307c76afd33101090752
 DIST darcs-1.0.7.tar.gz 1009946 RMD160 01cbde260718b5e16475047b3ed801c8d52507df SHA1 31e9048b223c9cf3bd33102419a63034255071b0 SHA256 8d9e60f67e937f344332458cd58f46545d1348c8427b76ece2f3541661732e94
 DIST darcs-1.0.8.tar.gz 1010010 RMD160 a95309f7dc79b29d7e4f237627aa300a84aa5331 SHA1 f69fb2f5deb3c5281b2eaed9fcb8aa3fe55829dd SHA256 36cf64b10a9e09e4bb2d4bc78371a8b511e7e5bbf13deb1a754e867b0efcfcac
 DIST darcs-1.0.9.tar.gz 1059363 RMD160 3a971f778e4343d90e88f1ba8815ea3c880ac2a1 SHA1 b2d2238c01d530796c29db4b46fd4fd9c21be9b6 SHA256 f848a63363ad72d3217b1eb469c267c00ea6085a491172d385ab6eda210b30dc
+DIST darcs-1.1.0pre1.tar.gz 1116180 RMD160 4269f61695045e85f2b74eb124221c1e0ac449d6 SHA1 ec47136625c2a7c99030cdfa9738d09e77dbd517 SHA256 4c0cc05d251af94c86664bc2e4cdae7bf2a6cf10fcef2ebf5329b593d661a2f0
 EBUILD darcs-1.0.5.ebuild 1783 RMD160 9414c6ac98e2e9074bbe26fdefe100461261431c SHA1 265cf95798908580817e48e8d913e3bd4fe647d8 SHA256 448695fbbe006746ce93268e5a69049823bb8447fc0c0cde2b0445665712688f
 MD5 81d9fec416d78b5a8bf1a8fdd0bbaac9 darcs-1.0.5.ebuild 1783
 RMD160 9414c6ac98e2e9074bbe26fdefe100461261431c darcs-1.0.5.ebuild 1783
@@ -30,14 +35,18 @@ EBUILD darcs-1.0.8-r2.ebuild 2484 RMD160 91edc9b2fd14296a358b1ded39823dfbc5c77ba
 MD5 3aa4cfa97bbec9759704ef4fc2a42df1 darcs-1.0.8-r2.ebuild 2484
 RMD160 91edc9b2fd14296a358b1ded39823dfbc5c77ba6 darcs-1.0.8-r2.ebuild 2484
 SHA256 7838646b726a1931463311002c2c7358aad61f4a902dc897649fdcaf502bd7f0 darcs-1.0.8-r2.ebuild 2484
-EBUILD darcs-1.0.9.ebuild 2467 RMD160 c2945aad94e232e7a6ed6fb419bff58a663159b9 SHA1 e099942499feb9a3a29a63fe387e5e2c3079bca0 SHA256 447f1263593f2f77bd4ccec629df1dccc8d8d7b78281c5ac3ced422ae78c5978
-MD5 0289d95316b9343001091dbcacdfca49 darcs-1.0.9.ebuild 2467
-RMD160 c2945aad94e232e7a6ed6fb419bff58a663159b9 darcs-1.0.9.ebuild 2467
-SHA256 447f1263593f2f77bd4ccec629df1dccc8d8d7b78281c5ac3ced422ae78c5978 darcs-1.0.9.ebuild 2467
-MISC ChangeLog 11230 RMD160 09cebe386314bfc6e80b233d57541706239f5074 SHA1 802dbf4ba09c7d05e271aca07024249281f98e79 SHA256 92f80bfb6d594b2f6ccc3a42275589ea78b75c79fa8b3667613244bcd06e3a6c
-MD5 71ab1adddb704ea46ea189103f823247 ChangeLog 11230
-RMD160 09cebe386314bfc6e80b233d57541706239f5074 ChangeLog 11230
-SHA256 92f80bfb6d594b2f6ccc3a42275589ea78b75c79fa8b3667613244bcd06e3a6c ChangeLog 11230
+EBUILD darcs-1.0.9.ebuild 2490 RMD160 d6c8036af57d6dec2ea5b9fd521a798ef1c1dd8f SHA1 a780aeea6e03373ba9733796c656dbab2cc62ba6 SHA256 2f54f974518bd99813711dd44d9d0e9c9ff5932932b745780c7996026d8ebe43
+MD5 ee9beacc97295175b6f1b8727c9b15bc darcs-1.0.9.ebuild 2490
+RMD160 d6c8036af57d6dec2ea5b9fd521a798ef1c1dd8f darcs-1.0.9.ebuild 2490
+SHA256 2f54f974518bd99813711dd44d9d0e9c9ff5932932b745780c7996026d8ebe43 darcs-1.0.9.ebuild 2490
+EBUILD darcs-1.1.0_pre1.ebuild 2848 RMD160 773b96361483223064164b5faa2f81689acb4dbf SHA1 4c9e8e4f9cec4afb70aa810281cc45228b854a1e SHA256 df3e166649e163152cdc9a9df17d59c89e9bec4cbf186bc8b03e30638d3bb06b
+MD5 ced7bef9317caf6b32e24440527aaf16 darcs-1.1.0_pre1.ebuild 2848
+RMD160 773b96361483223064164b5faa2f81689acb4dbf darcs-1.1.0_pre1.ebuild 2848
+SHA256 df3e166649e163152cdc9a9df17d59c89e9bec4cbf186bc8b03e30638d3bb06b darcs-1.1.0_pre1.ebuild 2848
+MISC ChangeLog 11485 RMD160 b2384c17723a12228a81703b238ecea835be6510 SHA1 fdcdbca5d0a3dc1c696f7f11a9f7f100c6738889 SHA256 bf173b3d98ce36064b79ebe5bf2f52d79930fa3452a4991bcd0719a15a385873
+MD5 7e307f5fb63a2898f8fe3d40deb54314 ChangeLog 11485
+RMD160 b2384c17723a12228a81703b238ecea835be6510 ChangeLog 11485
+SHA256 bf173b3d98ce36064b79ebe5bf2f52d79930fa3452a4991bcd0719a15a385873 ChangeLog 11485
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -57,10 +66,13 @@ SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/di
 MD5 c0b350638dc66e5c05ffbd1afd2e1702 files/digest-darcs-1.0.9 238
 RMD160 b7425ccd6d556e866e95305e7fec54a65160353c files/digest-darcs-1.0.9 238
 SHA256 98f6aadbdd76bf96df15e26d22c6575e8f25ccb6faea889a515d7ab0de1757c1 files/digest-darcs-1.0.9 238
+MD5 d49751b798cdbbbd0bf7886fb8e3b097 files/digest-darcs-1.1.0_pre1 250
+RMD160 1d911473ef828ec33859c30dd74663d231bd1699 files/digest-darcs-1.1.0_pre1 250
+SHA256 007b9f6052c2e8b07f7371fbc1d43822ef252a5547ba352da302655687ca3f1e files/digest-darcs-1.1.0_pre1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHKIE5nUVyUObPUL4RAo4/AJ4pZ3dLP5xe8s00Q5mzTVlXZshCMQCeNF19
-LQ8J7P+I9s3v+BcfM+T9xiA=
-=0TAW
+iD8DBQFHanLRnUVyUObPUL4RAt4rAJ0Q56dEZYmi4d6HdKpceVUn7hII3gCfbCay
+BMph651tDWTaMVoA+w4tMpI=
+=5K9/
 -----END PGP SIGNATURE-----
diff --git a/dev-util/darcs/darcs-1.0.9.ebuild b/dev-util/darcs/darcs-1.0.9.ebuild
index 798623d69a74..d52af353ded2 100644
--- a/dev-util/darcs/darcs-1.0.9.ebuild
+++ b/dev-util/darcs/darcs-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.9.ebuild,v 1.8 2007/08/29 01:09:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.9.ebuild,v 1.9 2007/12/20 13:48:35 dcoutts Exp $
 
 inherit base autotools eutils
 
@@ -17,6 +17,7 @@ IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
 	>=dev-lang/ghc-6.2.2
+	<dev-lang/ghc-6.8
 	dev-haskell/quickcheck
 	dev-haskell/mtl
 	dev-haskell/html
diff --git a/dev-util/darcs/darcs-1.1.0_pre1.ebuild b/dev-util/darcs/darcs-1.1.0_pre1.ebuild
new file mode 100644
index 000000000000..02ea2001a49e
--- /dev/null
+++ b/dev-util/darcs/darcs-1.1.0_pre1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.1.0_pre1.ebuild,v 1.1 2007/12/20 13:48:35 dcoutts Exp $
+
+inherit base autotools eutils
+
+DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
+HOMEPAGE="http://darcs.net"
+MY_P0="${P/_rc/rc}"
+MY_P="${MY_P0/_pre/pre}"
+SRC_URI="http://darcs.net/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND=">=net-misc/curl-7.10.2
+	>=dev-lang/ghc-6.2.2
+	dev-haskell/quickcheck
+	dev-haskell/mtl
+	dev-haskell/html
+	sys-apps/diffutils
+	doc?  ( virtual/tetex
+		>=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"
+
+RDEPEND=">=net-misc/curl-7.10.2
+	virtual/mta
+	dev-libs/gmp"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	if use doc && ! built_with_use -o dev-tex/latex2html png gif; then
+		eerror "Building darcs with USE=\"doc\" requires that"
+		eerror "dev-tex/latex2html is built with at least one of"
+		eerror "USE=\"png\" and USE=\"gif\"."
+		die "USE=doc requires dev-tex/latex2html with USE=\"png\" or USE=\"gif\""
+	fi
+}
+
+src_unpack() {
+	base_src_unpack
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.1.0pre1-ghc68.patch"
+
+	cd "${S}/tools"
+	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
+
+	# If we're going to use the CFLAGS with GHC's -optc flag then we'd better
+	# use it with -opta too or it'll break with some CFLAGS, eg -mcpu on sparc
+	sed -i 's:\($(addprefix -optc,$(CFLAGS) $(CPPFLAGS))\):\1 $(addprefix -opta,$(CFLAGS)):' \
+		"${S}/autoconf.mk.in"
+
+	# On ia64 we need to tone down the level of inlining so we don't break some
+	# of the low level ghc/gcc interaction gubbins.
+	use ia64 && sed -i 's/-funfolding-use-threshold20//' "${S}/GNUmakefile"
+}
+
+src_compile() {
+	# Since we've patched the build system:
+	eautoreconf
+
+	econf $(use_with doc docs) \
+		|| die "configure failed"
+	emake all || die "make failed"
+}
+
+src_test() {
+	make test
+}
+
+src_install() {
+	make DESTDIR="${D}" installbin || die "installation failed"
+	# The bash completion should be installed in /usr/share/bash-completion/
+	# rather than /etc/bash_completion.d/ . Fixes bug #148038.
+	insinto "/usr/share/bash-completion" \
+		&& doins "${D}/etc/bash_completion.d/darcs" \
+		&& rm    "${D}/etc/bash_completion.d/darcs" \
+		&& rmdir "${D}/etc/bash_completion.d" \
+		&& rmdir "${D}/etc" \
+		|| die "fixing location of darcs bash completion failed"
+	if use doc; then
+		dodoc "${S}/darcs.ps"
+		dohtml -r "${S}/manual/"*
+	fi
+}
+
+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 "/etc/ssmtp/ssmtp.conf with appropriate values for your site."
+}
diff --git a/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch b/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch
new file mode 100644
index 000000000000..b4d2d51f6421
--- /dev/null
+++ b/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch
@@ -0,0 +1,38 @@
+diff -ur darcs-1.1.0pre1.orig/aclocal.m4 darcs-1.1.0pre1/aclocal.m4
+--- darcs-1.1.0pre1.orig/aclocal.m4	2007-12-13 23:20:50.000000000 +1000
++++ darcs-1.1.0pre1/aclocal.m4	2007-12-13 23:21:18.000000000 +1000
+@@ -447,6 +447,20 @@
+ openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+ openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
+         ]]),
++AC_MSG_RESULT([okay])
++IMPORT_WORKAROUND([
++import qualified GHC.Handle ( fdToHandle' )
++import System.IO ( Handle, IOMode )
++import System.Posix.Internals ( FDType )
++import qualified GHC.IOBase ( FD )
++])
++CODE_WORKAROUND([[
++  {- 
++   Work around change in the GHC.Handle.fdToHandle' API.
++  -}
++openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
++openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
++]]),
+        AC_MSG_RESULT([failed])
+        AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
+     )
+Only in darcs-1.1.0pre1/: aclocal.m4~
+diff -ur darcs-1.1.0pre1.orig/autoconf.mk.in darcs-1.1.0pre1/autoconf.mk.in
+--- darcs-1.1.0pre1.orig/autoconf.mk.in	2007-12-13 23:20:50.000000000 +1000
++++ darcs-1.1.0pre1/autoconf.mk.in	2007-12-13 23:21:07.000000000 +1000
+@@ -22,7 +22,7 @@
+ OPTCCFLAGS      := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
+ LDFLAGS		:= @LDFLAGS@ @LIBS@
+ OPTLLDFLAGS     := $(addprefix -optl,$(LDFLAGS))
+-GHCFLAGS	:= -cpp @GHCFLAGS@
++GHCFLAGS	:= -package containers -cpp @GHCFLAGS@
+ HAVE_CURSES     := @HAVE_CURSES@
+ HAVE_LIBCURL    := @HAVE_LIBCURL@
+ HAVE_MAPI       := @HAVE_MAPI@
+Only in darcs-1.1.0pre1/: autoconf.mk.in~
diff --git a/dev-util/darcs/files/digest-darcs-1.1.0_pre1 b/dev-util/darcs/files/digest-darcs-1.1.0_pre1
new file mode 100644
index 000000000000..32ea383dc983
--- /dev/null
+++ b/dev-util/darcs/files/digest-darcs-1.1.0_pre1
@@ -0,0 +1,3 @@
+MD5 36b4b0b238a21593fddff5e40cfe0da2 darcs-1.1.0pre1.tar.gz 1116180
+RMD160 4269f61695045e85f2b74eb124221c1e0ac449d6 darcs-1.1.0pre1.tar.gz 1116180
+SHA256 4c0cc05d251af94c86664bc2e4cdae7bf2a6cf10fcef2ebf5329b593d661a2f0 darcs-1.1.0pre1.tar.gz 1116180