Removed ~amd64 keyword for ghc-6.2.2, because ghc-6.2.2 is broken on this arch. Cleaned up old versions.

(Portage version: 2.0.51.22-r2)

14 files changed, 20 insertions, 987 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 28f3387aa41f..56864f8e4f38 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.61 2005/05/20 15:04:18 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.62 2005/08/17 10:26:09 kosmikus Exp $
+
+  17 Aug 2005; Andres Loeh <loeh@gentoo.org> -files/ghc-5.04.3-r1.patch,
+  -files/ghc-6.2.1-linker.patch.bz2, -files/ghc-6.2.documentation.patch,
+  -files/ghc-6.2.hardened.patch.bz2, -files/lndir.c, -ghc-6.2.ebuild,
+  -ghc-6.2-r1.ebuild, -ghc-6.2.1-r1.ebuild, ghc-6.2.2.ebuild:
+  Removed ~amd64 keyword for ghc-6.2.2, because ghc-6.2.2 is broken on this
+  arch. Cleaned up old versions.
 
   20 May 2005; <duncan@gentoo.org> ghc-6.2.2.ebuild:
   Add ~sparc to KEYWORDS and disable GHCi support on sparc since it does not
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 67d5ec60d7ea..d803f0d041ce 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,33 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dc3fbd0dd8b83c728645c8669f38e35a ChangeLog 11477
+MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
+MD5 cbc12cf1c40d49f9149e16e991147fec ghc-6.2.2.ebuild 5563
+MD5 4159ff00144d8d3d6f3fb0d0e0afcb51 ghc-6.4.ebuild 6089
+MD5 9e6600077a9180cbf90a9ea23384b2eb ChangeLog 11865
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 558c6b9e9b0e15185b69cdfe241dad9a files/ghc-updater 8775
+MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
+MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
 MD5 d417c9e24a826959ad6d921247e43328 files/digest-ghc-6.0.1 67
-MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2 65
-MD5 2e1bd1157c6d47093864b670d6b51a64 files/digest-ghc-6.2-r1 65
-MD5 0cc23d312b60d64e20735768503db1c6 files/digest-ghc-6.2.1-r1 67
 MD5 9e9c22452b545fd9ec1367155c15d8e2 files/digest-ghc-6.2.2 67
 MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
-MD5 d4a4184d5dcf525047332f9c68e522f7 files/ghc-5.04.3-r1.patch 2717
 MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
