public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.13.1.ebuild ChangeLog
@ 2012-11-18 13:42 Mark Wright (gienah)
  0 siblings, 0 replies; only message in thread
From: Mark Wright (gienah) @ 2012-11-18 13:42 UTC (permalink / raw
  To: gentoo-commits

gienah      12/11/18 13:42:07

  Modified:             ChangeLog
  Added:                haddock-2.13.1.ebuild
  Log:
  Bump haddock to 2.13.1 with no keywords, as depends on ghc 7.6.1 which is not yet in portage
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.95                 dev-haskell/haddock/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog	21 Oct 2012 08:04:50 -0000	1.94
+++ ChangeLog	18 Nov 2012 13:42:07 -0000	1.95
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.94 2012/10/21 08:04:50 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.95 2012/11/18 13:42:07 gienah Exp $
+
+*haddock-2.13.1 (18 Nov 2012)
+
+  18 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/haddock-2.13.1-drop-tools.patch, +haddock-2.13.1.ebuild:
+  Bump haddock to 2.13.1 with no keywords, as depends on ghc 7.6.1 which is not
+  yet in portage
 
 *haddock-2.10.0-r2 (21 Oct 2012)
 



1.1                  dev-haskell/haddock/haddock-2.13.1.ebuild

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

Index: haddock-2.13.1.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.13.1.ebuild,v 1.1 2012/11/18 13:42:07 gienah Exp $

EAPI="4"

CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep"
inherit eutils haskell-cabal pax-utils

DESCRIPTION="A documentation-generation tool for Haskell libraries"
HOMEPAGE="http://www.haskell.org/haddock/"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${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=""
IUSE=""

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"

RESTRICT="test" # avoid depends on QC

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
}

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}"

	# we use 'nocabaldep' to use ghc's bundled Cabal
	# as external one is likely to break our haddock
	# (known to work on 1.16.0 and breaks on 1.16.0.1!)
	haskell-cabal_src_configure \
		--with-haddock="${exe}" \
		--constraint="Cabal == $(cabal-version)"
}

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}"
}





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-11-18 13:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-18 13:42 [gentoo-commits] gentoo-x86 commit in dev-haskell/haddock: haddock-2.13.1.ebuild ChangeLog Mark Wright (gienah)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox