| 1 |
kolmodin 10/01/26 19:59:01 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: haddock-2.6.0.ebuild |
| 5 |
Log: |
| 6 |
Version bump dev-haskell/haddock-2.6, the version used by ghc-6.12.1. |
| 7 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.67 dev-haskell/haddock/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.67&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?rev=1.67&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/ChangeLog?r1=1.66&r2=1.67 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v |
| 19 |
retrieving revision 1.66 |
| 20 |
retrieving revision 1.67 |
| 21 |
diff -u -r1.66 -r1.67 |
| 22 |
--- ChangeLog 31 Oct 2009 13:14:49 -0000 1.66 |
| 23 |
+++ ChangeLog 26 Jan 2010 19:59:00 -0000 1.67 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-haskell/haddock |
| 26 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.66 2009/10/31 13:14:49 kolmodin Exp $ |
| 28 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.67 2010/01/26 19:59:00 kolmodin Exp $ |
| 30 |
+ |
| 31 |
+*haddock-2.6.0 (26 Jan 2010) |
| 32 |
+ |
| 33 |
+ 26 Jan 2010; <kolmodin@g.o> +haddock-2.6.0.ebuild: |
| 34 |
+ Version bump the haddock version used by ghc 6.12.1. |
| 35 |
|
| 36 |
31 Oct 2009; Lennart Kolmodin <kolmodin@g.o> haddock-2.4.2.ebuild: |
| 37 |
Add keywords tested in the overlay. |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-haskell/haddock/haddock-2.6.0.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.6.0.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/haddock/haddock-2.6.0.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: haddock-2.6.0.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2010 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.6.0.ebuild,v 1.1 2010/01/26 19:59:00 kolmodin Exp $ |
| 51 |
|
| 52 |
CABAL_FEATURES="bin lib" |
| 53 |
# don't enable profiling as the 'ghc' package is not built with profiling |
| 54 |
inherit haskell-cabal autotools |
| 55 |
|
| 56 |
DESCRIPTION="A documentation-generation tool for Haskell libraries" |
| 57 |
HOMEPAGE="http://www.haskell.org/haddock/" |
| 58 |
SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="BSD" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~ppc64 ~sparc ~x86" |
| 63 |
IUSE="doc" |
| 64 |
|
| 65 |
# we bundle the dep on ghc-paths to reduce the dependencies on this critical |
| 66 |
# package. ghc-paths would like to be compiled with USE=doc, which pulls in |
| 67 |
# haddock, which requires ghc-paths, which pulls in haddock... |
| 68 |
|
| 69 |
RDEPEND=">=dev-lang/ghc-6.12" |
| 70 |
DEPEND="${RDEPEND} |
| 71 |
>=dev-haskell/cabal-1.6 |
| 72 |
doc? ( ~app-text/docbook-xml-dtd-4.2 |
| 73 |
app-text/docbook-xsl-stylesheets |
| 74 |
>=dev-libs/libxslt-1.1.2 )" |
| 75 |
|
| 76 |
src_unpack() { |
| 77 |
unpack ${A} |
| 78 |
|
| 79 |
# remove dependency on ghc-paths, we include it right into haddock instead |
| 80 |
sed -e "s|build-depends: ghc-paths|build-depends:|" \ |
| 81 |
-i "${S}/${PN}.cabal" |
| 82 |
|
| 83 |
# copy of slightly modified version of GHC.Paths |
| 84 |
mkdir "${S}/src/GHC" |
| 85 |
cp "${FILESDIR}/ghc-paths-1.0.5.0-GHC-Paths.hs" "${S}/src/GHC/Paths.hs" |
| 86 |
|
| 87 |
# a few things we need to replace, and example values |
| 88 |
# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010 |
| 89 |
# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html |
| 90 |
# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg |
| 91 |
# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG) |
| 92 |
|
| 93 |
# hardcode stuff above: |
| 94 |
sed \ |
| 95 |
-e "s|GHC_PATHS_LIBDIR|\"$(ghc-libdir)\"|" \ |
| 96 |
-e "s|GHC_PATHS_DOCDIR|\"/usr/share/doc/ghc-$(ghc-version)/html\"|" \ |
| 97 |
-e "s|GHC_PATHS_GHC_PKG|\"$(ghc-getghcpkg)\"|" \ |
| 98 |
-e "s|GHC_PATHS_GHC|\"$(ghc-getghc)\"|" \ |
| 99 |
-i "${S}/src/GHC/Paths.hs" |
| 100 |
|
| 101 |
if use doc; then |
| 102 |
cd "${S}/doc" |
| 103 |
eautoreconf |
| 104 |
fi |
| 105 |
|
| 106 |
|
| 107 |
} |
| 108 |
|
| 109 |
src_compile () { |
| 110 |
cabal_src_compile |
| 111 |
if use doc; then |
| 112 |
cd "${S}/doc" |
| 113 |
./configure --prefix="${D}/usr/" \ |
| 114 |
|| die 'error configuring documentation.' |
| 115 |
emake html || die 'error building documentation.' |
| 116 |
fi |
| 117 |
} |
| 118 |
|
| 119 |
src_install () { |
| 120 |
cabal_src_install |
| 121 |
if use doc; then |
| 122 |
dohtml -r "${S}/doc/haddock/"* |
| 123 |
fi |
| 124 |
dodoc CHANGES README |
| 125 |
} |
Archives