From: Keri Harris <keri@gentoo.org>
Date: Fri, 12 Aug 2011 23:12:17 +0000 (+0000)
Subject: Remove old versions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac5db51708c71475497d35c3a624fba567037b0b;p=gentoo.git

Remove old versions

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
---

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 017704faed94..94bc7a5f42a4 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.97 2011/08/12 21:37:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.98 2011/08/12 23:12:17 keri Exp $
+
+  12 Aug 2011; <keri@gentoo.org> -mercury-extras-0.13.1-r1.ebuild,
+  -files/mercury-extras-0.13.1-curs.patch,
+  -files/mercury-extras-0.13.1-dynamic_linking.patch,
+  -files/mercury-extras-0.13.1-iodbc.patch,
+  -files/mercury-extras-0.13.1-lex.patch,
+  -files/mercury-extras-0.13.1-mercury_glut.patch,
+  -files/mercury-extras-0.13.1-mercury_opengl.patch,
+  -files/mercury-extras-0.13.1-mercury_tcltk.patch,
+  -files/mercury-extras-0.13.1-odbc.patch,
+  -files/mercury-extras-0.13.1-posix.patch, -mercury-extras-10.04.ebuild,
+  -mercury-extras-10.04-r1.ebuild, -mercury-extras-10.04.1.ebuild,
+  -mercury-extras-11.01_beta1.ebuild:
+  Remove old versions
 
   12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
   mercury-extras-0.13.1-r1.ebuild, mercury-extras-10.04.ebuild,
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 505d5d80aa75..afacb068f3d0 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,46 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mercury-extras-0.13.1-curs.patch 18585 RMD160 19a3bb0881aa56554c1f2bc0fe3b8ca595d85b3f SHA1 0565cb3b11539da73063381cf768ccfb1af72a1e SHA256 66a9220fe4fe80cf425a08b148d7651c9762a08f159442e93325a5038319b692
-AUX mercury-extras-0.13.1-dynamic_linking.patch 376 RMD160 b39123b3713bc0e7cd35d1090eda6a404751be0f SHA1 996dbe39f6f229fe1e759ba8e2ce5ba85a8174b6 SHA256 8db33d8438f12f341b8074b13274063841380cedbd42c7468d8b3f125061c9b5
-AUX mercury-extras-0.13.1-iodbc.patch 1563 RMD160 bd21d49a15af2d07f289e3d9d108e34794b0e45e SHA1 0c2bad4cd932244ec77d49c39be362f14a7f6ebd SHA256 e2969924cbec77284162583f4745b98cac05d3e1ce6db0e0bb5c9dbc43c74da0
-AUX mercury-extras-0.13.1-lex.patch 736 RMD160 ae8e9185a7201848cad58d261d98777812a92eed SHA1 b7e7570bcbdef2fa99938115d9e60c75bac8ab25 SHA256 d5eff7470cdcaf6496f2e4250f955f49e2e2e31d13b0904187ac5f6b1f250c14
-AUX mercury-extras-0.13.1-mercury_glut.patch 758 RMD160 d19e1c034d1e1aa2adfa3226e200e67dc8746d2a SHA1 18fe7d93fe7b48c379073ff505fb4b6308d78be9 SHA256 fa5d6cdf06fe333a90834bd65b129d79dcc61b8dc3fc786462b4b11804e1cc70
-AUX mercury-extras-0.13.1-mercury_opengl.patch 4022 RMD160 b066b8e181cf7d0f21d617478f02af9744028e3a SHA1 9e350e38a018d1cc964d4b32195489a6347dc088 SHA256 6b372693d9b6bcdc78cc8e9f02748bfdf5d8561b0d34a65a06806343a076e6c5
-AUX mercury-extras-0.13.1-mercury_tcltk.patch 514 RMD160 017b0645322f622bbac569e8eefb4a58f2ff88e8 SHA1 91c6e32f27c14e07f6894745486fbf150adf3c48 SHA256 ad14d78321d44ecd5a8e36f4e8528c817c8ebf217e5223fcda52c5a01f4d4f6a
-AUX mercury-extras-0.13.1-odbc.patch 1253 RMD160 13fd607b42c4527ad7d05dcfeb3c59de9a7bf7c8 SHA1 0803073755587f993eea05c3276efe3c20589b73 SHA256 b9220a5f1774110ae2f4862448c246ec8728b43a19bd05e01cf01556232c549e
-AUX mercury-extras-0.13.1-posix.patch 354 RMD160 3d8b68c5efabda81ad117c6282f09b25741366ac SHA1 d66442038b7d93a5b4cdc6a0ab9cb666cdef9c07 SHA256 d47871298f94007173f6aee19e1597f57400654d9ece94ae94cf14fa0118efdf
-DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c
-DIST mercury-extras-10.04-gentoo-patchset-0.tar.gz 5725 RMD160 5082f1da6cca30678a484cc2ebe7c53473fa5d30 SHA1 fa948d12d921b56b3b59297753aca8d17e01d1fd SHA256 69801a24d6b9433eb9fb17d37be8d4f1b8b72405be19ebd5783242e0a84f367d
-DIST mercury-extras-10.04.1-gentoo-patchset-0.tar.gz 5600 RMD160 e03fff9e674c695c27a8b60174db486db59e0276 SHA1 2c33a3c16a4a605a9078c65931dfb1ccf0914b37 SHA256 d0d1758a93b9121d2f2f27530f95b8788f3f65a949eb20a1ff588ce52fb07420
-DIST mercury-extras-10.04.1.tar.gz 706531 RMD160 c249b239eafb19d27180e2fcbd6c763967eb4dda SHA1 5dec96a55fef96d5269f8be50f970f4d53522947 SHA256 7d7825224b0e0ae5079cdad4a323493d65a24f0a7f00eff6a100a6569329af3c
 DIST mercury-extras-10.04.2-gentoo-patchset-0.tar.gz 5720 RMD160 4e8539053ad5d71f5206462ac5777238d7b49692 SHA1 c4ac1a17c0cdca6e51c12e2525fbedd29f65e48b SHA256 deb629debc130b27fcd92c668c13cb3993b16c9e8991f5406863e729b38e211c
 DIST mercury-extras-10.04.2-gentoo-patchset-1.tar.gz 5728 RMD160 22b3002ba1b3f36f82a222a0ff1705051ba81644 SHA1 5420e804500e6789a3e850568c707f9e9e7d540f SHA256 77a494ce116e241a68f9d9542afd1d476a9a8fbd0efc0cdc7a35903cbe0ef570
 DIST mercury-extras-10.04.2.tar.gz 706566 RMD160 b88dc81d7a943ff265ead704ecd92f9a8a7976a4 SHA1 513de139260a8d02418ec3a1a0219845cdf03014 SHA256 f219b58df5e4dc24e75e0fb6f8f0d1255d4c2c9cbc5ea7e97f136896ce8acc8a
