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