Fix old patch to dev-util/darcs. All ghc versions should now be ok.

Package-Manager: portage-2.1.3.19

4 files changed, 45 insertions, 35 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 8415ae7a028c..2b699fbc406f 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.82 2007/12/30 16:30:48 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.83 2007/12/30 19:33:01 kolmodin Exp $
+
+  30 Dec 2007; Lennart Kolmodin <kolmodin@gentoo.org>
+  files/darcs-1.1.0pre1-ghc68.patch, darcs-1.1.0_pre1.ebuild:
+  Rewrite the GHC version patch. It should now work with all versions of GHC
+  where darcs previously worked. This fixes bug #203507.
 
   30 Dec 2007; Lennart Kolmodin <kolmodin@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/Manifest b/dev-util/darcs/Manifest
index b3e801d3c04e..ca2683834534 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -9,10 +9,10 @@ AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b
 MD5 4f8642df13c4e3d08370075d46b8dafb files/darcs-1.0.9-bashcomp.patch 510
 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 files/darcs-1.0.9-bashcomp.patch 510
 SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6 files/darcs-1.0.9-bashcomp.patch 510
-AUX darcs-1.1.0pre1-ghc68.patch 1588 RMD160 308f6a8845b2ab4cc6015b515d5974b1817b895e SHA1 97d9b33ff8f7b2c71df0e6158b3025a28f28ecb1 SHA256 8cad221ce2f41dbb578373843ebfa6a523f4e2f24391d362527802711d76222a
-MD5 4d048af3264cdd558cb16807736b0230 files/darcs-1.1.0pre1-ghc68.patch 1588
-RMD160 308f6a8845b2ab4cc6015b515d5974b1817b895e files/darcs-1.1.0pre1-ghc68.patch 1588
-SHA256 8cad221ce2f41dbb578373843ebfa6a523f4e2f24391d362527802711d76222a files/darcs-1.1.0pre1-ghc68.patch 1588
+AUX darcs-1.1.0pre1-ghc68.patch 1548 RMD160 bde8493cae0dd2fa9e21367ec5322252780209d5 SHA1 9f64935e8b4a44cab474352a0b8090192b3052e0 SHA256 252199c644163c24c09504c72a34cf750d065fab322a2c17bf4016d83b1b826e
+MD5 b1ccba2adb9a0eecbfb91db99a421fb3 files/darcs-1.1.0pre1-ghc68.patch 1548
+RMD160 bde8493cae0dd2fa9e21367ec5322252780209d5 files/darcs-1.1.0pre1-ghc68.patch 1548
+SHA256 252199c644163c24c09504c72a34cf750d065fab322a2c17bf4016d83b1b826e files/darcs-1.1.0pre1-ghc68.patch 1548
 DIST darcs-1.0.5.tar.gz 944888 RMD160 453dc7282d2751c0b862cf74bd095b63b927e5d7 SHA1 49512ba28c1724adba9eef4a9e3f7e104b7634f9 SHA256 9e71bfdab2be413b43219bdd10f8e79a3b496d542eb447d910b2708f8a6663a9
 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
@@ -39,14 +39,14 @@ EBUILD darcs-1.0.9.ebuild 2814 RMD160 0fb903cc76b304dd216e4c3b06ff7bd2d7063253 S
 MD5 3d8ce4884c741441f516c22a1a795407 darcs-1.0.9.ebuild 2814
 RMD160 0fb903cc76b304dd216e4c3b06ff7bd2d7063253 darcs-1.0.9.ebuild 2814
 SHA256 e6b20855b113fe505b7d799f683c67401e9ec176068ab666000a559052baf573 darcs-1.0.9.ebuild 2814
