mjo         14/10/28 03:49:33

  Modified:             ChangeLog
  Added:                haddock-2.13.2.1.ebuild
  Log:
  Version bump for the 2.13 series as part of bug #511004
  
  (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 
0x6F48D3DA05C2DADB!)

Revision  Changes    Path
1.114                dev-haskell/haddock/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- ChangeLog   11 Aug 2014 10:20:38 -0000      1.113
+++ ChangeLog   28 Oct 2014 03:49:33 -0000      1.114
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.113 
2014/08/11 10:20:38 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.114 
2014/10/28 03:49:33 mjo Exp $
+
+*haddock-2.13.2.1 (28 Oct 2014)
+
+  28 Oct 2014; Michael Orlitzky <[email protected]> +haddock-2.13.2.1.ebuild:
+  Version bump for the 2.13 series as part of bug #511004
 
 *haddock-2.14.3.0.7.8.3 (11 Aug 2014)
 



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

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

Index: haddock-2.13.2.1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.13.2.1.ebuild,v 1.1 
2014/10/28 03:49:33 mjo Exp $

EAPI=5

CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep test-suite"
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
# x86-fbsd is lost due xhtml
KEYWORDS="~amd64 -ia64 ~x86"
IUSE=""

RDEPEND="dev-haskell/ghc-paths:=[profile?]
                =dev-haskell/xhtml-3000.2*:=[profile?]
                >=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:="
DEPEND="${RDEPEND}
                >=dev-haskell/cabal-1.14"

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
        # pick pregenerated files
        for f in Lex Parse; do
                rm "src/Haddock/$f."* || die
                mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ 
|| die
        done
        rm -r "dist/build/"* || die

        # Fix: Ticket #213 Haddock fails when advanced typesystem features are 
used
        # epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch
        if [[ ! -e "${S}/html" ]]; then
                ln -s resources/html "${S}/html" || die "Could not create 
symbolic link ${S}/html"
        fi
}

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




Reply via email to