Stop providing virtual/ghc. Nothing in portage has depended on it for some time.

Package-Manager: portage-2.1.3.19

6 files changed, 11 insertions, 26 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 6a85caa832fa..940f4ae438fd 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.143 2007/12/12 13:01:51 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.144 2007/12/13 15:58:31 dcoutts Exp $
+
+  13 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> files/ghc-updater,
+  ghc-6.2.2.ebuild, ghc-6.4.2.ebuild, ghc-6.6.ebuild, ghc-6.6.1.ebuild:
+  Stop providing virtual/ghc. Nothing in portage has depended on it for some
+  time.
 
   12 Dec 2007; Ferris McCormick <fmccor@gentoo.org> ghc-6.6.1.ebuild:
   Sparc stable --- needed for Bug #201984 generally.
diff --git a/dev-lang/ghc/files/ghc-updater b/dev-lang/ghc/files/ghc-updater
index 83f142e1322d..622735cc9028 100755
--- a/dev-lang/ghc/files/ghc-updater
+++ b/dev-lang/ghc/files/ghc-updater
@@ -226,7 +226,7 @@ eloginfo "Re-ordering packages to merge .."
 
 DEPSORT=$(find_in_portdir "dev-lang/ghc/files/depsort.py")
 if [[ -z ${DEPSORT} ]]; then
-	eerror "Fatal error: File dev-lang/ghc/files/depsort.py in portage tree."
+	eerror "Fatal error: File dev-lang/ghc/files/depsort.py not in portage tree."
 	exit 1
 fi
 PKGS_OK_SORTED="$(${PORTAGE_PYTHON} ${DEPSORT} ${PKGS_OK} | xargs)"
diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index 786ebf57ae59..7a418b44e54b 100644
--- a/dev-lang/ghc/ghc-6.2.2.ebuild
+++ b/dev-lang/ghc/ghc-6.2.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-lang/ghc/ghc-6.2.2.ebuild,v 1.25 2007/11/05 10:27:49 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.26 2007/12/13 15:58:31 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -12,9 +12,6 @@
 # from source.  If the latter, then the relevant ghc-bin for the
 # arch in question will be used in the working directory to compile
 # ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -47,8 +44,6 @@ IUSE="binary doc ghcbootstrap opengl"
 
 LOC="/opt/ghc" # location for installation of binary version
 
-PROVIDE="virtual/ghc"
-
 RDEPEND="
 	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3
diff --git a/dev-lang/ghc/ghc-6.4.2.ebuild b/dev-lang/ghc/ghc-6.4.2.ebuild
index 16a251a58c4b..fbeda1b74e73 100644
--- a/dev-lang/ghc/ghc-6.4.2.ebuild
+++ b/dev-lang/ghc/ghc-6.4.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-lang/ghc/ghc-6.4.2.ebuild,v 1.24 2007/11/05 20:03:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.2.ebuild,v 1.25 2007/12/13 15:58:31 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -12,9 +12,6 @@
 # from source.  If the latter, then the relevant ghc-bin for the
 # arch in question will be used in the working directory to compile
 # ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -63,8 +60,6 @@ IUSE="binary doc ghcbootstrap test X opengl openal"
 LOC="/opt/ghc" # location for installation of binary version
 S="${WORKDIR}/${MY_P}"
 
-PROVIDE="virtual/ghc"
-
 RDEPEND="
 	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3
diff --git a/dev-lang/ghc/ghc-6.6.1.ebuild b/dev-lang/ghc/ghc-6.6.1.ebuild
index 5cde058af5a3..ab2c913f7ca3 100644
--- a/dev-lang/ghc/ghc-6.6.1.ebuild
+++ b/dev-lang/ghc/ghc-6.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-lang/ghc/ghc-6.6.1.ebuild,v 1.14 2007/12/12 13:01:51 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.1.ebuild,v 1.15 2007/12/13 15:58:31 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -12,9 +12,6 @@
 # from source.  If the latter, then the relevant ghc-bin for the
 # arch in question will be used in the working directory to compile
 # ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -56,8 +53,6 @@ IUSE="binary doc ghcbootstrap"
 LOC="/opt/ghc" # location for installation of binary version
 S="${WORKDIR}/${MY_P}"
 
-PROVIDE="virtual/ghc"
-
 RDEPEND="
 	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3
diff --git a/dev-lang/ghc/ghc-6.6.ebuild b/dev-lang/ghc/ghc-6.6.ebuild
index 53f8d8bf6d8b..0590d3ffe148 100644
--- a/dev-lang/ghc/ghc-6.6.ebuild
+++ b/dev-lang/ghc/ghc-6.6.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-lang/ghc/ghc-6.6.ebuild,v 1.13 2007/11/05 02:18:21 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.6.ebuild,v 1.14 2007/12/13 15:58:31 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -12,9 +12,6 @@
 # from source.  If the latter, then the relevant ghc-bin for the
 # arch in question will be used in the working directory to compile
 # ghc from source.
-#
-# This solution has the advantage of allowing us to retain the one
-# ebuild for both packages, and thus phase out virtual/ghc.
 
 # Note to users of hardened gcc-3.x:
 #
@@ -58,8 +55,6 @@ IUSE="binary doc ghcbootstrap"
 LOC="/opt/ghc" # location for installation of binary version
 S="${WORKDIR}/${MY_P}"
 
-PROVIDE="virtual/ghc"
-
 RDEPEND="
 	!dev-lang/ghc-bin
 	>=sys-devel/gcc-2.95.3