Updated older darcs ebuilds with deps+blocks, newer ones got ghc-extra-libs deps.

(Portage version: 2.1.2.3)

6 files changed, 36 insertions, 9 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index f6a208e2e26a..1317780d9904 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.65 2007/04/16 07:25:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.66 2007/04/29 21:38:40 kolmodin Exp $
+
+  29 Apr 2007; Lennart Kolmodin <kolmodin@gentoo.org> darcs-1.0.4.ebuild,
+  darcs-1.0.5.ebuild, darcs-1.0.6.ebuild, darcs-1.0.7.ebuild,
+  darcs-1.0.8-r1.ebuild:
+  Added ghc-6.6 blocks for 1.0.4, 1.0.5 and 1.0.6. Added proper extra-libs
+  deps to 1.0.7 and 1.0.8-r1. 1.0.4 also got a src_unpack which the otherones
+  already had, wrt compiling C code with correct C flags.
 
   16 Apr 2007; Markus Rothe <corsair@gentoo.org> darcs-1.0.8-r1.ebuild:
   Stable on ppc64
diff --git a/dev-util/darcs/darcs-1.0.4.ebuild b/dev-util/darcs/darcs-1.0.4.ebuild
index 01fd9459f044..70f94aed14bb 100644
--- a/dev-util/darcs/darcs-1.0.4.ebuild
+++ b/dev-util/darcs/darcs-1.0.4.ebuild
@@ -1,6 +1,8 @@
 # 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.4.ebuild,v 1.2 2007/03/09 04:54:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.4.ebuild,v 1.3 2007/04/29 21:38:40 kolmodin Exp $
+
+inherit base
 
 DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
 HOMEPAGE="http://abridgegame.org/darcs"
@@ -16,7 +18,8 @@ IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
 	virtual/mta
-	>=virtual/ghc-6.2.2
+	<virtual/ghc-6.6
+	!>=virtual/ghc-6.6
 	doc?  ( virtual/tetex
 		dev-tex/latex2html )"
 #	wxwindows?  ( dev-haskell/wxhaskell )
@@ -28,6 +31,15 @@ RDEPEND=">=net-misc/curl-7.10.2
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	base_src_unpack
+
+	# 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))\):\1 $(addprefix -opta,$(CFLAGS)):' \
+		${S}/autoconf.mk.in
+}
+
 src_compile() {
 	local myconf
 #	myconf="`use_with wxwindows wx`"
diff --git a/dev-util/darcs/darcs-1.0.5.ebuild b/dev-util/darcs/darcs-1.0.5.ebuild
index 22107ebf18bf..4000641bd613 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
 # 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.7 2007/03/09 04:54:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.5.ebuild,v 1.8 2007/04/29 21:38:40 kolmodin Exp $
 
 inherit base fixheadtails
 
@@ -18,7 +18,8 @@ IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
 	virtual/mta
-	>=virtual/ghc-6.2.2
+	<virtual/ghc-6.6
+	!>=virtual/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 dee0d79fc15b..e0ffdcb9e841 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
 # 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.6 2007/03/09 04:54:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.6.ebuild,v 1.7 2007/04/29 21:38:40 kolmodin Exp $
 
 inherit base
 
@@ -18,7 +18,8 @@ IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
 	virtual/mta
-	>=virtual/ghc-6.2.2
+	<virtual/ghc-6.6
+	!>=virtual/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 8d7a770874aa..f1129ea9a887 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
 # 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.3 2007/03/09 04:54:36 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.7.ebuild,v 1.4 2007/04/29 21:38:40 kolmodin Exp $
 
 inherit base autotools
 
@@ -16,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
+	dev-haskell/html
+	dev-haskell/mtl
+	dev-haskell/quickcheck
 	>=virtual/ghc-6.2.2
 	doc?  ( virtual/tetex
 			>=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"
diff --git a/dev-util/darcs/darcs-1.0.8-r1.ebuild b/dev-util/darcs/darcs-1.0.8-r1.ebuild
index 252b61006f2b..df6716b551e2 100644
--- a/dev-util/darcs/darcs-1.0.8-r1.ebuild
+++ b/dev-util/darcs/darcs-1.0.8-r1.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.8-r1.ebuild,v 1.6 2007/04/16 07:25:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r1.ebuild,v 1.7 2007/04/29 21:38:40 kolmodin Exp $
 
 inherit base autotools
 
@@ -16,6 +16,9 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=net-misc/curl-7.10.2
+	dev-haskell/html
+	dev-haskell/mtl
+	dev-haskell/quickcheck
 	>=virtual/ghc-6.2.2
 	doc?  ( virtual/tetex
 			>=dev-tex/latex2html-2002.2.1_pre20041025-r1 )"