Bundle dev-haskell/mtl with dev-haskell/haddock.

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

3 files changed, 39 insertions, 13 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/Manifest b/dev-haskell/happy/Manifest
index f5abef3210ec..8616b2a928c5 100644
--- a/dev-haskell/happy/Manifest
+++ b/dev-haskell/happy/Manifest
@@ -7,17 +7,18 @@ DIST happy-1.16.tar.gz 226566 RMD160 ebe54b1c3ee7623de96e56bc69299dd236323781 SH
 DIST happy-1.17.tar.gz 228494 RMD160 4c7f4f0ad31cf580252fe6d47059a8d50c6d88c0 SHA1 050bda892fc3f634c088057db1a65825f376e17c SHA256 dca4e47d17e5d538335496236b3d2c3cbff644cf7380c987a4714e7784c70a2b
 DIST happy-1.18.2.tar.gz 158782 RMD160 9d42d701c51936d705646f32ac2facbfa305ac70 SHA1 1fe37e97f410dd4b4344d0b01e6a5f7cfeec7cf3 SHA256 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae
 DIST happy-1.18.4.tar.gz 157585 RMD160 846d90e2962c6053acae03ace90de3656ce271b5 SHA1 86c6a61ed8b3909c476c27343f41cb12971d52bd SHA256 909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832
+DIST mtl-1.1.0.2.tar.gz 18901 RMD160 e7032fc069c8b24b97725b259d2e6fb05ace208b SHA1 883deca3cdf8052173c995b741bdedccc3c91440 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e4c135d2b31b8421a58d36
 EBUILD happy-1.15.ebuild 1561 RMD160 265ba55c752ed9ff10115ec57af96baf9d9258fe SHA1 ace9d0d58cc55e40ffecbdca74092fc144d2bbc6 SHA256 645c04e91d89cf993a914731e4aaa9ac57b8ac6add3a72a7880d3fb0178a08ea
 EBUILD happy-1.16.ebuild 966 RMD160 26971689b6bef79a184caf6a175340ba0f68a75d SHA1 ed53802356766ce59dfe148950d90abe300d44fc SHA256 a73bcaa4f80d478dc8d01de1c45f8dbb1d11ca8578384090f31b76521ee12f1f
 EBUILD happy-1.17.ebuild 1053 RMD160 cbd9406ec6c01e3df8798c6abd64a04bc02a4d7f SHA1 39096db69088f22eb11ab8a4a2fea79fc1cc31aa SHA256 3318a3f0f78d1344a21b4a5387cfa31ad821b71536aa5c07fdd20338cec96e4a
 EBUILD happy-1.18.2.ebuild 972 RMD160 db282042db41119b781dd254945e6621c5d13197 SHA1 686c13b6951b04ec57b6aa439c8efecae44e512b SHA256 6bfd55f217f5a54d043f491c80c902e8091545b5b0fe9d0b8d47eaa175a7d5e3
-EBUILD happy-1.18.4.ebuild 995 RMD160 66c42a62f120541a2783baba40ea5c381af773fe SHA1 7a593452749b8d4e46e5613a392372ab042847c3 SHA256 fe4db9d2198fb9ca0bcf635e723d0da69324d5d3f4752fdeba4f5525c75ed973
-MISC ChangeLog 5022 RMD160 ae580b2e7b6531e9949a507303ff61c19eb58d5e SHA1 476984e9ad002bebfcc89dc932d534a5076bad71 SHA256 e291658ad1a414dcd8060f06974cd6c971c3706730539736cb5760cfc4ff6806
+EBUILD happy-1.18.4.ebuild 1729 RMD160 1377de4d0d1a9af6a1a9ea44357cccae5cd23934 SHA1 aaa184946b1f9992f7b3a5b542ed46b112d93c99 SHA256 3187eced6dedf8c561d6db3451ba27908746cdbdeff045d97ae2146f84bb3ca0
+MISC ChangeLog 5270 RMD160 f005ab5866b70ec0125d94ed2af03a35d27930cb SHA1 d8fcee49a73a6bf4ee32e9a9b0f1f78c3f9e83c6 SHA256 a84a76dc97f61b1242bbb224c4f23bbdc31ded0b87136d4853e343d9ea3160f2
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkp1V+gACgkQ1n/CYbXjntKyuQCdExGNJzTSeV/DF+EzKM3MXK6J
-JzYAoJTI2MpoQF0y/M1I8/5GlTrYOfHV
-=/tIP
+iEYEARECAAYFAkuvYAgACgkQ1n/CYbXjntIaywCeN/BNJAoORVZqbar9qoi/XPAY
+j4EAnA7ce82t1WRg1070j2NsOAYwxmEC
+=2gYJ
 -----END PGP SIGNATURE-----
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() {