Remove old versions

(Portage version: 2.1.4.5)

18 files changed, 20 insertions, 1539 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 0d68a92636ca..30191b3f8468 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.68 2008/12/14 20:46:28 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.69 2008/12/25 22:15:14 keri Exp $
+
+  25 Dec 2008; <keri@gentoo.org>
+  -files/mercury-extras-0.12.2-concurrency.patch,
+  -files/mercury-extras-0.12.2-curs.patch,
+  -files/mercury-extras-0.12.2-dynamic_linking.patch,
+  -files/mercury-extras-0.12.2-gcc4.patch,
+  -files/mercury-extras-0.12.2-lex.patch,
+  -files/mercury-extras-0.12.2-mercury_glut.patch,
+  -files/mercury-extras-0.12.2-mercury_opengl.patch,
+  -files/mercury-extras-0.12.2-mercury_tcltk.patch,
+  -files/mercury-extras-0.12.2-odbc.patch,
+  -files/mercury-extras-0.12.2-posix.patch,
+  -files/mercury-extras-0.12.2-references.patch,
+  -files/mercury-extras-0.12.2-trailed_update.patch,
+  -files/mercury-extras-0.13.1-concurrency.patch,
+  -files/mercury-extras-0.13.1-references.patch,
+  -files/mercury-extras-0.13.1-trailed_update.patch,
+  -mercury-extras-0.12.2-r2.ebuild, -mercury-extras-0.13.1.ebuild:
+  Remove old versions
 
   14 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
   mercury-extras-0.13.1-r1.ebuild:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-concurrency.patch
deleted file mode 100644
index 6742134600d6..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-concurrency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.12.2.orig/concurrency/Mmakefile	2003-01-16 23:44:13.000000000 +1300
-+++ mercury-extras-0.12.2/concurrency/Mmakefile	2006-03-26 18:45:21.000000000 +1200
-@@ -8,6 +8,8 @@
- 
- TESTS = philo philo2 philo3 midimon
- 
-+LIBGRADES := $(LIBGRADES:hlc.gc=)
-+
- -include ../Mmake.params
- 
- default_target: all
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-curs.patch
deleted file mode 100644
index 938af3b43fc3..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-curs.patch
+++ /dev/null
@@ -1,637 +0,0 @@
-diff -urN mercury-extras-0.12.2.orig/curs/curs.m mercury-extras-0.12.2/curs/curs.m
---- mercury-extras-0.12.2.orig/curs/curs.m	2006-10-10 19:42:19.000000000 +1300
-+++ mercury-extras-0.12.2/curs/curs.m	2006-10-10 20:06:42.000000000 +1300
-@@ -30,7 +30,7 @@
- 
- :- import_module bool, io, string, char, int.
- 
--
-+:- include_module curs__panel.
- 
-     % Start a curses session (colour, unbuffered input, no echoing, 
-     % invisible cursor if possible, scrolling on when output past
-@@ -220,104 +220,6 @@
- :- func cyan = colour.
- :- func white = colour.
- 
--    % ------------------------------------------------------------------------ %
--    % ------------------------------------------------------------------------ %
--
--        % Panels are windows over the main display; they may be
--        % stacked, moved, ordered and hidden.  Contents of panels
--        % closer to the top of the stack obscure the parts of panels
--        % they overlap that are lower in the stack.
--        %
--    :- module panel.
--
--    :- interface.
--
--
--
--    :- type panel.
--
--        % new(Rows, Cols, Row, Col, Attr, Panel) creates a new panel
--        % Panel whose size is given by (Rows, Cols) and whose position
--        % on the display is given by (Row, Col).  The new panel starts
--        % visible and at the top of the stack.  The default attributes
--        % for the panel are set to Attr.
--        %
--    :- pred new(int::in, int::in, int::in, int::in, attr::in, panel::out,
--                io__state::di, io__state::uo) is det.
--
--        % Destroy a panel.
--        %
--    :- pred delete(panel::in, io__state::di, io__state::uo) is det.
--
--        % Raise/lower a panel to the top/bottom of the stack.
--        %
--    :- pred raise(panel::in, io__state::di, io__state::uo) is det.
--
--    :- pred lower(panel::in, io__state::di, io__state::uo) is det.
--
--        % Hide/reveal a panel (revealing places it at the top of the stack).
--        %
--    :- pred hide(panel::in, io__state::di, io__state::uo) is det.
--
--    :- pred reveal(panel::in, io__state::di, io__state::uo) is det.
--
--        % Move a panel to (Row, Col) on the display.
--        %
--    :- pred relocate(panel::in, int::in, int::in,
--                io__state::di, io__state::uo) is det.
--
--        % Clear a panel.
--        %
--    :- pred clear(panel::in, io__state::di, io__state::uo) is det.
--
--        % Move the virtual cursor to given row and column; (0, 0) are the
--        % coordinates for the upper left hand corner of the panel.
--        %
--    :- pred move(panel::in, int::in, int::in,
--                io__state::di, io__state::uo) is det.
--
--        % Add a char/string to a panel with the given attributes.
--        % Note that char codes are passed rather than plain chars.
--        %
--    :- pred addch(panel::in, attr::in, int::in,
--                io__state::di, io__state::uo) is det.
--
--    :- pred addstr(panel::in, attr::in, string::in,
--                io__state::di, io__state::uo) is det.
--
--        % Turn on/off or set attributes that will be applied by default.
--        %
--    :- pred attr_on(panel::in, attr::in, io__state::di, io__state::uo) is det.
--    :- pred attr_off(panel::in, attr::in, io__state::di, io__state::uo) is det.
--    :- pred attr_set(panel::in, attr::in, io__state::di, io__state::uo) is det.
--
--        % Update the display (also calls doupdate).
--        % NOTE that doupdate does not call update_panels.
--        %
--    :- pred update_panels(io__state::di, io__state::uo) is det.
--
--
--
--        % Draws a border around the inside edge of the display.
--        %
--    :- pred border(panel::in, io__state::di, io__state::uo) is det.
--
--        % Draws an horizontal line of length N moving to the right.
--        %
--    :- pred hline(panel::in, int::in, int::in,
--                io__state::di, io__state::uo) is det.
--
--        % Draws a vertical line of length N moving down.
--        %
--    :- pred vline(panel::in, int::in, int::in,
--                io__state::di, io__state::uo) is det.
--
--    :- end_module panel.
--
--    % ------------------------------------------------------------------------ %
--    % ------------------------------------------------------------------------ %
--
--% ---------------------------------------------------------------------------- %
- % ---------------------------------------------------------------------------- %
- 
- :- implementation.
-@@ -936,219 +838,4 @@
- 
- ").
- 
--    % ------------------------------------------------------------------------ %
--    % ------------------------------------------------------------------------ %
--
--    :- module panel.
--
--    :- implementation.
--
--    :- type panel == c_pointer.
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma c_header_code("
--
--    #include <ncurses.h>
--    #include <panel.h>
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", new(Rows::in, Cols::in, Row::in, Col::in, Attr::in,
--                            Panel::out, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        WINDOW *w = newwin(Rows, Cols, Row, Col);
--        scrollok(w, TRUE);
--        wattrset(w, Attr);
--        wcolor_set(w, Attr, NULL);
--        wclear(w);
--        (*(PANEL**)&(Panel)) = new_panel(w);
--
--        IO = IO0;
--    
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", delete(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        delwin(panel_window((PANEL *)Panel));
--        del_panel((PANEL *)Panel);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", raise(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        top_panel((PANEL *)Panel);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", lower(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        bottom_panel((PANEL *)Panel);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", hide(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        hide_panel((PANEL *)Panel);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", reveal(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        show_panel((PANEL *)Panel);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", relocate(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        move_panel((PANEL *)Panel, Row, Col);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", clear(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wclear(panel_window((PANEL *)Panel));
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", move(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wmove(panel_window((PANEL *)Panel), Row, Col);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", addch(Panel::in, Attr::in, CharCode::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        waddch(panel_window((PANEL *)Panel), (chtype)Attr | (chtype)CharCode);
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    addstr(Panel, Attr, Str) -->
--        string__foldl(
--            ( pred(Char::in, di, uo) is det -->
--                addch(Panel, Attr, char__to_int(Char))
--            ),
--            Str
--        ).
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", attr_on(Panel::in, Attr::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wattron(panel_window((PANEL *)Panel), Attr);
--        IO = IO0;
--
--    ").
--    :- pragma foreign_proc("C", attr_off(Panel::in, Attr::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wattroff(panel_window((PANEL *)Panel), Attr);
--        IO = IO0;
--
--    ").
--    :- pragma foreign_proc("C", attr_set(Panel::in, Attr::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wattrset(panel_window((PANEL *)Panel), Attr);
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", update_panels(IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        update_panels();
--        doupdate();
--
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- pragma foreign_proc("C", border(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wborder(panel_window((PANEL *)Panel), 0, 0, 0, 0, 0, 0, 0, 0);
--        IO = IO0;
--
--    ").
--
--    :- pragma foreign_proc("C", hline(Panel::in, C::in, N::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        whline(panel_window((PANEL *)Panel), C, N);
--        IO = IO0;
--
--    ").
--
--    :- pragma foreign_proc("C", vline(Panel::in, C::in, N::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure], "
--
--        wvline(panel_window((PANEL *)Panel), C, N);
--        IO = IO0;
--
--    ").
--
--    % ------------------------------------------------------------------------ %
--
--    :- end_module panel.
--
--    % ------------------------------------------------------------------------ %
--    % ------------------------------------------------------------------------ %
--
--% ---------------------------------------------------------------------------- %
- % ---------------------------------------------------------------------------- %
-diff -urN mercury-extras-0.12.2.orig/curs/curs.panel.m mercury-extras-0.12.2/curs/curs.panel.m
---- mercury-extras-0.12.2.orig/curs/curs.panel.m	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-extras-0.12.2/curs/curs.panel.m	2006-10-10 20:07:35.000000000 +1300
-@@ -0,0 +1,296 @@
-+% ------------------------------------------------------------------------ %
-+
-+    % Panels are windows over the main display; they may be
-+    % stacked, moved, ordered and hidden.  Contents of panels
-+    % closer to the top of the stack obscure the parts of panels
-+    % they overlap that are lower in the stack.
-+    %
-+:- module curs__panel.
-+
-+:- interface.
-+
-+
-+
-+:- type panel.
-+
-+    % new(Rows, Cols, Row, Col, Attr, Panel) creates a new panel
-+    % Panel whose size is given by (Rows, Cols) and whose position
-+    % on the display is given by (Row, Col).  The new panel starts
-+    % visible and at the top of the stack.  The default attributes
-+    % for the panel are set to Attr.
-+    %
-+:- pred new(int::in, int::in, int::in, int::in, attr::in, panel::out,
-+            io__state::di, io__state::uo) is det.
-+
-+    % Destroy a panel.
-+    %
-+:- pred delete(panel::in, io__state::di, io__state::uo) is det.
-+
-+    % Raise/lower a panel to the top/bottom of the stack.
-+    %
-+:- pred raise(panel::in, io__state::di, io__state::uo) is det.
-+
-+:- pred lower(panel::in, io__state::di, io__state::uo) is det.
-+
-+    % Hide/reveal a panel (revealing places it at the top of the stack).
-+    %
-+:- pred hide(panel::in, io__state::di, io__state::uo) is det.
-+
-+:- pred reveal(panel::in, io__state::di, io__state::uo) is det.
-+
-+    % Move a panel to (Row, Col) on the display.
-+    %
-+:- pred relocate(panel::in, int::in, int::in,
-+            io__state::di, io__state::uo) is det.
-+
-+    % Clear a panel.
-+    %
-+:- pred clear(panel::in, io__state::di, io__state::uo) is det.
-+
-+    % Move the virtual cursor to given row and column; (0, 0) are the
-+    % coordinates for the upper left hand corner of the panel.
-+    %
-+:- pred move(panel::in, int::in, int::in,
-+            io__state::di, io__state::uo) is det.
-+
-+    % Add a char/string to a panel with the given attributes.
-+    % Note that char codes are passed rather than plain chars.
-+    %
-+:- pred addch(panel::in, attr::in, int::in,
-+            io__state::di, io__state::uo) is det.
-+
-+:- pred addstr(panel::in, attr::in, string::in,
-+            io__state::di, io__state::uo) is det.
-+
-+    % Turn on/off or set attributes that will be applied by default.
-+    %
-+:- pred attr_on(panel::in, attr::in, io__state::di, io__state::uo) is det.
-+:- pred attr_off(panel::in, attr::in, io__state::di, io__state::uo) is det.
-+:- pred attr_set(panel::in, attr::in, io__state::di, io__state::uo) is det.
-+
-+    % Update the display (also calls doupdate).
-+    % NOTE that doupdate does not call update_panels.
-+    %
-+:- pred update_panels(io__state::di, io__state::uo) is det.
-+
-+
-+
-+    % Draws a border around the inside edge of the display.
-+    %
-+:- pred border(panel::in, io__state::di, io__state::uo) is det.
-+
-+    % Draws an horizontal line of length N moving to the right.
-+    %
-+:- pred hline(panel::in, int::in, int::in,
-+            io__state::di, io__state::uo) is det.
-+
-+    % Draws a vertical line of length N moving down.
-+    %
-+:- pred vline(panel::in, int::in, int::in,
-+            io__state::di, io__state::uo) is det.
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- implementation.
-+
-+:- type panel == c_pointer.
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma c_header_code("
-+
-+#include <ncurses.h>
-+#include <panel.h>
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", new(Rows::in, Cols::in, Row::in, Col::in, Attr::in,
-+                        Panel::out, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    WINDOW *w = newwin(Rows, Cols, Row, Col);
-+    scrollok(w, TRUE);
-+    wattrset(w, Attr);
-+    wcolor_set(w, Attr, NULL);
-+    wclear(w);
-+    (*(PANEL**)&(Panel)) = new_panel(w);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", delete(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    delwin(panel_window((PANEL *)Panel));
-+    del_panel((PANEL *)Panel);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", raise(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    top_panel((PANEL *)Panel);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", lower(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    bottom_panel((PANEL *)Panel);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", hide(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    hide_panel((PANEL *)Panel);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", reveal(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    show_panel((PANEL *)Panel);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", relocate(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    move_panel((PANEL *)Panel, Row, Col);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", clear(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wclear(panel_window((PANEL *)Panel));
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", move(Panel::in, Row::in, Col::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wmove(panel_window((PANEL *)Panel), Row, Col);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", addch(Panel::in, Attr::in, CharCode::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    waddch(panel_window((PANEL *)Panel), (chtype)Attr | (chtype)CharCode);
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+addstr(Panel, Attr, Str) -->
-+    string__foldl(
-+        ( pred(Char::in, di, uo) is det -->
-+            addch(Panel, Attr, char__to_int(Char))
-+        ),
-+        Str
-+    ).
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", attr_on(Panel::in, Attr::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wattron(panel_window((PANEL *)Panel), Attr);
-+    IO = IO0;
-+
-+").
-+:- pragma foreign_proc("C", attr_off(Panel::in, Attr::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wattroff(panel_window((PANEL *)Panel), Attr);
-+    IO = IO0;
-+
-+").
-+:- pragma foreign_proc("C", attr_set(Panel::in, Attr::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wattrset(panel_window((PANEL *)Panel), Attr);
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", update_panels(IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    update_panels();
-+    doupdate();
-+
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
-+
-+:- pragma foreign_proc("C", border(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wborder(panel_window((PANEL *)Panel), 0, 0, 0, 0, 0, 0, 0, 0);
-+    IO = IO0;
-+
-+").
-+
-+:- pragma foreign_proc("C", hline(Panel::in, C::in, N::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    whline(panel_window((PANEL *)Panel), C, N);
-+    IO = IO0;
-+
-+").
-+
-+:- pragma foreign_proc("C", vline(Panel::in, C::in, N::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure], "
-+
-+    wvline(panel_window((PANEL *)Panel), C, N);
-+    IO = IO0;
-+
-+").
-+
-+% ------------------------------------------------------------------------ %
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-dynamic_linking.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-dynamic_linking.patch
deleted file mode 100644
index 1a6a0df80887..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-dynamic_linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.12.2.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
-+++ mercury-extras-0.12.2/dynamic_linking/Mmakefile	2006-04-23 23:11:49.000000000 +1200
-@@ -11,7 +11,7 @@
- MLFLAGS = --shared
- 
- # Link in the `-ldl' library (this may not be needed on some systems)
--MLLIBS = -ldl
-+MLLIBS = -L/usr/lib -ldl
- 
- # enable C-level debugging
- CFLAGS = -g
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-gcc4.patch
deleted file mode 100644
index 6ceaccebb03f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-gcc4.patch
+++ /dev/null
@@ -1,341 +0,0 @@
---- mercury-extras-0.12.2.orig/concurrency/global.m	2003-03-01 04:20:33.000000000 +1300
-+++ mercury-extras-0.12.2/concurrency/global.m	2006-03-29 22:09:36.000000000 +1200
-@@ -54,7 +54,7 @@
- :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo),
- 		will_not_call_mercury, "{
- 	MR_Word *tmp;
--	MR_incr_hp((MR_Word) tmp, 1);
-+	MR_incr_hp((*(MR_Word*)&(tmp)), 1);
- 	*tmp = Thing;
- 	Glob = (MR_Word) tmp;
- 	IO = IO0;
---- mercury-extras-0.12.2.orig/curs/curs.m	2004-12-02 16:22:03.000000000 +1300
-+++ mercury-extras-0.12.2/curs/curs.m	2006-03-29 22:13:00.000000000 +1200
-@@ -965,7 +965,7 @@
-         wattrset(w, Attr);
-         wcolor_set(w, Attr, NULL);
-         wclear(w);
--        (PANEL *)Panel = new_panel(w);
-+        (*(PANEL**)&(Panel)) = new_panel(w);
- 
-         IO = IO0;
-     
---- mercury-extras-0.12.2.orig/graphics/mercury_tcltk/mtcltk.m	2005-08-15 21:12:13.000000000 +1200
-+++ mercury-extras-0.12.2/graphics/mercury_tcltk/mtcltk.m	2006-03-29 22:28:22.000000000 +1200
-@@ -141,7 +141,7 @@
- 		argc++;
- 	}
- 
--	MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1);
-+	MR_incr_hp((*(MR_Word*)&(argv)), argc + 1);
- 
- 	for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
- 		argv[i] = (char *) MR_list_head(l);
---- mercury-extras-0.12.2.orig/odbc/odbc.m	2005-02-13 02:50:41.000000000 +1300
-+++ mercury-extras-0.12.2/odbc/odbc.m	2006-03-29 21:41:48.000000000 +1200
-@@ -1316,38 +1316,38 @@
- 		Status::out, DB0::di, DB::uo),
- 		may_call_mercury,
- "{
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
-+	MR_assert(statement != NULL);
- 
--	if (stat->num_rows == 0 ) {
-+	if (statement->num_rows == 0 ) {
- 		MR_DEBUG(printf(""Fetching rows...\\n""));
- 	}
- 
- 	/* Fetching new row */
--	Status = SQLFetch(stat->stat_handle);
-+	Status = SQLFetch(statement->stat_handle);
- 
- 	if (Status != SQL_NO_DATA_FOUND && 
- 			! odbc_check(odbc_env_handle, odbc_connection, 
--				stat->stat_handle, Status))
-+				statement->stat_handle, Status))
- 	{
--		odbc_do_cleanup_statement(stat);
-+		odbc_do_cleanup_statement(statement);
- 		odbc_throw();
- 		/* not reached */
- 	}
- 
- 	/* Update number of rows fetched */
- 	if (Status == SQL_SUCCESS) {
--		stat->num_rows++;
-+		statement->num_rows++;
- 	}
- 
- 	if (Status == SQL_NO_DATA_FOUND) {
--		MR_DEBUG(printf(""Fetched %d rows\\n"", stat->num_rows));
-+		MR_DEBUG(printf(""Fetched %d rows\\n"", statement->num_rows));
- 	}
- 
--	Statement = (MR_Word) stat;
-+	Statement = (MR_Word) statement;
- 	DB = DB0;
- 
- }").
-@@ -1362,13 +1362,13 @@
- 		Statement::uo, DB0::di, DB::uo), 
- 		will_not_call_mercury,
- "{
--	MODBC_Statement * stat;
-+	MODBC_Statement * statement;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
-+	MR_assert(statement != NULL);
- 		
--	NumColumns = stat->num_columns;
-+	NumColumns = statement->num_columns;
- 	DB = DB0;
- 	Statement = Statement0;
- }").
-@@ -1384,25 +1384,25 @@
- 		may_call_mercury,
- "{
- 
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
- 	SDWORD		column_info;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
--	MR_assert(stat->row != NULL);
-+	MR_assert(statement != NULL);
-+	MR_assert(statement->row != NULL);
- 
--	MR_DEBUG(printf(""Getting column %i\n"", (int) Column));
-+	MR_DEBUG(printf(""Getting column %i\\n"", (int) Column));
- 
--	if (stat->binding_type == MODBC_GET_DATA) {
-+	if (statement->binding_type == MODBC_GET_DATA) {
- 
- 		/* Slurp up the data for this column. */ 
--		odbc_do_get_data(stat, Column);
-+		odbc_do_get_data(statement, Column);
- 	}
- 
--	col = &(stat->row[Column]);
-+	col = &(statement->row[Column]);
- 
- 	if (col->value_info == SQL_NULL_DATA) {
- 		Type = MODBC_NULL;
-@@ -1430,7 +1430,7 @@
- 			odbc_message_list =
- 				MR_list_cons(overflow_message,
- 					odbc_message_list);
--			odbc_do_cleanup_statement(stat);
-+			odbc_do_cleanup_statement(statement);
- 			odbc_throw();
- 		}
- 		break;
-@@ -1475,7 +1475,7 @@
- 		break;
- 	} /* end switch (Type) */
- 
--	Statement = (MR_Word) stat;
-+	Statement = (MR_Word) statement;
- 	DB = DB0;
- 
- } /* end odbc__get_data() */
-@@ -1484,7 +1484,7 @@
- :- pragma c_code("
- 
- void
--odbc_do_get_data(MODBC_Statement *stat, int column_id)
-+odbc_do_get_data(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*column;
- 	SQLRETURN 	rc;
-@@ -1494,11 +1494,11 @@
- 					 ** byte and nothing else.
- 					 */
- 
--	column = &(stat->row[column_id]);
-+	column = &(statement->row[column_id]);
- 	if (column->attr_type == MODBC_VAR_STRING) {
- 
- 		/* Just get the length first time through. */
--		rc = SQLGetData(stat->stat_handle, column_id,
-+		rc = SQLGetData(statement->stat_handle, column_id,
- 				column->conversion_type, dummy_buffer, 
- 				1, &(column->value_info));
- 
-@@ -1510,9 +1510,9 @@
- 		if (rc != SQL_SUCCESS_WITH_INFO &&
- 				! odbc_check(odbc_env_handle, 
- 					odbc_connection, 
--					stat->stat_handle, rc)) 
-+					statement->stat_handle, rc)) 
- 		{
--			odbc_do_cleanup_statement(stat);	
-+			odbc_do_cleanup_statement(statement);	
- 			odbc_throw();
- 		}
- 
-@@ -1535,7 +1535,7 @@
- 			** length of the available data, rather than the 
- 			** total length of data available.
- 			*/
--			odbc_get_data_in_chunks(stat, column_id);
-+			odbc_get_data_in_chunks(statement, column_id);
- 		} else { 
- 			MR_Word data;
- 
-@@ -1543,42 +1543,42 @@
- 			** column->value_info == length of data 
- 			*/
- 			column->size = column->value_info + 1;
--			MR_incr_hp_atomic(MR_LVALUE_CAST(MR_Word, column->data), 
-+			MR_incr_hp_atomic((*(MR_Word*)&(column->data)), 
- 				(column->size + sizeof(MR_Word)) / sizeof(MR_Word));
--			odbc_get_data_in_one_go(stat, column_id);
-+			odbc_get_data_in_one_go(statement, column_id);
- 		}
- 	} else {
- 		/* 
- 		** It's a fixed length column, so we can 
- 		** get the lot in one go.
- 		*/
--		odbc_get_data_in_one_go(stat, column_id);
-+		odbc_get_data_in_one_go(statement, column_id);
- 	}
- }
- 
- void 
--odbc_get_data_in_one_go(MODBC_Statement *stat, int column_id)
-+odbc_get_data_in_one_go(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
- 
--	MR_DEBUG(printf(""getting column %i in one go\n"", column_id));
-+	MR_DEBUG(printf(""getting column %i in one go\\n"", column_id));
- 
--	col = &(stat->row[column_id]);
-+	col = &(statement->row[column_id]);
- 
--	rc = SQLGetData(stat->stat_handle, column_id, col->conversion_type, 
-+	rc = SQLGetData(statement->stat_handle, column_id, col->conversion_type, 
- 			(SQLPOINTER) col->data, col->size, &(col->value_info));
- 
- 	if (! odbc_check(odbc_env_handle, odbc_connection, 
--			stat->stat_handle, rc)) 
-+			statement->stat_handle, rc)) 
- 	{
--		odbc_do_cleanup_statement(stat);	
-+		odbc_do_cleanup_statement(statement);	
- 		odbc_throw();
- 	}
- }
- 
- void 
--odbc_get_data_in_chunks(MODBC_Statement *stat, int column_id)
-+odbc_get_data_in_chunks(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
-@@ -1586,11 +1586,11 @@
- 	MR_Word 		chunk_list;
- 	String		result;
- 
--	MR_DEBUG(printf(""getting column %i in chunks\n"", column_id));
-+	MR_DEBUG(printf(""getting column %i in chunks\\n"", column_id));
- 
- 	chunk_list = MR_list_empty();
- 
--	col = &(stat->row[column_id]);
-+	col = &(statement->row[column_id]);
- 
- 	rc = SQL_SUCCESS_WITH_INFO;
- 
-@@ -1601,7 +1601,7 @@
- 		*/
- 	while (rc == SQL_SUCCESS_WITH_INFO) {
- 
--		rc = SQLGetData(stat->stat_handle, column_id, 
-+		rc = SQLGetData(statement->stat_handle, column_id, 
- 				col->conversion_type, (SQLPOINTER) this_bit,
- 				MODBC_CHUNK_SIZE - 1, &(col->value_info));
- 	
-@@ -1611,9 +1611,9 @@
- 
- 		if (rc != SQL_SUCCESS_WITH_INFO &&
- 				! odbc_check(odbc_env_handle, odbc_connection, 
--					stat->stat_handle, rc)) 
-+					statement->stat_handle, rc)) 
- 		{
--			odbc_do_cleanup_statement(stat);	
-+			odbc_do_cleanup_statement(statement);	
- 			odbc_throw();
- 		}
- 
-@@ -1655,12 +1655,12 @@
- 	odbc__cleanup_statement_check_error(Statement::di, DB0::di, DB::uo),
- 	may_call_mercury,
- "{
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 	SQLRETURN rc;
- 
--	stat = (MODBC_Statement *) Statement;
-+	statement = (MODBC_Statement *) Statement;
- 
--	rc = odbc_do_cleanup_statement(stat);
-+	rc = odbc_do_cleanup_statement(statement);
- 	if (! odbc_check(odbc_env_handle, odbc_connection, 
- 			SQL_NULL_HSTMT, rc)) 
- 	{
-@@ -1672,29 +1672,29 @@
- :- pragma c_code("
- 
- static SQLRETURN
--odbc_do_cleanup_statement(MODBC_Statement *stat)
-+odbc_do_cleanup_statement(MODBC_Statement *statement)
- {
- 	int i;
- 	SQLRETURN rc;
- 
--	if (stat != NULL) {
-+	if (statement != NULL) {
- 		MR_DEBUG(printf(""cleaning up statement\\n""));
--		if (stat->row != NULL) {
--		    for (i = 1; i <= stat->num_columns; i++) {
-+		if (statement->row != NULL) {
-+		    for (i = 1; i <= statement->num_columns; i++) {
- 			    /*
- 			    ** Variable length types are allocated directly
- 			    ** onto the Mercury heap, so don't free them here. 
- 			    */
- 			if (! is_variable_length_sql_type(
--				    	stat->row[i].sql_type)) 
-+				    	statement->row[i].sql_type)) 
- 			{
--				MR_GC_free(stat->row[i].data);
-+				MR_GC_free(statement->row[i].data);
- 			}
- 		    }
--		    MR_GC_free(stat->row);
-+		    MR_GC_free(statement->row);
- 		}
--		rc = SQLFreeStmt(stat->stat_handle, SQL_DROP);
--		MR_GC_free(stat);
-+		rc = SQLFreeStmt(statement->stat_handle, SQL_DROP);
-+		MR_GC_free(statement);
- 		return rc;
- 	} else {
- 		return SQL_SUCCESS;
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-lex.patch
deleted file mode 100644
index 312b9c28cc5b..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-lex.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mercury-extras-0.12.2.orig/lex/Mmakefile	2002-12-03 17:48:31.000000000 +1300
-+++ mercury-extras-0.12.2/lex/Mmakefile	2006-10-23 11:49:12.000000000 +1300
-@@ -25,7 +25,7 @@
- # Omit this line if you want to install the default grades.
- # Edit this line if you want to install with different grades.
- #
--LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug
-+#LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug
- 
- # Any application using these libraries will also need the following
- # in its Mmakefile:
-@@ -47,7 +47,9 @@
- 
- depend: lex.depend regex.depend
- 
--install: liblex.install libregex.install
-+install:
-+	$(MMAKE) $(MMAKEFLAGS) liblex.install
-+	$(MMAKE) $(MMAKEFLAGS) libregex.install
- 
- check: install
- 	(cd tests; mmake check)
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_glut.patch
deleted file mode 100644
index 6475491c0fef..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_glut.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mercury-extras-0.12.2.orig/graphics/mercury_glut/Mmakefile	2004-05-17 20:28:51.000000000 +1200
-+++ mercury-extras-0.12.2/graphics/mercury_glut/Mmakefile	2006-03-26 22:37:20.000000000 +1200
-@@ -13,10 +13,10 @@
- # The following libraries are for X on Linux (Debian) using Mesa.
- 	
- # Libaries required by X windows.
--X_LIBS = -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
-+# X_LIBS = -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
- 
- # Libraries required by OpenGL.
--GL_LIBS = -lGL -LGL
-+# GL_LIBS = -lGL -LGL
- 
- MCFLAGS-mercury_glut+=--no-warn-nothing-exported --no-warn-interface-imports
- 
-@@ -26,7 +26,7 @@
- MGNUCFLAGS = --pic-reg
- EXTRA_MLFLAGS = -shared
- 
--MLLIBS = -lglut $(X_LIBS) $(GL_LIBS)
-+MLLIBS = -lglut
- 
- depend: mercury_glut.depend
- 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_opengl.patch
deleted file mode 100644
index c9bc5260bece..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_opengl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- mercury-extras-0.12.2.orig/graphics/mercury_opengl/Mmakefile	2004-12-01 14:45:30.000000000 +1300
-+++ mercury-extras-0.12.2/graphics/mercury_opengl/Mmakefile	2006-03-26 10:41:53.000000000 +1200
-@@ -11,7 +11,7 @@
- 
- # Specify what libraries we need to link against for OpenGL on this system.
- # (The following works on Debian with mesa as the OpenGL implementation).
--GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXi -lXmu -lXt -lICE -lXext -lSM
-+GL_LIBS = -lGL -lGLU 
- 
- # Don't issue a warning because mercury_opengl doesn't export anything.
- MCFLAGS-mercury_opengl = --no-warn-nothing-exported
---- mercury-extras-0.12.2.orig/graphics/mercury_opengl/Mmakefile.mtogl	2004-12-01 14:45:30.000000000 +1300
-+++ mercury-extras-0.12.2/graphics/mercury_opengl/Mmakefile.mtogl	2006-03-26 23:50:23.000000000 +1200
-@@ -11,29 +11,30 @@
- MLOBJS-mtogl = togl.o 
- 
- # Specify the location of the `mercury_tcltk' package.
--MERCURY_TCLTK_DIR 	= ../mercury_tcltk
-+# MERCURY_TCLTK_DIR 	= ../mercury_tcltk
- 
- # Specify the version of Tcl/Tk.
--TCLTK_VERSION = 8.0
-+TCLTK_VERSION = 8.4
- 
- # Specify what libraries we need to link against for Tcl/Tk on this system.
--TCLTK_LIBS = -ltcl$(TCLTK_VERSION) -ltk$(TCLTK_VERSION) -ldl
-+TCLTK_LIBS = -ltcl -ltk -ldl
-+GL_LIBS = -lGL -lGLU -lX11 -lXmu
- 
- # Tell mmake to use the `mercury_tcltk' library.
--VPATH 		= $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
--MCFLAGS 	= -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS)
--MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
--          	  -L$(MERCURY_TCLTK_DIR) 
--MLLIBS 		= $(TCLTK_LIBS) $(EXTRA_MLLIBS)
--C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
-+# VPATH 		= $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
-+# MCFLAGS 	= -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS)
-+# MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
-+#           	  -L$(MERCURY_TCLTK_DIR) 
-+MLLIBS 		= $(TCLTK_LIBS) $(GL_LIBS) $(EXTRA_MLLIBS)
-+# C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
- 
- # We may need to tell mmake where tcl.h and tk.h are.
- # If we are using Tcl/Tk version 8.0 on Debian the include directory
- # we need is `/usr/include/tcl8.0/generic'.
--CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION)
-+# CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION)
- 
- # We need to also access mtcltk.mh
--MGNUCFLAGS	= -I$(MERCURY_TCLTK_DIR)
-+MGNUCFLAGS	= -I/usr/lib/tk$(TCLTK_VERSION)/include/generic
- 
- depend: mtogl.depend
- 
---- mercury-extras-0.12.2.orig/graphics/mercury_opengl/togl.c	2003-08-13 17:49:46.000000000 +1200
-+++ mercury-extras-0.12.2/graphics/mercury_opengl/togl.c	2006-03-26 09:42:40.000000000 +1200
-@@ -274,22 +274,7 @@
- #include <tcl.h>
- #include <tk.h>
- #if defined(X11)
--#if TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==0
--#  include "tkInt4.0.h"
--#  define NO_TK_CURSOR
--#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==1
--#  include "tkInt4.1.h"
--#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==2
--#  include "tkInt4.2.h"
--#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==0
--#  include "tkInt8.0.h"
--#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==2
--#  include "tkInt8.0p2.h"
--#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==5
--#  include "tkInt8.0p5.h"
--#else
--   Sorry, you will have to edit togl.c to include the right tkInt.h file
--#endif
-+#include <tkInt.h>
- #elif defined(WIN32)
- #if TK_MAJOR_VERSION<8
-    Sorry Windows version requires Tcl/Tk ver 8.0 or higher.
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_tcltk.patch
deleted file mode 100644
index db43dcee2771..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-mercury_tcltk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mercury-extras-0.12.2.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 21:12:13.000000000 +1200
-+++ mercury-extras-0.12.2/graphics/mercury_tcltk/Mmakefile	2006-03-26 11:37:21.000000000 +1200
-@@ -4,14 +4,13 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
-+
- include Mercury.options
- 
- # You may need to modify the line below
- 
--MLLIBS    = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \
--   	    -lXt -lICE -lSM
--
--MLFLAGS	  = -R/usr/X11R6/lib
-+MLLIBS    = -ltk -ltcl
- 
- # On some Linux machines you may need to let mgnuc know where the 
- # tcl/tk header files are. 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-odbc.patch
deleted file mode 100644
index f230fe831980..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-odbc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mercury-extras-0.12.2.orig/odbc/Mmakefile	2003-01-16 23:44:21.000000000 +1300
-+++ mercury-extras-0.12.2/odbc/Mmakefile	2006-03-26 17:23:25.000000000 +1200
-@@ -37,16 +37,18 @@
- 	ODBC_INCL_DIR=$(ODBC_SDK_DIR)/include
- 	MLLIBS=-lodbc32
- else 
--	ODBC_LIB_DIR=$(IODBC_DIR)/lib
--	ODBC_INCL_DIR=$(IODBC_DIR)/include
-+	ODBC_LIBS=`iodbc-config --libs`
-+	ODBC_INCLS=`iodbc-config --cflags`
- 	# note: on a DEC Alpha using OSF1 remove the -ldl.
--	MLLIBS=-L$(ODBC_LIB_DIR) -R$(ODBC_LIB_DIR) -liodbc -ldl
-+	MLLIBS=-$(ODBC_LIBS) -lpthread -ldl
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -57,7 +59,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch
deleted file mode 100644
index b5beebc78cbf..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-posix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.12.2.orig/posix/Mmakefile	2004-02-11 17:35:14.000000000 +1300
-+++ mercury-extras-0.12.2/posix/Mmakefile	2006-06-07 18:41:15.000000000 +1200
-@@ -34,7 +34,7 @@
- 
- .PHONY: install
- install: libposix.install
--	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
-+	cp $(ADDITIONAL_HDRS) $(INSTALL_LIBDIR)/inc
- 
- .PHONY: clean
- clean:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-references.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-references.patch
deleted file mode 100644
index e4a092aceac0..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-references.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mercury-extras-0.12.2.orig/references/Mmakefile	2004-02-17 13:00:24.000000000 +1300
-+++ mercury-extras-0.12.2/references/Mmakefile	2006-04-01 16:15:40.000000000 +1200
-@@ -10,7 +10,9 @@
- 
- # Install in an "extras" subdirectory of the main installation tree
- INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
--LIBGRADES = asm_fast.gc.tr asm_fast.gc.tr.debug
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
- 
- MAIN_TARGET = libglobal
- 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.12.2-trailed_update.patch
deleted file mode 100644
index 75281dd710b9..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.12.2-trailed_update.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mercury-extras-0.12.2.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.12.2/trailed_update/Mmakefile	2006-03-26 22:00:13.000000000 +1200
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -25,6 +29,8 @@
- 	cd samples && mmake $(MMAKEFLAGS) depend
- 	cd tests && mmake $(MMAKEFLAGS) depend
- 
-+install: libtrailed_update.install
-+
- .PHONY: check
- check: libtrailed_update
- 	cd samples && mmake $(MMAKEFLAGS) check
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-concurrency.patch
deleted file mode 100644
index a05fe55f7614..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-concurrency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.13.1.orig/concurrency/Mmakefile	2006-04-20 19:43:31.000000000 +1200
-+++ mercury-extras-0.13.1/concurrency/Mmakefile	2006-12-04 21:56:38.000000000 +1300
-@@ -8,6 +8,8 @@
- 
- TESTS = philo philo2 philo3 midimon
- 
-+LIBGRADES := $(LIBGRADES:hlc.gc=)
-+
- -include ../Mmake.params
- 
- default_target: all
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-references.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-references.patch
deleted file mode 100644
index d257289fd4e1..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-references.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mercury-extras-0.13.1.orig/references/Mmakefile	2006-04-21 17:01:39.000000000 +1200
-+++ mercury-extras-0.13.1/references/Mmakefile	2006-12-04 22:07:20.000000000 +1300
-@@ -10,7 +10,9 @@
- 
- # Install in an "extras" subdirectory of the main installation tree
- INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
--LIBGRADES = asm_fast.gc.tr asm_fast.gc.tr.debug
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
- 
- MAIN_TARGET = libglobal
- 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-trailed_update.patch
deleted file mode 100644
index 54bc932cf0ee..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-trailed_update.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- mercury-extras-0.13.1.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.13.1/trailed_update/Mmakefile	2006-12-04 22:07:58.000000000 +1300
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -30,6 +34,9 @@
- 	cd samples && mmake $(MMAKEFLAGS) check
- 	cd tests && mmake $(MMAKEFLAGS) check
- 
-+.PHONY: install
-+install: libtrailed_update.install
-+
- .PHONY: clean
- clean:
- 	cd samples && mmake $(MMAKEFLAGS) clean
diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild
deleted file mode 100644
index 262366748a29..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.16 2008/03/12 06:30:58 keri Exp $
-
-inherit eutils
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/old-releases/0.12.2/mercury-extras-0.12.2.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
-
-IUSE="doc glut iodbc opengl ncurses tcl tk xml"
-
-DEPEND="~dev-lang/mercury-0.12.2
-	glut? ( virtual/glut )
-	iodbc? ( dev-db/libiodbc )
-	ncurses? ( sys-libs/ncurses )
-	opengl? ( virtual/opengl )
-	tcl? ( tk? (
-			dev-lang/tcl
-			dev-lang/tk
-			x11-libs/libX11
-			x11-libs/libXmu ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-concurrency.patch
-	epatch "${FILESDIR}"/${P}-curs.patch
-	epatch "${FILESDIR}"/${P}-dynamic_linking.patch
-	epatch "${FILESDIR}"/${P}-lex.patch
-	epatch "${FILESDIR}"/${P}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P}-posix.patch
-	epatch "${FILESDIR}"/${P}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" Mmakefile
-
-	if built_with_use dev-lang/mercury minimal; then
-		sed -i -e "s:references::" Mmakefile
-	else
-		sed -i	-e "s:cgi:cgi clpr:" \
-			-e "s:xml:trailed_update xml:" Mmakefile
-	fi
-
-	use iodbc && sed -i -e "s:moose:moose odbc:" Mmakefile
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
-	! use xml && sed -i -e "s:xml::" Mmakefile
-}
-
-src_compile() {
-	mmake \
-		-j1 depend || die "mmake depend failed"
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		|| die "mmake failed"
-
-	if use opengl && use tcl && use tk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake \
-			-f Mmakefile.mtogl \
-			-j1 depend || die "mmake depend mtogl failed"
-		mmake \
-			MMAKEFLAGS="${MAKEOPTS}" \
-			-f Mmakefile.mtogl \
-			|| die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	if use opengl && use tcl && use tk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake \
-			MMAKEFLAGS="${MAKEOPTS}" \
-			INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	find "${D}"/usr/lib/mercury-${PV} -type l | xargs rm
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses ; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild
deleted file mode 100644
index b35542100cf7..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.1.ebuild,v 1.4 2008/03/12 06:30:58 keri Exp $
-
-inherit eutils
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-extras-0.13.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="doc glut iodbc ncurses odbc opengl tcl tk xml"
-
-DEPEND="~dev-lang/mercury-${PV}
-	glut? ( virtual/glut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	ncurses? ( sys-libs/ncurses )
-	opengl? ( virtual/opengl )
-	tcl? ( tk? (
-			dev-lang/tcl
-			dev-lang/tk
-			x11-libs/libX11
-			x11-libs/libXmu ) )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-concurrency.patch
-	epatch "${FILESDIR}"/${P}-curs.patch
-	epatch "${FILESDIR}"/${P}-dynamic_linking.patch
-	epatch "${FILESDIR}"/${P}-lex.patch
-	epatch "${FILESDIR}"/${P}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P}-posix.patch
-	epatch "${FILESDIR}"/${P}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:windows_installer_generator ::" Mmakefile
-
-	if built_with_use dev-lang/mercury minimal; then
-		sed -i -e "s:references::" Mmakefile
-	else
-		sed -i -e "s:xml:trailed_update xml:" Mmakefile
-	fi
-
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcl && use tk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-
-	if use odbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	elif use iodbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
-	fi
-
-	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
-	! use xml && sed -i -e "s:xml::" Mmakefile
-}
-
-src_compile() {
-	mmake \
-		-j1 depend || die "mmake depend failed"
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		|| die "mmake failed"
-
-	if use opengl && use tcl && use tk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake \
-			-f Mmakefile.mtogl \
-			-j1 depend || die "mmake depend mtogl failed"
-		mmake \
-			MMAKEFLAGS="${MAKEOPTS}" \
-			-f Mmakefile.mtogl \
-			|| die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		INSTALL_PREFIX="${D}" \
-		install || die "mmake install failed"
-
-	if use opengl && use tcl && use tk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake \
-			MMAKEFLAGS="${MAKEOPTS}" \
-			INSTALL_PREFIX="${D}" \
-			install || die "mmake install mtogl failed"
-	fi
-
-	find "${D}"/usr/lib/mercury-${PV} -type l | xargs rm
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		if use ncurses ; then
-			docinto samples/curs
-			dodoc curs/samples/*.m
-
-			docinto samples/curses
-			dodoc curses/sample/*.m
-		fi
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}