diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-10-31 12:57:11 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-10-31 12:57:11 +0000 |
| commit | 6376126f06985d95ce006274b359da9ab9babcca (patch) | |
| tree | 097e819c2c3d2c8e673d97a102f13530b357ba40 /dev-haskell/haddock | |
| parent | Drop virtual/ghc in favour of dev-lang/ghc (diff) | |
| download | gentoo-2-6376126f06985d95ce006274b359da9ab9babcca.tar.gz gentoo-2-6376126f06985d95ce006274b359da9ab9babcca.tar.bz2 gentoo-2-6376126f06985d95ce006274b359da9ab9babcca.zip | |
Drop virtual/ghc in favour of dev-lang/ghc
(Portage version: 2.1.3.16)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.7.ebuild | 10 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.8.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index c2cb5a80ba09..e776ed5fa852 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.49 2007/08/11 15:34:57 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.50 2007/10/31 12:57:11 dcoutts Exp $ + + 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> haddock-0.7.ebuild, + haddock-0.8.ebuild: + Drop virtual/ghc in favour of dev-lang/ghc 11 Aug 2007; Steve Dibb <beandog@gentoo.org> haddock-0.8.ebuild: amd64 stable, bug 186849 diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild index 51eebd72167a..53b5630acaae 100644 --- a/dev-haskell/haddock/haddock-0.7.ebuild +++ b/dev-haskell/haddock/haddock-0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 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.15 2007/07/13 06:03:10 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.16 2007/10/31 12:57:11 dcoutts Exp $ # # USE variable summary: # doc - Build extra documenation from DocBook sources, @@ -19,8 +19,8 @@ SLOT="0" KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" LICENSE="as-is" -DEPEND="virtual/ghc - !>=virtual/ghc-6.6 +DEPEND="dev-lang/ghc + !>=dev-lang/ghc-6.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 @@ -29,7 +29,7 @@ DEPEND="virtual/ghc RDEPEND="" pkg_setup() { - if ! has_version virtual/ghc; then + if ! has_version dev-lang/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" diff --git a/dev-haskell/haddock/haddock-0.8.ebuild b/dev-haskell/haddock/haddock-0.8.ebuild index a44ba7d71c94..995ac2a7b88e 100644 --- a/dev-haskell/haddock/haddock-0.8.ebuild +++ b/dev-haskell/haddock/haddock-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.9 2007/08/11 15:34:57 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.10 2007/10/31 12:57:11 dcoutts Exp $ CABAL_FEATURES="bin" inherit haskell-cabal eutils versionator @@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="doc" -DEPEND=">=virtual/ghc-6.4 +DEPEND=">=dev-lang/ghc-6.4 >=dev-haskell/cabal-1.1.4 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets |