Remove lots of cruft, like ghc-6.4.1, ia64 hacks. Make 6.2.2 work again.

(Portage version: 2.1.2.9)

8 files changed, 7 insertions, 168 deletions

diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1-r2 b/dev-lang/ghc/files/digest-ghc-6.4.1-r2
deleted file mode 100644
index 47c2c92a66b4..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.4.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
-RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 ghc-6.4.1-src.tar.bz2 6826112
-SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/files/digest-ghc-6.4.1-r3 b/dev-lang/ghc/files/digest-ghc-6.4.1-r3
deleted file mode 100644
index 47c2c92a66b4..000000000000
--- a/dev-lang/ghc/files/digest-ghc-6.4.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fd289bc7c3afa272ff831a71a50b5b00 ghc-6.4.1-src.tar.bz2 6826112
-RMD160 b6167e3d197bd461f46f860a37fff749bf3aa076 ghc-6.4.1-src.tar.bz2 6826112
-SHA256 4079fa6fe4dc3b0577e1e60167569c02469d46fbd31fbff3a31406000c1ccb36 ghc-6.4.1-src.tar.bz2 6826112
diff --git a/dev-lang/ghc/files/ghc-6.2.hardened.patch b/dev-lang/ghc/files/ghc-6.2.hardened.patch
deleted file mode 100644
index 706fe33b6e8e..000000000000
--- a/dev-lang/ghc/files/ghc-6.2.hardened.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ghc/ghc.sh.orig	2004-09-25 20:07:56.256016992 +0200
-+++ ghc/ghc.sh	2004-09-25 20:09:51.779454760 +0200
-@@ -1,2 +1,3 @@
-+#!/bin/bash
- # Mini-driver for GHC
--exec $GHCBIN $TOPDIROPT ${1+"$@"}
-+exec ${GHCBIN} ${TOPDIROPT} @GHC_CFLAGS@ ${1+"$@"}
---- ghci/ghci.sh.orig	2004-09-25 20:08:07.860252880 +0200
-+++ ghci/ghci.sh	2004-09-25 20:09:45.880351560 +0200
-@@ -1,2 +1,3 @@
-+#!/bin/bash
- # Mini-driver for GHCi
--exec $GHCBIN $TOPDIROPT --interactive ${1+"$@"}
-+exec ${GHCBIN} ${TOPDIROPT} @GHC_CFLAGS@ --interactive ${1+"$@"}
diff --git a/dev-lang/ghc/files/ghc-6.4.1-configure.patch b/dev-lang/ghc/files/ghc-6.4.1-configure.patch
deleted file mode 100644
index adacb6a70e4f..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-configure.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urwpN ghc-6.4.1/libraries/HGL/aclocal.m4 ghc-6.4.1.patched/libraries/HGL/aclocal.m4
---- ghc-6.4.1/libraries/HGL/aclocal.m4	2004-11-23 08:35:13.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/HGL/aclocal.m4	2006-02-11 02:07:47.000000000 -0400
-@@ -1,2 +1,13 @@
- # Empty file to avoid a dependency on automake: autoreconf calls aclocal to
- # generate a temporary aclocal.m4t when no aclocal.m4 is present.
-+
-+# FP_ARG_HGL
-+# -------------
-+AC_DEFUN([FP_ARG_HGL],
-+[AC_ARG_ENABLE([hgl],
-+  [AC_HELP_STRING([--enable-hgl],
-+    [build HGL.
-+     (default=autodetect)])],
-+  [enable_hgl=$enableval],
-+  [enable_hgl=yes])
-+])# FP_ARG_HGL
-diff -urwpN ghc-6.4.1/libraries/HGL/configure.ac ghc-6.4.1.patched/libraries/HGL/configure.ac
---- ghc-6.4.1/libraries/HGL/configure.ac	2005-05-08 08:19:45.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/HGL/configure.ac	2006-02-11 02:07:47.000000000 -0400
-@@ -1,5 +1,10 @@
- AC_INIT([Haskell Graphics Library], [3.1], [libraries@haskell.org], [HGL])
- 
-+FP_ARG_HGL
-+
-+if test "$enable_hgl" = no; then
-+  HGL_BUILD_PACKAGE=no
-+else
- # Safety check: Ensure that we are in the correct source directory.
- AC_CONFIG_SRCDIR([Graphics/HGL.hs])
- 
-@@ -28,6 +33,7 @@ else
-   HGL_BUILD_PACKAGE=yes
-   PLATFORM=X11
- fi
-+fi
- AC_SUBST([HGL_BUILD_PACKAGE])
- AC_SUBST([PLATFORM])
-
-diff -urwpN ghc-6.4.1/libraries/X11/aclocal.m4 ghc-6.4.1.patched/libraries/X11/aclocal.m4
---- ghc-6.4.1/libraries/X11/aclocal.m4	2004-11-23 08:35:18.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/X11/aclocal.m4	2006-02-11 02:07:38.000000000 -0400
-@@ -1,2 +1,13 @@
- # Empty file to avoid a dependency on automake: autoreconf calls aclocal to
- # generate a temporary aclocal.m4t when no aclocal.m4 is present.
-+
-+# FP_ARG_X11
-+# -------------
-+AC_DEFUN([FP_ARG_X11],
-+[AC_ARG_ENABLE([x11],
-+  [AC_HELP_STRING([--enable-x11],
-+    [build a Haskell binding for X11.
-+     (default=autodetect)])],
-+  [enable_x11=$enableval],
-+  [enable_x11=yes])
-+])# FP_ARG_X11
-diff -urwpN ghc-6.4.1/libraries/X11/configure.ac ghc-6.4.1.patched/libraries/X11/configure.ac
---- ghc-6.4.1/libraries/X11/configure.ac	2005-05-08 08:19:28.000000000 -0400
-+++ ghc-6.4.1.patched/libraries/X11/configure.ac	2006-02-11 02:07:38.000000000 -0400
-@@ -1,5 +1,11 @@
- AC_INIT([Haskell X11 package], [1.1], [libraries@haskell.org], [X11])
- 
-+FP_ARG_X11
-+
-+if test "$enable_x11" = no; then
-+  X11_BUILD_PACKAGE=no
-+  BUILD_PACKAGE_BOOL=False
-+else
- # Safety check: Ensure that we are in the correct source directory.
- AC_CONFIG_SRCDIR([include/HsXlib.h])
- 
-@@ -24,6 +30,7 @@ else
-   X11_BUILD_PACKAGE=yes
-   BUILD_PACKAGE_BOOL=True
- fi
-+fi
- AC_SUBST([X11_BUILD_PACKAGE])
- AC_SUBST([BUILD_PACKAGE_BOOL])
diff --git a/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch b/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch
deleted file mode 100644
index d9e77abb8921..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-gcc41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urwpN ghc-6.4.1/ghc/rts/StgCRun.c ghc-6.4.1.patched/ghc/rts/StgCRun.c
---- ghc-6.4.1/ghc/rts/StgCRun.c	2005-03-30 04:01:48.000000000 -0600
-+++ ghc-6.4.1.patched/ghc/rts/StgCRun.c	2006-03-21 17:13:22.000000000 -0600
-@@ -179,7 +179,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg
- 
- extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-     __asm__ volatile (
- 	/*
-@@ -604,7 +604,7 @@ static void StgRunIsImplementedInAssembl
- // *) The Link Register is saved to a different offset in the caller's stack frame
- //    (Linux: 4(r1), Darwin 8(r1))
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
- 	__asm__ volatile (
- 		"\t.globl StgRun\n"
-@@ -683,7 +683,7 @@ static void StgRunIsImplementedInAssembl
- #ifdef linux_HOST_OS
- extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg);
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-         // r0 volatile
- 	// r1 stack pointer
-@@ -833,7 +833,7 @@ static void StgRunIsImplementedInAssembl
- #define LOCALS 31
- #endif
- 
--static void StgRunIsImplementedInAssembler(void)
-+static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void)
- {
-     __asm__ volatile(
- 		".global StgRun\n"
diff --git a/dev-lang/ghc/files/ghc-6.4.1-openal.patch b/dev-lang/ghc/files/ghc-6.4.1-openal.patch
deleted file mode 100644
index 44a71d336ede..000000000000
--- a/dev-lang/ghc/files/ghc-6.4.1-openal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urwpN ghc-6.4.1-orig/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs ghc-6.4.1/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs
---- ghc-6.4.1-orig/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs	2006-02-11 22:28:57.000000000 +0100
-+++ ghc-6.4.1/libraries/OpenAL/Sound/OpenAL/ALC/Context.hs	2006-02-11 22:31:39.000000000 +0100
-@@ -66,10 +66,10 @@ foreign import CALLCONV unsafe "alcCreat
- -- | Destroys the given context.
- 
- destroyContext :: Context -> IO ()
--destroyContext = ignore . alcDestroyContext
-+destroyContext = alcDestroyContext
- 
- foreign import CALLCONV unsafe "alcDestroyContext"
--   alcDestroyContext :: Context -> IO ALCenum
-+   alcDestroyContext :: Context -> IO ()
- 
- --------------------------------------------------------------------------------
- 
-@@ -102,10 +102,10 @@ foreign import CALLCONV unsafe "alcMakeC
- -- | Performs processing on a synced context, nop on an asynchronous context.
- 
- processContext :: Context -> IO ()
--processContext = ignore . alcProcessContext
-+processContext = alcProcessContext
- 
- foreign import CALLCONV unsafe "alcProcessContext"
--   alcProcessContext :: Context -> IO Context
-+   alcProcessContext :: Context -> IO ()
- 
- -- | Suspends processing on an asynchronous context. This is a legal nop on a
- -- synced context.
diff --git a/dev-lang/ghc/files/ghc-6.5-norelax.patch b/dev-lang/ghc/files/ghc-6.5-norelax.patch
index d4dc386c97c5..c11612df9d94 100644
--- a/dev-lang/ghc/files/ghc-6.5-norelax.patch
+++ b/dev-lang/ghc/files/ghc-6.5-norelax.patch
@@ -1,12 +1,14 @@
 diff -rN -u old-ghc-1/compiler/main/DriverPipeline.hs new-ghc/compiler/main/DriverPipeline.hs
 --- old-ghc-1/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
 +++ new-ghc/compiler/main/DriverPipeline.hs	2006-09-13 10:33:23.000000000 +0200
-@@ -1014,6 +1014,8 @@
+@@ -1014,6 +1014,10 @@
  	let ld_r args = SysTools.runLink dflags ([ 
  				SysTools.Option "-nostdlib",
  				SysTools.Option "-nodefaultlibs",
++ #ifdef sparc_TARGET_ARCH
 +				-- options '--relax' and '-r' are incompatible
 +				SysTools.Option "-mno-relax",
++ #endif
  				SysTools.Option "-Wl,-r", 
  				SysTools.Option ld_x_flag, 
  				SysTools.Option "-o", 
diff --git a/dev-lang/ghc/files/ghc-updater b/dev-lang/ghc/files/ghc-updater
index 32e3343c88ca..d12b841f3358 100755
--- a/dev-lang/ghc/files/ghc-updater
+++ b/dev-lang/ghc/files/ghc-updater
@@ -23,6 +23,9 @@
 
 shopt -s nullglob
 
+# fix the PATH to include the dirs where portage installs ghc
+PATH="/usr/bin:/opt/ghc/bin:${PATH}"
+
 NEW_GHC_VER=$(ghc --version | sed 's:^.*version ::')
 NEW_GHC_LIBDIR=$(ghc --print-libdir)
 
@@ -310,7 +313,7 @@ if [ -n "${PKGS_FAILED}" -o -n "${PKGS_MISSING}" -o -n "${PKGS_MASKED}" ]; then
       echo
    fi
    
-   elog "Python update completed with errors."
+   elog "GHC update completed with errors."
    elog "Masked Packages:"
    for x in ${PKGS_MASKED}; do
    		elog $x