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

(Portage version: 2.1.3.19)

5 files changed, 147 insertions, 2 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/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