[gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: ChangeLog haddock-2.10.0_pre20120202.ebuild haddock-2.9.2.ebuild

[Mark Wright (gienah)]

gienah      12/03/04 03:24:53

  Modified:             ChangeLog haddock-2.9.2.ebuild
  Added:                haddock-2.10.0_pre20120202.ebuild
  Log:
  Add haddock 2.10.0_pre20120202 that is included in ghc 7.4.1
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.86                 dev-haskell/haddock/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.85&r2=1.86

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog	3 Aug 2011 13:14:54 -0000	1.85
+++ ChangeLog	4 Mar 2012 03:24:53 -0000	1.86
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.85 2011/08/03 13:14:54 slyfox Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.86 2012/03/04 03:24:53 gienah Exp $
+
+*haddock-2.10.0_pre20120202 (04 Mar 2012)
+
+  04 Mar 2012; Mark Wright <gienah@g.o> haddock-2.9.2.ebuild,
+  +haddock-2.10.0_pre20120202.ebuild:
+  Add haddock 2.10.0_pre20120202 that is included in ghc 7.4.1
 
 *haddock-2.9.2 (03 Aug 2011)
 



1.2                  dev-haskell/haddock/haddock-2.9.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild?r1=1.1&r2=1.2

Index: haddock-2.9.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haddock-2.9.2.ebuild	3 Aug 2011 13:14:54 -0000	1.1
+++ haddock-2.9.2.ebuild	4 Mar 2012 03:24:53 -0000	1.2
@@ -1,6 +1,6 @@
-# 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.9.2.ebuild,v 1.1 2011/08/03 13:14:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v 1.2 2012/03/04 03:24:53 gienah Exp $
 
 # ebuild generated by hackport 0.2.9
 
@@ -29,6 +29,8 @@
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.10"
 
+CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+
 # although haddock depends on alex and happy to build from scratch, we don't
 # want this ebuild to depend on those packages.
 # we use haddock to build the documentation enabled by USE="doc".



1.1                  dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild?rev=1.1&content-type=text/plain

Index: haddock-2.10.0_pre20120202.ebuild
===================================================================
# 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.10.0_pre20120202.ebuild,v 1.1 2012/03/04 03:24:53 gienah Exp $

# haddock-2.9.4 on hackage does not work with ghc-7.4.1
# this ebuild uses a tarball of what's distributed with ghc-7.4.1

EAPI="4"

#CABAL_FEATURES="bin lib profile haddock hscolour"
CABAL_FEATURES="bin lib profile hscolour"
inherit haskell-cabal pax-utils versionator

MY_PV=$(get_version_component_range '1-3')
MY_P="${MY_PN}-${PV}"

DESCRIPTION="A documentation-generation tool for Haskell libraries"
HOMEPAGE="http://www.haskell.org/haddock/"
#SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"

LICENSE="BSD"
SLOT="0"
# ia64 lost as we don't have ghc-7 there yet
# ppc64 needs to be rekeyworded due to xhtml not being keyworded
KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE=""

RDEPEND="dev-haskell/ghc-paths[profile?]
		=dev-haskell/xhtml-3000.2*[profile?]
		>=dev-lang/ghc-7.4"
DEPEND="${RDEPEND}
		>=dev-haskell/cabal-1.10"

S="${WORKDIR}/${PN}-${MY_PV}"

RESTRICT="test" # avoid depends on QC

CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"

# haddock is disabled as Cabal seems to be buggy about building docks with itself.
# however, other packages seem to work
src_configure() {
	# create a fake haddock executable. it'll set the right version to cabal
	# configure, but will eventually get overwritten in src_compile by
	# the real executable.
	local exe="${S}/dist/build/haddock/haddock"
	mkdir -p $(dirname "${exe}")
	echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
	chmod +x "${exe}"

	haskell-cabal_src_configure --with-haddock="${exe}"
}

src_compile() {
	# when building the (recursive..) haddock docs, change the datadir to the
	# current directory, as we're using haddock inplace even if it's built to be
	# installed into the system first.
	haddock_datadir="${S}" haskell-cabal_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}"
}