* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.6.1.ebuild ChangeLog
@ 2012-03-09 21:55 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-03-09 21:55 UTC (permalink / raw
To: gentoo-commits
slyfox 12/03/09 21:55:22
Modified: haddock-2.6.1.ebuild ChangeLog
Log:
Fix build failure against system's cabal-1.10 (use cabal bundled with ghc). Fixes bug #383707 by Niklas Johansson and others.
(Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)
Revision Changes Path
1.14 dev-haskell/haddock/haddock-2.6.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?r1=1.13&r2=1.14
Index: haddock-2.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- haddock-2.6.1.ebuild 5 Jun 2011 12:19:18 -0000 1.13
+++ haddock-2.6.1.ebuild 9 Mar 2012 21:55:22 -0000 1.14
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.13 2011/06/05 12:19:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.14 2012/03/09 21:55:22 slyfox Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools pax-utils
+inherit eutils haskell-cabal autotools pax-utils
DESCRIPTION="A documentation-generation tool for Haskell libraries"
HOMEPAGE="http://www.haskell.org/haddock/"
@@ -33,6 +33,9 @@
sed -e "s|build-depends: ghc-paths|build-depends:|" \
-i "${S}/${PN}.cabal"
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-cabal-1.8.patch
+
# copy of slightly modified version of GHC.Paths
mkdir "${S}/src/GHC"
cp "${FILESDIR}/ghc-paths-1.0.5.0-GHC-Paths.hs" "${S}/src/GHC/Paths.hs"
1.88 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.87&r2=1.88
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog 6 Mar 2012 05:31:21 -0000 1.87
+++ ChangeLog 9 Mar 2012 21:55:22 -0000 1.88
@@ -1,6 +1,11 @@
# ChangeLog for dev-haskell/haddock
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.87 2012/03/06 05:31:21 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.88 2012/03/09 21:55:22 slyfox Exp $
+
+ 09 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/haddock-2.6.1-cabal-1.8.patch, haddock-2.6.1.ebuild:
+ Fix build failure against system's cabal-1.10 (use cabal bundled with ghc).
+ Fixes bug #383707 by Niklas Johansson and others.
*haddock-2.10.0 (06 Mar 2012)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.6.1.ebuild ChangeLog
@ 2013-02-10 14:26 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-02-10 14:26 UTC (permalink / raw
To: gentoo-commits
slyfox 13/02/10 14:26:06
Modified: haddock-2.6.1.ebuild ChangeLog
Log:
Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).
(Portage version: 2.2.0_alpha153_p6/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.16 dev-haskell/haddock/haddock-2.6.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild?r1=1.15&r2=1.16
Index: haddock-2.6.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- haddock-2.6.1.ebuild 14 Sep 2012 07:03:20 -0000 1.15
+++ haddock-2.6.1.ebuild 10 Feb 2013 14:26:06 -0000 1.16
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.15 2012/09/14 07:03:20 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.16 2013/02/10 14:26:06 slyfox Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -19,7 +19,7 @@
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
-RDEPEND=">=dev-lang/ghc-6.12"
+RDEPEND=">=dev-lang/ghc-6.12 <dev-lang/ghc-7"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
doc? ( ~app-text/docbook-xml-dtd-4.2
1.99 dev-haskell/haddock/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.98&r2=1.99
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- ChangeLog 10 Feb 2013 14:23:03 -0000 1.98
+++ ChangeLog 10 Feb 2013 14:26:06 -0000 1.99
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haddock
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.98 2013/02/10 14:23:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.99 2013/02/10 14:26:06 slyfox Exp $
+
+ 10 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild:
+ Constrained older haddock release ot use ghc-6.12 (bug #454442 by fffaaaaew).
*haddock-2.13.1-r2 (10 Feb 2013)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-02-10 14:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-09 21:55 [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.6.1.ebuild ChangeLog Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2013-02-10 14:26 Sergei Trofimovich (slyfox)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox