diff options
author | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-03-28 13:56:24 +0000 |
---|---|---|
committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2010-03-28 13:56:24 +0000 |
commit | 7edb553d71b68badc93f145317d0f75ff265351a (patch) | |
tree | 26e3a61869f45b254b6473d1cfad65ac06725d1e /dev-haskell | |
parent | Automated update of use.local.desc (diff) | |
download | gentoo-2-7edb553d71b68badc93f145317d0f75ff265351a.tar.gz gentoo-2-7edb553d71b68badc93f145317d0f75ff265351a.tar.bz2 gentoo-2-7edb553d71b68badc93f145317d0f75ff265351a.zip |
Bundle dev-haskell/mtl with dev-haskell/haddock.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/happy/ChangeLog | 9 | ||||
-rw-r--r-- | dev-haskell/happy/happy-1.18.4.ebuild | 30 |
2 files changed, 32 insertions, 7 deletions
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog index ec52c8eefa75..3de59870529a 100644 --- a/dev-haskell/happy/ChangeLog +++ b/dev-haskell/happy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/happy -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.43 2009/08/02 09:09:50 kolmodin Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.44 2010/03/28 13:56:24 kolmodin Exp $ + + 28 Mar 2010; Lennart Kolmodin <kolmodin@gentoo.org> happy-1.18.4.ebuild: + Bundle dev-haskell/mtl. mtl requires haddock if built with USE=doc, and + happy is a dependency of haddock. Bundling mtl breaks the cyclic + dependency. See bug #302397. *happy-1.18.4 (02 Aug 2009) diff --git a/dev-haskell/happy/happy-1.18.4.ebuild b/dev-haskell/happy/happy-1.18.4.ebuild index cd40c1bc6905..3a46c3a62256 100644 --- a/dev-haskell/happy/happy-1.18.4.ebuild +++ b/dev-haskell/happy/happy-1.18.4.ebuild @@ -1,22 +1,28 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.4.ebuild,v 1.1 2009/08/02 09:09:50 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.4.ebuild,v 1.2 2010/03/28 13:56:24 kolmodin Exp $ CABAL_FEATURES="bin" inherit haskell-cabal autotools +# we bundle mtl as we want fewer dependencies for haddock, which require happy +# mtl needs haddock to be compiled with USE=doc +MTL_PN="mtl" +MTL_PV="1.1.0.2" +MTL_P="${MTL_PN}-${MTL_PV}" + DESCRIPTION="Happy is a parser generator for Haskell" HOMEPAGE="http://www.haskell.org/happy/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" +SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz + http://hackage.haskell.org/packages/archive/${MTL_PN}/${MTL_PV}/${MTL_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="doc" -DEPEND=">=dev-lang/ghc-6.4 +DEPEND=">=dev-lang/ghc-6.6.1 >=dev-haskell/cabal-1.2.3 - >=dev-haskell/mtl-1.0 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets )" RDEPEND="" @@ -24,6 +30,20 @@ RDEPEND="" src_unpack() { unpack ${A} cd "${S}/doc" && eautoconf + + # change happy.cabal to use bundled mtl + # remove dep on mtl, add path + sed -e "s|, mtl >= 1.0||" \ + -e "s|hs-source-dirs: src|hs-source-dirs: src, ../mtl-1.1.0.2|" \ + -i "${S}/${PN}.cabal" + # compile happy with the extensions mtl uses (safe?) + # this gives repoman whitespace warnings, ignore them + cat >> "${S}/${PN}.cabal" << EOF + extensions: MultiParamTypeClasses, + FunctionalDependencies, + FlexibleInstances, + TypeSynonymInstances +EOF } src_compile() { |