Remove old beta version

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

13 files changed, 15 insertions, 885 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 3088dadb0097..ef7c32370865 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.80 2010/10/30 04:40:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.81 2010/11/03 07:19:08 keri Exp $
+
+  03 Nov 2010; <keri@gentoo.org> -mercury-extras-10.04_beta1.ebuild,
+  -files/mercury-extras-10.04_beta1-curs.patch,
+  -files/mercury-extras-10.04_beta1-dynamic-linking.patch,
+  -files/mercury-extras-10.04_beta1-iodbc.patch,
+  -files/mercury-extras-10.04_beta1-lex.patch,
+  -files/mercury-extras-10.04_beta1-mercury_glut.patch,
+  -files/mercury-extras-10.04_beta1-mercury_opengl.patch,
+  -files/mercury-extras-10.04_beta1-mercury_tcltk.patch,
+  -files/mercury-extras-10.04_beta1-no-java-grade.patch,
+  -files/mercury-extras-10.04_beta1-odbc.patch,
+  -files/mercury-extras-10.04_beta1-posix.patch:
+  Remove old beta version
 
   30 Oct 2010; <keri@gentoo.org> mercury-extras-10.04.2-r1.ebuild:
   QA - add die to do... function calls, add die to sed calls
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 90fa932c95e6..713f5615e1a4 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -37,18 +37,7 @@ AUX mercury-extras-10.04.2-mercury-tcltk.patch 1262 RMD160 398d17a8907649f0ae6e2
 AUX mercury-extras-10.04.2-no-java-grade-no-erlang-grade.patch 8206 RMD160 c92f19754bf898468117c97f7c8805dda74bcba7 SHA1 7103da160e1854808c868c952c0892b0072df3ea SHA256 19f8e5e67d4c4405a5aa227da2063227ad47655d04fd736e03ce6326ef12c0f7
 AUX mercury-extras-10.04.2-odbc.patch 2087 RMD160 c9b916db88e02be67ce22c36b4bd87049bd1d157 SHA1 f272162f8993ca89ee5bc2188236f06d52b4db1e SHA256 7b0ccfa970a1c7ab882e7ae263b7a145a2d2693546a579067192b8aee8d68fc3
 AUX mercury-extras-10.04.2-posix.patch 466 RMD160 3b56cff3a9152c60ebff88a9934bce390c944f7d SHA1 aafd8950fc32f6e07e6ba17e8877e993b988b490 SHA256 2bc9eac0212a51e599fd92a5ba389b9c624cac9a0d2b997cdf02da3f0a0a3202
