| 1 |
kolmodin 09/08/30 09:55:34 |
| 2 |
|
| 3 |
Modified: ChangeLog darcs-2.0.2.ebuild |
| 4 |
Log: |
| 5 |
Make darcs-2.0.2 build with the most recent GHC version, and fix bug #282661. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.104 dev-util/darcs/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/ChangeLog?rev=1.104&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/ChangeLog?rev=1.104&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/ChangeLog?r1=1.103&r2=1.104 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v |
| 18 |
retrieving revision 1.103 |
| 19 |
retrieving revision 1.104 |
| 20 |
diff -u -r1.103 -r1.104 |
| 21 |
--- ChangeLog 25 Jul 2009 13:19:17 -0000 1.103 |
| 22 |
+++ ChangeLog 30 Aug 2009 09:55:34 -0000 1.104 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for dev-util/darcs |
| 25 |
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.103 2009/07/25 13:19:17 kolmodin Exp $ |
| 27 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.104 2009/08/30 09:55:34 kolmodin Exp $ |
| 29 |
+ |
| 30 |
+ 30 Aug 2009; Lennart Kolmodin <kolmodin@g.o> darcs-2.0.2.ebuild: |
| 31 |
+ Fix build system so that it builds with ghc 6.10, as this is the latest |
| 32 |
+ stable package and thus is the default to users running stable systems. |
| 33 |
+ Patch by Sergei Trofimovich <slyfox@×××××.ru>. |
| 34 |
+ Also add sys-libs/zlib as dep, to fix bug #282661. |
| 35 |
|
| 36 |
25 Jul 2009; Lennart Kolmodin <kolmodin@g.o> darcs-2.2.1.ebuild: |
| 37 |
When building with USE=doc, make sure we have >=haddock-2.4.1. |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.8 dev-util/darcs/darcs-2.0.2.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild?rev=1.8&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild?rev=1.8&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild?r1=1.7&r2=1.8 |
| 46 |
|
| 47 |
Index: darcs-2.0.2.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild,v |
| 50 |
retrieving revision 1.7 |
| 51 |
retrieving revision 1.8 |
| 52 |
diff -u -r1.7 -r1.8 |
| 53 |
--- darcs-2.0.2.ebuild 18 Oct 2008 18:05:50 -0000 1.7 |
| 54 |
+++ darcs-2.0.2.ebuild 30 Aug 2009 09:55:34 -0000 1.8 |
| 55 |
@@ -1,8 +1,8 @@ |
| 56 |
-# Copyright 1999-2008 Gentoo Foundation |
| 57 |
+# Copyright 1999-2009 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild,v 1.7 2008/10/18 18:05:50 nixnut Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-2.0.2.ebuild,v 1.8 2009/08/30 09:55:34 kolmodin Exp $ |
| 61 |
|
| 62 |
-inherit base autotools eutils |
| 63 |
+inherit base autotools eutils ghc-package |
| 64 |
|
| 65 |
DESCRIPTION="David's Advanced Revision Control System is yet another replacement for CVS" |
| 66 |
HOMEPAGE="http://darcs.net" |
| 67 |
@@ -23,6 +23,7 @@ |
| 68 |
dev-haskell/parsec |
| 69 |
dev-haskell/regex-compat |
| 70 |
sys-apps/diffutils |
| 71 |
+ sys-libs/zlib |
| 72 |
doc? ( virtual/latex-base |
| 73 |
>=dev-tex/latex2html-2002.2.1_pre20041025-r1 )" |
| 74 |
|
| 75 |
@@ -44,6 +45,7 @@ |
| 76 |
src_unpack() { |
| 77 |
base_src_unpack |
| 78 |
|
| 79 |
+ epatch "${FILESDIR}/${PN}-2.0.2-add-dummy-base-dependency.diff" |
| 80 |
cd "${S}/tools" |
| 81 |
epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch" |
| 82 |
|
| 83 |
@@ -51,7 +53,16 @@ |
| 84 |
# of the low level ghc/gcc interaction gubbins. |
| 85 |
use ia64 && sed -i 's/-funfolding-use-threshold20//' "${S}/GNUmakefile" |
| 86 |
|
| 87 |
+ sed -i 's/-Werror//' "${S}/GNUmakefile" |
| 88 |
+ |
| 89 |
+ #emulate: CABAL_CONFIGURE_FLAGS="--constraint=base<4" |
| 90 |
+ # ghc-6.4: base-1; ghc-6.6.1: base-2; ghc-6.8: base-3; ghc-6.10: base-3, base-4 |
| 91 |
+ base_version="$($(ghc-getghcpkg) list --simple-output | tr " " "\n" | egrep '^base-[1-3]')" |
| 92 |
+ sed -i "s@, base ,@, $base_version ,@" "${S}/aclocal.m4" |
| 93 |
+ sed -i "s@-package base @-package $base_version @" "${S}/autoconf.mk.in" |
| 94 |
+ |
| 95 |
cd "${S}" |
| 96 |
+ sed -i 's/-Werror//' "${S}/aclocal.m4" |
| 97 |
# Since we've patched the build system: |
| 98 |
eautoreconf |
| 99 |
} |
Archives