Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-haskell/haddock
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/haddock')
-rw-r--r--dev-haskell/haddock/ChangeLog110
-rw-r--r--dev-haskell/haddock/Manifest22
-rw-r--r--dev-haskell/haddock/haddock-0.6-r2.ebuild37
-rw-r--r--dev-haskell/haddock/haddock-0.6-r3.ebuild50
-rw-r--r--dev-haskell/haddock/haddock-0.7.ebuild26
5 files changed, 217 insertions, 28 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 75634511ec8e..a3e4dc3baba1 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,112 @@
# ChangeLog for dev-haskell/haddock
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.1 2003/05/22 06:49:31 kosmikus Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.1.1.1 2005/11/30 09:48:23 chriswhite Exp $
+
+ 19 Sep 2005; Luis F. Araujo <araujo@gentoo.org> haddock-0.7.ebuild:
+ Fixed multilib inheritance
+
+ 19 Sep 2005; Luis F. Araujo <araujo@gentoo.org> haddock-0.6-r3.ebuild:
+ Fixed multilib inheritance
+
+ 15 Sep 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild,
+ haddock-0.6-r3.ebuild, haddock-0.7.ebuild:
+ Fail with an informative error message when haddock is merged before ghc due
+ to a portage bug.
+
+ 01 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> haddock-0.6-r3.ebuild:
+ Stable on sparc
+
+*haddock-0.7 (05 Aug 2005)
+
+ 05 Aug 2005; Andres Loeh <kosmikus@gentoo.org> +haddock-0.7.ebuild:
+ New version.
+
+ 20 May 2005; <duncan@gentoo.org> haddock-0.6-r3.ebuild:
+ Added ~sparc to KEYWORDS.
+
+ 10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> haddock-0.6-r3.ebuild:
+ Stable on ppc.
+
+ 24 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r3.ebuild:
+ haddock-0.6-r3 works with ghc-6.4 now.
+
+ 23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild,
+ haddock-0.6-r3.ebuild:
+ haddock is currently blocked by ghc-6.4, and haddock-0.6-r3 now inherits
+ ghc-package.eclass, hopefully fixing bug #86214.
+
+ 23 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> haddock-0.6-r2.ebuild,
+ haddock-0.6-r3.ebuild:
+ sparc needs deps first
+
+ 18 Nov 2004; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r3.ebuild:
+ Can now be built on amd64 (bug #69830). Moved to ~amd64.
+
+*haddock-0.6-r3 (21 Oct 2004)
+
+ 21 Oct 2004; Andres Loeh <kosmikus@gentoo.org> haddock-0.4.ebuild,
+ haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r3.ebuild,
+ haddock-0.6.ebuild, files/haddock-0.4-ghc6.patch,
+ files/haddock-0.6-gcc3.4.patch:
+ Patched to build with gcc-3.4. Removed old versions.
+
+ 19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> haddock-0.4.ebuild,
+ haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r2.ebuild,
+ haddock-0.6.ebuild:
+ Fixed missing dependencies; bug #68021.
+
+ 24 Sep 2004; <SeJo@gentoo.org> haddock-0.6-r2.ebuild:
+ stable bump due to bug 59753
+
+ 02 Jun 2004; Aron Griffis <agriffis@gentoo.org> haddock-0.4.ebuild,
+ haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r2.ebuild,
+ haddock-0.6.ebuild:
+ Fix use invocation
+
+ 18 May 2004; Mamoru KOMACHI <usata@gentoo.org> haddock-0.4.ebuild,
+ haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r2.ebuild,
+ haddock-0.6.ebuild:
+ Changed app-text/tetex to virtual/tetex.
+
+ 25 Apr 2004; Aron Griffis <agriffis@gentoo.org> haddock-0.4.ebuild,
+ haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r2.ebuild,
+ haddock-0.6.ebuild:
+ Add die following econf for bug 48950
+
+ 23 Mar 2004; Matthieu Sozeau <mattam@gentoo.org> haddock-0.6-r2.ebuild:
+ Added ~ppc keyword.
+
+*haddock-0.6-r2 (22 Dec 2003)
+
+ 22 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r1.ebuild,
+ haddock-0.6-r2.ebuild:
+ Another directory problem in haddock-0.6
+
+*haddock-0.6-r1 (17 Dec 2003)
+
+ 17 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r1.ebuild:
+ Created -r1 to make sure everyone updates to the correct version.
+
+ 16 Dec 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6.ebuild:
+ Fixed ebuild: Library files now in correct position. Cleaned installation of
+ docs a little bit.
+
+*haddock-0.6 (12 Nov 2003)
+
+ 12 Nov 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.6.ebuild:
+ Version bump.
+
+*haddock-0.5 (28 Jul 2003)
+
+ 28 Jul 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.5.ebuild:
+ Version bump. Fixes #23291, too.
+
+ 28 Jul 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.4.ebuild,
+ files/haddock-0.4-ghc6.patch:
+ Fixed bug #23291. Marked stable for x86.
+
+ 05 Jun 2003; Andres Loeh <kosmikus@gentoo.org> haddock-0.4.ebuild:
+ fixed dependencies
*haddock-0.4 (21 May 2003)
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 15fb29bd0845..9c8f4860bf24 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,3 +1,19 @@
-MD5 4ba001c5cffebd5522ae6664533d8ef0 haddock-0.4.ebuild 1748
-MD5 02e59176af8082207d2c55a8a28c65de ChangeLog 464
-MD5 345c00e86d5388d60c897e487987922a files/digest-haddock-0.4 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8e1d215c97780123dc3e313382b39f0a ChangeLog 4240
+MD5 8bf7027e7c34557be795ad102a3da7a6 haddock-0.6-r2.ebuild 2646
+MD5 c1dc72fd2a7923d460c09e6ff273f5d0 haddock-0.6-r3.ebuild 2895
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 4399948c20502c047b795fb42dca07e5 haddock-0.7.ebuild 2488
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67
+MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967
+MD5 574da10760a87f23fa635f37265b7c0c files/digest-haddock-0.7 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLmDaBQBy/eDH5uERAuHKAJ9miH5G8ZPZBMZ2k9Pg74xM6WBC8ACgnw8m
+l95V5P2g5fMfBH/E7S9dNIk=
+=pvmt
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild
index d647aa98b740..66db0ec05719 100644
--- a/dev-haskell/haddock/haddock-0.6-r2.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.1 2003/12/22 09:11:11 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.1.1.1 2005/11/30 09:48:23 chriswhite Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -16,15 +16,16 @@ SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
HOMEPAGE="http://www.haskell.org/haddock"
SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ppc"
LICENSE="as-is"
DEPEND="virtual/ghc
+ !>=virtual/ghc-6.4
doc? ( >=app-text/openjade-1.3.1
>=app-text/sgml-common-0.6.3
- =app-text/docbook-sgml-dtd-3.1-r1
+ ~app-text/docbook-sgml-dtd-3.1
>=app-text/docbook-dsssl-stylesheets-1.64
- tetex? ( >=app-text/tetex-1.0.7
+ tetex? ( virtual/tetex
>=app-text/jadetex-3.12 ) )"
RDEPEND=""
@@ -32,10 +33,30 @@ RDEPEND=""
# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
GHCPATH="${PATH}:/opt/ghc/bin"
+pkg_setup() {
+ if ! has_version virtual/ghc; then
+ eerror "Due to a bug in the portage dependency resolution, emerge"
+ eerror "sometimes tries to merge haddock before a version of ghc"
+ eerror "is available on the system. This is usually triggered when"
+ eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
+ eerror "the command"
+ eerror
+ eerror " emerge ghc"
+ eerror
+ eerror "To resolve this problem, proceed in two steps. First, emerge"
+ eerror "haddock (which should first pull in ghc-bin). Second, emerge"
+ eerror "ghc again:"
+ eerror
+ eerror " emerge haddock"
+ eerror " emerge ghc"
+ die "portage dependency problem"
+ fi
+}
+
src_compile() {
# unset SGML_CATALOG_FILES because documentation installation
# breaks otherwise ...
- PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf
+ PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
# using make because emake behaved strangely on my machine
make || die "make failed"
@@ -65,11 +86,11 @@ src_install() {
cd ${S}/haddock
dodoc CHANGES LICENSE README TODO
- if [ "`use doc`" ]; then
+ if use doc; then
cd ${S}/haddock/doc
dohtml -r haddock/* || die
dosym haddock.html /usr/share/doc/${PF}/html/index.html
- if [ "`use tetex`" ]; then
+ if use tetex; then
docinto ps
dodoc haddock.ps || die
fi
diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 901964c82fbe..306e8d4cdcd8 100644
--- a/dev-haskell/haddock/haddock-0.6-r3.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.1 2004/10/21 14:09:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.1.1.1 2005/11/30 09:48:23 chriswhite Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -8,7 +8,7 @@
# tetex - Build the above docs as PostScript as well.
-inherit base eutils
+inherit base eutils ghc-package multilib
IUSE="doc tetex"
DESCRIPTION="A documentation tool for Haskell"
@@ -16,7 +16,7 @@ SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
HOMEPAGE="http://www.haskell.org/haddock"
SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="x86 ppc ~amd64 sparc"
LICENSE="as-is"
DEPEND="virtual/ghc
@@ -29,8 +29,25 @@ DEPEND="virtual/ghc
RDEPEND=""
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
+pkg_setup() {
+ if ! has_version virtual/ghc; then
+ eerror "Due to a bug in the portage dependency resolution, emerge"
+ eerror "sometimes tries to merge haddock before a version of ghc"
+ eerror "is available on the system. This is usually triggered when"
+ eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
+ eerror "the command"
+ eerror
+ eerror " emerge ghc"
+ eerror
+ eerror "To resolve this problem, proceed in two steps. First, emerge"
+ eerror "haddock (which should first pull in ghc-bin). Second, emerge"
+ eerror "ghc again:"
+ eerror
+ eerror " emerge haddock"
+ eerror " emerge ghc"
+ die "portage dependency problem"
+ fi
+}
src_unpack() {
base_src_unpack
@@ -40,9 +57,14 @@ src_unpack() {
src_compile() {
# unset SGML_CATALOG_FILES because documentation installation
# breaks otherwise ...
- PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
- # using make because emake behaved strangely on my machine
- make || die "make failed"
+ SGML_CATALOG_FILES="" econf || die "econf failed"
+
+ if $(ghc-cabal); then
+ echo "SRC_HC_OPTS += -package mtl" >> mk/build.mk
+ fi
+
+ # using -j1 because -j2 behaved strangely on my machine
+ emake -j1 || die "make failed"
# if documentation has been requested, build documentation ...
if use doc; then
@@ -61,22 +83,26 @@ src_compile() {
src_install() {
local mydoc
+ # the libdir0 setting is needed for amd64, and does not
+ # harm for other arches
make install \
prefix="${D}/usr" \
datadir="${D}/usr/share/${P}" \
infodir="${D}/usr/share/info" \
- mandir="${D}/usr/share/man" || die "make install failed"
+ mandir="${D}/usr/share/man" \
+ libdir0="${D}/usr/$(get_libdir)" \
+ || die "make install failed"
cd ${S}/haddock
dodoc CHANGES LICENSE README TODO
if use doc; then
cd ${S}/haddock/doc
- dohtml -r haddock/* || die
+ dohtml -r haddock/* || die "html docs couldn't be installed"
dosym haddock.html /usr/share/doc/${PF}/html/index.html
if use tetex; then
docinto ps
- dodoc haddock.ps || die
+ dodoc haddock.ps || die "ps docs couldn't be installed"
fi
fi
}
diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild
index 8691f0fe7dc0..21c029429890 100644
--- a/dev-haskell/haddock/haddock-0.7.ebuild
+++ b/dev-haskell/haddock/haddock-0.7.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.1 2005/08/05 12:48:21 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.1.1.1 2005/11/30 09:48:23 chriswhite Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
# in HTML format.
-# tetex - Build the above docs as PostScript as well.
+# java - Build the above docs as PostScript as well.
-inherit ghc-package
+inherit ghc-package multilib
IUSE="doc java"
DESCRIPTION="A documentation tool for Haskell"
@@ -27,6 +27,26 @@ DEPEND="virtual/ghc
java? ( >=dev-java/fop-0.20.5 ) )"
RDEPEND=""
+pkg_setup() {
+ if ! has_version virtual/ghc; then
+ eerror "Due to a bug in the portage dependency resolution, emerge"
+ eerror "sometimes tries to merge haddock before a version of ghc"
+ eerror "is available on the system. This is usually triggered when"
+ eerror "you try to bootstrap ghc on a system with USE=\"doc\" using"
+ eerror "the command"
+ eerror
+ eerror " emerge ghc"
+ eerror
+ eerror "To resolve this problem, proceed in two steps. First, emerge"
+ eerror "haddock (which should first pull in ghc-bin). Second, emerge"
+ eerror "ghc again:"
+ eerror
+ eerror " emerge haddock"
+ eerror " emerge ghc"
+ die "portage dependency problem"
+ fi
+}
+
src_compile() {
local myconf
local mydoc