summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/alex/ChangeLog6
-rw-r--r--dev-haskell/alex/alex-2.0.1-r1.ebuild4
-rw-r--r--dev-haskell/alex/alex-2.1.0.ebuild4
-rw-r--r--dev-haskell/alut/ChangeLog5
-rw-r--r--dev-haskell/alut/alut-1.0.ebuild4
-rw-r--r--dev-haskell/c2hs/ChangeLog5
-rw-r--r--dev-haskell/c2hs/c2hs-0.14.5.ebuild4
-rw-r--r--dev-haskell/cabal/ChangeLog6
-rw-r--r--dev-haskell/cabal/cabal-1.1.3-r1.ebuild6
-rw-r--r--dev-haskell/cabal/cabal-1.1.4.ebuild6
-rw-r--r--dev-haskell/cabal/cabal-1.1.6.1.ebuild4
-rw-r--r--dev-haskell/cabal/cabal-1.1.6.2.ebuild4
-rw-r--r--dev-haskell/cpphs/ChangeLog6
-rw-r--r--dev-haskell/cpphs/cpphs-1.1.ebuild6
-rw-r--r--dev-haskell/cpphs/cpphs-1.2.ebuild4
-rw-r--r--dev-haskell/drift/ChangeLog6
-rw-r--r--dev-haskell/drift/drift-2.1.2.ebuild6
-rw-r--r--dev-haskell/drift/drift-2.2.0.ebuild4
-rw-r--r--dev-haskell/fgl/ChangeLog5
-rw-r--r--dev-haskell/fgl/fgl-5.2.ebuild6
-rw-r--r--dev-haskell/frown/ChangeLog7
-rw-r--r--dev-haskell/frown/frown-0.6.1-r1.ebuild6
-rw-r--r--dev-haskell/gtk2hs/ChangeLog5
-rw-r--r--dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild6
-rw-r--r--dev-haskell/haddock/ChangeLog6
-rw-r--r--dev-haskell/haddock/haddock-0.7.ebuild10
-rw-r--r--dev-haskell/haddock/haddock-0.8.ebuild4
-rw-r--r--dev-haskell/happy/ChangeLog6
-rw-r--r--dev-haskell/happy/happy-1.15.ebuild6
-rw-r--r--dev-haskell/happy/happy-1.16.ebuild4
-rw-r--r--dev-haskell/harp/ChangeLog5
-rw-r--r--dev-haskell/harp/harp-0.2.ebuild6
-rw-r--r--dev-haskell/haskell-src-exts/ChangeLog8
-rw-r--r--dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild6
-rw-r--r--dev-haskell/haskell-src/ChangeLog5
-rw-r--r--dev-haskell/haskell-src/haskell-src-1.0.ebuild6
-rw-r--r--dev-haskell/haxml/ChangeLog6
-rw-r--r--dev-haskell/haxml/haxml-1.12.ebuild8
-rw-r--r--dev-haskell/haxml/haxml-1.13-r1.ebuild8
-rw-r--r--dev-haskell/haxml/haxml-1.13.2.ebuild4
-rw-r--r--dev-haskell/hdbc-odbc/ChangeLog6
-rw-r--r--dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild6
-rw-r--r--dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild4
-rw-r--r--dev-haskell/hdbc-postgresql/ChangeLog6
-rw-r--r--dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild6
-rw-r--r--dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild4
-rw-r--r--dev-haskell/hdbc-sqlite/ChangeLog6
-rw-r--r--dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild6
-rw-r--r--dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild4
-rw-r--r--dev-haskell/hdbc/ChangeLog6
-rw-r--r--dev-haskell/hdbc/hdbc-1.0.0.ebuild6
-rw-r--r--dev-haskell/hdbc/hdbc-1.0.1.ebuild4
-rw-r--r--dev-haskell/hdoc/ChangeLog7
-rw-r--r--dev-haskell/hdoc/hdoc-0.8.3.ebuild6
-rw-r--r--dev-haskell/hmake/ChangeLog6
-rw-r--r--dev-haskell/hmake/hmake-3.10.ebuild10
-rw-r--r--dev-haskell/hmake/hmake-3.11.ebuild6
-rw-r--r--dev-haskell/hmake/hmake-3.13.ebuild6
-rw-r--r--dev-haskell/hs-plugins/ChangeLog6
-rw-r--r--dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild6
-rw-r--r--dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild6
-rw-r--r--dev-haskell/hsql-mysql/ChangeLog7
-rw-r--r--dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild6
-rw-r--r--dev-haskell/hsql-odbc/ChangeLog5
-rw-r--r--dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild6
-rw-r--r--dev-haskell/hsql-postgresql/ChangeLog6
-rw-r--r--dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild6
-rw-r--r--dev-haskell/hsql-sqlite/ChangeLog5
-rw-r--r--dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild6
-rw-r--r--dev-haskell/hsql/ChangeLog5
-rw-r--r--dev-haskell/hsql/hsql-1.7.ebuild4
-rw-r--r--dev-haskell/hsshellscript/ChangeLog8
-rw-r--r--dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild8
-rw-r--r--dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild8
-rw-r--r--dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild6
-rw-r--r--dev-haskell/hsshellscript/hsshellscript-2.6.3.ebuild6
-rw-r--r--dev-haskell/hsshellscript/hsshellscript-2.7.0.ebuild6
-rw-r--r--dev-haskell/html/ChangeLog5
-rw-r--r--dev-haskell/html/html-1.0.ebuild6
-rw-r--r--dev-haskell/http/ChangeLog5
-rw-r--r--dev-haskell/http/http-2006.7.7.ebuild4
-rw-r--r--dev-haskell/hunit/ChangeLog5
-rw-r--r--dev-haskell/hunit/hunit-1.1.ebuild6
-rw-r--r--dev-haskell/hxt/ChangeLog6
-rw-r--r--dev-haskell/hxt/hxt-4.02-r1.ebuild10
-rw-r--r--dev-haskell/hxt/hxt-4.02.ebuild10
-rw-r--r--dev-haskell/hxt/hxt-5.00.ebuild10
-rw-r--r--dev-haskell/hxt/hxt-6.0.ebuild6
-rw-r--r--dev-haskell/lhs2tex/ChangeLog6
-rw-r--r--dev-haskell/lhs2tex/lhs2tex-1.10_pre.ebuild8
-rw-r--r--dev-haskell/lhs2tex/lhs2tex-1.11.ebuild6
-rw-r--r--dev-haskell/missingh/ChangeLog6
-rw-r--r--dev-haskell/missingh/missingh-0.14.4.ebuild4
-rw-r--r--dev-haskell/missingh/missingh-0.16.0.ebuild4
-rw-r--r--dev-haskell/network/ChangeLog5
-rw-r--r--dev-haskell/network/network-1.0.ebuild6
-rw-r--r--dev-haskell/openal/ChangeLog5
-rw-r--r--dev-haskell/openal/openal-1.2.ebuild4
-rw-r--r--dev-haskell/quickcheck/ChangeLog5
-rw-r--r--dev-haskell/quickcheck/quickcheck-1.0.ebuild6
-rw-r--r--dev-haskell/uuagc/ChangeLog7
-rw-r--r--dev-haskell/uuagc/uuagc-0.9.1.ebuild6
-rw-r--r--dev-haskell/uulib/ChangeLog7
-rw-r--r--dev-haskell/uulib/uulib-0.9.2.ebuild6
-rw-r--r--dev-haskell/wash/ChangeLog6
-rw-r--r--dev-haskell/wash/wash-2.0.6.ebuild8
-rw-r--r--dev-haskell/wash/wash-2.3.1.ebuild8
-rw-r--r--dev-haskell/wash/wash-2.5.6.ebuild6
-rw-r--r--dev-haskell/wxhaskell/ChangeLog5
-rw-r--r--dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild6
-rw-r--r--dev-haskell/x11/ChangeLog5
-rw-r--r--dev-haskell/x11/x11-1.1.ebuild6
112 files changed, 403 insertions, 255 deletions
diff --git a/dev-haskell/alex/ChangeLog b/dev-haskell/alex/ChangeLog
index bca1b68f9637..47d6d80bb2e9 100644
--- a/dev-haskell/alex/ChangeLog
+++ b/dev-haskell/alex/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/alex
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.31 2007/08/11 15:26:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/ChangeLog,v 1.32 2007/10/31 12:53:01 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> alex-2.0.1-r1.ebuild,
+ alex-2.1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Aug 2007; Steve Dibb <beandog@gentoo.org> alex-2.1.0.ebuild:
amd64 stable
diff --git a/dev-haskell/alex/alex-2.0.1-r1.ebuild b/dev-haskell/alex/alex-2.0.1-r1.ebuild
index eec084434c87..285f47d15179 100644
--- a/dev-haskell/alex/alex-2.0.1-r1.ebuild
+++ b/dev-haskell/alex/alex-2.0.1-r1.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/alex/alex-2.0.1-r1.ebuild,v 1.16 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.0.1-r1.ebuild,v 1.17 2007/10/31 12:53:01 dcoutts Exp $
#
# USE variable summary:
# doc - Build extra documenation from DocBook sources,
@@ -19,7 +19,7 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
LICENSE="as-is"
-DEPEND=">=virtual/ghc-6.2
+DEPEND=">=dev-lang/ghc-6.2
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
>=dev-libs/libxslt-1.1.2 )"
diff --git a/dev-haskell/alex/alex-2.1.0.ebuild b/dev-haskell/alex/alex-2.1.0.ebuild
index bade6140e020..a0713c8907be 100644
--- a/dev-haskell/alex/alex-2.1.0.ebuild
+++ b/dev-haskell/alex/alex-2.1.0.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/alex/alex-2.1.0.ebuild,v 1.8 2007/08/11 15:26:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-2.1.0.ebuild,v 1.9 2007/10/31 12:53:01 dcoutts Exp $
CABAL_FEATURES="bin"
inherit autotools haskell-cabal
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
# java use flag disabled because of bug #107019
-DEPEND=">=virtual/ghc-6.2
+DEPEND=">=dev-lang/ghc-6.2
>=dev-haskell/cabal-1.1.6
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets
diff --git a/dev-haskell/alut/ChangeLog b/dev-haskell/alut/ChangeLog
index e5a7eda63386..90cc879db3da 100644
--- a/dev-haskell/alut/ChangeLog
+++ b/dev-haskell/alut/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/alut
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alut/ChangeLog,v 1.2 2007/07/09 12:54:38 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alut/ChangeLog,v 1.3 2007/10/31 12:53:27 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> alut-1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
09 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> alut-2.0.ebuild,
alut-2.0.1.ebuild:
diff --git a/dev-haskell/alut/alut-1.0.ebuild b/dev-haskell/alut/alut-1.0.ebuild
index 22b9ee32fbc2..663bfc90e650 100644
--- a/dev-haskell/alut/alut-1.0.ebuild
+++ b/dev-haskell/alut/alut-1.0.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/alut/alut-1.0.ebuild,v 1.1 2007/07/09 12:41:32 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alut/alut-1.0.ebuild,v 1.2 2007/10/31 12:53:27 dcoutts Exp $
inherit ghc-package flag-o-matic
@@ -17,7 +17,7 @@ DEPEND="=dev-lang/ghc-6.4*"
pkg_setup () {
ghc-package_pkg_setup
- if ! ( built_with_use virtual/ghc openal && built_with_use virtual/ghc opengl ); then
+ if ! ( built_with_use dev-lang/ghc openal && built_with_use dev-lang/ghc opengl ); then
eerror "This library has to be provided by ghc."
eerror "Please re-emerge ghc with USE=\"openal opengl\""
die "dev-haskell/alut requires ghc to be built with USE=\"openal opengl\""
diff --git a/dev-haskell/c2hs/ChangeLog b/dev-haskell/c2hs/ChangeLog
index f8a4d67cbdd7..ebc4d69e1c83 100644
--- a/dev-haskell/c2hs/ChangeLog
+++ b/dev-haskell/c2hs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/c2hs
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.24 2007/07/28 14:35:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/ChangeLog,v 1.25 2007/10/31 12:53:53 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> c2hs-0.14.5.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
28 Jul 2007; nixnut <nixnut@gentoo.org> c2hs-0.14.5.ebuild:
Stable on ppc wrt bug 186849
diff --git a/dev-haskell/c2hs/c2hs-0.14.5.ebuild b/dev-haskell/c2hs/c2hs-0.14.5.ebuild
index 30e8245206dc..a03b7264dda6 100644
--- a/dev-haskell/c2hs/c2hs-0.14.5.ebuild
+++ b/dev-haskell/c2hs/c2hs-0.14.5.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/c2hs/c2hs-0.14.5.ebuild,v 1.12 2007/07/28 14:35:33 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/c2hs/c2hs-0.14.5.ebuild,v 1.13 2007/10/31 12:53:53 dcoutts Exp $
CABAL_FEATURES="bin"
inherit base eutils haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4"
+DEPEND=">=dev-lang/ghc-6.4"
src_unpack() {
base_src_unpack
diff --git a/dev-haskell/cabal/ChangeLog b/dev-haskell/cabal/ChangeLog
index c5ff1c0ba4d5..53bce4ff692f 100644
--- a/dev-haskell/cabal/ChangeLog
+++ b/dev-haskell/cabal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/cabal
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.34 2007/08/29 01:11:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/ChangeLog,v 1.35 2007/10/31 12:54:22 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> cabal-1.1.3-r1.ebuild,
+ cabal-1.1.4.ebuild, cabal-1.1.6.1.ebuild, cabal-1.1.6.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
29 Aug 2007; Jeroen Roovers <jer@gentoo.org> cabal-1.1.6.2.ebuild:
Stable for HPPA too.
diff --git a/dev-haskell/cabal/cabal-1.1.3-r1.ebuild b/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
index 16cd9ffe9ea4..9314b0d85a08 100644
--- a/dev-haskell/cabal/cabal-1.1.3-r1.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.3-r1.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/cabal/cabal-1.1.3-r1.ebuild,v 1.11 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.3-r1.ebuild,v 1.12 2007/10/31 12:54:22 dcoutts Exp $
CABAL_FEATURES="bootstrap lib"
inherit haskell-cabal eutils base
@@ -15,8 +15,8 @@ KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
-DEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6"
+DEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6"
MY_PV="${PV/_pre*/}"
S="${WORKDIR}/${PN}"
diff --git a/dev-haskell/cabal/cabal-1.1.4.ebuild b/dev-haskell/cabal/cabal-1.1.4.ebuild
index 6168579604cc..015a32133ee1 100644
--- a/dev-haskell/cabal/cabal-1.1.4.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.4.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/cabal/cabal-1.1.4.ebuild,v 1.10 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.4.ebuild,v 1.11 2007/10/31 12:54:22 dcoutts Exp $
CABAL_FEATURES="bootstrap profile lib"
inherit haskell-cabal eutils base
@@ -15,8 +15,8 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="doc"
-DEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6"
+DEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6"
src_unpack() {
unpack ${A}
diff --git a/dev-haskell/cabal/cabal-1.1.6.1.ebuild b/dev-haskell/cabal/cabal-1.1.6.1.ebuild
index be2095214399..44de6a2d54a5 100644
--- a/dev-haskell/cabal/cabal-1.1.6.1.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.6.1.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/cabal/cabal-1.1.6.1.ebuild,v 1.3 2007/08/11 15:22:48 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.1.ebuild,v 1.4 2007/10/31 12:54:22 dcoutts Exp $
CABAL_FEATURES="bootstrap profile lib"
inherit haskell-cabal eutils
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.2"
+DEPEND=">=dev-lang/ghc-6.2"
src_unpack() {
unpack "${A}"
diff --git a/dev-haskell/cabal/cabal-1.1.6.2.ebuild b/dev-haskell/cabal/cabal-1.1.6.2.ebuild
index 3b00107c5260..6c10f55f7661 100644
--- a/dev-haskell/cabal/cabal-1.1.6.2.ebuild
+++ b/dev-haskell/cabal/cabal-1.1.6.2.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/cabal/cabal-1.1.6.2.ebuild,v 1.8 2007/08/29 01:11:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.1.6.2.ebuild,v 1.9 2007/10/31 12:54:22 dcoutts Exp $
CABAL_FEATURES="bootstrap profile lib"
inherit haskell-cabal eutils
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.2"
+DEPEND=">=dev-lang/ghc-6.2"
GHC_PV="6.6.1"
diff --git a/dev-haskell/cpphs/ChangeLog b/dev-haskell/cpphs/ChangeLog
index 6bdf825989cc..4601a22ff941 100644
--- a/dev-haskell/cpphs/ChangeLog
+++ b/dev-haskell/cpphs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/cpphs
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/ChangeLog,v 1.19 2007/08/04 11:22:08 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/ChangeLog,v 1.20 2007/10/31 12:54:50 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> cpphs-1.1.ebuild,
+ cpphs-1.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*cpphs-1.3 (04 Aug 2007)
diff --git a/dev-haskell/cpphs/cpphs-1.1.ebuild b/dev-haskell/cpphs/cpphs-1.1.ebuild
index 3fee6005397b..461be3e66bbc 100644
--- a/dev-haskell/cpphs/cpphs-1.1.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.1.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/cpphs/cpphs-1.1.ebuild,v 1.6 2006/10/11 18:38:06 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.1.ebuild,v 1.7 2007/10/31 12:54:50 dcoutts Exp $
CABAL_FEATURES="bin"
inherit eutils haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="virtual/ghc"
+DEPEND="dev-lang/ghc"
RDEPEND=""
src_install() {
diff --git a/dev-haskell/cpphs/cpphs-1.2.ebuild b/dev-haskell/cpphs/cpphs-1.2.ebuild
index 393fcc91587a..5f9dace9e409 100644
--- a/dev-haskell/cpphs/cpphs-1.2.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.2.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/cpphs/cpphs-1.2.ebuild,v 1.8 2007/07/28 14:37:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.2.ebuild,v 1.9 2007/10/31 12:54:50 dcoutts Exp $
CABAL_FEATURES="bin lib profile"
inherit eutils haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND="virtual/ghc"
+DEPEND="dev-lang/ghc"
src_install() {
cabal_src_install
diff --git a/dev-haskell/drift/ChangeLog b/dev-haskell/drift/ChangeLog
index e72776bfbf6d..3f682698868c 100644
--- a/dev-haskell/drift/ChangeLog
+++ b/dev-haskell/drift/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/drift
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/ChangeLog,v 1.18 2007/08/11 15:29:15 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/ChangeLog,v 1.19 2007/10/31 12:55:21 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> drift-2.1.2.ebuild,
+ drift-2.2.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Aug 2007; Steve Dibb <beandog@gentoo.org> drift-2.2.0.ebuild:
amd64 stable, bug 186849
diff --git a/dev-haskell/drift/drift-2.1.2.ebuild b/dev-haskell/drift/drift-2.1.2.ebuild
index 9966caa70bda..6afe5a71d0f7 100644
--- a/dev-haskell/drift/drift-2.1.2.ebuild
+++ b/dev-haskell/drift/drift-2.1.2.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/drift/drift-2.1.2.ebuild,v 1.8 2006/10/05 03:11:31 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/drift-2.1.2.ebuild,v 1.9 2007/10/31 12:55:21 dcoutts Exp $
inherit ghc-package
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6"
+DEPEND=">=dev-lang/ghc-6"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/drift/drift-2.2.0.ebuild b/dev-haskell/drift/drift-2.2.0.ebuild
index 905b79cda0d5..79b97faf887a 100644
--- a/dev-haskell/drift/drift-2.2.0.ebuild
+++ b/dev-haskell/drift/drift-2.2.0.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/drift/drift-2.2.0.ebuild,v 1.6 2007/08/11 15:29:15 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/drift/drift-2.2.0.ebuild,v 1.7 2007/10/31 12:55:21 dcoutts Exp $
inherit ghc-package
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6"
+DEPEND=">=dev-lang/ghc-6"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/fgl/ChangeLog b/dev-haskell/fgl/ChangeLog
index 035e9f76bd99..38bc380bc297 100644
--- a/dev-haskell/fgl/ChangeLog
+++ b/dev-haskell/fgl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/fgl
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/ChangeLog,v 1.19 2007/07/11 18:09:32 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/ChangeLog,v 1.20 2007/10/31 12:55:48 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> fgl-5.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> fgl-5.4.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/fgl/fgl-5.2.ebuild b/dev-haskell/fgl/fgl-5.2.ebuild
index fafcb0c69512..8d343fbd5cde 100644
--- a/dev-haskell/fgl/fgl-5.2.ebuild
+++ b/dev-haskell/fgl/fgl-5.2.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/fgl/fgl-5.2.ebuild,v 1.12 2007/04/30 20:21:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/fgl/fgl-5.2.ebuild,v 1.13 2007/10/31 12:55:48 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/frown/ChangeLog b/dev-haskell/frown/ChangeLog
index 35b2a5c46c0b..3ddd1802bb9c 100644
--- a/dev-haskell/frown/ChangeLog
+++ b/dev-haskell/frown/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/frown
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/ChangeLog,v 1.12 2006/10/05 03:13:02 cparrott Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/ChangeLog,v 1.13 2007/10/31 12:56:14 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> frown-0.6.1-r1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
05 Oct 2006; Chris Parrott <cparrott@gentoo.org> frown-0.6.1-r1.ebuild:
marked stable for amd64 (bug 144678)
diff --git a/dev-haskell/frown/frown-0.6.1-r1.ebuild b/dev-haskell/frown/frown-0.6.1-r1.ebuild
index d1f447f770db..e978c06ab82a 100644
--- a/dev-haskell/frown/frown-0.6.1-r1.ebuild
+++ b/dev-haskell/frown/frown-0.6.1-r1.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/frown/frown-0.6.1-r1.ebuild,v 1.10 2006/10/05 03:13:02 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/frown/frown-0.6.1-r1.ebuild,v 1.11 2007/10/31 12:56:14 dcoutts Exp $
CABAL_FEATURES="bin"
inherit haskell-cabal
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2.2"
+DEPEND=">=dev-lang/ghc-6.2.2"
RDEPEND=""
S="${WORKDIR}/Frown-${PV}"
diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index cf85a4d669c5..69d1e45aa0ea 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/gtk2hs
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.35 2007/10/29 06:51:08 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.36 2007/10/31 12:56:42 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> gtk2hs-0.9.10-r1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
29 Oct 2007; Luis F. Araujo <araujo@gentoo.org> gtk2hs-0.9.12.ebuild:
Fix for recent glib that changes the type of the gtype typedef
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
index c9ede425392b..794950d31017 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.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/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.5 2007/10/12 08:41:45 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.6 2007/10/31 12:56:42 dcoutts Exp $
inherit base eutils ghc-package multilib autotools
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc glade gnome firefox"
-RDEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6
+RDEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6
amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
>=x11-libs/gtk+-2
glade? ( >=gnome-base/libglade-2 )
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
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog
index 07ea467e2e78..ebf1d3362b39 100644
--- a/dev-haskell/happy/ChangeLog
+++ b/dev-haskell/happy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/happy
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.31 2007/10/14 08:49:04 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.32 2007/10/31 12:57:48 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> happy-1.15.ebuild,
+ happy-1.16.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
14 Oct 2007; Lennart Kolmodin <kolmodin@gentoo.org> happy-1.16.ebuild:
Specify exactly which cabal versions that are supported, as happy-1.16
diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild
index 13ed7c28418c..5bda71c1b165 100644
--- a/dev-haskell/happy/happy-1.15.ebuild
+++ b/dev-haskell/happy/happy-1.15.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/happy/happy-1.15.ebuild,v 1.15 2006/10/11 18:31:57 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.16 2007/10/31 12:57:48 dcoutts Exp $
inherit base eutils ghc-package
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
#java use flag disabled, bug #107019
-DEPEND=">=virtual/ghc-5.04
+DEPEND=">=dev-lang/ghc-5.04
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets )"
# java? ( >=dev-java/fop-0.20.5 ) )"
diff --git a/dev-haskell/happy/happy-1.16.ebuild b/dev-haskell/happy/happy-1.16.ebuild
index a9a1da6ef0b1..1d889c9961c8 100644
--- a/dev-haskell/happy/happy-1.16.ebuild
+++ b/dev-haskell/happy/happy-1.16.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/happy/happy-1.16.ebuild,v 1.10 2007/10/14 08:49:04 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.16.ebuild,v 1.11 2007/10/31 12:57:48 dcoutts Exp $
CABAL_FEATURES="bin"
inherit haskell-cabal autotools
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
|| ( =dev-haskell/cabal-1.1.6.1 =dev-haskell/cabal-1.1.6.2 )
doc? ( ~app-text/docbook-xml-dtd-4.2
app-text/docbook-xsl-stylesheets )"
diff --git a/dev-haskell/harp/ChangeLog b/dev-haskell/harp/ChangeLog
index be203f88db5e..4370ec397adc 100644
--- a/dev-haskell/harp/ChangeLog
+++ b/dev-haskell/harp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/harp
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/harp/ChangeLog,v 1.7 2007/02/21 23:18:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/harp/ChangeLog,v 1.8 2007/10/31 12:58:14 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> harp-0.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/harp/harp-0.2.ebuild b/dev-haskell/harp/harp-0.2.ebuild
index f28648c73567..f4811f23e0e0 100644
--- a/dev-haskell/harp/harp-0.2.ebuild
+++ b/dev-haskell/harp/harp-0.2.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/harp/harp-0.2.ebuild,v 1.7 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/harp/harp-0.2.ebuild,v 1.8 2007/10/31 12:58:14 dcoutts Exp $
CABAL_FEATURES="haddock lib"
inherit haskell-cabal
@@ -14,6 +14,6 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="virtual/ghc"
+DEPEND="dev-lang/ghc"
S=${WORKDIR}/haskell-src-exts/src/harp
diff --git a/dev-haskell/haskell-src-exts/ChangeLog b/dev-haskell/haskell-src-exts/ChangeLog
index 3dcdf3e0e1c7..ac97c0c89638 100644
--- a/dev-haskell/haskell-src-exts/ChangeLog
+++ b/dev-haskell/haskell-src-exts/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/haskell-src-exts
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.9 2006/10/17 20:42:54 dcoutts Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/ChangeLog,v 1.10 2007/10/31 12:59:13 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ haskell-src-exts-0.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
17 Oct 2006; Duncan Coutts <dcoutts@gentoo.org>
haskell-src-exts-0.2.ebuild:
diff --git a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild
index 28814293cd46..f56928046c0a 100644
--- a/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild
+++ b/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.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/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.9 2006/10/17 20:42:54 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src-exts/haskell-src-exts-0.2.ebuild,v 1.10 2007/10/31 12:59:13 dcoutts Exp $
CABAL_FEATURES="lib happy"
inherit base haskell-cabal eutils
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2
+DEPEND=">=dev-lang/ghc-6.2
dev-haskell/happy"
S=${WORKDIR}/haskell-src-exts/src/haskell-src-exts
diff --git a/dev-haskell/haskell-src/ChangeLog b/dev-haskell/haskell-src/ChangeLog
index 48a34af1950b..e7413a4785df 100644
--- a/dev-haskell/haskell-src/ChangeLog
+++ b/dev-haskell/haskell-src/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haskell-src
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.18 2007/07/11 18:13:04 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/ChangeLog,v 1.19 2007/10/31 12:58:47 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> haskell-src-1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> haskell-src-1.0.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/haskell-src/haskell-src-1.0.ebuild b/dev-haskell/haskell-src/haskell-src-1.0.ebuild
index 909f2dd77be5..fe615d40059f 100644
--- a/dev-haskell/haskell-src/haskell-src-1.0.ebuild
+++ b/dev-haskell/haskell-src/haskell-src-1.0.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/haskell-src/haskell-src-1.0.ebuild,v 1.12 2007/04/30 20:22:52 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haskell-src/haskell-src-1.0.ebuild,v 1.13 2007/10/31 12:58:47 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/haxml/ChangeLog b/dev-haskell/haxml/ChangeLog
index 5b0ae27f056c..0d27a77364fb 100644
--- a/dev-haskell/haxml/ChangeLog
+++ b/dev-haskell/haxml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/haxml
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.24 2007/08/11 15:48:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/ChangeLog,v 1.25 2007/10/31 12:59:40 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> haxml-1.12.ebuild,
+ haxml-1.13-r1.ebuild, haxml-1.13.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Aug 2007; Steve Dibb <beandog@gentoo.org> haxml-1.13.2.ebuild:
amd64 stable, bug 186849
diff --git a/dev-haskell/haxml/haxml-1.12.ebuild b/dev-haskell/haxml/haxml-1.12.ebuild
index 535c15a2b509..f1cfa8b5f9da 100644
--- a/dev-haskell/haxml/haxml-1.12.ebuild
+++ b/dev-haskell/haxml/haxml-1.12.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/haxml/haxml-1.12.ebuild,v 1.8 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/haxml-1.12.ebuild,v 1.9 2007/10/31 12:59:40 dcoutts Exp $
inherit ghc-package fixheadtails
@@ -19,8 +19,8 @@ IUSE="doc"
# actually, >=ghc-5.02 should be ok
# hugs and nhc98 are ok too, somebody might want to add support for them
-DEPEND=">=virtual/ghc-6.0
- !>=virtual/ghc-6.6
+DEPEND=">=dev-lang/ghc-6.0
+ !>=dev-lang/ghc-6.6
doc? ( >=dev-haskell/haddock-0.6-r2 )"
S=${WORKDIR}/${MY_P}
diff --git a/dev-haskell/haxml/haxml-1.13-r1.ebuild b/dev-haskell/haxml/haxml-1.13-r1.ebuild
index cffbaad54cb7..1d1775efa254 100644
--- a/dev-haskell/haxml/haxml-1.13-r1.ebuild
+++ b/dev-haskell/haxml/haxml-1.13-r1.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/haxml/haxml-1.13-r1.ebuild,v 1.12 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/haxml-1.13-r1.ebuild,v 1.13 2007/10/31 12:59:40 dcoutts Exp $
CABAL_FEATURES="lib bin profile haddock"
inherit base haskell-cabal
@@ -20,8 +20,8 @@ IUSE=""
# actually, >=ghc-5.02 should be ok (if not using cabal)
# hugs and nhc98 are ok too, somebody might want to add support for them
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.6
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.6
>=dev-haskell/cabal-1.1.3-r1"
S=${WORKDIR}/${MY_P}
diff --git a/dev-haskell/haxml/haxml-1.13.2.ebuild b/dev-haskell/haxml/haxml-1.13.2.ebuild
index 1c2c791e7870..bba10316503d 100644
--- a/dev-haskell/haxml/haxml-1.13.2.ebuild
+++ b/dev-haskell/haxml/haxml-1.13.2.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/haxml/haxml-1.13.2.ebuild,v 1.7 2007/08/11 15:48:42 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haxml/haxml-1.13.2.ebuild,v 1.8 2007/10/31 12:59:40 dcoutts Exp $
CABAL_FEATURES="lib bin profile haddock"
inherit base haskell-cabal
@@ -20,7 +20,7 @@ IUSE=""
# actually, >=ghc-5.02 should be ok (if not using cabal)
# hugs and nhc98 are ok too, somebody might want to add support for them
-DEPEND=">=virtual/ghc-6.2
+DEPEND=">=dev-lang/ghc-6.2
>=dev-haskell/cabal-1.1.3-r1"
S=${WORKDIR}/${MY_P}
diff --git a/dev-haskell/hdbc-odbc/ChangeLog b/dev-haskell/hdbc-odbc/ChangeLog
index 01454c271a31..018136b41d0e 100644
--- a/dev-haskell/hdbc-odbc/ChangeLog
+++ b/dev-haskell/hdbc-odbc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hdbc-odbc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.10 2007/07/11 17:42:32 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/ChangeLog,v 1.11 2007/10/31 13:00:38 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hdbc-odbc-1.0.0.0.ebuild,
+ hdbc-odbc-1.0.1.1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hdbc-odbc-1.0.1.1 (11 Jul 2007)
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild
index f6d5f337a7ca..e31542c40a41 100644
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild
+++ b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.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/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild,v 1.1 2006/07/02 19:09:02 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.0.0.ebuild,v 1.2 2007/10/31 13:00:38 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/unixODBC-2.2"
diff --git a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild
index 1fd586714a49..50eb12d1799a 100644
--- a/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild
+++ b/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.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/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild,v 1.1 2007/07/11 17:42:32 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-odbc/hdbc-odbc-1.0.1.1.ebuild,v 1.2 2007/10/31 13:00:38 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/unixODBC-2.2"
diff --git a/dev-haskell/hdbc-postgresql/ChangeLog b/dev-haskell/hdbc-postgresql/ChangeLog
index a850c9a25367..c32f40ef7428 100644
--- a/dev-haskell/hdbc-postgresql/ChangeLog
+++ b/dev-haskell/hdbc-postgresql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hdbc-postgresql
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.9 2007/07/11 17:41:17 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/ChangeLog,v 1.10 2007/10/31 13:01:03 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ hdbc-postgresql-1.0.0.0.ebuild, hdbc-postgresql-1.0.1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hdbc-postgresql-1.0.1.0 (11 Jul 2007)
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild
index b2c6fccc387c..5a7bd9c34faa 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.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/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild,v 1.1 2006/07/02 19:09:24 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.0.0.ebuild,v 1.2 2007/10/31 13:01:03 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/libpq-8"
diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild
index b3f514d61eeb..9a7766cb8ea4 100644
--- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild
+++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.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/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild,v 1.1 2007/07/11 17:41:17 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-postgresql/hdbc-postgresql-1.0.1.0.ebuild,v 1.2 2007/10/31 13:01:03 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/libpq-8"
diff --git a/dev-haskell/hdbc-sqlite/ChangeLog b/dev-haskell/hdbc-sqlite/ChangeLog
index fa699b752a40..26f326bff515 100644
--- a/dev-haskell/hdbc-sqlite/ChangeLog
+++ b/dev-haskell/hdbc-sqlite/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hdbc-sqlite
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.9 2007/07/11 17:40:15 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/ChangeLog,v 1.10 2007/10/31 13:01:36 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ hdbc-sqlite-1.0.0.0.ebuild, hdbc-sqlite-1.0.1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hdbc-sqlite-1.0.1.0 (11 Jul 2007)
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild
index 43ca014dca23..402bbc8bef79 100644
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.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/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild,v 1.1 2006/07/02 19:09:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.0.0.ebuild,v 1.2 2007/10/31 13:01:36 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/sqlite-3.2"
diff --git a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild
index 416b48a55be8..b6e4ccdd500f 100644
--- a/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild
+++ b/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.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/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild,v 1.1 2007/07/11 17:40:15 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc-sqlite/hdbc-sqlite-1.0.1.0.ebuild,v 1.2 2007/10/31 13:01:36 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal versionator
@@ -16,7 +16,7 @@ IUSE=""
hdbc_PV=$(get_version_component_range 1-3)
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hdbc-${hdbc_PV}
>=dev-db/sqlite-3.2"
diff --git a/dev-haskell/hdbc/ChangeLog b/dev-haskell/hdbc/ChangeLog
index 08b361ea8d7a..98b0e907ebf0 100644
--- a/dev-haskell/hdbc/ChangeLog
+++ b/dev-haskell/hdbc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hdbc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.9 2007/07/11 17:39:02 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/ChangeLog,v 1.10 2007/10/31 13:00:06 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hdbc-1.0.0.ebuild,
+ hdbc-1.0.1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hdbc-1.0.1 (11 Jul 2007)
diff --git a/dev-haskell/hdbc/hdbc-1.0.0.ebuild b/dev-haskell/hdbc/hdbc-1.0.0.ebuild
index 1eb6f47fccc4..c0d57dc91a9c 100644
--- a/dev-haskell/hdbc/hdbc-1.0.0.ebuild
+++ b/dev-haskell/hdbc/hdbc-1.0.0.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/hdbc/hdbc-1.0.0.ebuild,v 1.1 2006/07/02 19:08:39 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.0.0.ebuild,v 1.2 2007/10/31 13:00:06 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="odbc postgres sqlite"
-DEPEND=">=virtual/ghc-6.4.1"
+DEPEND=">=dev-lang/ghc-6.4.1"
PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${PV}* )
postgres? ( =dev-haskell/hdbc-postgresql-${PV}* )
diff --git a/dev-haskell/hdbc/hdbc-1.0.1.ebuild b/dev-haskell/hdbc/hdbc-1.0.1.ebuild
index aa34a35e7984..9f7873fda1d1 100644
--- a/dev-haskell/hdbc/hdbc-1.0.1.ebuild
+++ b/dev-haskell/hdbc/hdbc-1.0.1.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/hdbc/hdbc-1.0.1.ebuild,v 1.1 2007/07/11 17:39:02 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdbc/hdbc-1.0.1.ebuild,v 1.2 2007/10/31 13:00:06 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="odbc postgres sqlite"
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
>=dev-haskell/mtl-1.0"
PDEPEND="odbc? ( =dev-haskell/hdbc-odbc-${PV}* )
diff --git a/dev-haskell/hdoc/ChangeLog b/dev-haskell/hdoc/ChangeLog
index 1f78fd8ffb30..434cbce125f0 100644
--- a/dev-haskell/hdoc/ChangeLog
+++ b/dev-haskell/hdoc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hdoc
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/ChangeLog,v 1.15 2006/10/05 03:23:53 cparrott Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/ChangeLog,v 1.16 2007/10/31 13:02:03 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hdoc-0.8.3.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
05 Oct 2006; Chris Parrott <cparrott@gentoo.org> hdoc-0.8.3.ebuild:
marked stable for amd64 (bug 144678)
diff --git a/dev-haskell/hdoc/hdoc-0.8.3.ebuild b/dev-haskell/hdoc/hdoc-0.8.3.ebuild
index 7618b4209622..fe7b8c62b6fa 100644
--- a/dev-haskell/hdoc/hdoc-0.8.3.ebuild
+++ b/dev-haskell/hdoc/hdoc-0.8.3.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/hdoc/hdoc-0.8.3.ebuild,v 1.10 2006/10/05 03:23:53 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hdoc/hdoc-0.8.3.ebuild,v 1.11 2007/10/31 13:02:03 dcoutts Exp $
DESCRIPTION="A documentation generator for Haskell"
HOMEPAGE="http://www.fmi.uni-passau.de/~groessli/hdoc/"
@@ -11,7 +11,7 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND="virtual/ghc"
+DEPEND="dev-lang/ghc"
RDEPEND=""
src_compile() {
diff --git a/dev-haskell/hmake/ChangeLog b/dev-haskell/hmake/ChangeLog
index 056f02fa21f9..c17985d15484 100644
--- a/dev-haskell/hmake/ChangeLog
+++ b/dev-haskell/hmake/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hmake
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.32 2007/07/29 13:48:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/ChangeLog,v 1.33 2007/10/31 13:02:30 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hmake-3.10.ebuild,
+ hmake-3.11.ebuild, hmake-3.13.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hmake-3.13 (29 Jul 2007)
diff --git a/dev-haskell/hmake/hmake-3.10.ebuild b/dev-haskell/hmake/hmake-3.10.ebuild
index b9f28ef4ab03..d0bb1ab14fa6 100644
--- a/dev-haskell/hmake/hmake-3.10.ebuild
+++ b/dev-haskell/hmake/hmake-3.10.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/hmake/hmake-3.10.ebuild,v 1.8 2006/10/12 23:01:39 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.10.ebuild,v 1.9 2007/10/31 13:02:30 dcoutts Exp $
inherit base eutils fixheadtails
@@ -13,10 +13,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="virtual/ghc
- !>=virtual/ghc-6.6
+DEPEND="dev-lang/ghc
+ !>=dev-lang/ghc-6.6
sys-libs/readline"
-RDEPEND="virtual/ghc
+RDEPEND="dev-lang/ghc
sys-libs/readline
>=sys-apps/sandbox-1.2.12"
diff --git a/dev-haskell/hmake/hmake-3.11.ebuild b/dev-haskell/hmake/hmake-3.11.ebuild
index 9bd4ad0f3776..9c2a5b81844b 100644
--- a/dev-haskell/hmake/hmake-3.11.ebuild
+++ b/dev-haskell/hmake/hmake-3.11.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/hmake/hmake-3.11.ebuild,v 1.10 2007/07/29 13:48:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.11.ebuild,v 1.11 2007/10/31 13:02:30 dcoutts Exp $
inherit base eutils fixheadtails ghc-package
@@ -13,10 +13,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
IUSE=""
-DEPEND="virtual/ghc
+DEPEND="dev-lang/ghc
sys-libs/readline
>=sys-apps/sandbox-1.2.12"
-RDEPEND="virtual/ghc
+RDEPEND="dev-lang/ghc
sys-libs/readline"
# sandbox dependency due to bug #97441, #101433
diff --git a/dev-haskell/hmake/hmake-3.13.ebuild b/dev-haskell/hmake/hmake-3.13.ebuild
index 55eeccfc8640..459c8ef80001 100644
--- a/dev-haskell/hmake/hmake-3.13.ebuild
+++ b/dev-haskell/hmake/hmake-3.13.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/hmake/hmake-3.13.ebuild,v 1.1 2007/07/29 13:48:46 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hmake/hmake-3.13.ebuild,v 1.2 2007/10/31 13:02:30 dcoutts Exp $
inherit base eutils ghc-package
@@ -13,10 +13,10 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="virtual/ghc
+DEPEND="dev-lang/ghc
sys-libs/readline
>=sys-apps/sandbox-1.2.12"
-RDEPEND="virtual/ghc
+RDEPEND="dev-lang/ghc
sys-libs/readline"
# sandbox dependency due to bug #97441, #101433
diff --git a/dev-haskell/hs-plugins/ChangeLog b/dev-haskell/hs-plugins/ChangeLog
index 1077f7331c1e..93565bdf6a86 100644
--- a/dev-haskell/hs-plugins/ChangeLog
+++ b/dev-haskell/hs-plugins/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hs-plugins
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.15 2007/04/30 07:34:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/ChangeLog,v 1.16 2007/10/31 13:02:57 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ hs-plugins-0.9.10-r1.ebuild, hs-plugins-1.0_rc0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
30 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> -hs-plugins-0.9.6.ebuild,
-hs-plugins-0.9.8.ebuild, hs-plugins-0.9.10-r1.ebuild:
diff --git a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
index 53314993b7fa..1b8ea09693ba 100644
--- a/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild
+++ b/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.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/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.6 2007/04/30 07:34:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-0.9.10-r1.ebuild,v 1.7 2007/10/31 13:02:57 dcoutts Exp $
inherit ghc-package
@@ -14,8 +14,8 @@ SLOT="0"
KEYWORDS="-amd64 ~ppc ~sparc ~x86" # currently broken on amd64
IUSE="doc"
-DEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6
+DEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6
>=dev-haskell/haskell-src-exts-0.2
dev-haskell/cabal"
diff --git a/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild b/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild
index 6de4c4e56c5c..22ccabd01b29 100644
--- a/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild
+++ b/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.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/hs-plugins/hs-plugins-1.0_rc0.ebuild,v 1.4 2007/04/30 07:34:42 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hs-plugins/hs-plugins-1.0_rc0.ebuild,v 1.5 2007/10/31 13:02:57 dcoutts Exp $
CABAL_FEATURES="lib"
@@ -18,8 +18,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="doc"
-DEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6
+DEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6
>=dev-haskell/haskell-src-exts-0.2
dev-haskell/cabal"
diff --git a/dev-haskell/hsql-mysql/ChangeLog b/dev-haskell/hsql-mysql/ChangeLog
index f02f34f18a8d..5092e9f5b029 100644
--- a/dev-haskell/hsql-mysql/ChangeLog
+++ b/dev-haskell/hsql-mysql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql-mysql
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.6 2006/11/23 15:44:46 vivo Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/ChangeLog,v 1.7 2007/10/31 13:03:59 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-mysql-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
23 Nov 2006; Francesco Riosa <vivo@gentoo.org> hsql-mysql-1.7.ebuild:
dev-db/mysql => virtual/mysql
diff --git a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild b/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
index 5cd83f9026ee..a114102dd5a2 100644
--- a/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild
+++ b/dev-haskell/hsql-mysql/hsql-mysql-1.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/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.6 2006/11/23 15:44:46 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-mysql/hsql-mysql-1.7.ebuild,v 1.7 2007/10/31 13:03:59 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hsql-${PV}
>=virtual/mysql-4.0"
diff --git a/dev-haskell/hsql-odbc/ChangeLog b/dev-haskell/hsql-odbc/ChangeLog
index c6d9d4ef06a3..9e6eaef05b5c 100644
--- a/dev-haskell/hsql-odbc/ChangeLog
+++ b/dev-haskell/hsql-odbc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql-odbc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.6 2007/02/21 23:19:15 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/ChangeLog,v 1.7 2007/10/31 13:04:28 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-odbc-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild b/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
index c3389b927f25..8cc6d0177d07 100644
--- a/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild
+++ b/dev-haskell/hsql-odbc/hsql-odbc-1.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/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.5 2006/03/09 17:45:07 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-odbc/hsql-odbc-1.7.ebuild,v 1.6 2007/10/31 13:04:28 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hsql-${PV}
>=dev-db/unixODBC-2.2"
diff --git a/dev-haskell/hsql-postgresql/ChangeLog b/dev-haskell/hsql-postgresql/ChangeLog
index 527c283f2daf..a5c3e899733d 100644
--- a/dev-haskell/hsql-postgresql/ChangeLog
+++ b/dev-haskell/hsql-postgresql/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hsql-postgresql
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.6 2007/02/21 23:19:52 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/ChangeLog,v 1.7 2007/10/31 13:04:59 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ hsql-postgresql-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild b/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild
index 3f4fe2f3a7b7..f54d3b5f0e6d 100644
--- a/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild
+++ b/dev-haskell/hsql-postgresql/hsql-postgresql-1.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/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.5 2006/03/09 17:46:00 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-postgresql/hsql-postgresql-1.7.ebuild,v 1.6 2007/10/31 13:04:59 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hsql-${PV}
>=dev-db/libpq-7"
diff --git a/dev-haskell/hsql-sqlite/ChangeLog b/dev-haskell/hsql-sqlite/ChangeLog
index 76d3219e19fb..d323e0605f2a 100644
--- a/dev-haskell/hsql-sqlite/ChangeLog
+++ b/dev-haskell/hsql-sqlite/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql-sqlite
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.7 2007/02/21 23:20:19 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/ChangeLog,v 1.8 2007/10/31 13:05:25 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-sqlite-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild b/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
index 77a5c83d2039..ab69a3e0c2bf 100644
--- a/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild
+++ b/dev-haskell/hsql-sqlite/hsql-sqlite-1.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/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.5 2006/03/09 17:46:53 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql-sqlite/hsql-sqlite-1.7.ebuild,v 1.6 2007/10/31 13:05:25 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1
+DEPEND=">=dev-lang/ghc-6.4.1
~dev-haskell/hsql-${PV}
>=dev-db/sqlite-3.0"
diff --git a/dev-haskell/hsql/ChangeLog b/dev-haskell/hsql/ChangeLog
index a2349db5cd7e..96acb2036852 100644
--- a/dev-haskell/hsql/ChangeLog
+++ b/dev-haskell/hsql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hsql
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.9 2007/01/06 17:53:26 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/ChangeLog,v 1.10 2007/10/31 13:03:29 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hsql-1.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
06 Jan 2007; Andres Loeh <kosmikus@gentoo.org> hsql-1.7.ebuild:
Fixed elog / einfo usage.
diff --git a/dev-haskell/hsql/hsql-1.7.ebuild b/dev-haskell/hsql/hsql-1.7.ebuild
index 7d394061c1d6..436d44a666e2 100644
--- a/dev-haskell/hsql/hsql-1.7.ebuild
+++ b/dev-haskell/hsql/hsql-1.7.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/hsql/hsql-1.7.ebuild,v 1.9 2007/01/06 17:53:26 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsql/hsql-1.7.ebuild,v 1.10 2007/10/31 13:03:29 dcoutts Exp $
CABAL_FEATURES="lib haddock"
inherit base eutils ghc-package haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4.1"
+DEPEND=">=dev-lang/ghc-6.4.1"
S="${WORKDIR}/HSQL/HSQL"
diff --git a/dev-haskell/hsshellscript/ChangeLog b/dev-haskell/hsshellscript/ChangeLog
index 8b4ba0f0a54d..54d34f1f6dcd 100644
--- a/dev-haskell/hsshellscript/ChangeLog
+++ b/dev-haskell/hsshellscript/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-haskell/hsshellscript
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.16 2007/02/21 23:20:47 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/ChangeLog,v 1.17 2007/10/31 13:05:52 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org>
+ hsshellscript-2.2.2.ebuild, hsshellscript-2.3.0.ebuild,
+ hsshellscript-2.6.0.ebuild, hsshellscript-2.6.3.ebuild,
+ hsshellscript-2.7.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
index 734f1a921523..9afc4e3709fa 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/hsshellscript/hsshellscript-2.2.2.ebuild,v 1.3 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.2.2.ebuild,v 1.4 2007/10/31 13:05:52 dcoutts Exp $
inherit base eutils ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4"
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4"
RDEPEND=""
src_unpack() {
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild
index d9fba8b3d6fd..558bf46d06dc 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/hsshellscript/hsshellscript-2.3.0.ebuild,v 1.3 2007/07/13 06:03:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.3.0.ebuild,v 1.4 2007/10/31 13:05:52 dcoutts Exp $
inherit base eutils ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4"
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4"
RDEPEND=""
src_unpack() {
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild
index a6e121f0845d..535abd1ecd26 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.6.0.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/hsshellscript/hsshellscript-2.6.0.ebuild,v 1.6 2006/08/15 00:32:33 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.6.0.ebuild,v 1.7 2007/10/31 13:05:52 dcoutts Exp $
inherit base eutils multilib ghc-package
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~ppc ~x86 ~amd64"
IUSE=""
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
>=dev-libs/glib-2.0
>=dev-haskell/haddock-0.6"
RDEPEND=""
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.6.3.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.6.3.ebuild
index 5b624c5f0a97..587b636cf19a 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.6.3.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.6.3.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/hsshellscript/hsshellscript-2.6.3.ebuild,v 1.1 2006/08/15 00:28:58 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.6.3.ebuild,v 1.2 2007/10/31 13:05:52 dcoutts Exp $
inherit base eutils multilib ghc-package
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~ppc ~x86 ~amd64"
IUSE=""
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
>=dev-libs/glib-2.0
>=dev-haskell/haddock-0.6"
RDEPEND=""
diff --git a/dev-haskell/hsshellscript/hsshellscript-2.7.0.ebuild b/dev-haskell/hsshellscript/hsshellscript-2.7.0.ebuild
index 932f3adbe056..eb741bdb5229 100644
--- a/dev-haskell/hsshellscript/hsshellscript-2.7.0.ebuild
+++ b/dev-haskell/hsshellscript/hsshellscript-2.7.0.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/hsshellscript/hsshellscript-2.7.0.ebuild,v 1.1 2006/11/03 20:52:41 araujo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hsshellscript/hsshellscript-2.7.0.ebuild,v 1.2 2007/10/31 13:05:52 dcoutts Exp $
inherit base eutils multilib ghc-package
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~ppc ~x86 ~amd64"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
>=dev-libs/glib-2.0
doc? ( >=dev-haskell/haddock-0.6 )"
RDEPEND=""
diff --git a/dev-haskell/html/ChangeLog b/dev-haskell/html/ChangeLog
index 66854cb3a0a3..6a8c01e209fb 100644
--- a/dev-haskell/html/ChangeLog
+++ b/dev-haskell/html/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/html
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/ChangeLog,v 1.18 2007/07/11 18:14:05 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/ChangeLog,v 1.19 2007/10/31 13:06:21 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> html-1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> html-1.0.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/html/html-1.0.ebuild b/dev-haskell/html/html-1.0.ebuild
index 17a563d78f59..ac4ced20db78 100644
--- a/dev-haskell/html/html-1.0.ebuild
+++ b/dev-haskell/html/html-1.0.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/html/html-1.0.ebuild,v 1.12 2007/04/30 20:24:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/html/html-1.0.ebuild,v 1.13 2007/10/31 13:06:21 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/http/ChangeLog b/dev-haskell/http/ChangeLog
index d289d0b48b2c..6c85781b44c7 100644
--- a/dev-haskell/http/ChangeLog
+++ b/dev-haskell/http/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/http
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.4 2007/04/29 22:41:35 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/ChangeLog,v 1.5 2007/10/31 13:06:47 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> http-2006.7.7.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
29 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> http-2006.7.7.ebuild:
Add missing dep on >=dev-haskell/network-1.0
diff --git a/dev-haskell/http/http-2006.7.7.ebuild b/dev-haskell/http/http-2006.7.7.ebuild
index d1a6d2f9d5f7..429aec1abcaf 100644
--- a/dev-haskell/http/http-2006.7.7.ebuild
+++ b/dev-haskell/http/http-2006.7.7.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/http/http-2006.7.7.ebuild,v 1.2 2007/04/29 22:41:35 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-2006.7.7.ebuild,v 1.3 2007/10/31 13:06:47 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base versionator eutils haskell-cabal
@@ -21,7 +21,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
>=dev-haskell/network-1.0"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-haskell/hunit/ChangeLog b/dev-haskell/hunit/ChangeLog
index 6e3e4f8c61db..baf5bd086c4b 100644
--- a/dev-haskell/hunit/ChangeLog
+++ b/dev-haskell/hunit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/hunit
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/ChangeLog,v 1.18 2007/07/11 18:15:44 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/ChangeLog,v 1.19 2007/10/31 13:07:14 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hunit-1.1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> hunit-1.1.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/hunit/hunit-1.1.ebuild b/dev-haskell/hunit/hunit-1.1.ebuild
index c5aaaf986a42..ec52fa97c1b7 100644
--- a/dev-haskell/hunit/hunit-1.1.ebuild
+++ b/dev-haskell/hunit/hunit-1.1.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/hunit/hunit-1.1.ebuild,v 1.12 2007/04/30 20:26:01 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.1.ebuild,v 1.13 2007/10/31 13:07:14 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/hxt/ChangeLog b/dev-haskell/hxt/ChangeLog
index 3519ff6e050d..564164d9e0ca 100644
--- a/dev-haskell/hxt/ChangeLog
+++ b/dev-haskell/hxt/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/hxt
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.8 2007/07/28 17:58:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/ChangeLog,v 1.9 2007/10/31 13:07:44 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> hxt-4.02.ebuild,
+ hxt-4.02-r1.ebuild, hxt-5.00.ebuild, hxt-6.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*hxt-7.2 (28 Jul 2007)
diff --git a/dev-haskell/hxt/hxt-4.02-r1.ebuild b/dev-haskell/hxt/hxt-4.02-r1.ebuild
index 1254065890cf..5bb45696d291 100644
--- a/dev-haskell/hxt/hxt-4.02-r1.ebuild
+++ b/dev-haskell/hxt/hxt-4.02-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/hxt/hxt-4.02-r1.ebuild,v 1.1 2005/04/26 10:59:54 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-4.02-r1.ebuild,v 1.2 2007/10/31 13:07:44 dcoutts Exp $
inherit fixheadtails base eutils ghc-package
@@ -16,10 +16,10 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4
doc? ( >=dev-haskell/haddock-0.6-r2 )"
-RDEPEND=">=virtual/ghc-6.2"
+RDEPEND=">=dev-lang/ghc-6.2"
S=${WORKDIR}/${MY_PV}
diff --git a/dev-haskell/hxt/hxt-4.02.ebuild b/dev-haskell/hxt/hxt-4.02.ebuild
index 4866742ebdc8..3e80af231656 100644
--- a/dev-haskell/hxt/hxt-4.02.ebuild
+++ b/dev-haskell/hxt/hxt-4.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/hxt/hxt-4.02.ebuild,v 1.2 2005/03/19 22:09:42 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-4.02.ebuild,v 1.3 2007/10/31 13:07:44 dcoutts Exp $
inherit fixheadtails base eutils ghc-package
@@ -16,10 +16,10 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4
doc? ( >=dev-haskell/haddock-0.6-r2 )"
-RDEPEND=">=virtual/ghc-6.2"
+RDEPEND=">=dev-lang/ghc-6.2"
S=${WORKDIR}/${MY_PV}
diff --git a/dev-haskell/hxt/hxt-5.00.ebuild b/dev-haskell/hxt/hxt-5.00.ebuild
index 4b14fb747fb3..9d8a6a1a83e7 100644
--- a/dev-haskell/hxt/hxt-5.00.ebuild
+++ b/dev-haskell/hxt/hxt-5.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/hxt/hxt-5.00.ebuild,v 1.1 2005/04/26 10:59:54 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-5.00.ebuild,v 1.2 2007/10/31 13:07:44 dcoutts Exp $
inherit fixheadtails base eutils ghc-package
@@ -16,11 +16,11 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc"
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4
!=dev-haskell/hxt-4.02
doc? ( >=dev-haskell/haddock-0.6-r2 )"
-RDEPEND=">=virtual/ghc-6.2"
+RDEPEND=">=dev-lang/ghc-6.2"
S=${WORKDIR}/${MY_P}
diff --git a/dev-haskell/hxt/hxt-6.0.ebuild b/dev-haskell/hxt/hxt-6.0.ebuild
index 540263118c71..c2d36bb01b8e 100644
--- a/dev-haskell/hxt/hxt-6.0.ebuild
+++ b/dev-haskell/hxt/hxt-6.0.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/hxt/hxt-6.0.ebuild,v 1.1 2006/07/06 18:05:29 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hxt/hxt-6.0.ebuild,v 1.2 2007/10/31 13:07:44 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.4
dev-haskell/http"
S=${WORKDIR}/${MY_P}
diff --git a/dev-haskell/lhs2tex/ChangeLog b/dev-haskell/lhs2tex/ChangeLog
index ae07dacd41b5..7f1ef526bf65 100644
--- a/dev-haskell/lhs2tex/ChangeLog
+++ b/dev-haskell/lhs2tex/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/lhs2tex
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/ChangeLog,v 1.18 2007/03/13 00:05:58 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/ChangeLog,v 1.19 2007/10/31 13:08:10 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> lhs2tex-1.10_pre.ebuild,
+ lhs2tex-1.11.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.10_pre.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.10_pre.ebuild
index 369ef61a8c93..f598138fc943 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.10_pre.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.10_pre.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/lhs2tex/lhs2tex-1.10_pre.ebuild,v 1.11 2006/10/12 17:52:08 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/lhs2tex-1.10_pre.ebuild,v 1.12 2007/10/31 13:08:10 dcoutts Exp $
DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
HOMEPAGE="http://www.iai.uni-bonn.de/~loeh/lhs2tex"
@@ -14,8 +14,8 @@ IUSE="doc"
S="${WORKDIR}/${P/_pre/pre}"
DEPEND=">=dev-tex/polytable-0.7.2
- >=virtual/ghc-5.04
- !>=virtual/ghc-6.6
+ >=dev-lang/ghc-5.04
+ !>=dev-lang/ghc-6.6
doc? ( dev-lang/hugs98 )
virtual/tetex"
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.11.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.11.ebuild
index 2fc411db722c..bb6026e8f3a4 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.11.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.11.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/lhs2tex/lhs2tex-1.11.ebuild,v 1.7 2006/10/15 18:42:43 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/lhs2tex/lhs2tex-1.11.ebuild,v 1.8 2007/10/31 13:08:10 dcoutts Exp $
DESCRIPTION="Preprocessor for typesetting Haskell sources with LaTeX"
HOMEPAGE="http://www.iai.uni-bonn.de/~loeh/lhs2tex"
@@ -14,7 +14,7 @@ IUSE="doc"
S="${WORKDIR}/${P/_pre/pre}"
DEPEND=">=dev-tex/polytable-0.8.2
- >=virtual/ghc-6.2.2
+ >=dev-lang/ghc-6.2.2
doc? ( dev-lang/hugs98 virtual/tetex )"
RDEPEND=">=dev-tex/polytable-0.8.2"
diff --git a/dev-haskell/missingh/ChangeLog b/dev-haskell/missingh/ChangeLog
index 3fb2d28800fb..618a6efc4787 100644
--- a/dev-haskell/missingh/ChangeLog
+++ b/dev-haskell/missingh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/missingh
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.6 2007/07/26 16:38:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/ChangeLog,v 1.7 2007/10/31 13:08:35 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> missingh-0.14.4.ebuild,
+ missingh-0.16.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*missingh-0.18.6 (26 Jul 2007)
diff --git a/dev-haskell/missingh/missingh-0.14.4.ebuild b/dev-haskell/missingh/missingh-0.14.4.ebuild
index b11fd5895ff3..2944d8aaa7af 100644
--- a/dev-haskell/missingh/missingh-0.14.4.ebuild
+++ b/dev-haskell/missingh/missingh-0.14.4.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/missingh/missingh-0.14.4.ebuild,v 1.2 2007/07/26 16:38:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-0.14.4.ebuild,v 1.3 2007/10/31 13:08:35 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal
@@ -16,7 +16,7 @@ SLOT="0"
S="${WORKDIR}/missingh"
-DEPEND=">=virtual/ghc-6.4.1"
+DEPEND=">=dev-lang/ghc-6.4.1"
src_unpack() {
base_src_unpack
diff --git a/dev-haskell/missingh/missingh-0.16.0.ebuild b/dev-haskell/missingh/missingh-0.16.0.ebuild
index 3b42fcc9decb..9505588b8c48 100644
--- a/dev-haskell/missingh/missingh-0.16.0.ebuild
+++ b/dev-haskell/missingh/missingh-0.16.0.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/missingh/missingh-0.16.0.ebuild,v 1.3 2007/07/07 20:31:14 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/missingh/missingh-0.16.0.ebuild,v 1.4 2007/10/31 13:08:35 dcoutts Exp $
CABAL_FEATURES="lib profile haddock"
inherit base haskell-cabal
@@ -16,7 +16,7 @@ SLOT="0"
S="${WORKDIR}/missingh"
-DEPEND=">=virtual/ghc-6.4.2
+DEPEND=">=dev-lang/ghc-6.4.2
>=dev-haskell/mtl-1.0
>=dev-haskell/quickcheck-1.0
>=dev-haskell/hunit-1.1
diff --git a/dev-haskell/network/ChangeLog b/dev-haskell/network/ChangeLog
index 6a392c5e4793..a2937494da65 100644
--- a/dev-haskell/network/ChangeLog
+++ b/dev-haskell/network/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/network
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.18 2007/07/11 18:21:47 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/ChangeLog,v 1.19 2007/10/31 13:09:03 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> network-1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> network-2.0.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/network/network-1.0.ebuild b/dev-haskell/network/network-1.0.ebuild
index 2cedee29bdda..e6a20476ca27 100644
--- a/dev-haskell/network/network-1.0.ebuild
+++ b/dev-haskell/network/network-1.0.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/network/network-1.0.ebuild,v 1.12 2007/04/30 20:29:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-1.0.ebuild,v 1.13 2007/10/31 13:09:03 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/openal/ChangeLog b/dev-haskell/openal/ChangeLog
index 00d89a9a2677..e9be80bc71d3 100644
--- a/dev-haskell/openal/ChangeLog
+++ b/dev-haskell/openal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/openal
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/ChangeLog,v 1.1 2007/07/09 12:40:29 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/ChangeLog,v 1.2 2007/10/31 13:09:28 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> openal-1.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
*openal-1.3.1 (09 Jul 2007)
*openal-1.3 (09 Jul 2007)
diff --git a/dev-haskell/openal/openal-1.2.ebuild b/dev-haskell/openal/openal-1.2.ebuild
index f9004d0d4b95..17a2a184740f 100644
--- a/dev-haskell/openal/openal-1.2.ebuild
+++ b/dev-haskell/openal/openal-1.2.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/openal/openal-1.2.ebuild,v 1.1 2007/07/09 12:40:29 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/openal/openal-1.2.ebuild,v 1.2 2007/10/31 13:09:28 dcoutts Exp $
inherit ghc-package flag-o-matic
@@ -21,7 +21,7 @@ DEPEND="=dev-lang/ghc-6.4*"
pkg_setup () {
ghc-package_pkg_setup
- if ! built_with_use virtual/ghc openal; then
+ if ! built_with_use dev-lang/ghc openal; then
eerror "This library has to be provided by ghc."
eerror "Please re-emerge ghc with USE=\"openal\""
die "dev-haskell/openal requires ghc to be built with USE=\"openal\""
diff --git a/dev-haskell/quickcheck/ChangeLog b/dev-haskell/quickcheck/ChangeLog
index d2c6cb17263d..97650800d45d 100644
--- a/dev-haskell/quickcheck/ChangeLog
+++ b/dev-haskell/quickcheck/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/quickcheck
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.18 2007/07/11 18:24:54 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/ChangeLog,v 1.19 2007/10/31 13:09:55 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> quickcheck-1.0.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
11 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> quickcheck-1.0.1.ebuild:
Marked ~ia64.
diff --git a/dev-haskell/quickcheck/quickcheck-1.0.ebuild b/dev-haskell/quickcheck/quickcheck-1.0.ebuild
index 881c354fa2c3..878a7f90356b 100644
--- a/dev-haskell/quickcheck/quickcheck-1.0.ebuild
+++ b/dev-haskell/quickcheck/quickcheck-1.0.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/quickcheck/quickcheck-1.0.ebuild,v 1.12 2007/04/30 20:30:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/quickcheck/quickcheck-1.0.ebuild,v 1.13 2007/10/31 13:09:55 dcoutts Exp $
inherit ghc-package
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="=virtual/ghc-6.4*
- !>=virtual/ghc-6.6"
+DEPEND="=dev-lang/ghc-6.4*
+ !>=dev-lang/ghc-6.6"
pkg_setup () {
ghc-package_pkg_setup
diff --git a/dev-haskell/uuagc/ChangeLog b/dev-haskell/uuagc/ChangeLog
index 03777c63db4f..68c89d99b588 100644
--- a/dev-haskell/uuagc/ChangeLog
+++ b/dev-haskell/uuagc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/uuagc
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.12 2006/11/12 15:24:34 mabi Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/ChangeLog,v 1.13 2007/10/31 13:10:21 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> uuagc-0.9.1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
12 Nov 2006; Matti Bickel <mabi@gentoo.org> uuagc-0.9.1.ebuild:
Stable on ppc
diff --git a/dev-haskell/uuagc/uuagc-0.9.1.ebuild b/dev-haskell/uuagc/uuagc-0.9.1.ebuild
index 9e98af52bc5d..d8ab6b7dfda4 100644
--- a/dev-haskell/uuagc/uuagc-0.9.1.ebuild
+++ b/dev-haskell/uuagc/uuagc-0.9.1.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/uuagc/uuagc-0.9.1.ebuild,v 1.11 2006/11/12 15:24:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uuagc/uuagc-0.9.1.ebuild,v 1.12 2007/10/31 13:10:21 dcoutts Exp $
CABAL_FEATURES="bin"
inherit haskell-cabal
@@ -14,5 +14,5 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2.2
+DEPEND=">=dev-lang/ghc-6.2.2
>=dev-haskell/uulib-0.9.1"
diff --git a/dev-haskell/uulib/ChangeLog b/dev-haskell/uulib/ChangeLog
index f1bca4c8bc71..be9fa8db3bc7 100644
--- a/dev-haskell/uulib/ChangeLog
+++ b/dev-haskell/uulib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/uulib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.13 2006/11/12 15:23:34 mabi Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/ChangeLog,v 1.14 2007/10/31 13:10:46 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> uulib-0.9.2.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
12 Nov 2006; Matti Bickel <mabi@gentoo.org> uulib-0.9.2.ebuild:
Stable on ppc (bug #144678)
diff --git a/dev-haskell/uulib/uulib-0.9.2.ebuild b/dev-haskell/uulib/uulib-0.9.2.ebuild
index 986c80c70269..dbc4ba393699 100644
--- a/dev-haskell/uulib/uulib-0.9.2.ebuild
+++ b/dev-haskell/uulib/uulib-0.9.2.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/uulib/uulib-0.9.2.ebuild,v 1.9 2006/11/12 15:23:34 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/uulib/uulib-0.9.2.ebuild,v 1.10 2007/10/31 13:10:46 dcoutts Exp $
CABAL_FEATURES="haddock lib"
inherit base haskell-cabal
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ppc ppc64 sparc x86"
IUSE=""
-DEPEND=">=virtual/ghc-6.2.2"
+DEPEND=">=dev-lang/ghc-6.2.2"
src_unpack() {
base_src_unpack
diff --git a/dev-haskell/wash/ChangeLog b/dev-haskell/wash/ChangeLog
index 9a0b5f7ddb71..2fde3b059147 100644
--- a/dev-haskell/wash/ChangeLog
+++ b/dev-haskell/wash/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-haskell/wash
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.11 2007/03/24 00:27:50 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/ChangeLog,v 1.12 2007/10/31 13:11:16 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> wash-2.0.6.ebuild,
+ wash-2.3.1.ebuild, wash-2.5.6.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/dev-haskell/wash/wash-2.0.6.ebuild b/dev-haskell/wash/wash-2.0.6.ebuild
index c0b56995a9e3..03e38fadd83b 100644
--- a/dev-haskell/wash/wash-2.0.6.ebuild
+++ b/dev-haskell/wash/wash-2.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/wash/wash-2.0.6.ebuild,v 1.2 2005/03/25 00:31:05 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.0.6.ebuild,v 1.3 2007/10/31 13:11:16 dcoutts Exp $
inherit ghc-package
@@ -17,8 +17,8 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc postgres"
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4
postgres? ( dev-haskell/c2hs
>=dev-db/postgresql-7.4.3 )"
diff --git a/dev-haskell/wash/wash-2.3.1.ebuild b/dev-haskell/wash/wash-2.3.1.ebuild
index 5893e74d6aa8..0092fbfc5c95 100644
--- a/dev-haskell/wash/wash-2.3.1.ebuild
+++ b/dev-haskell/wash/wash-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/wash/wash-2.3.1.ebuild,v 1.2 2005/03/25 00:31:05 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.3.1.ebuild,v 1.3 2007/10/31 13:11:16 dcoutts Exp $
inherit ghc-package
@@ -17,8 +17,8 @@ SLOT="0"
KEYWORDS="~x86"
IUSE="doc postgres"
-DEPEND=">=virtual/ghc-6.2
- !>=virtual/ghc-6.4
+DEPEND=">=dev-lang/ghc-6.2
+ !>=dev-lang/ghc-6.4
postgres? ( dev-haskell/c2hs
>=dev-db/postgresql-7.4.3 )"
diff --git a/dev-haskell/wash/wash-2.5.6.ebuild b/dev-haskell/wash/wash-2.5.6.ebuild
index 6b3323eda249..01e2137666d6 100644
--- a/dev-haskell/wash/wash-2.5.6.ebuild
+++ b/dev-haskell/wash/wash-2.5.6.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/wash/wash-2.5.6.ebuild,v 1.4 2006/10/17 20:56:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wash/wash-2.5.6.ebuild,v 1.5 2007/10/31 13:11:16 dcoutts Exp $
inherit base eutils ghc-package check-reqs autotools
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~x86 ~amd64 ~sparc"
IUSE="doc postgres"
-RDEPEND=">=virtual/ghc-6.4.1
+RDEPEND=">=dev-lang/ghc-6.4.1
postgres? ( >=dev-db/libpq-7.4.3 )"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index 4155c3819a21..ce9a1bcf7125 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/wxhaskell
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.26 2007/10/13 14:21:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.27 2007/10/31 13:11:43 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> wxhaskell-0.9.4.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
13 Oct 2007; Ryan Hill <dirtyepic@gentoo.org> wxhaskell-0.9.4.ebuild:
Make sure the right version of wxGTK is being checked in pkg_setup.
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
index 45a46e68780c..fc7f2afb6306 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.4.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/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.11 2007/10/13 14:21:41 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.12 2007/10/31 13:11:43 dcoutts Exp $
inherit flag-o-matic wxwidgets ghc-package multilib
@@ -13,8 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="doc"
-RDEPEND="<virtual/ghc-6.6
- !>=virtual/ghc-6.6
+RDEPEND="<dev-lang/ghc-6.6
+ !>=dev-lang/ghc-6.6
=x11-libs/wxGTK-2.6*"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/x11/ChangeLog b/dev-haskell/x11/ChangeLog
index 64a6e80e907a..50a4b1d36508 100644
--- a/dev-haskell/x11/ChangeLog
+++ b/dev-haskell/x11/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/x11
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.2 2007/07/25 18:38:18 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/ChangeLog,v 1.3 2007/10/31 13:12:08 dcoutts Exp $
+
+ 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> x11-1.1.ebuild:
+ Drop virtual/ghc in favour of dev-lang/ghc
25 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> x11-1.2.ebuild,
x11-1.2.1.ebuild, x11-1.2.2.ebuild:
diff --git a/dev-haskell/x11/x11-1.1.ebuild b/dev-haskell/x11/x11-1.1.ebuild
index 375acc9d815e..08cf00545ce2 100644
--- a/dev-haskell/x11/x11-1.1.ebuild
+++ b/dev-haskell/x11/x11-1.1.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/x11/x11-1.1.ebuild,v 1.1 2007/07/09 12:39:24 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11/x11-1.1.ebuild,v 1.2 2007/10/31 13:12:08 dcoutts Exp $
inherit ghc-package flag-o-matic
@@ -13,11 +13,11 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND="=virtual/ghc-6.4*"
+DEPEND="=dev-lang/ghc-6.4*"
pkg_setup () {
ghc-package_pkg_setup
- if ! built_with_use virtual/ghc X; then
+ if ! built_with_use dev-lang/ghc X; then
eerror "This library has to be provided by ghc."
eerror "Please re-emerge ghc with USE=\"X\""
die "dev-haskell/x11 requires ghc to be built with USE=\"X\""