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

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

[Sergei Trofimovich (slyfox)]

slyfox      13/02/10 14:23:03

  Modified:             haddock-2.10.0-r2.ebuild ChangeLog
  Added:                haddock-2.13.1-r2.ebuild
  Removed:              haddock-2.13.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.2                  dev-haskell/haddock/haddock-2.10.0-r2.ebuild

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

Index: haddock-2.10.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- haddock-2.10.0-r2.ebuild	21 Oct 2012 08:04:50 -0000	1.1
+++ haddock-2.10.0-r2.ebuild	10 Feb 2013 14:23:03 -0000	1.2
@@ -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 @@
 
 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"
 



1.98                 dev-haskell/haddock/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog	1 Jan 2013 18:52:56 -0000	1.97
+++ ChangeLog	10 Feb 2013 14:23:03 -0000	1.98
@@ -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:



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

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

Index: haddock-2.13.1-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2013/02/10 14:23:03 slyfox Exp $

EAPI=5

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/${PV}"
# ia64 lost as we don't have ghc-7 there yet
# ppc64 needs to be rekeyworded due to xhtml not being keyworded
KEYWORDS="~amd64 ~x86"
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
	# Fix: Ticket #213 Haddock fails when advanced typesystem features are used
	epatch "${FILESDIR}"/${PN}-2.13.1-renameType.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}"
}