Fix qa bug #207449 and fix installing docs.

(Portage version: 2.1.3.19)

7 files changed, 37 insertions, 29 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 2b699fbc406f..60180ac00f0c 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.83 2007/12/30 19:33:01 kolmodin Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.84 2008/01/26 19:57:12 dcoutts Exp $
+
+  26 Jan 2008; 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,
+  darcs-1.0.9.ebuild, darcs-1.1.0_pre1.ebuild:
+  Fix qa bug #207449 and fix installing docs.
 
   30 Dec 2007; Lennart Kolmodin <kolmodin@gentoo.org>
   files/darcs-1.1.0pre1-ghc68.patch, darcs-1.1.0_pre1.ebuild:
diff --git a/dev-util/darcs/darcs-1.0.5.ebuild b/dev-util/darcs/darcs-1.0.5.ebuild
index e92c2a223779..0776a1d20696 100644
--- a/dev-util/darcs/darcs-1.0.5.ebuild
+++ b/dev-util/darcs/darcs-1.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.5.ebuild,v 1.11 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.5.ebuild,v 1.12 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base fixheadtails eutils
 
@@ -19,7 +19,6 @@ IUSE="doc"
 DEPEND=">=net-misc/curl-7.10.2
 	virtual/mta
 	<dev-lang/ghc-6.6
-	!>=dev-lang/ghc-6.6
 	doc?  ( virtual/tetex
 		dev-tex/latex2html )"
 #	wxwindows?  ( dev-haskell/wxhaskell )
diff --git a/dev-util/darcs/darcs-1.0.6.ebuild b/dev-util/darcs/darcs-1.0.6.ebuild
index 8cfd79c46027..5a4ba4bb1684 100644
--- a/dev-util/darcs/darcs-1.0.6.ebuild
+++ b/dev-util/darcs/darcs-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.6.ebuild,v 1.10 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.6.ebuild,v 1.11 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base eutils
 
@@ -19,7 +19,6 @@ IUSE="doc"
 DEPEND=">=net-misc/curl-7.10.2
 	virtual/mta
 	<dev-lang/ghc-6.6
-	!>=dev-lang/ghc-6.6
 	doc?  ( virtual/tetex
 		dev-tex/latex2html )"
 #	wxwindows?  ( dev-haskell/wxhaskell )
diff --git a/dev-util/darcs/darcs-1.0.7.ebuild b/dev-util/darcs/darcs-1.0.7.ebuild
index f736d1a227ee..c704ed2b4b72 100644
--- a/dev-util/darcs/darcs-1.0.7.ebuild
+++ b/dev-util/darcs/darcs-1.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.7.ebuild,v 1.8 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.7.ebuild,v 1.9 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base autotools eutils
 
@@ -52,11 +52,12 @@ src_unpack() {
 	# 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
+}
+
+src_compile() {
 
 	econf $(use_with doc docs) \
 		|| die "configure failed"
diff --git a/dev-util/darcs/darcs-1.0.8-r2.ebuild b/dev-util/darcs/darcs-1.0.8-r2.ebuild
index 27b21fb43ccf..7c5679bc2579 100644
--- a/dev-util/darcs/darcs-1.0.8-r2.ebuild
+++ b/dev-util/darcs/darcs-1.0.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r2.ebuild,v 1.4 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r2.ebuild,v 1.5 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base autotools eutils
 
@@ -53,11 +53,12 @@ src_unpack() {
 	# 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
+}
+
+src_compile() {
 
 	econf $(use_with doc docs) \
 		|| die "configure failed"
diff --git a/dev-util/darcs/darcs-1.0.9.ebuild b/dev-util/darcs/darcs-1.0.9.ebuild
index a315a33b3045..2db6fee70ba4 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
+# Copyright 1999-2008 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.10 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.9.ebuild,v 1.11 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base autotools eutils
 
@@ -54,11 +54,12 @@ src_unpack() {
 	# 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
+}
+
+src_compile() {
 
 	econf $(use_with doc docs) \
 		|| die "configure failed"
@@ -80,8 +81,8 @@ src_install() {
 		&& rmdir "${D}/etc" \
 		|| die "fixing location of darcs bash completion failed"
 	if use doc; then
-		dodoc "${S}/darcs.ps"
-		dohtml -r "${S}/manual/"*
+		dodoc "${S}/darcs.ps" || die "installing darcs.ps failed"
+		dohtml -r "${S}/manual/"* || die "installing darcs manual failed"
 	fi
 }
 
diff --git a/dev-util/darcs/darcs-1.1.0_pre1.ebuild b/dev-util/darcs/darcs-1.1.0_pre1.ebuild
index ce4357e875e2..d8cfef5695e5 100644
--- a/dev-util/darcs/darcs-1.1.0_pre1.ebuild
+++ b/dev-util/darcs/darcs-1.1.0_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.3 2007/12/30 19:33:01 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.1.0_pre1.ebuild,v 1.4 2008/01/26 19:57:12 dcoutts Exp $
 
 inherit base autotools eutils
 
@@ -51,8 +51,9 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-1.1.0pre1-ghc68.patch"
 
-	cd "${S}/tools"
+	pushd tools
 	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
+	popd
 
 	# 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
@@ -62,11 +63,12 @@ src_unpack() {
 	# 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
+}
+
+src_compile() {
 
 	econf $(use_with doc docs) \
 		|| die "configure failed"
@@ -88,8 +90,8 @@ src_install() {
 		&& rmdir "${D}/etc" \
 		|| die "fixing location of darcs bash completion failed"
 	if use doc; then
-		dodoc "${S}/darcs.ps"
-		dohtml -r "${S}/manual/"*
+		dodoc "${S}/doc/manual/darcs.ps" || die "installing darcs.ps failed"
+		dohtml -r "${S}/doc/manual/"* || die "installing darcs manual failed"
 	fi
 }