| 1 |
mjo 14/10/28 03:49:33 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: haddock-2.13.2.1.ebuild |
| 5 |
Log: |
| 6 |
Version bump for the 2.13 series as part of bug #511004 |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.114 dev-haskell/haddock/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.114&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.114&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.113&r2=1.114 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v |
| 20 |
retrieving revision 1.113 |
| 21 |
retrieving revision 1.114 |
| 22 |
diff -u -r1.113 -r1.114 |
| 23 |
--- ChangeLog 11 Aug 2014 10:20:38 -0000 1.113 |
| 24 |
+++ ChangeLog 28 Oct 2014 03:49:33 -0000 1.114 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for dev-haskell/haddock |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.113 2014/08/11 10:20:38 slyfox Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.114 2014/10/28 03:49:33 mjo Exp $ |
| 30 |
+ |
| 31 |
+*haddock-2.13.2.1 (28 Oct 2014) |
| 32 |
+ |
| 33 |
+ 28 Oct 2014; Michael Orlitzky <mjo@g.o> +haddock-2.13.2.1.ebuild: |
| 34 |
+ Version bump for the 2.13 series as part of bug #511004 |
| 35 |
|
| 36 |
*haddock-2.14.3.0.7.8.3 (11 Aug 2014) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-haskell/haddock/haddock-2.13.2.1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/haddock/haddock-2.13.2.1.ebuild?rev=1.1&view=markup |
| 44 |
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 |
| 45 |
|
| 46 |
Index: haddock-2.13.2.1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2014 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $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 $ |
| 51 |
|
| 52 |
EAPI=5 |
| 53 |
|
| 54 |
CABAL_FEATURES="bin lib profile haddock hscolour nocabaldep test-suite" |
| 55 |
inherit eutils haskell-cabal pax-utils |
| 56 |
|
| 57 |
DESCRIPTION="A documentation-generation tool for Haskell libraries" |
| 58 |
HOMEPAGE="http://www.haskell.org/haddock/" |
| 59 |
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
| 60 |
|
| 61 |
LICENSE="BSD" |
| 62 |
SLOT="0/${PV}" |
| 63 |
# ia64 lost as we don't have ghc-7 there yet |
| 64 |
# ppc64 needs to be rekeyworded due to xhtml not being keyworded |
| 65 |
# x86-fbsd is lost due xhtml |
| 66 |
KEYWORDS="~amd64 -ia64 ~x86" |
| 67 |
IUSE="" |
| 68 |
|
| 69 |
RDEPEND="dev-haskell/ghc-paths:=[profile?] |
| 70 |
=dev-haskell/xhtml-3000.2*:=[profile?] |
| 71 |
>=dev-lang/ghc-7.6:= <dev-lang/ghc-7.7:=" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
>=dev-haskell/cabal-1.14" |
| 74 |
|
| 75 |
CABAL_EXTRA_BUILD_FLAGS+=" --ghc-options=-rtsopts" |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
# we would like to avoid happy and alex depends |
| 79 |
epatch "${FILESDIR}"/${PN}-2.13.1-drop-tools.patch |
| 80 |
# pick pregenerated files |
| 81 |
for f in Lex Parse; do |
| 82 |
rm "src/Haddock/$f."* || die |
| 83 |
mv "dist/build/haddock/haddock-tmp/Haddock/$f.hs" src/Haddock/ || die |
| 84 |
done |
| 85 |
rm -r "dist/build/"* || die |
| 86 |
|
| 87 |
# Fix: Ticket #213 Haddock fails when advanced typesystem features are used |
| 88 |
# epatch "${FILESDIR}"/${PN}-2.13.1-renameType.patch |
| 89 |
if [[ ! -e "${S}/html" ]]; then |
| 90 |
ln -s resources/html "${S}/html" || die "Could not create symbolic link ${S}/html" |
| 91 |
fi |
| 92 |
} |
| 93 |
|
| 94 |
src_configure() { |
| 95 |
# create a fake haddock executable. it'll set the right version to cabal |
| 96 |
# configure, but will eventually get overwritten in src_compile by |
| 97 |
# the real executable. |
| 98 |
local exe="${S}/dist/build/haddock/haddock" |
| 99 |
mkdir -p $(dirname "${exe}") |
| 100 |
echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}" |
| 101 |
chmod +x "${exe}" |
| 102 |
|
| 103 |
# we use 'nocabaldep' to use ghc's bundled Cabal |
| 104 |
# as external one is likely to break our haddock |
| 105 |
# (known to work on 1.16.0 and breaks on 1.16.0.1!) |
| 106 |
haskell-cabal_src_configure \ |
| 107 |
--with-haddock="${exe}" \ |
| 108 |
--constraint="Cabal == $(cabal-version)" |
| 109 |
} |
| 110 |
|
| 111 |
src_compile() { |
| 112 |
# when building the (recursive..) haddock docs, change the datadir to the |
| 113 |
# current directory, as we're using haddock inplace even if it's built to be |
| 114 |
# installed into the system first. |
| 115 |
haddock_datadir="${S}" haskell-cabal_src_compile |
| 116 |
} |
| 117 |
|
| 118 |
src_install() { |
| 119 |
cabal_src_install |
| 120 |
# haddock uses GHC-api to process TH source. |
| 121 |
# TH requires GHCi which needs mmap('rwx') (bug #299709) |
| 122 |
pax-mark -m "${D}/usr/bin/${PN}" |
| 123 |
} |
Archives