-DIST mercury-extras-10.04.tar.gz 706376 RMD160 988e17736ace555916b452a5f22b3d8f67ad6b4e SHA1 22cb6eb10bd6a4d17605217fe97f8718b8dfbbb4 SHA256 408d0a428b8d15934d5b7f5bd3e2139807fb2eb0a7f58d125c8490456445814b
-DIST mercury-extras-11.01-beta-2010-12-22.tar.gz 776653 RMD160 9b209534b6ae80e885304f06b0756f59203371be SHA1 2bb6df2c2d3d58e3ba64d96a40ea3ca4816cac89 SHA256 784f741daa43b63230b406e3c44f374c4e1393254a2fad6cdbd0f206073cc1df
 DIST mercury-extras-11.01-gentoo-patchset-2.tar.gz 5005 RMD160 4621a6c46793b414404d67a96ca32c4037c189b2 SHA1 c646f0624f31444d5367116dabe06df11217b8d4 SHA256 68e8a358a75527823a7c7f119ac0104acb0702263178f27be659c6b1d09cb46c
 DIST mercury-extras-11.01.tar.gz 777185 RMD160 992446a01d81d26d06ff60ed7f98d47e897c59fc SHA1 b82bdeded6ebcd843202ad2b4649edb3e2a402c3 SHA256 52eb6758e2136eb288329917d4c352da98e9ce0e951d6a5c884919bf8e85b1b1
-DIST mercury-extras-11.01_beta1-gentoo-patchset-1.tar.gz 5056 RMD160 f5c7073fafe97511bf9c80673281c7e0fca26845 SHA1 f67ef663687b5ff5c2033123551b8069fae85b6c SHA256 7d1c2087914f3825f17f09470561d31547e29c7fd4737902b8cd754b4edd9dc6
 DIST mercury-extras-11.07-beta-2011-06-28-unstable.tar.gz 777409 RMD160 f889ec5b921415d50aa573dca30a86db489d8467 SHA1 5fe0b52ef45df8c00ab09b0f292ed1fd16a5a51f SHA256 e93e2c8116927d30ac70158a95dd0a2833f20fcf6dea7cca57119ef39daef613
 DIST mercury-extras-11.07_beta1-gentoo-patchset-0.tar.gz 5011 RMD160 5a9588d154d0a4ffa03b2eb8434842d6691cdf5c SHA1 c6033c23a29f1afc415711f55ead7ec65bbc5547 SHA256 c90f601e2ab05c9bf3d3a606cf106d3bcfe552773286c0860e84ab179df0f2a6