-AUX mercury-extras-10.04_beta1-curs.patch 10243 RMD160 0b1ece400baa1b754b0ad5b2669170b89f7da975 SHA1 9a90d957f27bbc0b0329859663ffdb919db9d2db SHA256 3aa05184dd72ae534bfb6fca6cbf60ff18f8da253dcb280c59ebc9b9ff844645
-AUX mercury-extras-10.04_beta1-dynamic-linking.patch 389 RMD160 a46c4805390c5d9914a952d96a0cb4867ba51378 SHA1 54a2c32f01372db644d756ddd47b1ff4c790c4ea SHA256 b4b170c62547ad91420f850c6307a3f594231be8893112915b17f016c636087c
-AUX mercury-extras-10.04_beta1-iodbc.patch 2417 RMD160 f33db752ff83805fc0f178f0b408d15b9c2aac0d SHA1 2b0cc49d3abc83e4e2c849d25f5cdbb2770b67a7 SHA256 6f0123261d319b651fef1d579c8795c585bebdf343a37f302052e84239b0f51d
-AUX mercury-extras-10.04_beta1-lex.patch 727 RMD160 dca26bbb761ef47d32cff53974d423070843c88b SHA1 b6b257bb2b7567b4f7962f69962f7b97f408a35f SHA256 8696df633d10bbad085295de4046ff8a017eb63010308411b968a12cd1edfede
-AUX mercury-extras-10.04_beta1-mercury_glut.patch 766 RMD160 69452dd9f6a8d7753ef9ed5fe1e57c977e40e953 SHA1 e58972ddf1cefcef7bb853ecae6577be95856f5e SHA256 8daea7fd94f9794ce21d6fcbfce4a21344547df5e2b2493f29ae5d84c654ca4d
-AUX mercury-extras-10.04_beta1-mercury_opengl.patch 948 RMD160 892c2628ee455b5a4b8e575ae5aa9df0be12bf74 SHA1 cada8b1a5545ebce7d94a19f7e74fa9a10ae5944 SHA256 080334b5b7836ac718b35e81c47b1f036fc892a5a5a3f464aa4e045323aaf820
-AUX mercury-extras-10.04_beta1-mercury_tcltk.patch 1284 RMD160 c57463a3c95ced89dba5f87d68763ac794cc55c3 SHA1 e0bbecab38bdc4ab2e6ecec8b2c278dcc0eb05d5 SHA256 230c87edba9e6257abeec27abdf08beab4d88e53e41a3e2e2d303ad9aba0223f
-AUX mercury-extras-10.04_beta1-no-java-grade.patch 7158 RMD160 bb0d379884085ecc32efe60868255d4752f07937 SHA1 1b8b4168f1e2ae29606fa2682a6192792b9d407b SHA256 1d404490984bdd56aad366388c042bc9327b650b8343b70ebf21c486a3809b35
-AUX mercury-extras-10.04_beta1-odbc.patch 2107 RMD160 856ce0c442a77dcdbcca7f5cb833c8630da4e613 SHA1 e802d2b5e2fb67806a3d79ec8c00acda89e6ded3 SHA256 f6bb1b9e9ba799ebc68e278324af42108befd2285734d5f373022b2398ce3e15
-AUX mercury-extras-10.04_beta1-posix.patch 477 RMD160 dbe0a1f1d117a2a90a4aa588f9dea92e7a915fd1 SHA1 8fea62228a711694e869924fb20eae69b5177f70 SHA256 4ea5d325f6d36fee58ec87f1b2ea6d57959eb8dcc5693ab935a0486e12d47173
 DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c
-DIST mercury-extras-10.04-beta.tar.gz 713626 RMD160 d4a4e04e6fef80af430006ad3d20e94d3fc82e61 SHA1 a9efcc59ffc0104d6ceb821daa1dfca08fb83e1a SHA256 34040ca9eb85acee4409a15d3e11d5a6b2ad12f9ef8cb41776754aaf49a8abcd
 DIST mercury-extras-10.04.1.tar.gz 706531 RMD160 c249b239eafb19d27180e2fcbd6c763967eb4dda SHA1 5dec96a55fef96d5269f8be50f970f4d53522947 SHA256 7d7825224b0e0ae5079cdad4a323493d65a24f0a7f00eff6a100a6569329af3c
 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
@@ -58,6 +47,5 @@ EBUILD mercury-extras-10.04.1.ebuild 3639 RMD160 57126b80bcbeb7aa1002690c55e7f0b
 EBUILD mercury-extras-10.04.2-r1.ebuild 4774 RMD160 695d4457b81609e9a1c25a5964ad869af6840847 SHA1 9952d2b05cff802a77153ca810e61efdfc760ddc SHA256 396d488c72db2b3bc1fcc753eac705a9124a351974ac8c5f326d6f8b7b6e9268
 EBUILD mercury-extras-10.04.2.ebuild 3634 RMD160 61c1b4d9c8f89f60e7213c92aba4decf009ce703 SHA1 6bb92238ca4a4e69d2903fd7499c2e753e489c32 SHA256 5f72df92f0a38f57a6d8b761564ef504d34ca7a1b4a650c596ca91611de69111
 EBUILD mercury-extras-10.04.ebuild 3475 RMD160 7906873f1ec69c7dea2c1a4778b3e4f9ac8ddad3 SHA1 cc3380aa62ce9ccef41b737ad501f24e455ef147 SHA256 fcaca1dfc38a744298187406cead871542497bc5b763b1224ca1aea70fa5370e
