slyfox      15/08/01 21:23:32

  Modified:             ChangeLog
  Added:                haddock-2.16.1.ebuild
  Log:
  Version bump.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
611FF3AA)

Revision  Changes    Path
1.117                dev-haskell/haddock/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ChangeLog   2 Jan 2015 23:16:40 -0000       1.116
+++ ChangeLog   1 Aug 2015 21:23:32 -0000       1.117
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.116 
2015/01/02 23:16:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.117 
2015/08/01 21:23:32 slyfox Exp $
+
+*haddock-2.16.1 (01 Aug 2015)
+
+  01 Aug 2015; Sergei Trofimovich <[email protected]> +haddock-2.16.1.ebuild:
+  Version bump.
 
   02 Jan 2015; Sergei Trofimovich <[email protected]>
   -files/ghc-paths-1.0.5.0-GHC-Paths.hs, -files/haddock-2.6.1-cabal-1.8.patch,



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

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

Index: haddock-2.16.1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.16.1.ebuild,v 
1.1 2015/08/01 21:23:32 slyfox Exp $

EAPI=5

# ebuild generated by hackport 0.4.4.9999

CABAL_FEATURES="bin test-suite"
CABAL_FEATURES+=" nocabaldep"
inherit 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"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""

RESTRICT=test # tests are outdated

RDEPEND=""
DEPEND="${RDEPEND}
        >=dev-haskell/cabal-1.10
        >=dev-lang/ghc-7.4.1
        ~dev-haskell/haddock-api-2.16.1
"

src_prepare() {
        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 \
                --flags=-in-ghc-tree \
                --ghc-options=-rtsopts \
                --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
        pax-mark -m "${S}/dist/build/haddock"
}

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