-EBUILD mercury-extras-0.13.1-r1.ebuild 3341 RMD160 5f3bf3ef220adb3320a9485b52e5c0518db7fd7d SHA1 79dbbe4b5f9380a39058b119f11d752c84168887 SHA256 93d7b09d1155545e49d555a6a71f9e9ee8dc03e62bb9661ec1a1194ba49517cc
-EBUILD mercury-extras-10.04-r1.ebuild 3429 RMD160 29e5ba9c66b1ed54049145a849b9d8824cd0abc5 SHA1 41681a45bea6240376605f35a52762b6d0fe6717 SHA256 595fd7452eb70e26f95c4d726c7f340f8b2ed0fa6f2db867755d8be0801a2b0a
-EBUILD mercury-extras-10.04.1.ebuild 3427 RMD160 6237f3d3d6ce07acd0cf2e2297ee7e47040df730 SHA1 0403442c167f36f85d821724803ac5819b23aea9 SHA256 a6494e65f4b1f0d7224cabd7ae09f3e50137155f32c0e2945ba4ac0e127bd3f6
 EBUILD mercury-extras-10.04.2-r1.ebuild 4587 RMD160 a41efa0913d87e00cc19c1a9aaae91716eb9dd35 SHA1 5f83c5ee380f203d81e2890cca6a3475e766c112 SHA256 6df995f17698557dd07bce99a6e20ee6dd195fb31f7facff3397c00cce1bede5
 EBUILD mercury-extras-10.04.2.ebuild 3427 RMD160 0da9aceb9206e8689a7f3e50ea17bf401b32a33e SHA1 3ce6b961620336bce6b6e5469407712bb1c5ea3c SHA256 2b29854d9823dd4d0370c9e81954b920f13d83d671051265a2a5283c7fe4fc6d
-EBUILD mercury-extras-10.04.ebuild 3263 RMD160 90add15942eb1d73804ac3c03f21145aa42a535f SHA1 f859cd79c2047c0f48b0cc5c24b5485a20ceb929 SHA256 b0f0fd7a76e45c6bf8d536e0d4d36246b148246d0518a4aaf6aedaa9e9d7d3a0
 EBUILD mercury-extras-11.01.ebuild 4740 RMD160 db03a85e22168dd89235d2a3eb33676a3dac8448 SHA1 6304ef451f2c31155c3c52a5d4eb9f27709a5def SHA256 47365648d8d8a1c8104337e48618b87318cf9054ab6e112d5d59142590d06bc0
-EBUILD mercury-extras-11.01_beta1.ebuild 4829 RMD160 5bd268bf364f65ecb8035b35f9da1d928cf1db62 SHA1 06acbbd3d08c1ff117eba13dbdeb97e82f100e48 SHA256 3df16577da94d951d26da8f909535b3d7961107476b8ec22a9e70ea92541c0b9
 EBUILD mercury-extras-11.07_beta1.ebuild 4839 RMD160 56c73f9c8448bd0f764d9bb5a82d80205c2ddb40 SHA1 09368e0be06b16cfd4e4ecfafe4663a1d042ba67 SHA256 57c898896c92c4e009b544021395761c7dafb883ca2cba76ea84227dab3b8191
