Make darcs-2.0.2 build with the most recent GHC version, and fix bug #282661.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 41 insertions, 10 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index b99c5ff1c689..2902a2d9170f 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/darcs
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.103 2009/07/25 13:19:17 kolmodin Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.104 2009/08/30 09:55:34 kolmodin Exp $
+
+  30 Aug 2009; Lennart Kolmodin <kolmodin@gentoo.org> darcs-2.0.2.ebuild:
+  Fix build system so that it builds with ghc 6.10, as this is the latest
+  stable package and thus is the default to users running stable systems.
+  Patch by Sergei Trofimovich <slyfox@inbox.ru>.
+  Also add sys-libs/zlib as dep, to fix bug #282661.
 
   25 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> darcs-2.2.1.ebuild:
   When building with USE=doc, make sure we have >=haddock-2.4.1.
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index b01e74c40f4e..d6ecbdd477ce 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX darcs-1.0.8-ghc66.patch 3057 RMD160 0eb34da97317b5ae24800ae6b026d3a8acc990b1 SHA1 57d192aa7347dbea460de5bd7aea7c7ff160c7ed SHA256 18ff1042e522d9dc09c1f81b716c22370decfa9b02841c8e765f9e30ce682ea1
 AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 SHA1 1abf5c0477169eb0109a0dd7ecfb2c38dfee15ff SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6
 AUX darcs-1.1.0pre1-ghc68.patch 1548 RMD160 bde8493cae0dd2fa9e21367ec5322252780209d5 SHA1 9f64935e8b4a44cab474352a0b8090192b3052e0 SHA256 252199c644163c24c09504c72a34cf750d065fab322a2c17bf4016d83b1b826e
+AUX darcs-2.0.2-add-dummy-base-dependency.diff 520 RMD160 b7206ef051d9be2df94d0c331dd029de6358106c SHA1 5c3dc86bcadfa51b452d0532d9cd45efec71a3a7 SHA256 a93ffcb918456fdb1514b02e7d1a3fc9498f8505f11d5f1d03cf9acd189a78b2
 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
@@ -19,15 +20,15 @@ EBUILD darcs-1.0.7.ebuild 2375 RMD160 a2063de21c656c860d4f2a9913b9b746370c13f7 S
 EBUILD darcs-1.0.8-r2.ebuild 2815 RMD160 94d68752d6a3e9f43844536660fe5efda8bbd18b SHA1 11ca7049d3e4074a2fb00ad3d6db380fae5533a1 SHA256 8e5c88aa24d5fa995d74a6e9f3df9e2838135147d07ecd7a0fe8d7a4437b8e43
 EBUILD darcs-1.0.9.ebuild 3105 RMD160 242b1d272995f5e46e4647eb1b8dd3b1c20d5b36 SHA1 1e0a58b11e561b1c6a5f557b1b1f6f0cab412391 SHA256 50bf987f188dcb4a8d500f155c5af5a4e9071605d151a2a681f0c4830ce949a1
 EBUILD darcs-1.1.0_pre1.ebuild 3159 RMD160 9afeda06991d7494fddd19e1262f1597d7e5d1be SHA1 c85e03cf1aa6849d7bcb6a03eaa99a08cb429f80 SHA256 b3870adb092a5fac4f0328b7f2155a86597e3e8cb42241a37bad6039a97d6dc9
-EBUILD darcs-2.0.2.ebuild 2679 RMD160 c93f8f7aa2d138b80586a9b446baaa7974a53110 SHA1 170154a4c65e35166771bd82eeb949ee87424374 SHA256 a3bf908c5844d045bc7b4b62b61352de01537f2041d6a3ad04cc48d1bb913a96
+EBUILD darcs-2.0.2.ebuild 3217 RMD160 af1834efd54ed054b9c53c2c5465b7f9964258c8 SHA1 99609acfa871752ff401e10d0d3e50dc1acba460 SHA256 69b690ca9ff2c8c68b343fd5bec0733a891dcb7d02f47e75a7e148f9280c3f86
 EBUILD darcs-2.1.0-r1.ebuild 2806 RMD160 8fed3d5b17f1c7b1b5903264217a72a882165be7 SHA1 f6ddf2460fafcb594025c0bbc5685607dcd774a2 SHA256 a7c3b75112208630dc8000ea3c5fb478c89d729a2701e43a4ce76849e96ff5ff
 EBUILD darcs-2.2.1.ebuild 2316 RMD160 f53ccd4745b20e6fda26cdb647b0506d8c49730b SHA1 360e4aaeb38c0e6da8458eacb4a4279fd12ae9da SHA256 86e5863eda1b06a525e4341e86b14487d899423dd68310a8cd3aaa587528b664
-MISC ChangeLog 15610 RMD160 7952849da198aaf627abe691006491201a3bec25 SHA1 3de81be5c1c5f2588c7edb9569e149d1b0e8215d SHA256 5102ee89171bd1f7075d13e5993c4018753d32929836323b3aa2146e64830c25
+MISC ChangeLog 15935 RMD160 7c38842cbda17f8ab6fba5439db98d0324542b73 SHA1 e899ff1406b4671ffce3aab362671097f25e97ea SHA256 ffbd2af58213128fe380a0fe9fcc4e38e9187cc8deb2594f14a30b7c5ca2fa9e
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkprBmAACgkQ1n/CYbXjntKT8wCdGtVS15qJtjYE5EXLd9/mXHds
-wQwAoIhnJjrRmz2Okg4IQXaGLa+rpgId
-=H3cp
+iEYEARECAAYFAkqaPmkACgkQ1n/CYbXjntJ6pQCfYnNicnoOGqPOXYjpMeEAk0FU
+Yi4An3KmC7zFxAXZdJSIPphyFNTB3mAM
+=B16V
 -----END PGP SIGNATURE-----
diff --git a/dev-util/darcs/darcs-2.0.2.ebuild b/dev-util/darcs/darcs-2.0.2.ebuild
index cf68a44fe243..44c7bced5b3f 100644
--- a/dev-util/darcs/darcs-2.0.2.ebuild
+++ b/dev-util/darcs/darcs-2.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild,v 1.7 2008/10/18 18:05:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild,v 1.8 2009/08/30 09:55:34 kolmodin Exp $
 
-inherit base autotools eutils
+inherit base autotools eutils ghc-package
 
 DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS"
 HOMEPAGE="http://darcs.net"
@@ -23,6 +23,7 @@ DEPEND=">=net-misc/curl-7.10.2
 	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 )"
 
@@ -44,6 +45,7 @@ pkg_setup() {
 src_unpack() {
 	base_src_unpack
 
+	epatch "${FILESDIR}/${PN}-2.0.2-add-dummy-base-dependency.diff"
 	cd "${S}/tools"
 	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
 
@@ -51,7 +53,16 @@ src_unpack() {
 	# 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
 }
diff --git a/dev-util/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff b/dev-util/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff
new file mode 100644
index 000000000000..af5c7ff1a541
--- /dev/null
+++ b/dev-util/darcs/files/darcs-2.0.2-add-dummy-base-dependency.diff
@@ -0,0 +1,13 @@
+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@