Removed old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

9 files changed, 8 insertions, 629 deletions

diff --git a/dev-vcs/darcs/ChangeLog b/dev-vcs/darcs/ChangeLog
index 508a935e9564..4b6eef14828b 100644
--- a/dev-vcs/darcs/ChangeLog
+++ b/dev-vcs/darcs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2011/04/10 19:18:53 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/ChangeLog,v 1.20 2011/06/05 12:08:48 slyfox Exp $
+
+  05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/darcs-1.0.8-ghc66.patch, -darcs-1.0.9.ebuild,
+  -files/darcs-1.1.0pre1-ghc68.patch, -darcs-2.0.2.ebuild,
+  -files/darcs-2.0.2-add-dummy-base-dependency.diff, -darcs-2.1.0-r1.ebuild,
+  -darcs-2.2.1.ebuild, -darcs-2.4.4.ebuild:
+  Removed old.
 
   10 Apr 2011; Fabian Groffen <grobian@gentoo.org> darcs-2.4.4-r1.ebuild:
   Marked ~x86-macos, fixed for Prefix (EAPI=3)
diff --git a/dev-vcs/darcs/darcs-1.0.9.ebuild b/dev-vcs/darcs/darcs-1.0.9.ebuild
deleted file mode 100644
index 93ac007d7e96..000000000000
--- a/dev-vcs/darcs/darcs-1.0.9.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-1.0.9.ebuild,v 1.2 2010/07/01 19:08:31 jer Exp $
-
-inherit base autotools eutils
-
-DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
-HOMEPAGE="http://abridgegame.org/darcs"
-MY_P0="${P/_rc/rc}"
-MY_P="${MY_P0/_pre/pre}"
-SRC_URI="http://abridgegame.org/darcs/${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-1*
-	dev-haskell/mtl
-	dev-haskell/html
-	sys-apps/diffutils
-	doc?  ( virtual/latex-base
-		>=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
-
-	# For GHC 6.8* compatibility, make sure
-	#  * the new openFd/fdToHandle API is found
-	#  * to use the containers package, if it exists
-	# Works with all GHC versions
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.1.0pre1-ghc68.patch"
-
-	epatch "${FILESDIR}/${P}-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"
-
-	# Since we've patched the build system:
-	eautoreconf
-}
-
-src_compile() {
-
-	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}/manual/darcs.ps" || die "installing darcs.ps failed"
-		dohtml -r "${S}/manual/"* || die "installing darcs manual failed"
-	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-vcs/darcs/darcs-2.0.2.ebuild b/dev-vcs/darcs/darcs-2.0.2.ebuild
deleted file mode 100644
index bdafca6932ce..000000000000
--- a/dev-vcs/darcs/darcs-2.0.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.0.2.ebuild,v 1.2 2010/07/01 19:08:31 jer Exp $
-
-inherit base autotools eutils ghc-package
-
-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 sparc x86"
-IUSE="doc"
-
-DEPEND=">=net-misc/curl-7.10.2
-	>=dev-lang/ghc-6.2.2
-	=dev-haskell/quickcheck-1*
-	dev-haskell/mtl
-	dev-haskell/html
-	dev-haskell/parsec
-	dev-haskell/regex-compat
-	sys-apps/diffutils
-	sys-libs/zlib
-	doc?  ( virtual/latex-base
-		>=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}-2.0.2-add-dummy-base-dependency.diff"
-	cd "${S}/tools"
-	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
-
-	# 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"
-
-	sed -i 's/-Werror//' "${S}/GNUmakefile"
-
-	#emulate: CABAL_CONFIGURE_FLAGS="--constraint=base<4"
-	# ghc-6.4: base-1; ghc-6.6.1: base-2; ghc-6.8: base-3; ghc-6.10: base-3, base-4
-	base_version="$($(ghc-getghcpkg) list --simple-output | tr " " "\n" | egrep '^base-[1-3]')"
-	sed -i "s@, base ,@, $base_version ,@" "${S}/aclocal.m4"
-	sed -i "s@-package base @-package $base_version @" "${S}/autoconf.mk.in"
-
-	cd "${S}"
-	sed -i 's/-Werror//' "${S}/aclocal.m4"
-	# Since we've patched the build system:
-	eautoreconf
-}
-
-src_compile() {
-	# use --enable-bytestring?
-	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}/doc/manual/darcs.ps" || die "installing darcs.ps failed"
-		dohtml -r "${S}/doc/manual/"* || die "installing darcs manual failed"
-	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-vcs/darcs/darcs-2.1.0-r1.ebuild b/dev-vcs/darcs/darcs-2.1.0-r1.ebuild
deleted file mode 100644
index b8bd938d34ae..000000000000
--- a/dev-vcs/darcs/darcs-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.1.0-r1.ebuild,v 1.3 2010/07/01 19:08:31 jer 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 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=net-misc/curl-7.10.2
-	>=dev-lang/ghc-6.8
-	=dev-haskell/quickcheck-1*
-	dev-haskell/mtl
-	dev-haskell/html
-	dev-haskell/parsec
-	dev-haskell/regex-compat
-	sys-apps/diffutils
-	dev-haskell/network
-	sys-libs/zlib
-	doc?  ( virtual/latex-base
-		>=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}/tools"
-	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
-
-	# 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"
-
-	cd "${S}"
-	# Since we've patched the build system:
-	eautoreconf
-}
-
-src_compile() {
-	# use --enable-bytestring?
-	econf $(use_with doc manual) \
-		  --disable-haskeline \
-		  --disable-haskell-zlib \
-		|| 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}/doc/manual/darcs.ps" || die "installing darcs.ps failed"
-		dohtml -r "${S}/doc/manual/"* || die "installing darcs manual failed"
-	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-vcs/darcs/darcs-2.2.1.ebuild b/dev-vcs/darcs/darcs-2.2.1.ebuild
deleted file mode 100644
index 8b29ecf1be4e..000000000000
--- a/dev-vcs/darcs/darcs-2.2.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.2.1.ebuild,v 1.4 2010/07/12 11:46:48 slyfox Exp $
-
-CABAL_FEATURES="bin lib haddock"
-inherit haskell-cabal eutils bash-completion
-
-DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
-HOMEPAGE="http://darcs.net"
-SRC_URI="http://hackage.haskell.org/packages/archive/darcs/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND=">=net-misc/curl-7.10.2
-	>=dev-lang/ghc-6.8
-	>=dev-haskell/cabal-1.6
-	=dev-haskell/quickcheck-1*
-	dev-haskell/mtl
-	dev-haskell/html
-	dev-haskell/http
-	=dev-haskell/parsec-2.1*
-	dev-haskell/regex-compat
-	sys-apps/diffutils
-	dev-haskell/network"
-
-RDEPEND=">=net-misc/curl-7.10.2
-	virtual/mta
-	dev-libs/gmp"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/tools"
-	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
-
-	# 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() {
-	# don't use the haskell zlib package
-	# with it, I keep getting this:
-	#	darcs failed:  Codec.Compression.Zlib: incorrect data check
-	CABAL_CONFIGURE_FLAGS="--flags=-external-zlib"
-	cabal_src_compile
-}
-
-src_install() {
-	cabal_src_install
-	dobashcompletion "${S}/tools/darcs_completion" "${PN}"
-}
-
-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 "/etc/ssmtp/ssmtp.conf with appropriate values for your site."
-}
diff --git a/dev-vcs/darcs/darcs-2.4.4.ebuild b/dev-vcs/darcs/darcs-2.4.4.ebuild
deleted file mode 100644
index 46b7c5ae6cc3..000000000000
--- a/dev-vcs/darcs/darcs-2.4.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.3 2010/07/10 19:08:04 slyfox Exp $
-
-EAPI="2"
-CABAL_FEATURES="bin lib profile haddock"
-inherit haskell-cabal eutils bash-completion
-
-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 ~ppc64 ~x86"
-IUSE="doc test"
-
-# Dependency notes:
-# 1) Use a cunning trick for hashed-storage, haskeline, regex-compat
-#       where the min bound is the lowest version available.
-# 2) Do the opposite for zlib: highest not available.
-# 3) Prefer curl over HTTP since darcs uses an old version of HTTP.
-# 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: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
-		net-misc/curl"
-
-DEPEND="${COMMONDEPS}
-		>=dev-haskell/cabal-1.6
-		doc?  ( virtual/latex-base
-				dev-tex/latex2html )
-		test? ( dev-haskell/test-framework
-				dev-haskell/test-framework-hunit
-				dev-haskell/test-framework-quickcheck2 )
-		"
-
-# darcs also has a library version; we thus need $DEPEND
-RDEPEND="${COMMONDEPS}
-		virtual/mta"
-
-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_prepare() {
-	pushd "contrib"
-	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
-	popd
-
-	# Loosen dependency on hashed-storage
-	sed -i -e "s/hashed-storage == 0.4.13/hashed-storage == 0.4.*/" \
-		"${S}/${PN}.cabal" \
-		|| die "Could not loosen deps on hashed-storage"
-}
-
-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 "${D}/usr/bin/unit" 2> /dev/null
-
-	# fixup perms in such an an awkward way
-	mv "${D}/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 "${D}/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 "/etc/ssmtp/ssmtp.conf with appropriate values for your site."
-}
diff --git a/dev-vcs/darcs/files/darcs-1.0.8-ghc66.patch b/dev-vcs/darcs/files/darcs-1.0.8-ghc66.patch
deleted file mode 100644
index 5f0c0d6edd77..000000000000
--- a/dev-vcs/darcs/files/darcs-1.0.8-ghc66.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urwpN darcs-1.0.8.orig/configure.ac darcs-1.0.8/configure.ac
---- darcs-1.0.8.orig/configure.ac	2006-06-16 20:59:29.000000000 +0200
-+++ darcs-1.0.8/configure.ac	2006-09-18 23:15:25.000000000 +0200
-@@ -110,6 +110,7 @@ WORKAROUND_POSIXSIGNALS([installHandler,
- dnl Look for Text.Regex
- 
- GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), text, mkRegex undefined)
-+GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), regex-compat, mkRegex undefined)
- 
- dnl See if we need a package for QuickCheck
- 
-@@ -117,13 +118,17 @@ GHC_CHECK_MODULE(Debug.QuickCheck( quick
- 
- dnl See if we need the util or mtl packages for Control.Monad
- 
--GHC_CHECK_MODULE(Control.Monad.Error, util, putStr undefined)
--GHC_CHECK_MODULE(Control.Monad.Error, mtl, putStr undefined)
-+GHC_CHECK_MODULE(Control.Monad.Error, util, strMsg "foo" :: String)
-+GHC_CHECK_MODULE(Control.Monad.Error, mtl, strMsg "foo" :: String)
- 
- dnl See if we need a package for parsec...
- 
- GHC_CHECK_MODULE(Text.ParserCombinators.Parsec, parsec, errorPos undefined)
- 
-+dnl Check if we need package html
-+
-+GHC_CHECK_MODULE(Text.Html, html, text "foo")
-+
- dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
- 
- WORKAROUND_getCurrentDirectory
-diff -urwpN darcs-1.0.8.orig/Lcs.lhs darcs-1.0.8/Lcs.lhs
---- darcs-1.0.8.orig/Lcs.lhs	2006-06-16 20:59:28.000000000 +0200
-+++ darcs-1.0.8/Lcs.lhs	2006-09-18 22:28:38.000000000 +0200
-@@ -358,7 +358,8 @@ shiftBoundaries c_a c_b p_a i_ j_ =
- -- | goto next unchanged line, return the given line if unchanged
- nextUnchanged :: BSTArray s -> Int -> ST s Int
- nextUnchanged c i = do
--  if i == (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i == len + 1 then return i
-      else do b <- readArray c i
-              if b then nextUnchanged c (i+1)
-                 else return i
-@@ -367,7 +368,8 @@ nextUnchanged c i = do
- --   behind the last line
- skipOneUnChanged :: BSTArray s -> Int -> ST s Int
- skipOneUnChanged c i = do
--  if i == (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i == len + 1 then return i
-      else do b <- readArray c i
-              if not b then return (i+1)
-                 else skipOneUnChanged c (i+1)
-@@ -381,8 +383,9 @@ nextUnchangedN c n i = do
- 
- -- | goto next changed line, return the given line if changed
- nextChanged :: BSTArray s -> Int -> ST s (Maybe Int)
--nextChanged c i =
--  if i <= aLen c
-+nextChanged c i = do
-+  len <- aLenM c
-+  if i <= len
-     then do b <- readArray c i
-             if not b then nextChanged c (i+1)
-                else return $ Just i
-@@ -430,8 +433,17 @@ initM a = listArray (0, length a) (0:a)
- initP :: [PackedString] -> PArray
- initP a = listArray (0, length a) (nilPS:a)
- 
-+#if __GLASGOW_HASKELL__ > 604
-+aLen :: (IArray a e) => a Int e -> Int
-+aLen a = snd $ bounds a
-+aLenM :: (MArray a e m) => a Int e -> m Int
-+aLenM a = getBounds a >>= return . snd
-+#else
- aLen :: HasBounds a => a Int e -> Int
- aLen a = snd $ bounds a
-+aLenM :: (HasBounds a, Monad m) => a Int e -> m Int
-+aLenM = return . snd . bounds
-+#endif
- \end{code}
- 
- \begin{code}
diff --git a/dev-vcs/darcs/files/darcs-1.1.0pre1-ghc68.patch b/dev-vcs/darcs/files/darcs-1.1.0pre1-ghc68.patch
deleted file mode 100644
index ac6b8578f491..000000000000
--- a/dev-vcs/darcs/files/darcs-1.1.0pre1-ghc68.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -rN -u old-darcs-1.1.0pre1/aclocal.m4 new-darcs-1.1.0pre1/aclocal.m4
---- old-darcs-1.1.0pre1/aclocal.m4	2007-12-30 18:13:00.000000000 +0100
-+++ new-darcs-1.1.0pre1/aclocal.m4	2007-12-30 18:13:01.000000000 +0100
-@@ -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!])
-     )
-diff -rN -u old-darcs-1.1.0pre1/configure.ac new-darcs-1.1.0pre1/configure.ac
---- old-darcs-1.1.0pre1/configure.ac	2007-12-30 18:13:00.000000000 +0100
-+++ new-darcs-1.1.0pre1/configure.ac	2007-12-30 18:13:01.000000000 +0100
-@@ -135,6 +135,10 @@
- GHC_CHECK_MODULE(Text.Html, html, text "foo",,
-                  AC_MSG_ERROR(Cannot find Text.Html; try installing package html?))
- 
-+dnl See if we need a package for containers...
-+
-+GHC_CHECK_MODULE(Data.Map, containers, empty)
-+
- dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
- 
- WORKAROUND_getCurrentDirectory
-
diff --git a/dev-vcs/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff b/dev-vcs/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff
deleted file mode 100644
index af5c7ff1a541..000000000000
--- a/dev-vcs/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/autoconf.mk.in b/autoconf.mk.in
-index 86e0932..de4bdcf 100644
---- a/autoconf.mk.in
-+++ b/autoconf.mk.in
-@@ -24,7 +24,7 @@ LDFLAGS		:= @LDFLAGS@
- OPTLLDFLAGS     := $(addprefix -optl,$(LDFLAGS))
- LIBS            := @LIBS@
- OPTLLIBS        := $(filter-out -%,$(LIBS)) $(addprefix -optl,$(filter -%,$(LIBS)))
--GHCFLAGS	:= @GHCFLAGS@ @CPPFLAGS@ @DEFS@
-+GHCFLAGS	:= -package base @GHCFLAGS@ @CPPFLAGS@ @DEFS@
- USE_GNULIBSHA1  := @USE_GNULIBSHA1@
- HAVE_HTTP       := @HAVE_HTTP@
- HAVE_CURSES     := @HAVE_CURSES@