-MD5 627087e51858d514520531cedbd372f8 files/ghc-6.2.1-linker.patch.bz2 658
-MD5 9c184505ec441675c94d47a3110fa754 files/ghc-6.2.documentation.patch 721
-MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
-MD5 c2e63b1796b9c089a23a07b0eb6e76a7 files/ghc-6.2.hardened.patch.bz2 362
-MD5 ffd472c0685cf2766ce6533265f9a3c9 files/ghc-6.4-powerpc.patch 908
-MD5 558c6b9e9b0e15185b69cdfe241dad9a files/ghc-updater 8775
-MD5 9da9270be8ac4d92d6a5c23fd519cc3c files/lndir.c 8050
-MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
-MD5 80f9ac24762d1342df58d731a756956d ghc-6.2-r1.ebuild 5190
-MD5 2852eaf66fdd3a9ae5fcf1082bb014b3 ghc-6.2.1-r1.ebuild 5794
-MD5 df7da96c59eed3d1177ed33b6d8ee37d ghc-6.2.2.ebuild 5497
-MD5 ea84406fb33d27987c0f7d51ece23975 ghc-6.2.ebuild 5007
-MD5 4159ff00144d8d3d6f3fb0d0e0afcb51 ghc-6.4.ebuild 6089
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0BPnI1lqEGTUzyQRAkXeAJ9gRpkXnTUGOGcVyXxLSe4l3CgRswCffxWj
-9kHgXt3gMTHK+M0ndW73K10=
-=/GXx
------END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/files/digest-ghc-6.2 b/dev-lang/ghc/files/digest-ghc-6.2
deleted file mode 100644
index a1a0bad1815c..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc495e263f4384e1d6b38e851bf6eca0 ghc-6.2-src.tar.bz2 5356656
diff --git a/dev-lang/ghc/files/digest-ghc-6.2-r1 b/dev-lang/ghc/files/digest-ghc-6.2-r1
deleted file mode 100644
index a1a0bad1815c..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc495e263f4384e1d6b38e851bf6eca0 ghc-6.2-src.tar.bz2 5356656
diff --git a/dev-lang/ghc/files/digest-ghc-6.2.1-r1 b/dev-lang/ghc/files/digest-ghc-6.2.1-r1
deleted file mode 100644
index 61f5b8e7bb46..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fa9f90fd6b8852679c5fc16509e94d7a ghc-6.2.1-src.tar.bz2 5367409
diff --git a/dev-lang/ghc/files/ghc-5.04.3-r1.patch b/dev-lang/ghc/files/ghc-5.04.3-r1.patch
deleted file mode 100644
index c0f47a255ae0..000000000000
--- a/dev-lang/ghc/files/ghc-5.04.3-r1.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -Naur ghc-5.04.3.old/ghc/rts/Linker.c ghc-5.04.3/ghc/rts/Linker.c
---- ghc-5.04.3.old/ghc/rts/Linker.c	2003-05-06 02:01:16.000000000 +0200
-+++ ghc-5.04.3/ghc/rts/Linker.c	2003-05-06 02:19:52.000000000 +0200
-@@ -196,11 +196,7 @@
-       SymX(uname)                               \
-       SymX(unlink)                              \
-       SymX(utime)                               \
--      SymX(waitpid)                             \
--      Sym(__divdi3)                             \
--      Sym(__udivdi3)                            \
--      Sym(__moddi3)                             \
--      Sym(__umoddi3)
-+      SymX(waitpid)
- 
- #elif !defined(mingw32_TARGET_OS)
- #define RTS_MINGW_ONLY_SYMBOLS /**/
-@@ -271,11 +267,7 @@
-       Sym(opendir)                              \
-       Sym(readdir)                              \
-       Sym(rewinddir)                            \
--      Sym(closedir)                             \
--      Sym(__divdi3)                             \
--      Sym(__udivdi3)                            \
--      Sym(__moddi3)                             \
--      Sym(__umoddi3)
-+      Sym(closedir)
- #endif
- 
- #ifndef SMP
-@@ -498,12 +490,9 @@
- #define RTS_LONG_LONG_SYMS /* nothing */
- #endif
- 
--#ifdef ia64_TARGET_ARCH
--/* force these symbols to be present */
--#define RTS_EXTRA_SYMBOLS			\
--      Sym(__divsf3)
--#elif defined(powerpc_TARGET_ARCH)
--#define RTS_EXTRA_SYMBOLS                	\
-+// 64-bit support functions in libgcc.a
-+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4
-+#define RTS_LIBGCC_SYMBOLS                      \
-       Sym(__divdi3)                             \
-       Sym(__udivdi3)                            \
-       Sym(__moddi3)                             \
-@@ -511,7 +500,22 @@
-       Sym(__ashldi3)				\
-       Sym(__ashrdi3)				\
-       Sym(__lshrdi3)				\
--      SymX(__eprintf)
-+      Sym(__eprintf)
-+#else
-+#define RTS_LIBGCC_SYMBOLS
-+#endif
-+
-+#ifdef ia64_TARGET_ARCH
-+/* force these symbols to be present */
-+#define RTS_EXTRA_SYMBOLS			\
-+      Sym(__divsf3)
-+#elif defined(powerpc_TARGET_ARCH)
-+      // Symbols that don't have a leading underscore
-+      // on Mac OS X. They have to receive special treatment,
-+      // see machoInitSymbolsWithoutUnderscore()
-+#define RTS_MACHO_NOUNDERLINE_SYMBOLS           \
-+      Sym(saveFP)                               \
-+      Sym(restFP)
- #else
- #define RTS_EXTRA_SYMBOLS /* nothing */
- #endif
-@@ -525,6 +529,7 @@
- RTS_POSIX_ONLY_SYMBOLS
- RTS_MINGW_ONLY_SYMBOLS
- RTS_CYGWIN_ONLY_SYMBOLS
-+RTS_LIBGCC_SYMBOLS
- #undef Sym
- #undef SymX
- 
-@@ -545,6 +550,7 @@
-       RTS_POSIX_ONLY_SYMBOLS
-       RTS_MINGW_ONLY_SYMBOLS
-       RTS_CYGWIN_ONLY_SYMBOLS
-+      RTS_LIBGCC_SYMBOLS
-       { 0, 0 } /* sentinel */
- };
- 
diff --git a/dev-lang/ghc/files/ghc-6.2.1-linker.patch.bz2 b/dev-lang/ghc/files/ghc-6.2.1-linker.patch.bz2
deleted file mode 100644
index d329c984d6f6..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.1-linker.patch.bz2
+++ /dev/null
diff --git a/dev-lang/ghc/files/ghc-6.2.documentation.patch b/dev-lang/ghc/files/ghc-6.2.documentation.patch
deleted file mode 100644
index e0d397a4f228..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.documentation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur ghc-6.2.orig/mk/package.mk ghc-6.2/mk/package.mk
---- ghc-6.2.orig/mk/package.mk	2003-12-17 16:26:11.000000000 +0100
-+++ ghc-6.2/mk/package.mk	2003-12-17 16:27:21.000000000 +0100
-@@ -237,10 +237,10 @@
- CLEAN_FILES += $(PACKAGE).haddock
- 
- %.raw-hs : %.lhs
--	$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
-+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
- 
- %.raw-hs : %.hs
--	$(GHC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
-+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
- 
- install-docs :: $(HTML_DOC)
- 	@$(INSTALL_DIR) $(datadir)/html/libraries/$(PACKAGE)
diff --git a/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2 b/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2
deleted file mode 100644
index f541e5262e0a..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.hardened.patch.bz2
+++ /dev/null
diff --git a/dev-lang/ghc/files/lndir.c b/dev-lang/ghc/files/lndir.c
deleted file mode 100644
index 63ab57fd2104..000000000000
--- a/dev-lang/ghc/files/lndir.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* $Xorg: lndir.c,v 1.5 2001/02/09 02:03:17 xorgcvs Exp $ */
-/* Create shadow link tree (after X11R4 script of the same name)
-   Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */
-
-/* 
-Copyright (c) 1990, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/config/util/lndir.c,v 3.15 2001/12/14 19:53:22 dawes Exp $ */
-
-/* From the original /bin/sh script:
-
-  Used to create a copy of the a directory tree that has links for all
-  non-directories (except, by default, those named RCS, SCCS or CVS.adm).
-  If you are building the distribution on more than one machine, you
-  should use this technique.
-
-  If your master sources are located in /usr/local/src/X and you would like
-  your link tree to be in /usr/local/src/new-X, do the following:
-
-   	%  mkdir /usr/local/src/new-X
-	%  cd /usr/local/src/new-X
-   	%  lndir ../X
-*/
-
-#include <X11/Xos.h>
-#include <X11/Xfuncproto.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#if !defined(MINIX) && !defined(Lynx)
-#include <sys/param.h>
-#endif
-#include <errno.h>
-
-#ifndef X_NOT_POSIX
-#include <dirent.h>
-#else
-#ifdef SYSV
-#include <dirent.h>
-#else
-#ifdef USG
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#ifndef dirent
-#define dirent direct
-#endif
-#endif
-#endif
-#endif
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 2048
-#endif
-
-#include <stdarg.h>
-
-int silent = 0;			/* -silent */
-int ignore_links = 0;		/* -ignorelinks */
-int with_revinfo = 0;		/* -withrevinfo */
-
-char *rcurdir;
-char *curdir;
-
-static void
-quit (int code, char * fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    vfprintf (stderr, fmt, args);
-    va_end(args);
-    putc ('\n', stderr);
-    exit (code);
-}
-
-static void
-quiterr (int code, char *s)
-{
-    perror (s);
-    exit (code);
-}
-
-static void
-msg (char * fmt, ...)
-{
-    va_list args;
-    if (curdir) {
-	fprintf (stderr, "%s:\n", curdir);
-	curdir = 0;
-    }
-    va_start(args, fmt);
-    vfprintf (stderr, fmt, args);
-    va_end(args);
-    putc ('\n', stderr);
-}
-
-static void
-mperror (char *s)
-{
-    if (curdir) {
-	fprintf (stderr, "%s:\n", curdir);
-	curdir = 0;
-    }
-    perror (s);
-}
-
-
-static int 
-equivalent(char *lname, char *rname)
-{
-    char *s;
-
-    if (!strcmp(lname, rname))
-	return 1;
-    for (s = lname; *s && (s = strchr(s, '/')); s++) {
-	while (s[1] == '/')
-	    strcpy(s+1, s+2);
-    }
-    return !strcmp(lname, rname);
-}
-
-
-/* Recursively create symbolic links from the current directory to the "from"
-   directory.  Assumes that files described by fs and ts are directories. */
-static int
-dodir (char *fn,		/* name of "from" directory, either absolute or
-				   relative to cwd */
-       struct stat *fs, 
-       struct stat *ts,		/* stats for the "from" directory and cwd */
-       int rel)			/* if true, prepend "../" to fn before using */
-{
-    DIR *df;
-    struct dirent *dp;
-    char buf[MAXPATHLEN + 1], *p;
-    char symbuf[MAXPATHLEN + 1];
-    char basesym[MAXPATHLEN + 1];
-    struct stat sb, sc;
-    int n_dirs;
-    int symlen;
-    int basesymlen = -1;
-    char *ocurdir;
-
-    if ((fs->st_dev == ts->st_dev) && (fs->st_ino == ts->st_ino)) {
-	msg ("%s: From and to directories are identical!", fn);
-	return 1;
-    }
-
-    if (rel)
-	strcpy (buf, "../");
-    else
-	buf[0] = '\0';
-    strcat (buf, fn);
-    
-    if (!(df = opendir (buf))) {
-	msg ("%s: Cannot opendir", buf);
-	return 1;
-    }
-
-    p = buf + strlen (buf);
-    if (*(p - 1) != '/')
-	*p++ = '/';
-    n_dirs = fs->st_nlink;
-    while ((dp = readdir (df))) {
-	if (dp->d_name[strlen(dp->d_name) - 1] == '~')
-	    continue;
-#ifdef __DARWIN__
-	/* Ignore these Mac OS X Finder data files */
-	if (!strcmp(dp->d_name, ".DS_Store") || 
-	    !strcmp(dp->d_name, "._.DS_Store")) 
-	    continue;
-#endif
-	strcpy (p, dp->d_name);
-
-	if (n_dirs > 0) {
-	    if (stat (buf, &sb) < 0) {
-		mperror (buf);
-		continue;
-	    }
-
-#ifdef S_ISDIR
-	    if(S_ISDIR(sb.st_mode))
-#else
-	    if (sb.st_mode & S_IFDIR) 
-#endif
-	    {
-		/* directory */
-		n_dirs--;
-		if (dp->d_name[0] == '.' &&
-		    (dp->d_name[1] == '\0' || (dp->d_name[1] == '.' &&
-					       dp->d_name[2] == '\0')))
-		    continue;
-		if (!with_revinfo) {
-		    if (!strcmp (dp->d_name, "RCS"))
-			continue;
-		    if (!strcmp (dp->d_name, "SCCS"))
-			continue;
-		    if (!strcmp (dp->d_name, "CVS"))
-			continue;
-		    if (!strcmp (dp->d_name, "CVS.adm"))
-			continue;
-		}
-		ocurdir = rcurdir;
-		rcurdir = buf;
-		curdir = silent ? buf : (char *)0;
-		if (!silent)
-		    printf ("%s:\n", buf);
-		if ((stat (dp->d_name, &sc) < 0) && (errno == ENOENT)) {
-		    if (mkdir (dp->d_name, 0777) < 0 ||
-			stat (dp->d_name, &sc) < 0) {
-			mperror (dp->d_name);
-			curdir = rcurdir = ocurdir;
-			continue;
-		    }
-		}
-		if (readlink (dp->d_name, symbuf, sizeof(symbuf) - 1) >= 0) {
-		    msg ("%s: is a link instead of a directory", dp->d_name);
-		    curdir = rcurdir = ocurdir;
-		    continue;
-		}
-		if (chdir (dp->d_name) < 0) {
-		    mperror (dp->d_name);
-		    curdir = rcurdir = ocurdir;
-		    continue;
-		}
-		dodir (buf, &sb, &sc, (buf[0] != '/'));
-		if (chdir ("..") < 0)
-		    quiterr (1, "..");
-		curdir = rcurdir = ocurdir;
-		continue;
-	    }
-	}
-
-	/* non-directory */
-	symlen = readlink (dp->d_name, symbuf, sizeof(symbuf) - 1);
-	if (symlen >= 0)
-	    symbuf[symlen] = '\0';
-
-	/* The option to ignore links exists mostly because
-	   checking for them slows us down by 10-20%.
-	   But it is off by default because this really is a useful check. */
-	if (!ignore_links) {
-	    /* see if the file in the base tree was a symlink */
-	    basesymlen = readlink(buf, basesym, sizeof(basesym) - 1);
-	    if (basesymlen >= 0)
-		basesym[basesymlen] = '\0';
-	}
-
-	if (symlen >= 0) {
-	    /* Link exists in new tree.  Print message if it doesn't match. */
-	    if (!equivalent (basesymlen>=0 ? basesym : buf, symbuf))
-		msg ("%s: %s", dp->d_name, symbuf);
-	} else {
-	    if (symlink (basesymlen>=0 ? basesym : buf, dp->d_name) < 0)
-		mperror (dp->d_name);
-	}
-    }
-
-    closedir (df);
-    return 0;
-}
-
-int
-main (int ac, char *av[])
-{
-    char *prog_name = av[0];
-    char *fn, *tn;
-    struct stat fs, ts;
-
-    while (++av, --ac) {
-	if (strcmp(*av, "-silent") == 0)
-	    silent = 1;
-	else if (strcmp(*av, "-ignorelinks") == 0)
-	    ignore_links = 1;
-	else if (strcmp(*av, "-withrevinfo") == 0)
-	    with_revinfo = 1;
-	else if (strcmp(*av, "--") == 0) {
-	    ++av, --ac;
-	    break;
-	}
-	else
-	    break;
-    }
-
-    if (ac < 1 || ac > 2)
-	quit (1, "usage: %s [-silent] [-ignorelinks] fromdir [todir]",
-	      prog_name);
-
-    fn = av[0];
-    if (ac == 2)
-	tn = av[1];
-    else
-	tn = ".";
-
-    /* to directory */
-    if (stat (tn, &ts) < 0)
-	quiterr (1, tn);
-#ifdef S_ISDIR
-    if (!(S_ISDIR(ts.st_mode)))
-#else
-    if (!(ts.st_mode & S_IFDIR))
-#endif
-	quit (2, "%s: Not a directory", tn);
-    if (chdir (tn) < 0)
-	quiterr (1, tn);
-
-    /* from directory */
-    if (stat (fn, &fs) < 0)
-	quiterr (1, fn);
-#ifdef S_ISDIR
-    if (!(S_ISDIR(fs.st_mode)))
-#else
-    if (!(fs.st_mode & S_IFDIR))
-#endif
-	quit (2, "%s: Not a directory", fn);
-
-    exit (dodir (fn, &fs, &ts, 0));
-}
diff --git a/dev-lang/ghc/ghc-6.2-r1.ebuild b/dev-lang/ghc/ghc-6.2-r1.ebuild
deleted file mode 100644
index a638d287d203..000000000000
--- a/dev-lang/ghc/ghc-6.2-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2-r1.ebuild,v 1.10 2005/02/19 18:52:45 weeve Exp $
-
-#Some explanation of bootstrap logic:
-#
-#After thinking through the best way to bootstrap ghc I decided to split it into
-#ghc and ghc-bin and make ghc depend on ghc-bin.
-#  The ebuild has been revamped and greatly simplified. Bootstrap off old 4x hc files no longer works on x86.
-#Not sure what happens with old scheme on sparc, as I did not see any test reports.
-#
-#The considerations:
-#Making ghc unpack binary build first (under ${WORKDIR}) and bootstrapping from that will effectively force
-#ghc-bin reinstall every time ghc is rebuilt or upgraded. What is worse it will likely force download of binary image
-#at upgrade, which is not nice (in fact quite bad for modem users - 16+ MB).
-#
-#The best results are achieved if ghc-bin is left alone after ghc installation -
-#Both ebuilds install in the same place, thus space penalty is minimal. In fact only the docs exist in double
-#(considering that ghc is not installing much docs at present this looks more like an advantage).
-#When the upgrade time comes, if you still have ghc-bin around, portage will happily bootstrap off
-#your existing ghc (or ghc-bin, whichever was merged last), without attempting to ruin anything...
-#
-#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version.
-#Thus we need to detect presently installed one and bootstrap in one or two stages..
-
-inherit base
-
-IUSE="doc tetex opengl"
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -alpha -sparc"
-
-
-PROVIDE="virtual/ghc"
-# FIXME: Add USE support for parallel haskell (requires PVM)
-#	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
-	>=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/make-3.79.1
-	>=sys-apps/sed-3.02.80
-	>=sys-devel/flex-2.5.4a
-	>=dev-libs/gmp-4.1
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		>=dev-haskell/haddock-0.6-r2
-		tetex? ( virtual/tetex
-			>=app-text/jadetex-3.12 ) )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	opengl? ( virtual/opengl virtual/glu virtual/glut )"
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-src_unpack() {
-	base_src_unpack
-
-	# for documentation generation the new ghc should be used,
-	# not the old one ...
-	patch -p0 < ${FILESDIR}/ghc-6.2.documentation.patch
-	# hardened-gcc needs to be disabled, because the
-	# mangler doesn't accept its output
-	bzcat ${FILESDIR}/ghc-6.2.hardened.patch.bz2 | patch -p0
-}
-
-src_compile() {
-	local myconf
-	if use opengl; then
-		myconf="--enable-hopengl"
-	fi
-
-	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
-	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	# (this is still necessary, even though we have the patch, because
-	# we might be bootstrapping from a version that didn't have the
-	# patch included)
-	# new hardened gcc switches by pappy
-	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
-	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
-
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
-		--enable-threaded-rts ${myconf} || die "econf failed"
-
-	# the build does not seem to work all that
-	# well with parallel make
-	make || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		make html || die "make html failed"
-		if use tetex; then
-			make ps || die "make ps failed"
-		fi
-	fi
-
-}
-
-src_install () {
-	local mydoc
-	local insttarget
-
-	insttarget="install"
-
-	# determine what to do with documentation
-	if use doc; then
-		mydoc="html"
-		insttarget="${insttarget} install-docs"
-		if use tetex; then
-			mydoc="${mydoc} ps"
-		fi
-	else
-		mydoc=""
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
-
-	make ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
-
-	#need to remove ${D} from ghcprof script
-	cd ${D}/usr/bin
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd ${S}/ghc
-	dodoc README ANNOUNCE LICENSE VERSION
-}
-
-
-pkg_postinst () {
-	einfo "If you have dev-lang/ghc-bin installed, you might"
-	einfo "want to unmerge it again. It is no longer needed."
-}
diff --git a/dev-lang/ghc/ghc-6.2.1-r1.ebuild b/dev-lang/ghc/ghc-6.2.1-r1.ebuild
deleted file mode 100644
index d190298d9695..000000000000
--- a/dev-lang/ghc/ghc-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.1-r1.ebuild,v 1.7 2005/02/19 18:52:45 weeve Exp $
-
-#Some explanation of bootstrap logic:
-#
-#After thinking through the best way to bootstrap ghc I decided to split it into
-#ghc and ghc-bin and make ghc depend on ghc-bin.
-#  The ebuild has been revamped and greatly simplified. Bootstrap off old 4x hc files no longer works on x86.
-#Not sure what happens with old scheme on sparc, as I did not see any test reports.
-#
-#The considerations:
-#Making ghc unpack binary build first (under ${WORKDIR}) and bootstrapping from that will effectively force
-#ghc-bin reinstall every time ghc is rebuilt or upgraded. What is worse it will likely force download of binary image
-#at upgrade, which is not nice (in fact quite bad for modem users - 16+ MB).
-#
-#The best results are achieved if ghc-bin is left alone after ghc installation -
-#Both ebuilds install in the same place, thus space penalty is minimal. In fact only the docs exist in double
-#(considering that ghc is not installing much docs at present this looks more like an advantage).
-#When the upgrade time comes, if you still have ghc-bin around, portage will happily bootstrap off
-#your existing ghc (or ghc-bin, whichever was merged last), without attempting to ruin anything...
-#
-#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version.
-#Thus we need to detect presently installed one and bootstrap in one or two stages..
-
-inherit base flag-o-matic eutils
-
-IUSE="doc tetex opengl"
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc -alpha -sparc"
-
-
-PROVIDE="virtual/ghc"
-# FIXME: Add USE support for parallel haskell (requires PVM)
-#	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
-	>=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/make-3.79.1
-	>=sys-apps/sed-3.02.80
-	>=sys-devel/flex-2.5.4a
-	>=dev-libs/gmp-4.1
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		>=dev-haskell/haddock-0.6-r2
-		tetex? ( virtual/tetex
-			>=app-text/jadetex-3.12 ) )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	opengl? ( virtual/opengl virtual/glu virtual/glut )"
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-SUPPORTED_CFLAGS=""
-
-# Setup supported CFLAGS.
-setup_cflag() {
-	OLD_CFLAGS="${CFLAGS}"
-	CFLAGS="${CFLAGS} $1"
-	strip-unsupported-flags
-
-	if [ "${OLD_CFLAGS}" != "${CFLAGS}" ];
-	then
-		SUPPORTED_CFLAGS="$1 ${SUPPORTED_CFLAGS}"
-	fi
-}
-
-setup_cflags() {
-	setup_cflag "-fno-pic"
-	setup_cflag "-fno-stack-protector"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	# hardened-gcc needs to be disabled, because the
-	# mangler doesn't accept its output; yes, the 6.2 version
-	# should do ...
-	cd ${S}/ghc
-	pushd driver
-	setup_cflags
-	epatch ${FILESDIR}/${PN}-6.2.hardened.patch
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS//-f/-optc-f}|" ghc/ghc.sh
-	sed -i -e "s|@GHC_CFLAGS@|${SUPPORTED_CFLAGS//-f/-optc-f}|" ghci/ghci.sh
-	popd
-	cd compiler/ghci
-	bzcat ${FILESDIR}/ghc-6.2.1-linker.patch.bz2 | patch -p0
-}
-
-src_compile() {
-	local myconf
-	if use opengl; then
-		myconf="--enable-hopengl"
-	fi
-
-	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
-	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	# (this is still necessary, even though we have the patch, because
-	# we might be bootstrapping from a version that didn't have the
-	# patch included)
-	setup_cflags
-	echo "SRC_CC_OPTS+=${SUPPORTED_CFLAGS}" >> mk/build.mk
-	echo "SRC_HC_OPTS+=${SUPPORTED_CFLAGS//-f/-optc-f}" >> mk/build.mk
-
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	# Required under ppc to work around some obscure linker problem.
-	if use ppc;
-	then
-		echo "SplitObjs=NO" >> mk/build.mk
-	fi
-
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	# (--enable-threaded-rts is no longer needed)
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
-		${myconf} || die "econf failed"
-
-	# the build does not seem to work all that
-	# well with parallel make
-	make || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		make html || die "make html failed"
-		if use tetex; then
-			make ps || die "make ps failed"
-		fi
-	fi
-
-}
-
-src_install () {
-	local mydoc
-	local insttarget
-
-	insttarget="install"
-
-	# determine what to do with documentation
-	if use doc; then
-		mydoc="html"
-		insttarget="${insttarget} install-docs"
-		if use tetex; then
-			mydoc="${mydoc} ps"
-		fi
-	else
-		mydoc=""
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
-
-	make ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
-
-	#need to remove ${D} from ghcprof script
-	cd ${D}/usr/bin
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd ${S}/ghc
-	dodoc README ANNOUNCE LICENSE VERSION
-}
-
-
-pkg_postinst () {
-	einfo "If you have dev-lang/ghc-bin installed, you might"
-	einfo "want to unmerge it again. It is no longer needed."
-}
diff --git a/dev-lang/ghc/ghc-6.2.2.ebuild b/dev-lang/ghc/ghc-6.2.2.ebuild
index cc25ddd2635e..cbe691738563 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-2005 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.15 2005/07/09 18:13:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.2.ebuild,v 1.16 2005/08/17 10:26:09 kosmikus Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -25,13 +25,14 @@ SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc -alpha ~amd64 ~sparc"
+# removed amd64, because there's no binary to bootstrap from
+KEYWORDS="x86 ppc -alpha -amd64 ~sparc"
 
 
 PROVIDE="virtual/ghc"
 # FIXME: Add USE support for parallel haskell (requires PVM)
 #	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