-EBUILD mercury-extras-10.04_beta1.ebuild 3576 RMD160 6d687a48da2a78941ad97f34e3288e6155631219 SHA1 25ec4f3e0bc890925f8a67cad515154da16c09c9 SHA256 21dcc45569830f642e4842d6d8dcfe1164c6c8cabefdc777feb3fe8d2aa08437
-MISC ChangeLog 22215 RMD160 08acbbbdac9c5529d407fca2ecc368b18d9a9401 SHA1 c5e9902793cb8cd9d2f676e9796312e84d7611d8 SHA256 4757a7e4b4e6f1877b5943cd86dc5160672cf66e0e17b5ab1fcdfeee9cdc2463
+MISC ChangeLog 22839 RMD160 2dddb549a5a7c9685fde725f31f6ae7e0ec8ec57 SHA1 c82dc5318f6524b9c92296c08625f1ebee65624b SHA256 a1eb09aee6ddfdf492c217c5c54c56954cbd63eb819528356964ed108b2d70b2
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-curs.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-curs.patch
deleted file mode 100644
index e6cac458982f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-curs.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-diff -u mercury-extras-10.04-beta.orig/curs/curs.m mercury-extras-10.04-beta/curs/curs.m
---- mercury-extras-10.04-beta.orig/curs/curs.m	2006-04-21 15:37:10.000000000 +1200
-+++ mercury-extras-10.04-beta/curs/curs.m	2010-02-13 12:46: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 --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-dynamic-linking.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-dynamic-linking.patch
deleted file mode 100644
index 742b78064a33..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-dynamic-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
-+++ mercury-extras-10.04-beta/dynamic_linking/Mmakefile	2010-02-13 15:17:10.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/@libdir@ -ldl
- 
- # enable C-level debugging
- CFLAGS = -g
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-iodbc.patch
deleted file mode 100644
index 0624d37c88fa..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-iodbc.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -u mercury-extras-10.04-beta.orig/odbc/Mmakefile mercury-extras-10.04-beta/odbc/Mmakefile
---- mercury-extras-10.04-beta.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
-+++ mercury-extras-10.04-beta/odbc/Mmakefile	2010-02-13 14:40:32.000000000 +1300
-@@ -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.
-@@ -41,17 +41,20 @@
- 	# The following are for Debian.
- 
- 	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
-+	MLLIBS=`iodbc-config --libs`
-+	ODBC_CFLAGS=`iodbc-config --cflags`
- 	# 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 -u mercury-extras-10.04-beta.orig/odbc/odbc.m mercury-extras-10.04-beta/odbc/odbc.m
---- mercury-extras-10.04-beta.orig/odbc/odbc.m	2006-08-31 23:09:50.000000000 +1200
-+++ mercury-extras-10.04-beta/odbc/odbc.m	2010-02-13 14:29:04.000000000 +1300
-@@ -2000,8 +2000,8 @@
-             ** Arbitrary size, only needs to hold a 
-             ** descriptive string like ""SQL Server"".
-             */
--    String new_dsn;
--    String new_desc;
-+    LPSTR new_dsn;
-+    LPSTR new_desc;
-     SWORD dsn_len;
-     SWORD desc_len;
-     SQLRETURN rc;
-@@ -2335,7 +2335,7 @@
-     SQLSMALLINT msg_len;
-     UCHAR       message[SQL_MAX_MESSAGE_LENGTH];
-     UCHAR       sql_state[SQL_SQLSTATE_SIZE + 1];
--    String      mercury_message;
-+    LPSTR       mercury_message;
-     MR_Word     new_message;
- 
-     MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
deleted file mode 100644
index 1e831ab51687..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-lex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -uN lex/Mmakefile lex/Mmakefile
---- lex/Mmakefile	1970-01-01 12:00:00.000000000 +1200
-+++ lex/Mmakefile	2010-02-13 12:52:46.000000000 +1300
-@@ -0,0 +1,27 @@
-+# Copyright (C) 2001 Ralph Becket <rbeck@microsoft.com>
-+# Copyright (C) 2002 The University of Melbourne
-+
-+# To build, do the following:
-+#
-+# $ mmake depend
-+# $ mmake all
-+# $ mmake install
-+#
-+# If you have problems, try the following instead:
-+#
-+# $ mmake depend
-+# $ mmake all
-+# $ mmake liblex.install
-+# $ mmake libregex.install
-+
-+MAIN_TARGET = all
-+
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
-+.PHONEY: all depend install
-+
-+all: liblex libregex
-+
-+depend: lex.depend regex.depend
-+
-+install:
-+	$(MMAKE) liblex.install
-+	$(MMAKE) libregex.install
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_glut.patch
deleted file mode 100644
index a735b30743d7..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_glut.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
-+++ mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile	2010-02-13 12:12:57.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-10.04_beta1-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_opengl.patch
deleted file mode 100644
index c04b8eb5a073..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_opengl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
-+++ mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile	2010-02-13 12:23:34.000000000 +1300
-@@ -17,7 +17,8 @@
- 
- # 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 -lXt -lICE -lXext -lSM
-+GL_LIBS = `pkg-config --libs gl` `pkg-config --libs glu`
-+GL_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu`
- 
- # Don't issue a warning because mercury_opengl doesn't export anything.
- MCFLAGS-mercury_opengl = --no-warn-nothing-exported
-@@ -26,7 +27,7 @@
- # implemented completely.
- MCFLAGS-mogl = --no-warn-inferred-erroneous
- 
--MCFLAGS = --halt-at-warn --intermodule-optimization
-+MCFLAGS = --halt-at-warn --intermodule-optimization $(GL_CFLAGS)
- 
- MLLIBS 	= $(GL_LIBS) $(EXTRA_MLLIBS)
- 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_tcltk.patch
deleted file mode 100644
index b05fbe018d4f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-mercury_tcltk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile
---- mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile	2010-02-13 13:27:23.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 -ur mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-10.04-beta/graphics/mercury_tcltk/mtcltk.m
---- mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/mtcltk.m	2007-08-21 14:47:37.000000000 +1200
-+++ mercury-extras-10.04-beta/graphics/mercury_tcltk/mtcltk.m	2010-02-13 13:45:21.000000000 +1300
-@@ -154,7 +154,7 @@
-     MR_incr_hp(argv_word, argc + 1);
-     argv = (char **) argv_word;
- 
--    for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
-+    for (i = 0, l = Args; l != MR_list_empty(); l = MR_list_tail(l), i++) {
-         argv[i] = (char *) MR_list_head(l);
-     }
-     
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch
deleted file mode 100644
index c52630a51b44..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-no-java-grade.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -ur mercury-extras-10.04-beta.orig/cgi/Mmakefile mercury-extras-10.04-beta/cgi/Mmakefile
---- mercury-extras-10.04-beta.orig/cgi/Mmakefile	2004-07-30 19:01:07.000000000 +1200
-+++ mercury-extras-10.04-beta/cgi/Mmakefile	2010-02-20 19:37:53.000000000 +1300
-@@ -12,6 +12,8 @@
- 
- MAIN_TARGET = $(LIBRARY)
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- MCFLAGS-mercury_www = --no-warn-nothing-exported
- 
- depend: mercury_www.depend
-diff -ur mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile mercury-extras-10.04-beta/complex_numbers/Mmakefile
---- mercury-extras-10.04-beta.orig/complex_numbers/Mmakefile	2003-01-16 23:44:11.000000000 +1300
-+++ mercury-extras-10.04-beta/complex_numbers/Mmakefile	2010-02-20 19:41:36.000000000 +1300
-@@ -10,6 +10,8 @@
- 
- MAIN_TARGET = all
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- all:	libcomplex_numbers
- 
- depend:	complex_numbers.depend
-diff -ur mercury-extras-10.04-beta.orig/curs/Mmakefile mercury-extras-10.04-beta/curs/Mmakefile
---- mercury-extras-10.04-beta.orig/curs/Mmakefile	2003-01-16 23:44:14.000000000 +1300
-+++ mercury-extras-10.04-beta/curs/Mmakefile	2010-02-20 19:42:26.000000000 +1300
-@@ -26,7 +26,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
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
- 
- # The following standard libraries must be linked against in any
- # application using the curs library (i.e. MLLIBS must include
-diff -ur mercury-extras-10.04-beta.orig/curses/Mmakefile mercury-extras-10.04-beta/curses/Mmakefile
---- mercury-extras-10.04-beta.orig/curses/Mmakefile	2003-01-16 23:44:15.000000000 +1300
-+++ mercury-extras-10.04-beta/curses/Mmakefile	2010-02-20 19:43:04.000000000 +1300
-@@ -13,6 +13,8 @@
- # this line to include the appropriate curses library for your OS. 
- MLLIBS = -lncurses
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- -include ../Mmake.params
- 
- default_target:	libmcurses
-diff -ur mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile mercury-extras-10.04-beta/dynamic_linking/Mmakefile
---- mercury-extras-10.04-beta.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
-+++ mercury-extras-10.04-beta/dynamic_linking/Mmakefile	2010-02-20 19:43:42.000000000 +1300
-@@ -17,6 +17,8 @@
- CFLAGS = -g
- MLFLAGS += --no-strip
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- -include ../Mmake.params
- 
- main_target: libdl
-diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile
---- mercury-extras-10.04-beta.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
-+++ mercury-extras-10.04-beta/graphics/mercury_glut/Mmakefile	2010-02-20 19:44:06.000000000 +1300
-@@ -10,6 +10,8 @@
- 
- MAIN_TARGET = libmercury_glut
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- # The following libraries are for X on Linux (Debian) using Mesa.
- 	
- # Libaries required by X windows.
-diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile
---- mercury-extras-10.04-beta.orig/graphics/mercury_opengl/Mmakefile	2007-10-11 19:21:31.000000000 +1300
-+++ mercury-extras-10.04-beta/graphics/mercury_opengl/Mmakefile	2010-02-20 19:44:43.000000000 +1300
-@@ -15,6 +15,8 @@
- 
- MAIN_TARGET = libmercury_opengl
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- # 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 -lXt -lICE -lXext -lSM
-diff -ur mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile
---- mercury-extras-10.04-beta.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-10.04-beta/graphics/mercury_tcltk/Mmakefile	2010-02-20 19:44:24.000000000 +1300
-@@ -21,6 +21,8 @@
- 
- MAIN_TARGET = $(LIBRARY)
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- depend: mercury_tcltk.depend
- 
- install: libmercury_tcltk.install
-diff -ur mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile mercury-extras-10.04-beta/lazy_evaluation/Mmakefile
---- mercury-extras-10.04-beta.orig/lazy_evaluation/Mmakefile	2003-01-16 23:44:17.000000000 +1300
-+++ mercury-extras-10.04-beta/lazy_evaluation/Mmakefile	2010-02-20 19:46:58.000000000 +1300
-@@ -4,6 +4,8 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- -include ../Mmake.params
- default_target: all
- depend: lazy_list.depend lazy_list_test.depend
-diff -ur mercury-extras-10.04-beta.orig/moose/Mmakefile mercury-extras-10.04-beta/moose/Mmakefile
---- mercury-extras-10.04-beta.orig/moose/Mmakefile	2003-01-16 23:44:20.000000000 +1300
-+++ mercury-extras-10.04-beta/moose/Mmakefile	2010-02-20 19:45:19.000000000 +1300
-@@ -6,6 +6,7 @@
- 
- # GRADE = asm_fast.gc.debug
- # GRADE = asm_fast.gc.prof
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
- 
- # MCFLAGS = -O6
- # MCFLAGS = --intermodule-optimization -O6
-diff -ur mercury-extras-10.04-beta.orig/odbc/Mmakefile mercury-extras-10.04-beta/odbc/Mmakefile
---- mercury-extras-10.04-beta.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
-+++ mercury-extras-10.04-beta/odbc/Mmakefile	2010-02-20 19:49:20.000000000 +1300
-@@ -8,6 +8,7 @@
- 
- #-----------------------------------------------------------------------------#
- # Configuration
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
- 
- # The driver manager.
- # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
-diff -ur mercury-extras-10.04-beta.orig/posix/Mmakefile mercury-extras-10.04-beta/posix/Mmakefile
---- mercury-extras-10.04-beta.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
-+++ mercury-extras-10.04-beta/posix/Mmakefile	2010-02-20 19:46:08.000000000 +1300
-@@ -8,6 +8,8 @@
- 
- -include ../Mmake.params
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- # The following is needed (on some systems) to enable declarations of
- # Posix functions in standard C header files.
- MGNUCFLAGS = --no-ansi
-diff -ur mercury-extras-10.04-beta.orig/quickcheck/Mmakefile mercury-extras-10.04-beta/quickcheck/Mmakefile
---- mercury-extras-10.04-beta.orig/quickcheck/Mmakefile	2003-01-16 23:44:24.000000000 +1300
-+++ mercury-extras-10.04-beta/quickcheck/Mmakefile	2010-02-20 19:47:12.000000000 +1300
-@@ -10,6 +10,8 @@
- 
- MAIN_TARGET = all
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- .PHONY: depend
- depend:	qcheck.depend test_qcheck.depend
- 
-diff -ur mercury-extras-10.04-beta.orig/xml/Mmakefile mercury-extras-10.04-beta/xml/Mmakefile
---- mercury-extras-10.04-beta.orig/xml/Mmakefile	2002-03-06 23:10:31.000000000 +1300
-+++ mercury-extras-10.04-beta/xml/Mmakefile	2010-02-20 19:46:26.000000000 +1300
-@@ -8,6 +8,8 @@
- 
- INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
- 
-+LIBGRADES := $(filter-out java,$(LIBGRADES))
-+
- .PHONY: default_target
- default_target: tryit libxml
- 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-odbc.patch
deleted file mode 100644
index ea427cb5a0c2..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-odbc.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -u mercury-extras-10.04-beta.orig/odbc/Mmakefile mercury-extras-10.04-beta/odbc/Mmakefile
---- mercury-extras-10.04-beta.orig/odbc/Mmakefile	2006-04-03 18:19:54.000000000 +1200
-+++ mercury-extras-10.04-beta/odbc/Mmakefile	2010-02-13 14:40:32.000000000 +1300
-@@ -41,17 +41,20 @@
- 	# The following are for Debian.
- 
- 	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
-+	MLLIBS=`odbc_config --libs`
-+	ODBC_CFLAGS=`odbc_config --cflags`
- 	# 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 -u mercury-extras-10.04-beta.orig/odbc/odbc.m mercury-extras-10.04-beta/odbc/odbc.m
---- mercury-extras-10.04-beta.orig/odbc/odbc.m	2006-08-31 23:09:50.000000000 +1200
-+++ mercury-extras-10.04-beta/odbc/odbc.m	2010-02-13 14:29:04.000000000 +1300
-@@ -2000,8 +2000,8 @@
-             ** Arbitrary size, only needs to hold a 
-             ** descriptive string like ""SQL Server"".
-             */
--    String new_dsn;
--    String new_desc;
-+    LPSTR new_dsn;
-+    LPSTR new_desc;
-     SWORD dsn_len;
-     SWORD desc_len;
-     SQLRETURN rc;
-@@ -2335,7 +2335,7 @@
-     SQLSMALLINT msg_len;
-     UCHAR       message[SQL_MAX_MESSAGE_LENGTH];
-     UCHAR       sql_state[SQL_SQLSTATE_SIZE + 1];
--    String      mercury_message;
-+    LPSTR       mercury_message;
-     MR_Word     new_message;
- 
-     MR_ASSERT_IMPLY(connection_handle == SQL_NULL_HDBC, 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-posix.patch
deleted file mode 100644
index 03a208c09b17..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-10.04_beta1-posix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mercury-extras-10.04-beta.orig/posix/Mmakefile mercury-extras-10.04-beta/posix/Mmakefile
---- mercury-extras-10.04-beta.orig/posix/Mmakefile	2008-09-02 21:45:54.000000000 +1200
-+++ mercury-extras-10.04-beta/posix/Mmakefile	2010-02-13 10:56:21.000000000 +1300
-@@ -34,7 +34,7 @@
- 
- .PHONY: install
- install: libposix.install
--	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
-+	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/@libdir@/mercury/inc
- 
- .PHONY: clean
- clean:
diff --git a/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild b/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild
deleted file mode 100644
index 104b43b256b4..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-10.04_beta1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2010 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_beta1.ebuild,v 1.3 2010/09/16 16:39:20 scarabeus Exp $
-
-inherit eutils
-
-MY_PV=${PV/%?/}
-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/10.04-beta/mercury-extras-10.04-beta.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~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 ) )"
-
-S="${WORKDIR}"/${MY_P}
-
-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
-	epatch "${FILESDIR}"/${P}-no-java-grade.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
-
-	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
-}