amd64 compatibility, closing bug #69830

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index 8535129f3d816901292b0447b9fa4ac2fd755f3a..4a90e164fcd3952b3e9af4d2b3779b8abb337db4 100644 (file)
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.16 2004/10/21 14:09:36 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.17 2004/11/18 22:00:22 kosmikus Exp $
+
+  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)
 

diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 419264cc130aa47205342788921749fa282ac21e..7e4ce5390e8af993756b8a81664adad4baa2fa59 100644 (file)
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,6 +1,6 @@
 MD5 e840b12d8e339b635266cbbcd80a212b haddock-0.6-r2.ebuild 1964
-MD5 fa8022f9977ebdb5adfdcfc8b1c3b3c1 haddock-0.6-r3.ebuild 2048
-MD5 aebbefbda0ec4f3fa18d14c604593ffd ChangeLog 2831
+MD5 0468c56888c963a2cb6f15ddeffeec37 haddock-0.6-r3.ebuild 2246
+MD5 3d19ac1f5195a14e5e173bc99ad87efe ChangeLog 2963
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67

diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 901964c82fbe33b847725648dcf4f0aceb0e249c..65a2ab713dc56967927ccbb760bd805e87e2ddc3 100644 (file)
--- 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
 # 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.2 2004/11/18 22:00:22 kosmikus Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -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 ~sparc ~ppc ~amd64"
 LICENSE="as-is"
 
 DEPEND="virtual/ghc
@@ -41,8 +41,8 @@ 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"
+       # 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 +61,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
 }