+DEPEND="<virtual/ghc-6.3
 	>=dev-lang/perl-5.6.1
 	>=sys-devel/gcc-2.95.3
 	>=sys-devel/make-3.79.1
diff --git a/dev-lang/ghc/ghc-6.2.ebuild b/dev-lang/ghc/ghc-6.2.ebuild
deleted file mode 100644
index b5321142025f..000000000000
--- a/dev-lang/ghc/ghc-6.2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.2.ebuild,v 1.14 2005/02/19 18:52:45 weeve Exp $
-
-#Some explanation of bootstrap logic:
-#
-#After thinking through the best way to bootstrap ghc I decided to split it into
-#ghc and ghc-bin and make ghc depend on ghc-bin.
-#  The ebuild has been revamped and greatly simplified. Bootstrap off old 4x hc files no longer works on x86.
-#Not sure what happens with old scheme on sparc, as I did not see any test reports.
-#
-#The considerations:
-#Making ghc unpack binary build first (under ${WORKDIR}) and bootstrapping from that will effectively force
-#ghc-bin reinstall every time ghc is rebuilt or upgraded. What is worse it will likely force download of binary image
-#at upgrade, which is not nice (in fact quite bad for modem users - 16+ MB).
-#
-#The best results are achieved if ghc-bin is left alone after ghc installation -
-#Both ebuilds install in the same place, thus space penalty is minimal. In fact only the docs exist in double
-#(considering that ghc is not installing much docs at present this looks more like an advantage).
-#When the upgrade time comes, if you still have ghc-bin around, portage will happily bootstrap off
-#your existing ghc (or ghc-bin, whichever was merged last), without attempting to ruin anything...
-#
-#There is only one issue: ghci will be successfully built only if ghc is bootstrapped from the same version.
-#Thus we need to detect presently installed one and bootstrap in one or two stages..
-
-inherit base
-
-IUSE="doc tetex opengl"
-
-DESCRIPTION="The Glasgow Haskell Compiler"
-HOMEPAGE="http://www.haskell.org/ghc/"
-
-SRC_URI="http://www.haskell.org/ghc/dist/${PV}/ghc-${PV}-src.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ppc -alpha -sparc"
-
-
-PROVIDE="virtual/ghc"
-# FIXME: Add USE support for parallel haskell (requires PVM)
-#	 Get PVM from ftp://ftp.netlib.org/pvm3/
-DEPEND="virtual/ghc
-	>=dev-lang/perl-5.6.1
-	>=sys-devel/gcc-2.95.3
-	>=sys-devel/make-3.79.1
-	>=sys-apps/sed-3.02.80
-	>=sys-devel/flex-2.5.4a
-	>=dev-libs/gmp-4.1
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		>=dev-haskell/haddock-0.6-r2
-		tetex? ( virtual/tetex
-			>=app-text/jadetex-3.12 ) )
-	opengl? ( virtual/opengl
-		virtual/glu
-		virtual/glut )"
-
-RDEPEND="virtual/libc
-	>=sys-devel/gcc-2.95.3
-	>=dev-lang/perl-5.6.1
-	>=dev-libs/gmp-4.1
-	opengl? ( virtual/opengl virtual/glu virtual/glut )"
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-src_unpack() {
-	base_src_unpack
-
-	# for documentation generation the new ghc should be used,
-	# not the old one ...
-	patch -p0 < ${FILESDIR}/ghc-6.2.documentation.patch
-}
-
-src_compile() {
-	local myconf
-	if use opengl; then
-		myconf="--enable-hopengl"
-	fi
-
-	# disable the automatic PIC building which is considered as Prologue Junk by the Haskell Compiler
-	# thanks to Peter Simons for finding this and giving notice on bugs.gentoo.org
-	# new logic for hardened gcc specs file by pappy
-	echo "SRC_CC_OPTS+=-fno-pic -fno-stack-protector" >> mk/build.mk
-	echo "SRC_HC_OPTS+=-optc-fno-pic -optc-fno-stack-protector" >> mk/build.mk
-
-	# force the config variable ArSupportsInput to be unset;
-	# ar in binutils >= 2.14.90.0.8-r1 seems to be classified
-	# incorrectly by the configure script
-	echo "ArSupportsInput:=" >> mk/build.mk
-
-	if use ppc; then
-		echo "GhcUnregisterised=YES" >> mk/build.mk
-		echo "SplitObjs=NO" >> mk/build.mk
-	fi
-
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf \
-		--enable-threaded-rts ${myconf} || die "econf failed"
-
-	# the build does not seem to work all that
-	# well with parallel make
-	make || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		make html || die "make html failed"
-		if use tetex; then
-			make ps || die "make ps failed"
-		fi
-	fi
-}
-
-src_install () {
-	local mydoc
-	local insttarget
-
-	insttarget="install"
-
-	# determine what to do with documentation
-	if use doc; then
-		mydoc="html"
-		insttarget="${insttarget} install-docs"
-		if use tetex; then
-			mydoc="${mydoc} ps"
-		fi
-	else
-		mydoc=""
-		# needed to prevent haddock from being called
-		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
-	fi
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
-
-	make ${insttarget} \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
-
-	#need to remove ${D} from ghcprof script
-	cd ${D}/usr/bin
-	mv ghcprof ghcprof-orig
-	sed -e 's:$FPTOOLS_TOP_ABS:#$FPTOOLS_TOP_ABS:' ghcprof-orig > ghcprof
-	chmod a+x ghcprof
-	rm -f ghcprof-orig
-
-	cd ${S}/ghc
-	dodoc README ANNOUNCE LICENSE VERSION
-}
-
-
-pkg_postinst () {
-	einfo "If you have dev-lang/ghc-bin installed, you might"
-	einfo "want to unmerge it again. It is no longer needed."
-}