-EBUILD darcs-1.1.0_pre1.ebuild 2864 RMD160 8843c6874964f61a4e52fd5b684de4a1c28bc938 SHA1 04987b6b34f0a4134f825c69f5653d91d76b1008 SHA256 d1a93ebcd41f402d042f13c73146964584d0b8899c63bae69be5e9b414242e93
-MD5 ca96dc076d190333c13f98a29d80c59f darcs-1.1.0_pre1.ebuild 2864
-RMD160 8843c6874964f61a4e52fd5b684de4a1c28bc938 darcs-1.1.0_pre1.ebuild 2864
-SHA256 d1a93ebcd41f402d042f13c73146964584d0b8899c63bae69be5e9b414242e93 darcs-1.1.0_pre1.ebuild 2864
-MISC ChangeLog 12159 RMD160 8ee8e5f43ed9bfd9f794a38bd1d665bfbcaaf454 SHA1 0d973a3a1493ee189eaa10cc58e7cf3251c10e6a SHA256 f4f6efb6ce542323e19631259ad47177ed6bc2972ccb68e305ad61decddf81e4
-MD5 bca7d6587d9f38ffd1bfee2a053f2ca6 ChangeLog 12159
-RMD160 8ee8e5f43ed9bfd9f794a38bd1d665bfbcaaf454 ChangeLog 12159
-SHA256 f4f6efb6ce542323e19631259ad47177ed6bc2972ccb68e305ad61decddf81e4 ChangeLog 12159
+EBUILD darcs-1.1.0_pre1.ebuild 3032 RMD160 a93191d2657ae57fc7dad92b3418b0729056942a SHA1 4b2e183a6940662af639eb54e7ebac76a8448f20 SHA256 25781a25afeee74cd7469ef4b58c300747c0255e2bac3c66c9275b3373386d89
+MD5 53cf1e1c5be6a228bc0bff6a66cc1b92 darcs-1.1.0_pre1.ebuild 3032
+RMD160 a93191d2657ae57fc7dad92b3418b0729056942a darcs-1.1.0_pre1.ebuild 3032
+SHA256 25781a25afeee74cd7469ef4b58c300747c0255e2bac3c66c9275b3373386d89 darcs-1.1.0_pre1.ebuild 3032
+MISC ChangeLog 12410 RMD160 9a88ec6c6666802c07d35f16a527200001d9f7bc SHA1 bc0b9c85eafc8af922e4338aa03a0c792afc69a3 SHA256 96d23fed79a5ca190510ec6b8e94d20e33498e95ee1afcc76b9318f6b881bcc5
+MD5 e1bdb5cacc37d73739a73d025abb9e04 ChangeLog 12410
+RMD160 9a88ec6c6666802c07d35f16a527200001d9f7bc ChangeLog 12410
+SHA256 96d23fed79a5ca190510ec6b8e94d20e33498e95ee1afcc76b9318f6b881bcc5 ChangeLog 12410
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -72,7 +72,7 @@ SHA256 007b9f6052c2e8b07f7371fbc1d43822ef252a5547ba352da302655687ca3f1e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHd8fv1n/CYbXjntIRAhFpAKCvh/iLucJEfpRvM+JM1qe/oEnHcgCeOrks
-Ad1OMkgIQ0PoBGQQCpan3k0=
-=i6EF
+iD8DBQFHd/Kb1n/CYbXjntIRAvJTAJ9ZdjanNR+FJFyRUqIMBy1Q1lHECwCcCocs
+dPgA+/+IicmqE8g3PfVFpgA=
+=q/xV
 -----END PGP SIGNATURE-----
diff --git a/dev-util/darcs/darcs-1.1.0_pre1.ebuild b/dev-util/darcs/darcs-1.1.0_pre1.ebuild
index b9bf0ce4045e..ce4357e875e2 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
 # 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.2 2007/12/21 00:29:10 dcoutts Exp $
+# $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 $
 
 inherit base autotools eutils
 
@@ -44,6 +44,10 @@ pkg_setup() {
 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"
 
diff --git a/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch b/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch
index b4d2d51f6421..ac6b8578f491 100644
--- a/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch
+++ b/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -13,7 +13,7 @@ diff -ur darcs-1.1.0pre1.orig/aclocal.m4 darcs-1.1.0pre1/aclocal.m4
 +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
@@ -22,17 +22,18 @@ diff -ur darcs-1.1.0pre1.orig/aclocal.m4 darcs-1.1.0pre1/aclocal.m4
         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 -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
+