-MISC ChangeLog 26872 RMD160 e013d9006b41911e2fbfeabec47037aef5d79aec SHA1 677711ade69a3657b7b668b80bac701d02bed69d SHA256 d0b834aeb5f7036eac45990c4499b1d1ce4043a08464151ac4535b185a79d8b4
+MISC ChangeLog 27517 RMD160 f77a408d134b42cebc00df6bb5e4f4f3e975ebf9 SHA1 998bd3684b7fd887b96cd857e599641a9de64936 SHA256 7f0b93cab9b26879defeaa656b9a38e19904b8db1a094d2382974372fecab03a
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk5FnSgACgkQIiMqcbOVdxTWawP5AUvzxJeIemIJ1tEl5AW0E2K3
-kOiLKgI1ZPLW7+nAb+E+EilWbPwoJP8SEWWYS3vsA4+qqhi1lBcYCzpZtdpnB9mJ
-oDVMSUGUJ5JjL7eIKHQ/AuRRmxM0c4PGc7o+sD9T/1Ti7Z2B3TRnZHxPegS2Fr/r
-G10nrEImm/lH6eOWoQE=
-=772U
+iEYEARECAAYFAk5Fs24ACgkQrwS/tqE49e0b1wCffOP4iLenLpOwJ0sqldS4kFaw
+FEsAnjbwxFRDZhd4t4sWbLI9If1hgJDF
+=/mWw
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-curs.patch
deleted file mode 100644
index ac3d346e8e81..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-curs.patch
+++ /dev/null
@@ -1,600 +0,0 @@
-diff -urN mercury-extras-0.13.1.orig/curs/curs.m mercury-extras-0.13.1/curs/curs.m
---- mercury-extras-0.13.1.orig/curs/curs.m	2006-04-21 15:42:46.000000000 +1200
-+++ mercury-extras-0.13.1/curs/curs.m	2006-12-04 21:58:18.000000000 +1300
-@@ -31,6 +31,8 @@
- :- import_module io.
- :- import_module string.
- 
-+:- include_module curs__panel.
-+
- %-----------------------------------------------------------------------------%
- 
-     % Start a curses session (colour, unbuffered input, no echoing, 
-@@ -210,90 +212,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::di, io::uo) is det.
--
--        % Destroy a panel.
--        %
--    :- pred delete(panel::in, io::di, io::uo) is det.
--
--        % Raise/lower a panel to the top/bottom of the stack.
--        %
--    :- pred raise(panel::in, io::di, io::uo) is det.
--    :- pred lower(panel::in, io::di, io::uo) is det.
--
--        % Hide/reveal a panel (revealing places it at the top of the stack).
--        %
--    :- pred hide(panel::in, io::di, io::uo) is det.
--    :- pred reveal(panel::in, io::di, io::uo) is det.
--
--        % Move a panel to (Row, Col) on the display.
--        %
--    :- pred relocate(panel::in, int::in, int::in, io::di, io::uo) is det.
--
--        % Clear a panel.
--        %
--    :- pred clear(panel::in, io::di, io::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::di, io::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::di, io::uo) is det.
--    :- pred addstr(panel::in, attr::in, string::in, io::di, io::uo) is det.
--
--        % Turn on/off or set attributes that will be applied by default.
--        %
--    :- pred attr_on(panel::in, attr::in, io::di, io::uo) is det.
--    :- pred attr_off(panel::in, attr::in, io::di, io::uo) is det.
--    :- pred attr_set(panel::in, attr::in, io::di, io::uo) is det.
--
--        % Update the display (also calls doupdate).
--        % NOTE: doupdate does not call update_panels.
--        %
--    :- pred update_panels(io::di, io::uo) is det.
--
--        % Draws a border around the inside edge of the display.
--        %
--    :- pred border(panel::in, io::di, io::uo) is det.
--
--        % Draws an horizontal line of length N moving to the right.
--        %
--    :- pred hline(panel::in, int::in, int::in, io::di, io::uo) is det.
--
--        % Draws a vertical line of length N moving down.
--        %
--    :- pred vline(panel::in, int::in, int::in, io::di, io::uo) is det.
--
--    :- end_module panel.
--
--    %-------------------------------------------------------------------------%
--    %-------------------------------------------------------------------------%
--
--%-----------------------------------------------------------------------------%
- %-----------------------------------------------------------------------------%
- 
- :- implementation.
-@@ -1044,210 +962,4 @@
-     IO = IO0;
- ").
- 
--    %-------------------------------------------------------------------------%
--    %-------------------------------------------------------------------------%
--
--    :- module panel.
--
--    :- implementation.
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_decl("C", "
--
--        #include <ncurses.h>
--        #include <panel.h>
--
--    ").
--    
--    :- pragma foreign_type("C", panel, "PANEL *").
--
--    %-------------------------------------------------------------------------%
--
--    :- 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 = 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));
--        del_panel(Panel);
--
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_proc("C",
--        raise(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure],
--    "
--        top_panel(Panel);
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_proc("C",
--        lower(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure],
--    "
--        bottom_panel(Panel);
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_proc("C",
--        hide(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure],
--    "
--        hide_panel(Panel);
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_proc("C",
--        reveal(Panel::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure],
--    "
--        show_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, 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));
--        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), 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), (chtype)Attr | (chtype)CharCode);
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--
--    addstr(Panel, Attr, Str, !IO) :-
--        string.foldl(
--            ( pred(Char::in, !.IO::di, !:IO::uo) is det :-
--                addch(Panel, Attr, char.to_int(Char), !IO)
--            ),
--            Str, !IO
--        ).
--
--    %-------------------------------------------------------------------------%
--
--    :- pragma foreign_proc("C",
--        attr_on(Panel::in, Attr::in, IO0::di, IO::uo),
--        [will_not_call_mercury, promise_pure],
--    "
--        wattron(panel_window(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), 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), 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), 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), 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), C, N);
--        IO = IO0;
--    ").
--
--    %-------------------------------------------------------------------------%
--    :- end_module panel.
--    %-------------------------------------------------------------------------%
--    %-------------------------------------------------------------------------%
--
--%-----------------------------------------------------------------------------%
- %-----------------------------------------------------------------------------%
-diff -urN mercury-extras-0.13.1.orig/curs/curs.panel.m mercury-extras-0.13.1/curs/curs.panel.m
---- mercury-extras-0.13.1.orig/curs/curs.panel.m	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-extras-0.13.1/curs/curs.panel.m	2006-12-04 21:58:18.000000000 +1300
-@@ -0,0 +1,282 @@
-+%-----------------------------------------------------------------------------%
-+% curs.panel.m
-+% Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
-+% Thu Jan 11 13:47:25 GMT 2001
-+% vim: ts=4 sw=4 et tw=0 wm=0 ff=unix ft=mercury
-+%
-+%   THIS FILE IS HEREBY CONTRIBUTED TO THE MERCURY PROJECT TO
-+%   BE RELEASED UNDER WHATEVER LICENCE IS DEEMED APPROPRIATE
-+%   BY THE ADMINISTRATORS OF THE MERCURY PROJECT.
-+%
-+% Simplified Mercury interface to the ncurses panel library.
-+%
-+%-----------------------------------------------------------------------------%
-+
-+:- 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::di, io::uo) is det.
-+
-+    % Destroy a panel.
-+    %
-+:- pred delete(panel::in, io::di, io::uo) is det.
-+
-+    % Raise/lower a panel to the top/bottom of the stack.
-+    %
-+:- pred raise(panel::in, io::di, io::uo) is det.
-+:- pred lower(panel::in, io::di, io::uo) is det.
-+
-+    % Hide/reveal a panel (revealing places it at the top of the stack).
-+    %
-+:- pred hide(panel::in, io::di, io::uo) is det.
-+:- pred reveal(panel::in, io::di, io::uo) is det.
-+
-+    % Move a panel to (Row, Col) on the display.
-+    %
-+:- pred relocate(panel::in, int::in, int::in, io::di, io::uo) is det.
-+
-+    % Clear a panel.
-+    %
-+:- pred clear(panel::in, io::di, io::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::di, io::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::di, io::uo) is det.
-+:- pred addstr(panel::in, attr::in, string::in, io::di, io::uo) is det.
-+
-+    % Turn on/off or set attributes that will be applied by default.
-+    %
-+:- pred attr_on(panel::in, attr::in, io::di, io::uo) is det.
-+:- pred attr_off(panel::in, attr::in, io::di, io::uo) is det.
-+:- pred attr_set(panel::in, attr::in, io::di, io::uo) is det.
-+
-+    % Update the display (also calls doupdate).
-+    % NOTE: doupdate does not call update_panels.
-+    %
-+:- pred update_panels(io::di, io::uo) is det.
-+
-+    % Draws a border around the inside edge of the display.
-+    %
-+:- pred border(panel::in, io::di, io::uo) is det.
-+
-+    % Draws an horizontal line of length N moving to the right.
-+    %
-+:- pred hline(panel::in, int::in, int::in, io::di, io::uo) is det.
-+
-+    % Draws a vertical line of length N moving down.
-+    %
-+:- pred vline(panel::in, int::in, int::in, io::di, io::uo) is det.
-+
-+%-----------------------------------------------------------------------------%
-+
-+:- implementation.
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_decl("C", "
-+
-+    #include <ncurses.h>
-+    #include <panel.h>
-+
-+").
-+
-+:- pragma foreign_type("C", panel, "PANEL *").
-+
-+%-------------------------------------------------------------------------%
-+
-+:- 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 = 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));
-+    del_panel(Panel);
-+
-+    IO = IO0;
-+").
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_proc("C",
-+    raise(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure],
-+"
-+    top_panel(Panel);
-+    IO = IO0;
-+").
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_proc("C",
-+    lower(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure],
-+"
-+    bottom_panel(Panel);
-+    IO = IO0;
-+").
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_proc("C",
-+    hide(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure],
-+"
-+    hide_panel(Panel);
-+    IO = IO0;
-+").
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_proc("C",
-+    reveal(Panel::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure],
-+"
-+    show_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, 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));
-+    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), 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), (chtype)Attr | (chtype)CharCode);
-+    IO = IO0;
-+").
-+
-+%-------------------------------------------------------------------------%
-+
-+addstr(Panel, Attr, Str, !IO) :-
-+    string.foldl(
-+        ( pred(Char::in, !.IO::di, !:IO::uo) is det :-
-+            addch(Panel, Attr, char.to_int(Char), !IO)
-+        ),
-+        Str, !IO
-+    ).
-+
-+%-------------------------------------------------------------------------%
-+
-+:- pragma foreign_proc("C",
-+    attr_on(Panel::in, Attr::in, IO0::di, IO::uo),
-+    [will_not_call_mercury, promise_pure],
-+"
-+    wattron(panel_window(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), 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), 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), 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), 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), C, N);
-+    IO = IO0;
-+").
-+
-+%-----------------------------------------------------------------------------%
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-dynamic_linking.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-dynamic_linking.patch
deleted file mode 100644
index 940323e0495d..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-dynamic_linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.13.1.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
-+++ mercury-extras-0.13.1/dynamic_linking/Mmakefile	2006-12-04 21:59:53.000000000 +1300
-@@ -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.13.1-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch
deleted file mode 100644
index 0bfaea27f6f7..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- mercury-extras-0.13.1.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.1/odbc/Mmakefile	2008-08-22 19:26:52.000000000 +1200
-@@ -12,7 +12,7 @@
- # The driver manager.
- # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
- # Feel free to add more (and handle them in odbc.m).
--MODBC_DRIVER=MODBC_UNIX
-+MODBC_DRIVER=MODBC_IODBC
- 
- # The database.
- # Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER.
-@@ -36,22 +36,25 @@
- 	MLLIBS=-lodbc32
- else 
- 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
--	#ODBC_INCL_DIR=$(IODBC_DIR)/include
-+	ODBC_CFLAGS=`iodbc-config --cflags`
- 
- 	# The following are for Debian.
- 
- 	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
-+	MLLIBS=`iodbc-config --libs`
- 
- 	# for iODBC
- 	# MLLIBS=-liodbc l-pthread -ldl
- 	# note: on a DEC Alpha using OSF1 remove the -ldl.
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+.PHONY: install
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +65,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=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-lex.patch
deleted file mode 100644
index fcecb73100c6..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-lex.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mercury-extras-0.13.1.orig/lex/Mmakefile	2002-12-03 17:48:31.000000000 +1300
-+++ mercury-extras-0.13.1/lex/Mmakefile	2006-12-04 22:00:45.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.13.1-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_glut.patch
deleted file mode 100644
index c300c48b4046..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_glut.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mercury-extras-0.13.1.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
-+++ mercury-extras-0.13.1/graphics/mercury_glut/Mmakefile	2006-12-04 22:01:58.000000000 +1300
-@@ -13,10 +13,10 @@
- # The following libraries are for X on Linux (Debian) using Mesa.
- 	
- # Libaries required by X windows.
--X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
-+#X_LIBS = -lX11 -lXext -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.13.1-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_opengl.patch
deleted file mode 100644
index 6a99068bb09a..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_opengl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- mercury-extras-0.13.1.orig/graphics/mercury_opengl/Mmakefile	2006-03-30 14:52:44.000000000 +1200
-+++ mercury-extras-0.13.1/graphics/mercury_opengl/Mmakefile	2006-12-04 22:03:01.000000000 +1300
-@@ -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 -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.13.1.orig/graphics/mercury_opengl/Mmakefile.mtogl	2004-12-01 14:45:30.000000000 +1300
-+++ mercury-extras-0.13.1/graphics/mercury_opengl/Mmakefile.mtogl	2006-12-04 22:03:01.000000000 +1300
-@@ -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.13.1.orig/graphics/mercury_opengl/togl.c	2003-08-13 17:49:46.000000000 +1200
-+++ mercury-extras-0.13.1/graphics/mercury_opengl/togl.c	2006-12-04 22:03:01.000000000 +1300
-@@ -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.
---- mercury-extras-0.13.1.orig/graphics/mercury_opengl/mtogl.m	2003-08-13 17:49:46.000000000 +1200
-+++ mercury-extras-0.13.1/graphics/mercury_opengl/mtogl.m	2007-01-14 11:26:48.000000000 +1300
-@@ -32,7 +32,7 @@
- :- pred mtogl__reshape(pred(togl, io__state, io__state), io__state, io__state).
- :- mode mtogl__reshape(pred(in, di, uo)is det, di, uo) is det.
- 
--:- pred mtogl__destroy(pred(togl, io__state, io__state), io__state, io__state).
-+:- impure pred mtogl__destroy(pred(togl, io__state, io__state), io__state, io__state).
- :- mode mtogl__destroy(pred(in, di, uo)is det, di, uo) is det.
- 
- %:- pred mtogl__create_command(string, pred(togl, list(string),
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_tcltk.patch
deleted file mode 100644
index a6e437fcf0e7..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-mercury_tcltk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mercury-extras-0.13.1.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-0.13.1/graphics/mercury_tcltk/Mmakefile	2006-12-04 22:04:50.000000000 +1300
-@@ -8,10 +8,7 @@
- 
- # 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.13.1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch
deleted file mode 100644
index d8b8cc8205b0..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- mercury-extras-0.13.1.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.1/odbc/Mmakefile	2008-08-22 19:27:49.000000000 +1200
-@@ -36,22 +36,25 @@
- 	MLLIBS=-lodbc32
- else 
- 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
--	#ODBC_INCL_DIR=$(IODBC_DIR)/include
-+	ODBC_CFLAGS=`odbc_config --cflags`
- 
- 	# The following are for Debian.
- 
- 	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
-+	MLLIBS=`odbc_config --libs`
- 
- 	# for iODBC
- 	# MLLIBS=-liodbc l-pthread -ldl
- 	# note: on a DEC Alpha using OSF1 remove the -ldl.
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+.PHONY: install
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +65,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=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch
deleted file mode 100644
index 2bdbc38dfd02..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-posix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.13.1.orig/posix/Mmakefile	2004-02-11 17:35:14.000000000 +1300
-+++ mercury-extras-0.13.1/posix/Mmakefile	2006-12-04 22:06:43.000000000 +1300
-@@ -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/mercury-extras-0.13.1-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.1-r1.ebuild
deleted file mode 100644
index c1703462bb7f..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.7 2011/08/12 21:37:35 xarthisius 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 x86"
-
-IUSE="examples glut iodbc ncurses odbc opengl tcl tk xml"
-
-DEPEND="~dev-lang/mercury-${PV}
-	glut? ( media-libs/freeglut )
-	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}-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}-posix.patch
-
-	if use odbc; then
-		epatch "${FILESDIR}"/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${FILESDIR}"/${P}-iodbc.patch
-	fi
-
-	sed -i	-e "s:posix:posix quickcheck:" \
-		-e "s:references::" \
-		-e "s:windows_installer_generator ::" 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
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose 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 examples; then
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*.m
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*.m
-		fi
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*.m moose/samples/*.moo
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild
deleted file mode 100644
index e2ad87dfe758..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04-r1.ebuild,v 1.5 2011/08/12 21:37:35 xarthisius Exp $
-
-inherit eutils
-
-PATCHSET_VER="0"
-
-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="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X examples glut iodbc ncurses odbc opengl tcl tk xml"
-
-DEPEND="~dev-lang/mercury-${PV}
-	glut? ( media-libs/freeglut )
-	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}
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	if use odbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${FILESDIR}"/${PV}-odbc/${P}-iodbc.patch
-	fi
-
-	cd "${S}"
-	sed -i	-e "s:posix:posix quickcheck:" \
-		-e "s:references::" \
-		-e "s:windows_installer_generator ::" 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
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	fi
-
-	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
-	! use xml && sed -i -e "s:xml::" Mmakefile
-
-	sed -i -e "s:@libdir@:$(get_libdir):" \
-		dynamic_linking/Mmakefile posix/Mmakefile
-
-	# disable broken packages
-	sed -i  -e "s:lazy_evaluation ::" \
-		-e "s:quickcheck::" Mmakefile
-}
-
-src_compile() {
-	# Mercury dependency generation must be run single-threaded
-	mmake \
-		-j1 depend || die "mmake depend failed"
-
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*.m
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*.m
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/*.m
-			doins graphics/samples/gears/*.m
-			doins graphics/samples/maze/*.m
-		fi
-
-		if use opengl && use tck && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m
-		fi
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*.m moose/samples/*.moo
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild
deleted file mode 100644
index f58773192b57..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.1.ebuild,v 1.5 2011/08/12 21:37:35 xarthisius Exp $
-
-inherit eutils
-
-PATCHSET_VER="0"
-
-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="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X examples glut iodbc ncurses odbc opengl tcl tk xml"
-
-DEPEND="~dev-lang/mercury-${PV}
-	glut? ( media-libs/freeglut )
-	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}
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	if use odbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
-	fi
-
-	cd "${S}"
-	sed -i	-e "s:posix:posix quickcheck:" \
-		-e "s:references::" \
-		-e "s:windows_installer_generator ::" 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
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	fi
-
-	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
-	! use xml && sed -i -e "s:xml::" Mmakefile
-
-	sed -i -e "s:@libdir@:$(get_libdir):" \
-		dynamic_linking/Mmakefile posix/Mmakefile
-
-	# disable broken packages
-	sed -i  -e "s:lazy_evaluation ::" \
-		-e "s:quickcheck::" Mmakefile
-}
-
-src_compile() {
-	# Mercury dependency generation must be run single-threaded
-	mmake \
-		-j1 depend || die "mmake depend failed"
-
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*.m
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*.m
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/*.m
-			doins graphics/samples/gears/*.m
-			doins graphics/samples/maze/*.m
-		fi
-
-		if use opengl && use tck && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m
-		fi
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*.m moose/samples/*.moo
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04.ebuild
deleted file mode 100644
index c0140d511e89..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-10.04.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-10.04.ebuild,v 1.6 2011/08/12 21:37:35 xarthisius Exp $
-
-inherit eutils
-
-PATCHSET_VER="0"
-
-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="http://www.mercury.cs.mu.oz.au/download/files/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X examples glut iodbc ncurses odbc opengl tcl tk xml"
-
-DEPEND="~dev-lang/mercury-${PV}
-	glut? ( media-libs/freeglut )
-	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}
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	if use odbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
-	fi
-
-	cd "${S}"
-	sed -i	-e "s:posix:posix quickcheck:" \
-		-e "s:references::" \
-		-e "s:windows_installer_generator ::" 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
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	fi
-
-	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
-	! use xml && sed -i -e "s:xml::" Mmakefile
-
-	sed -i -e "s:@libdir@:$(get_libdir):" \
-		dynamic_linking/Mmakefile posix/Mmakefile
-
-	# disable broken packages
-	sed -i  -e "s:lazy_evaluation ::" \
-		-e "s:quickcheck::" Mmakefile
-}
-
-src_compile() {
-	mmake \
-		-j1 depend || die "mmake depend failed"
-
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		|| die "mmake failed"
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/*.m
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/*.m
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/*.m
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/*.m
-			doins graphics/samples/gears/*.m
-			doins graphics/samples/maze/*.m
-		fi
-
-		if use opengl && use tck && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m
-		fi
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/*.m
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/*.m moose/samples/*.moo
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-11.01_beta1.ebuild b/dev-lang/mercury-extras/mercury-extras-11.01_beta1.ebuild
deleted file mode 100644
index cb5fc1983937..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-11.01_beta1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-11.01_beta1.ebuild,v 1.4 2011/08/12 21:37:35 xarthisius Exp $
-
-EAPI=2
-
-inherit eutils
-
-PATCHSET_VER="1"
-MY_PV=${PV/%?/-2010-12-22}
-MY_P=${PN}-${MY_PV/_/-}
-
-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="http://www.mercury.cs.mu.oz.au/download/files/beta-releases/11.01-beta/${MY_P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml"
-
-RDEPEND="~dev-lang/mercury-${PV}
-	cairo? ( >=x11-libs/cairo-1.10.0 )
-	glut? ( media-libs/freeglut )
-	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 ) )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	cd "${WORKDIR}"
-
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	if use odbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-odbc.patch
-	elif use iodbc; then
-		epatch "${WORKDIR}"/${PV}-odbc/${P}-iodbc.patch
-	fi
-
-	cd "${S}"
-	sed -i	-e "s:references:references solver_types/library:" \
-		-e "s:windows_installer_generator::" \
-		Mmakefile || die "sed default packages failed"
-
-	if use cairo; then
-		sed -i -e "s: lex : graphics/mercury_cairo lex :" Mmakefile \
-			|| die "sed cairo failed"
-	fi
-
-	if use glut; then
-		sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile \
-			|| die "sed glut failed"
-	fi
-
-	if use opengl; then
-		sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile \
-			|| die "sed opengl failed"
-	fi
-
-	if use tcl && use tk; then
-		sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile \
-			|| die "sed tcltk failed"
-	fi
-
-	if use odbc || use iodbc; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile \
-			|| die "sed odbc failed"
-	fi
-
-	if ! use ncurses; then
-		sed -i -e "s:curs curses::" Mmakefile \
-			|| die "sed ncurses failed"
-	fi
-
-	if ! use xml; then
-		sed -i -e "s:xml::" Mmakefile \
-			|| die "sed xml failed"
-	fi
-
-	sed -i -e "s:@libdir@:$(get_libdir):" \
-		dynamic_linking/Mmakefile posix/Mmakefile \
-		|| die "sed libdir failed"
-
-	# disable broken packages
-	sed -i -e "s:lazy_evaluation::" -e "s:references::" Mmakefile \
-		|| die "sed broken packages failed"
-}
-
-src_compile() {
-	# Mercury dependency generation must be run single-threaded
-	mmake \
-		-j1 depend || die "mmake depend failed"
-
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_MLFLAGS=--no-strip \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		|| die "mmake failed"
-}
-
-src_install() {
-	mmake \
-		MMAKEFLAGS="${MAKEOPTS}" \
-		EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-		INSTALL_PREFIX="${D}"/usr \
-		install || die "mmake install failed"
-
-	find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
-	cd "${S}"
-	if use examples; then
-		insinto /usr/share/doc/${PF}/samples/base64
-		doins base64/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/complex_numbers
-		doins complex_numbers/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/dynamic_linking
-		doins dynamic_linking/hello.m || die
-
-		insinto /usr/share/doc/${PF}/samples/error
-		doins error/* || die
-
-		insinto /usr/share/doc/${PF}/samples/fixed
-		doins fixed/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/gator
-		doins -r gator/* || die
-
-		insinto /usr/share/doc/${PF}/samples/lex
-		doins lex/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/log4m
-		doins log4m/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/monte
-		doins monte/*.m || die
-
-		insinto /usr/share/doc/${PF}/samples/moose
-		doins moose/samples/* || die
-
-		insinto /usr/share/doc/${PF}/samples/net
-		doins net/*.m || die
-
-		if use ncurses; then
-			insinto /usr/share/doc/${PF}/samples/curs
-			doins curs/samples/* || die
-
-			insinto /usr/share/doc/${PF}/samples/curses
-			doins curses/sample/* || die
-		fi
-
-		if use X; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/easyx/samples/*.m || die
-		fi
-
-		if use glut && use opengl; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/calc/* || die
-			doins graphics/samples/gears/* || die
-			doins graphics/samples/maze/* || die
-			doins graphics/samples/pent/* || die
-		fi
-
-		if use opengl && use tcl && use tk; then
-			insinto /usr/share/doc/${PF}/samples/graphics
-			doins graphics/samples/pent/*.m || die
-		fi
-
-		if use ssl; then
-			insinto /usr/share/doc/${PF}/samples/mopenssl
-			doins mopenssl/*.m || die
-		fi
-	fi
-
-	rm -rf $(find "${D}"/usr/share/doc/${PF}/samples -name CVS)
-
-	dodoc README || die
-}