diff options
author | Andres Loeh <kosmikus@gentoo.org> | 2005-09-15 10:39:17 +0000 |
---|---|---|
committer | Andres Loeh <kosmikus@gentoo.org> | 2005-09-15 10:39:17 +0000 |
commit | 250eb02257875b3ef8537e79be7e8be78f76df0e (patch) | |
tree | ad0e75e4f4bfb2b6a01d1f9fcb1abf95f271ee2c /dev-haskell | |
parent | Mark 0.27 stable on alpha (diff) | |
download | gentoo-2-250eb02257875b3ef8537e79be7e8be78f76df0e.tar.gz gentoo-2-250eb02257875b3ef8537e79be7e8be78f76df0e.tar.bz2 gentoo-2-250eb02257875b3ef8537e79be7e8be78f76df0e.zip |
Fail with an informative error message when haddock is merged before ghc due to a portage bug.
(Portage version: 2.0.52-r1)
Diffstat (limited to 'dev-haskell')
-rw-r--r-- | dev-haskell/haddock/ChangeLog | 7 | ||||
-rw-r--r-- | dev-haskell/haddock/Manifest | 16 | ||||
-rw-r--r-- | dev-haskell/haddock/haddock-0.6-r2.ebuild | 22 | ||||
-rw-r--r-- | dev-haskell/haddock/haddock-0.6-r3.ebuild | 22 | ||||
-rw-r--r-- | dev-haskell/haddock/haddock-0.7.ebuild | 24 |
5 files changed, 73 insertions, 18 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index b2d9e6f94f87..38ba354cb33a 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.25 2005/09/01 14:52:22 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.26 2005/09/15 10:39:17 kosmikus Exp $ + + 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 diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index b11c1623393c..5038932a2f5a 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 149071cff87c229ea1de13ab965fc008 haddock-0.7.ebuild 1816 -MD5 128b9a894439f7226495b06aa0ea7b3c haddock-0.6-r2.ebuild 1981 -MD5 9452b1257542a1efb797c19271eae1af haddock-0.6-r3.ebuild 2222 +MD5 de8e4d940134f180b5d9f799c0ee7952 haddock-0.7.ebuild 2482 +MD5 9e4633b3925decd0b4823004144cd3d5 haddock-0.6-r2.ebuild 2647 +MD5 d818da3f2596e03c320255d4efadb62e haddock-0.6-r3.ebuild 2888 MD5 78a7d0444b1df418cc0e7de0c8c00516 ChangeLog 3822 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 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.1 (GNU/Linux) - -iD8DBQFDFxXCKRy60XGEcJIRAjGsAJ40Zqm45HlgIMXmfrEx37sjcINLQgCgsdle -4Bh86BJRNS43ffF/XKFM6+o= -=oWbW ------END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/haddock-0.6-r2.ebuild b/dev-haskell/haddock/haddock-0.6-r2.ebuild index a3090bd419d5..4595afff83ff 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-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.12 2005/03/23 14:03:58 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r2.ebuild,v 1.13 2005/09/15 10:39:17 kosmikus Exp $ # # USE variable summary: # doc - Build extra documenation from DocBook sources, @@ -33,6 +33,26 @@ 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 ... diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild index 0d2c3b89a21b..a3f024940f8b 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-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.9 2005/09/01 14:52:22 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.10 2005/09/15 10:39:17 kosmikus Exp $ # # USE variable summary: # doc - Build extra documenation from DocBook sources, @@ -29,6 +29,26 @@ DEPEND="virtual/ghc 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_unpack() { base_src_unpack epatch ${FILESDIR}/${P}-gcc3.4.patch diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild index 8691f0fe7dc0..4efa3553c87b 100644 --- a/dev-haskell/haddock/haddock-0.7.ebuild +++ b/dev-haskell/haddock/haddock-0.7.ebuild @@ -1,11 +1,11 @@ # 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.2 2005/09/15 10:39:17 kosmikus 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 @@ -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 |