Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2013-02-10 14:23:03 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2013-02-10 14:23:03 +0000
commit1cd28a8e948e95094a0ab4fb04eda996543cfa0f (patch)
treed22a533e3ae8e6a0ff2d207ab20ba58506b76d35
parentMask net-wireless/bluez-firmware because of missing or unclear licensing. (diff)
downloadgentoo-2-1cd28a8e948e95094a0ab4fb04eda996543cfa0f.tar.gz
gentoo-2-1cd28a8e948e95094a0ab4fb04eda996543cfa0f.tar.bz2
gentoo-2-1cd28a8e948e95094a0ab4fb04eda996543cfa0f.zip
Unmask latest haddock for ghc-7.6. Constraint older haddock to old ghc (bug #456410 by Tobias Klausmann).
(Portage version: 2.2.0_alpha153_p6/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat
-rw-r--r--dev-haskell/haddock/ChangeLog10
-rw-r--r--dev-haskell/haddock/files/haddock-2.13.1-renameType.patch56
-rw-r--r--dev-haskell/haddock/haddock-2.10.0-r2.ebuild6
-rw-r--r--dev-haskell/haddock/haddock-2.13.1-r2.ebuild (renamed from dev-haskell/haddock/haddock-2.13.1.ebuild)18
4 files changed, 78 insertions, 12 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 3dccc95ee5c4..5fb4ed433b58 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,14 @@
# 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.97 2013/01/01 18:52:56 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.98 2013/02/10 14:23:03 slyfox Exp $
+
+*haddock-2.13.1-r2 (10 Feb 2013)
+
+ 10 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/haddock-2.13.1-renameType.patch, +haddock-2.13.1-r2.ebuild,
+ -haddock-2.13.1.ebuild, haddock-2.10.0-r2.ebuild:
+ Unmask latest haddock for ghc-7.6. Constraint older haddock to old ghc (bug
+ #456410 by Tobias Klausmann).
01 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org> -haddock-2.10.0.ebuild,
-haddock-2.9.2.ebuild:
diff --git a/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
new file mode 100644
index 000000000000..1a4abab0cbe9
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-2.13.1-renameType.patch
@@ -0,0 +1,56 @@
+--- haddock-2.13.1-orig/src/Haddock/Interface/Rename.hs 2012-10-11 21:56:13.000000000 +1100
++++ haddock-2.13.1/src/Haddock/Interface/Rename.hs 2013-01-04 10:55:06.725718923 +1100
+@@ -271,9 +271,20 @@
+
+ HsTyLit x -> return (HsTyLit x)
+
++ HsWrapTy a b -> HsWrapTy a <$> renameType b
++ HsRecTy a -> HsRecTy <$> mapM renameConDeclFieldField a
++ HsCoreTy a -> pure (HsCoreTy a)
++ HsExplicitListTy a b -> HsExplicitListTy a <$> mapM renameLType b
++ HsExplicitTupleTy a b -> HsExplicitTupleTy a <$> mapM renameLType b
++ HsQuasiQuoteTy a -> HsQuasiQuoteTy <$> renameHsQuasiQuote a
++ HsSpliceTy _ _ _ -> error "renameType: HsSpliceTy"
++
+ _ -> error "renameType"
+
+
++renameHsQuasiQuote :: HsQuasiQuote Name -> RnM (HsQuasiQuote DocName)
++renameHsQuasiQuote (HsQuasiQuote a b c) = HsQuasiQuote <$> rename a <*> pure b <*> pure c
++
+ renameLTyVarBndrs :: LHsTyVarBndrs Name -> RnM (LHsTyVarBndrs DocName)
+ renameLTyVarBndrs (HsQTvs { hsq_kvs = _, hsq_tvs = tvs })
+ = do { tvs' <- mapM renameLTyVarBndr tvs
+@@ -398,22 +409,25 @@
+ return (decl { con_name = lname', con_qvars = ltyvars', con_cxt = lcontext'
+ , con_details = details', con_res = restype', con_doc = mbldoc' })
+ where
+- renameDetails (RecCon fields) = return . RecCon =<< mapM renameField fields
++ renameDetails (RecCon fields) = return . RecCon =<< mapM renameConDeclFieldField fields
+ renameDetails (PrefixCon ps) = return . PrefixCon =<< mapM renameLType ps
+ renameDetails (InfixCon a b) = do
+ a' <- renameLType a
+ b' <- renameLType b
+ return (InfixCon a' b')
+
+- renameField (ConDeclField name t doc) = do
+- name' <- renameL name
+- t' <- renameLType t
+- doc' <- mapM renameLDocHsSyn doc
+- return (ConDeclField name' t' doc')
+-
+ renameResType (ResTyH98) = return ResTyH98
+ renameResType (ResTyGADT t) = return . ResTyGADT =<< renameLType t
+
++
++renameConDeclFieldField :: ConDeclField Name -> RnM (ConDeclField DocName)
++renameConDeclFieldField (ConDeclField name t doc) = do
++ name' <- renameL name
++ t' <- renameLType t
++ doc' <- mapM renameLDocHsSyn doc
++ return (ConDeclField name' t' doc')
++
++
+ renameSig :: Sig Name -> RnM (Sig DocName)
+ renameSig sig = case sig of
+ TypeSig lnames ltype -> do
diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index 7cfedbf0f898..1566827d5ca8 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
@@ -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.10.0-r2.ebuild,v 1.1 2012/10/21 08:04:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.2 2013/02/10 14:23:03 slyfox Exp $
EAPI="4"
@@ -20,7 +20,7 @@ IUSE=""
RDEPEND="dev-haskell/ghc-paths[profile?]
=dev-haskell/xhtml-3000.2*[profile?]
- >=dev-lang/ghc-7.4"
+ >=dev-lang/ghc-7.4 <dev-lang/ghc-7.6"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14"
diff --git a/dev-haskell/haddock/haddock-2.13.1.ebuild b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
index a38b833e3613..5e72bd90c12e 100644
--- a/dev-haskell/haddock/haddock-2.13.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.13.1-r2.ebuild
@@ -1,8 +1,8 @@
-# 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.13.1.ebuild,v 1.1 2012/11/18 13:42:07 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.1-r2.ebuild,v 1.1 2013/02/10 14:23:03 slyfox Exp $
-EAPI="4"
+EAPI=5
CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
inherit eutils haskell-cabal pax-utils
@@ -12,15 +12,15 @@ HOMEPAGE="http://www.haskell.org/haddock/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
# ia64 lost as we don't have ghc-7 there yet
# ppc64 needs to be rekeyworded due to xhtml not being keyworded
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-haskell/ghc-paths[profile?]
- =dev-haskell/xhtml-3000.2*[profile?]
- >=dev-lang/ghc-7.6.1"
+RDEPEND="dev-haskell/ghc-paths:=[profile?]
+ =dev-haskell/xhtml-3000.2*:=[profile?]
+ >=dev-lang/ghc-7.6.1:="
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.14"
@@ -31,6 +31,8 @@ CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
src_prepare() {
# we would like to avoid happy and alex depends
epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch
+ # Fix: Ticket #213 Haddock fails when advanced typesystem features are used
+ epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
}
src_configure() {