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

Package-Manager: portage-2.1.2.3

7 files changed, 70 insertions, 33 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/Manifest b/dev-util/darcs/Manifest
index bd5785faeda8..dc571ac10aa1 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX darcs-1.0.8-ghc66.patch 3057 RMD160 0eb34da97317b5ae24800ae6b026d3a8acc990b1 SHA1 57d192aa7347dbea460de5bd7aea7c7ff160c7ed SHA256 18ff1042e522d9dc09c1f81b716c22370decfa9b02841c8e765f9e30ce682ea1
 MD5 23a159dd96c69e34673700f43e04f3f0 files/darcs-1.0.8-ghc66.patch 3057
 RMD160 0eb34da97317b5ae24800ae6b026d3a8acc990b1 files/darcs-1.0.8-ghc66.patch 3057
@@ -7,30 +10,30 @@ DIST darcs-1.0.5.tar.gz 944888 RMD160 453dc7282d2751c0b862cf74bd095b63b927e5d7 S
 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
-EBUILD darcs-1.0.4.ebuild 1425 RMD160 916eb8ee61ccf2243e1dcf9bc52b20616d5ad206 SHA1 8a6f3cb3fb98a52151d8b43f74eef83ea48435e6 SHA256 3b48394f1199ac9457e294211aaebd65786d017acc80ff4527c8d571309ac510
-MD5 d78722339dcc62a7c7dda66e2f788751 darcs-1.0.4.ebuild 1425
-RMD160 916eb8ee61ccf2243e1dcf9bc52b20616d5ad206 darcs-1.0.4.ebuild 1425
-SHA256 3b48394f1199ac9457e294211aaebd65786d017acc80ff4527c8d571309ac510 darcs-1.0.4.ebuild 1425
-EBUILD darcs-1.0.5.ebuild 1764 RMD160 0ef65aeb3323b249b0eb35e936f07d48fc593a2b SHA1 1b8451b6330932d2980002a2724347e9f2fb99ec SHA256 66019a7b91cb3d2d0ced2979210aa9b44e76053f3fcac10b37062c560cc14894
-MD5 09cb4d38d968d3fa5616af284d84d1b0 darcs-1.0.5.ebuild 1764
-RMD160 0ef65aeb3323b249b0eb35e936f07d48fc593a2b darcs-1.0.5.ebuild 1764
-SHA256 66019a7b91cb3d2d0ced2979210aa9b44e76053f3fcac10b37062c560cc14894 darcs-1.0.5.ebuild 1764
-EBUILD darcs-1.0.6.ebuild 1965 RMD160 a863f4eae615492869a277d23c66a945e6aeefed SHA1 b1957e79caa92c2fb22e4be95675255e41b70d0d SHA256 fae41d930e3c47269f992b99181bc58b20ac4582f3dcd66fd282a8954ce38285
-MD5 1161853ad10483c39b5d1fd795b3117b darcs-1.0.6.ebuild 1965
-RMD160 a863f4eae615492869a277d23c66a945e6aeefed darcs-1.0.6.ebuild 1965
-SHA256 fae41d930e3c47269f992b99181bc58b20ac4582f3dcd66fd282a8954ce38285 darcs-1.0.6.ebuild 1965
-EBUILD darcs-1.0.7.ebuild 1976 RMD160 0f0438016a888f00359f8aed25d106edc91b62f0 SHA1 cc395b17487876ea18651cd1bdaaae676cc31e2d SHA256 74cb5dd48d52fa8558a7a861799a3dccd3f008d678d177709cc36d69b62c8a4f
-MD5 5223dab85604386699bad5be5b8d745d darcs-1.0.7.ebuild 1976
-RMD160 0f0438016a888f00359f8aed25d106edc91b62f0 darcs-1.0.7.ebuild 1976
-SHA256 74cb5dd48d52fa8558a7a861799a3dccd3f008d678d177709cc36d69b62c8a4f darcs-1.0.7.ebuild 1976
-EBUILD darcs-1.0.8-r1.ebuild 2368 RMD160 803e6a276217a66268200110fe4d871d53de63be SHA1 5ab628517245ee5a69653c02221918ffc0fe7cc3 SHA256 9cd7053a8951177cf3f0b61cd6e52b2061ec8665637f0541063cf0024c05a851
-MD5 dda818fa88cb7bbdb80a73cfc707990b darcs-1.0.8-r1.ebuild 2368
-RMD160 803e6a276217a66268200110fe4d871d53de63be darcs-1.0.8-r1.ebuild 2368
-SHA256 9cd7053a8951177cf3f0b61cd6e52b2061ec8665637f0541063cf0024c05a851 darcs-1.0.8-r1.ebuild 2368
-MISC ChangeLog 9172 RMD160 55f0368fecc51bceba79dbcb046d35d13d328c14 SHA1 2fbafa9e8b008dd6f713f25cbddc6e53c065713a SHA256 224cec5550f71691edb9f3fba65f4b73bc2f7932b0366314a76fb7ee053f8747
-MD5 d161a017495002e783da286b27018907 ChangeLog 9172
-RMD160 55f0368fecc51bceba79dbcb046d35d13d328c14 ChangeLog 9172
-SHA256 224cec5550f71691edb9f3fba65f4b73bc2f7932b0366314a76fb7ee053f8747 ChangeLog 9172
+EBUILD darcs-1.0.4.ebuild 1746 RMD160 a6b0bcf713dfe815896746f319e97d02fdba6802 SHA1 6ab83fba9378e51820b1a8014954d584067c63f2 SHA256 cbbeba250ae83b90c4777782302f0db29c5f952303ab1fe4c973c60dfe9cd607
+MD5 82bdd441259b13fc2121d699ab9983c5 darcs-1.0.4.ebuild 1746
+RMD160 a6b0bcf713dfe815896746f319e97d02fdba6802 darcs-1.0.4.ebuild 1746
+SHA256 cbbeba250ae83b90c4777782302f0db29c5f952303ab1fe4c973c60dfe9cd607 darcs-1.0.4.ebuild 1746
+EBUILD darcs-1.0.5.ebuild 1782 RMD160 957c24277347fd0a53bf06b4ae632cec767a2d29 SHA1 5185163ed86f10bcefa7b5bc8c56ab49fa3c036e SHA256 88fc79ed133fa0d8bea0f6ac451e3c0c798f76c8c6eb786745efecb8b9e4912b
+MD5 05a76ec74b0d58814993ec53f87bbda5 darcs-1.0.5.ebuild 1782
+RMD160 957c24277347fd0a53bf06b4ae632cec767a2d29 darcs-1.0.5.ebuild 1782
+SHA256 88fc79ed133fa0d8bea0f6ac451e3c0c798f76c8c6eb786745efecb8b9e4912b darcs-1.0.5.ebuild 1782
+EBUILD darcs-1.0.6.ebuild 1983 RMD160 2dc3ba5886d3f96ac7c4710da04b383d25da8657 SHA1 22d019f1c1f0dda6fc337b61b90a7975e7b4b751 SHA256 a62f3df9d569ff28688e60e322bcc9967199100f061ea6d64b4332c301de3c02
+MD5 1eca7efe0e009a4dc3e704bed8e5fcdf darcs-1.0.6.ebuild 1983
+RMD160 2dc3ba5886d3f96ac7c4710da04b383d25da8657 darcs-1.0.6.ebuild 1983
+SHA256 a62f3df9d569ff28688e60e322bcc9967199100f061ea6d64b4332c301de3c02 darcs-1.0.6.ebuild 1983
+EBUILD darcs-1.0.7.ebuild 2036 RMD160 8fa87f20f6152722978f51f9e6a1dfa1b9e03a44 SHA1 0b2e9da9b6953d48c1f9af7baa3d062a9be56494 SHA256 5d852f1e2ae0d63595998ad1659318c6cc0aff2cc30e485c933fe01f20e9b892
+MD5 27470c4fbda0da5cc13f0324589760c5 darcs-1.0.7.ebuild 2036
+RMD160 8fa87f20f6152722978f51f9e6a1dfa1b9e03a44 darcs-1.0.7.ebuild 2036
+SHA256 5d852f1e2ae0d63595998ad1659318c6cc0aff2cc30e485c933fe01f20e9b892 darcs-1.0.7.ebuild 2036
+EBUILD darcs-1.0.8-r1.ebuild 2428 RMD160 c65a5dacec46c768c7fa199896ca17ce6d2a4c47 SHA1 1f7b7aaad1fa561b36bd56eb3989737f67b032d9 SHA256 1b85f799ba45f0256611ad91b2ca27585fca179c64ccb948fe8c05d2a0b72e34
+MD5 223dcd30abdaa0b73d32e7af0839bded darcs-1.0.8-r1.ebuild 2428
+RMD160 c65a5dacec46c768c7fa199896ca17ce6d2a4c47 darcs-1.0.8-r1.ebuild 2428
+SHA256 1b85f799ba45f0256611ad91b2ca27585fca179c64ccb948fe8c05d2a0b72e34 darcs-1.0.8-r1.ebuild 2428
+MISC ChangeLog 9546 RMD160 4ed06fd30e69d6f139d6f4906fd3379fa1c74fc4 SHA1 aa131f869a82de7b9ee0c4115bdcfc413bfafb6a SHA256 e1e7f117c4ffb4833a61d4d1c5d73f7cfbe0926faefeb11fed61a307c82799e4
+MD5 0b993bc171c7b8358e00376d0514a141 ChangeLog 9546
+RMD160 4ed06fd30e69d6f139d6f4906fd3379fa1c74fc4 ChangeLog 9546
+SHA256 e1e7f117c4ffb4833a61d4d1c5d73f7cfbe0926faefeb11fed61a307c82799e4 ChangeLog 9546
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -50,3 +53,10 @@ SHA256 f60ab21abc29fb110593b246c79dfc211e38c9bfa02f0e0d2b9f78f43fc389b4 files/di
 MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8-r1 238
 RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8-r1 238
 SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGNRBx1n/CYbXjntIRAvRpAJ9JDRTRF7Lts/a7U/zKEx/F7gNUrgCgkK4r
+iR+a8gKHRmBgzeHwBq7ekbk=
+=+ZFB
+-----END PGP SIGNATURE-----
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 )"