4 files changed, 24 insertions, 7 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 069caa5a0788..ce1f5f9660c8 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.75 2010/08/01 09:40:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.76 2010/09/19 17:01:23 slyfox Exp $
+
+  19 Sep 2010; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.4.1.ebuild,
+  haddock-2.4.2.ebuild, haddock-2.6.1.ebuild:
+  Make haddock usable on hardened. Disabled enforced memory protection (bug
+  #299709).
 
   01 Aug 2010; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild:
   Marked ~ppc. Thanks to Michael Mounteney (monty) for testing.
diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild
index 7640fe8cdb99..8ed1842a89b6 100644
--- a/dev-haskell/haddock/haddock-2.4.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.8 2010/07/01 19:24:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.9 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 GHCPATHS_PN="ghc-paths"
 GHCPATHS_PV="0.1.0.5"
@@ -78,6 +78,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi
diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild
index 893c75ec6df9..f7fdb27c101c 100644
--- a/dev-haskell/haddock/haddock-2.4.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.9 2010/05/31 18:19:44 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.10 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 GHCPATHS_PN="ghc-paths"
 GHCPATHS_PV="0.1.0.5"
@@ -69,6 +69,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
index 13c9f6e0c47c..4de9424fba35 100644
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 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.4 2010/08/01 09:40:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.5 2010/09/19 17:01:23 slyfox Exp $
 
 CABAL_FEATURES="bin lib"
 # don't enable profiling as the 'ghc' package is not built with profiling
-inherit haskell-cabal autotools
+inherit haskell-cabal autotools pax-utils
 
 DESCRIPTION="A documentation-generation tool for Haskell libraries"
 HOMEPAGE="http://www.haskell.org/haddock/"
@@ -70,6 +70,10 @@ src_compile () {
 
 src_install () {
 	cabal_src_install
+	# haddock uses GHC-api to process TH source.
+	# TH requires GHCi which needs mmap('rwx') (bug #299709)
+	pax-mark -m "${D}/usr/bin/${PN}"
+
 	if use doc; then
 		dohtml -r "${S}/doc/haddock/"*
 	fi