Remove old versions

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

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index d6c71fdb38b184cc692ba0a274c3a31b1353a07e..a7b404c55c13eaebc59540f0b93c89085976d57d 100644 (file)
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.142 2011/08/12 21:38:37 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.143 2011/08/12 23:28:17 keri Exp $
+
+  12 Aug 2011; <keri@gentoo.org> -mercury-0.13.1-r2.ebuild,
+  -files/mercury-0.13.1-docs.patch, -files/mercury-0.13.1-libgrades.patch,
+  -files/mercury-0.13.1-mmake-params.patch,
+  -files/mercury-0.13.1-multilib.patch, -files/mercury-0.13.1-no-reconf.patch,
+  -files/mercury-0.13.1-rebuild-mslice.patch,
+  -files/mercury-0.13.1-tests-dir_test.patch,
+  -files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch,
+  -files/mercury-0.13.1-tests-string_format.patch,
+  -files/mercury-0.13.1-tests-workspace.patch, -mercury-10.04.ebuild,
+  -mercury-10.04-r1.ebuild, -mercury-10.04.1.ebuild, -mercury-10.04.2.ebuild,
+  -mercury-10.04.2-r1.ebuild, -mercury-11.01_beta1.ebuild:
+  Remove old versions
 
   12 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> mercury-0.13.1-r2.ebuild,
   mercury-10.04.ebuild, mercury-10.04-r1.ebuild, mercury-10.04.1.ebuild,

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index a922976e866be53e1a7ac87035b95ea3c5b6a95a..c0a4940d19f949f89cf8595bda135f5e8ac2e840 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -2,54 +2,20 @@
 Hash: SHA1
 
 AUX 50mercury-gentoo.el 130 RMD160 293a39103c84059a611896e552d89736ee742789 SHA1 ea6071d0be2885090f90211ffca5474ad50b2286 SHA256 802dbbd82d775bba22bb750668e0a8462960d9e8b28e3731171cded00783d6f4
-AUX mercury-0.13.1-docs.patch 796 RMD160 842e415a6c97d910e77e7179ab9b3f7d6447827c SHA1 4abd392a9f8030c87c3be7e7a183deaa61966e74 SHA256 c5e3ff95f34e8822bafc54d511a1f5f710ba485cffb661fccac163daf73ea6c2
-AUX mercury-0.13.1-libgrades.patch 13854 RMD160 0f4dd4b97390962524944e3e57ce8d5b405967ed SHA1 8f5bdb0c367cb94aea0eae0dd15bddd164003cf1 SHA256 207d9af7c741845c1b0fcc098413952f8b002f4f71803fb38e474c63118d578f
-AUX mercury-0.13.1-mmake-params.patch 188 RMD160 7dbf331fc8516be5ab3806a87d1fb73aec78f092 SHA1 8f45dd9c968802146febc6f3e2046e6fd08ad9fd SHA256 00e736abd7f168992bd9d9f70ac9c7ab6bc4040fbeba638e46ded1f4f46a0e63
-AUX mercury-0.13.1-multilib.patch 3170 RMD160 fad84c0177d9611c869ad85657fc1fdeafc52942 SHA1 9f14ca95c454f426773aaa06b71a7b2e7e3f421b SHA256 58ebef426a8f7cf0015dfb92d6448e96b8db46070844e9d1e191c153cf79e647
-AUX mercury-0.13.1-no-reconf.patch 2257 RMD160 5c0e3eed97894c5ccdac39afade42fd284de4aee SHA1 2ff3fd52a2b549c9809336d5581b7bf7278c7702 SHA256 4ee2392c953af57baa91127e836765d919d72942216344e242c999aa50e3ba4f
-AUX mercury-0.13.1-rebuild-mslice.patch 460 RMD160 733e4f30235d08209cbc41451db19fbb278513a2 SHA1 93b228151377a27ba604c668309ba045bb9ce79e SHA256 1ffbd45a7db568268962b82eddba2747ba57c93b110a01d071fca39565c54e72
-AUX mercury-0.13.1-tests-dir_test.patch 2476 RMD160 99c040bc588d0f455b1da42279fedc3f3f357217 SHA1 41e0fda83eacbdb698833216de4251e626adeba3 SHA256 20d7710d93e108eb5440b0d189f6a4f3848b589fb22e2be3e87d08baebd5f535
-AUX mercury-0.13.1-tests-ho_and_type_spec_bug.patch 429 RMD160 4afcbd1b73c51c06187a0af02086e6c0527a8b8c SHA1 efe5458ab76060a37f0110000ee68e07212ff8d6 SHA256 d81c5e0a3cbf07190433cee583f9be8f14624b3f5e982bf04079fdb559b1f88c
-AUX mercury-0.13.1-tests-string_format.patch 15357 RMD160 1b3f5538f6c8aa9daa430d918e42c9c3e95122c5 SHA1 fb78eba72aae7de933951941f6db890548e298b0 SHA256 a0a3f1a5d9d75443d9f442925eb15131b7bfbe3c92f737a51f1340111b46a34e
-AUX mercury-0.13.1-tests-workspace.patch 899 RMD160 f866379e0e4f8e4debebb86bfed778e881c9e790 SHA1 6b6cc428a516c082bcd7ac8bdbe05de1b1e75831 SHA256 8ab0c250ccdfdb57ba377335fd61dc980ad87135e388c6ae4ebe0ff3c464e456
-DIST mercury-10.04-gentoo-patchset-0.tar.gz 8036 RMD160 6afb964cf8b592141e6b3af3b9e6cc0679a34914 SHA1 0a5fa28b9577184165ec715ba928d7430c9b03c9 SHA256 25f350abc14bc1638d328df2365aa5fa4f3208b7c3c244cf3908cfdb54d36c1a
-DIST mercury-10.04.1-gentoo-patchset-0.tar.gz 9013 RMD160 59e8c0507bd2bcfb55d83425d72a89adfa5e64a0 SHA1 30b10271f342e893cfab67426c0fd25d3f06845f SHA256 14f1fb3c3927cd7c5d16407e0003b5531248f7b49f4a202e7dd288f8da5fddac
-DIST mercury-10.04.2-gentoo-patchset-0.tar.gz 9352 RMD160 475bdba037ca93062a96092bc049bf4f6659ca99 SHA1 6d614541b3c4760910f263cc6e57e09697e324db SHA256 1c1323602a30d734b298521a1749d2a25196b290d416b51f8ce512321d0f7df6
-DIST mercury-10.04.2-gentoo-patchset-3.tar.gz 9341 RMD160 ca46e0875565c27beec1a9688ce35e01d9fb8dc5 SHA1 d4c75c4fb1b05dddf6bc0938f48b96b022a0cc8f SHA256 ef110c239ad9eedad59e6dda1d2774229cc8d44fec2a3e24594c1f41bb5d5c6c
 DIST mercury-11.01-gentoo-patchset-1.tar.gz 7129 RMD160 cfb89fa798724744ea7f1912b0015affdb1ea63c SHA1 d23e615b81cfd259e369cfcd1c5cd9965780f946 SHA256 43dbcb63add22b24da7515b7d42d8b4ad119d9923f80dbb29767d756436d0fa4
-DIST mercury-11.01_beta1-gentoo-patchset-0.tar.gz 8661 RMD160 c8d40aded3e13e86e801bc4f6aa0b260f61c75bd SHA1 8cb663391b544055bfa256c030afdf8a399c09cd SHA256 f1d4183f690848a9e7289fd8995f4a5dbf78e007dda62e60a2e1ea2f47dfedfd
 DIST mercury-11.07_beta1-gentoo-patchset-1.tar.gz 7157 RMD160 c82f9937fb1fce9a76a402fded8abfc254cfaf5a SHA1 37d4861d991962d37c2e25c4da2dc9834491511c SHA256 9e07bd3232463eb6bb679a86202bae0edb41385551b9dc5d01eac054880263f5
-DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
-DIST mercury-compiler-10.04.1.tar.gz 24600120 RMD160 99f998845ad5c952860cd5ba3051c948dc7f3397 SHA1 9d9135d171128ce53cc77680423c5fd5e4ea4530 SHA256 63fa2b5661ab34bcb7d199c7686753c7c20b85b989c18e67f682f00cd91a02bb
-DIST mercury-compiler-10.04.2.tar.gz 24608706 RMD160 efcc35f8fcfaa66413bb04956e79a7708531327f SHA1 c1ade62620a6092f345c9c850abecfa8c69349e1 SHA256 cc7682971cb5377f69f2dbbf04cd3c7545ac98079e51dac92d71979d85fd01a8
-DIST mercury-compiler-10.04.tar.gz 24586705 RMD160 fe9b131a272ab314618cde59463e5b55686126e3 SHA1 3ae0d596ad079d62bfb6ae41bc0ab0a5d78db6fa SHA256 ecb930c2b26f804648f6432503937a669de4c2c9e85dec9a60ef65f729fbbcda
-DIST mercury-compiler-11.01-beta-2010-12-22.tar.gz 25044345 RMD160 b16a07493c47e8cd79b94559b688d4078c6fcf5e SHA1 ba9f897379ef757b5c208db3aeec88eb2ea37be9 SHA256 af6d53196e5afc573343f081bbcf4c6d808817a75b036fe1847962dcf6bb6f03
 DIST mercury-compiler-11.01.tar.gz 25122699 RMD160 bee82b6037fa1f14f27b43d6f7d751d232941bc7 SHA1 508f9fbebdf061f706a44db5c77868cb4e769066 SHA256 2d12dc9bfaed46b1b30689b0592177bc871b21cf8852c8326c86371258bb18b0
 DIST mercury-compiler-11.07-beta-2011-06-28-unstable.tar.gz 25281973 RMD160 87a7ce5d4840521c033de59330756eb2a30e388e SHA1 14e494716717a21989e17219c540a14c79d7a415 SHA256 54e2327f247f6ae795d9963622ffd8ca00e8e3e85519eb7896ac39f1000c3793
-DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
-DIST mercury-tests-10.04.1.tar.gz 1332741 RMD160 e7880a095d071f4fcdce69f9e656e67dfe09de63 SHA1 4e9a9a1c12a1e435442822d28810cd209f9212b0 SHA256 1e05cb3fa3a673ab1c0464c9616181bdd07f5b09681f58f021a2da3bc5c05c26
-DIST mercury-tests-10.04.2.tar.gz 1332984 RMD160 5c56b4c92627be5903b9a7fcaa7af9dddc160ed3 SHA1 9a8dcaabcbe6aa6a398ab97f63700c2d2f53de5d SHA256 7aca501f4bb8604f09ca4d5d0c102fd327fbec4cdd789c27c7b0f08f7e9e9491
-DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
-DIST mercury-tests-11.01-beta-2010-12-22.tar.gz 1338813 RMD160 5a7aca181194c0238f36f3a983aa3be0b724bbbf SHA1 1b3280783bf8140dd0d2abf6cff86992a5411816 SHA256 f97f8d36ee8cca6933f736fb877666c0e4975444c437aca0ae3be06fe6a1a1da
 DIST mercury-tests-11.01.tar.gz 1351134 RMD160 4568a0b1044a116ab59b2f0d98002e20c6819461 SHA1 180741461386f7a2b0fd526e0d4c761cd7b0c3ff SHA256 862b70a589eb2d36c9fd82dbd2e0490dc4556f6edff604a54dfd6fc0ad6cccad
 DIST mercury-tests-11.07-beta-2011-06-28-unstable.tar.gz 1641484 RMD160 4a6db1128b13b24042626a99b4f89c21759605fd SHA1 da86df499f0ea46ec430a3233055396e0b8eec71 SHA256 6ee6131fb20e8b0fa6ad2a8947f234d768f95a3e0dc71ebdcff4583d99833bee
-EBUILD mercury-0.13.1-r2.ebuild 3343 RMD160 64a714d77266d63550264ed7c4dd265e16d25a79 SHA1 ec72d6a4201770fe898c0bf77aeb32b32df60d20 SHA256 72de90536f63b11790c06ba54f5d7501748d0653274be0cff8109f1993c8cc2f
-EBUILD mercury-10.04-r1.ebuild 4052 RMD160 fcef0b70b8b327ea0b0f5c2876220d1a0f836365 SHA1 6c564597ad6eca2b3ec4106e07cf9256ec9cdbe5 SHA256 cd85d4301068ac2c531f9e10e09ca94f50774381da3be1eba41e920b5c394f14
-EBUILD mercury-10.04.1.ebuild 4523 RMD160 ef1056f7035029672d8834601ee7584112ef40fb SHA1 6ed08bcce469cf0fd50edac452686950e86b2692 SHA256 ce2c4d5feea84fe67ab01341a0a220d9dc630f2264aad48d1d063820bdcdbdf9
-EBUILD mercury-10.04.2-r1.ebuild 5773 RMD160 dd7217a78dec7f8b953b1d5471d01defc5ad2ad0 SHA1 c4d6c5c471a52dd2293ecd4167163f5573738c5e SHA256 32457148204606933cb81da02cdec8469f7d56771a044368214370a964d64cdb
-EBUILD mercury-10.04.2.ebuild 4523 RMD160 fd022177b22b65b4767d98dd3a69be3c551c0050 SHA1 a295239cb7ba468796898cb438bb2d7285f46fd8 SHA256 80f34c7bb7caac0a66107fae667aa9dbc101f3562c46e2384281162b545fd7d0
-EBUILD mercury-10.04.ebuild 3851 RMD160 50e744b2df89e9d11cfb60bdcfaf1ec1ee82608d SHA1 615d5bf0576382bf535175e85c067b0f3fa9c5f1 SHA256 3198995f4865799569b1606c7ffb4fe6cecfb1ffaa6ebf97c6dcfd6b72baf7df
 EBUILD mercury-11.01.ebuild 5815 RMD160 07b2850968c2411bc41062b3e3217a5e3ca51b51 SHA1 e6334dc5b6ceb4607a640a820c496b3e02fcafb5 SHA256 1677f4b9f63c3bd405898616204bdf67c9bf8a88f0e71173478fbf5ca1c68a62
-EBUILD mercury-11.01_beta1.ebuild 5921 RMD160 7fbc95cd62725e98190b2f1522681ddd6d79a6d1 SHA1 c9343fe7dc4ce6df5d0955ff9a7aa70fcc4bda9f SHA256 7877bab008ad65bc1f96883f6a4b7e701897c05ddd309252c02793644a9dc33b
 EBUILD mercury-11.07_beta1.ebuild 5939 RMD160 2f1a6b50a35a45dfc7c54a6f896d29b1ee54b1e0 SHA1 b5332c7a7b2f07cba10e187ddce0acf4fe519218 SHA256 93eb5cf7d476dbd8968e9ef8a44e7979914961e117a67f79d0c18a8282642cce
-MISC ChangeLog 30152 RMD160 475ab4e3bd5a9b16841e33a4bbfcbc8ce727d4d0 SHA1 732ba2c4fcda3c9c754d08ddac050e4eca4b788a SHA256 e7b4f6f08cef33f399e6ec4db95effc125965b5ab56e0d7a432eab049f13f30b
+MISC ChangeLog 30835 RMD160 88c6182ba4287baf67bb10b987a0f479d508f4bd SHA1 22af4216a47a75e91256a807fb2c65b2e06a6917 SHA256 afcd6e95fcd6f48fa6dbed2189d12c398bf3b3a5db744059db78ae139fcbc8eb
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk5FnWYACgkQIiMqcbOVdxTbhwP+NAPTqJv2mzAS6k1vK7fjjQAW
-2pFgBMskJwkmQZ2qq+qdBTcdFR3ORwR+CSsoITUlEzxfqMHmWQVjeXNbwcytEoqM
-0qNv7Oiqfx7sgMC5NFcW35rn5q/Ot/8KjlHf6Iszhg2vRuSv4iH2Al3FGBGlF/Qc
-HgesPfi5DYya89lR1qQ=
-=LH4u
+iEYEARECAAYFAk5FtygACgkQrwS/tqE49e2lwgCfb1mLO3L3QVtGDJtWD148IS86
+5WIAnRYZy02qFwQOeA8gmGgGZNIiPEq6
+=Gnj+
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/mercury/files/mercury-0.13.1-docs.patch b/dev-lang/mercury/files/mercury-0.13.1-docs.patch
deleted file mode 100644 (file)
index 82c2ba9..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mercury-compiler-0.13.1.orig/doc/Mmakefile 2006-03-29 13:35:18.000000000 +1200
-+++ mercury-compiler-0.13.1/doc/Mmakefile      2006-12-04 21:10:35.000000000 +1300
-@@ -120,7 +120,7 @@
-       # formatted versions of the man pages.
-       # But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -331,7 +331,7 @@
-       # versions of the documentation.  If they are added they should
-       # be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
-       install_mdb_doc
-       # install_text install_ps
- 

diff --git a/dev-lang/mercury/files/mercury-0.13.1-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.1-libgrades.patch
deleted file mode 100644 (file)
index 96c4fc8..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-libgrades.patch
+++ /dev/null
@@ -1,375 +0,0 @@
---- mercury-compiler-0.13.1.orig/Mmakefile     2005-08-12 03:56:57.000000000 +1200
-+++ mercury-compiler-0.13.1/Mmakefile  2006-12-04 21:19:06.000000000 +1300
-@@ -281,6 +281,54 @@
-               mdbcomp browser trace
-       +cd deep_profiler && $(SUBDIR_MMAKE)
- 
-+libgrades:
-+      +for grade in x $(LIBGRADES); do                                \
-+          if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then    \
-+              gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \
-+              TWS=`/bin/pwd`/libgrades/$$grade;                       \
-+              /bin/rm -fr libgrades/$$grade;                          \
-+              mkdir -p libgrades/$$grade;                             \
-+              ( scripts/prepare_tmp_dir_fixed_part $$grade &&         \
-+                scripts/prepare_tmp_dir_grade_part $$grade ) &&       \
-+              ( cd libgrades/$$grade/boehm_gc &&                      \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade                  \
-+                      WORKSPACE=$$TWS GC_GRADE=$$gc_grade             \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              ( cd libgrades/$$grade/runtime &&                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              ( cd libgrades/$$grade/library &&                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      depend &&                                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              ( cd libgrades/$$grade/mdbcomp &&                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      depend &&                                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              ( cd libgrades/$$grade/browser &&                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      depend &&                                       \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              ( cd libgrades/$$grade/trace &&                         \
-+                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-+                      MERCURY_COMPILER=$$TWS/compiler/mercury_compile \
-+                      libgrade ) &&                                   \
-+              true ||                                                 \
-+                exit 1;                                               \
-+          fi;                                                         \
-+      done
-+
- #-----------------------------------------------------------------------------#
- 
- .PHONY: tags
-@@ -483,28 +531,13 @@
-       @echo
-       @echo "-- Installation complete."
-       @echo
--      @echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
--      @echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
--      @echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
--      @if test $(ENABLE_DEEP_PROFILER) != yes || \
--              cmp -s deep_profiler/mdprof_cgi \
--                      $(INSTALL_CGI_DIR)/mdprof_cgi; \
--      then true ; else \
--              echo "-- to copy deep_profiler/mdprof_cgi" \
--                      "to $(INSTALL_CGI_DIR),"; \
--      fi
--      @echo "-- and to add the following lines to the \`.emacs' file"
--      @echo "-- in your home directory:"
--      @echo " (setq load-path (cons (expand-file-name "
--      @echo "         \"$(INSTALL_ELISP_DIR)\") load-path))"
--      @echo " (autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
- 
- .PHONY: install_main
- install_main: all \
-               install_scripts install_util install_runtime install_boehm_gc \
-               install_library install_mdbcomp install_browser install_trace \
-               install_compiler install_slice install_profiler \
--              install_deep_profiler install_doc install_config
-+              install_deep_profiler install_doc
- 
- .PHONY: install_scripts
- install_scripts: scripts
-@@ -569,7 +602,7 @@
- #     .trans_opt .trans_opt_date .d .mh .mih .c_date  .c .o .pic_o
- 
- .PHONY: install_grades
--install_grades: all
-+install_grades: all libgrades
-       #
-       # Use the newly installed compiler to build the libraries
-       # in various different grades.  We need to override MC=mmc
-@@ -577,44 +610,33 @@
-       # runs the newly installed compiler, rather than using the
-       # bootstrap compiler.
-       #
--      /bin/rm -fr tmp_dir
--      scripts/prepare_tmp_dir_fixed_part
-       +for grade in x $(LIBGRADES); do                                \
-           if [ "$$grade" != "x" -a "$$grade" != "$(GRADE)" ]; then    \
-               gc_grade=`scripts/ml --grade $$grade --print-gc-grade`; \
--              TWS=`/bin/pwd`/tmp_dir;                                 \
--              scripts/prepare_tmp_dir_grade_part;                     \
--              ( cd tmp_dir/boehm_gc &&                                \
-+              TWS=`/bin/pwd`/libgrades/$$grade;                       \
-+              ( cd libgrades/$$grade/boehm_gc &&                      \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade                  \
-                       WORKSPACE=$$TWS GC_GRADE=$$gc_grade             \
-                       install_lib ) &&                                \
--              ( cd tmp_dir/runtime &&                                 \
-+              ( cd libgrades/$$grade/runtime &&                       \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-                       install_lib ) &&                                \
--              ( cd tmp_dir/library &&                                 \
--                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
--                      depend &&                                       \
-+              ( cd libgrades/$$grade/library &&                                       \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-                       install_library ) &&                            \
--              ( cd tmp_dir/mdbcomp &&                                 \
--                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
--                      depend &&                                       \
-+              ( cd libgrades/$$grade/mdbcomp &&                                       \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-                       install_library ) &&                            \
--              ( cd tmp_dir/browser &&                                 \
--                $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
--                      depend &&                                       \
-+              ( cd libgrades/$$grade/browser &&                                       \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-                       install_library ) &&                            \
--              ( cd tmp_dir/trace &&                                   \
-+              ( cd libgrades/$$grade/trace &&                                 \
-                 $(SUBDIR_MMAKE) MC=mmc GRADE=$$grade WORKSPACE=$$TWS  \
-                       install_lib ) &&                                \
-               true ||                                                 \
--              { echo "To clean up from failed install, remove tmp_dir"; \
--                exit 1; };                                            \
-+                exit 1;                                               \
-           fi;                                                         \
-       done
--      if test ! -f .leave_tmp_dir; then rm -fr tmp_dir; fi
- 
- .PHONY: install_split_library
- install_split_library: scripts dep_library
---- mercury-compiler-0.13.1.orig/boehm_gc/Mmakefile    2006-11-15 03:09:19.000000000 +1300
-+++ mercury-compiler-0.13.1/boehm_gc/Mmakefile 2006-12-04 21:19:06.000000000 +1300
-@@ -90,6 +90,9 @@
- .PHONY: force
- force:
- 
-+.PHONY: libgrade
-+libgrade: lib$(GC_GRADE).$A lib$(GC_GRADE).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.13.1.orig/browser/Mmakefile     2005-12-16 18:49:31.000000000 +1300
-+++ mercury-compiler-0.13.1/browser/Mmakefile  2006-12-04 21:19:06.000000000 +1300
-@@ -186,6 +186,11 @@
- .PHONY: int3s 
- int3s:        $(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+              lib$(BROWSER_LIB_NAME).$A \
-+              lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- tags: $(MTAGS) $($(BROWSER_LIB_NAME).ms)
---- mercury-compiler-0.13.1.orig/library/Mmakefile     2006-01-10 18:30:36.000000000 +1300
-+++ mercury-compiler-0.13.1/library/Mmakefile  2006-12-04 21:19:06.000000000 +1300
-@@ -196,6 +196,9 @@
- trans_opts: $(STD_LIB_NAME).trans_opts
- $(STD_LIB_NAME).trans_opts: $($(STD_LIB_NAME).trans_opts)
- 
-+.PHONY: libgrade
-+libgrade: lib$(STD_LIB_NAME)
-+
- #-----------------------------------------------------------------------------#
- 
- tags: $(MTAGS) $($(STD_LIB_NAME).ms)
---- mercury-compiler-0.13.1.orig/mdbcomp/Mmakefile     2005-12-16 18:49:40.000000000 +1300
-+++ mercury-compiler-0.13.1/mdbcomp/Mmakefile  2006-12-04 21:19:06.000000000 +1300
-@@ -150,6 +150,13 @@
- .PHONY: int3s 
- int3s:        $(INT3S_TARGETS)
- 
-+.PHONY: libgrade
-+libgrade: \
-+              $(mer_mdbcomp.int3s) $(mer_mdbcomp.ints) \
-+              lib$(MDBCOMP_LIB_NAME).$A \
-+              lib$(MDBCOMP_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
-+              all-ints
-+
- #-----------------------------------------------------------------------------#
- 
- tags: $(MTAGS) $($(MDBCOMP_LIB_NAME).ms)
---- mercury-compiler-0.13.1.orig/runtime/Mmakefile     2006-11-15 03:09:20.000000000 +1300
-+++ mercury-compiler-0.13.1/runtime/Mmakefile  2006-12-04 21:19:06.000000000 +1300
-@@ -420,6 +420,9 @@
-       @if test ! -f tags; then echo making tags; \
-       ctags $(CFILES) $(HDRS) $(BODY_HDRS) $(LIB_DLL_H); fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules
---- mercury-compiler-0.13.1.orig/scripts/prepare_tmp_dir_fixed_part.in 2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.13.1/scripts/prepare_tmp_dir_fixed_part.in      2006-12-04 21:19:06.000000000 +1300
-@@ -12,18 +12,20 @@
- fi
- wd=`/bin/pwd`
- 
--mkdir tmp_dir
--cp Mmake* tmp_dir
--cp Mercury.* tmp_dir
--cp VERSION tmp_dir
--cp config* tmp_dir
--cp aclocal.m4 tmp_dir
--mkdir tmp_dir/scripts
--cp scripts/* tmp_dir/scripts
--mkdir tmp_dir/tools
--cp tools/* tmp_dir/tools
--$ln_s $wd/compiler tmp_dir
--$ln_s $wd/analysis tmp_dir
--$ln_s $wd/robdd tmp_dir
--$ln_s $wd/util tmp_dir
-+libgrade_dir=libgrades/$1
-+
-+mkdir -p $libgrade_dir
-+cp Mmake* $libgrade_dir
-+cp Mercury.* $libgrade_dir
-+cp VERSION $libgrade_dir
-+cp config* $libgrade_dir
-+cp aclocal.m4 $libgrade_dir
-+mkdir $libgrade_dir/scripts
-+cp scripts/* $libgrade_dir/scripts
-+mkdir $libgrade_dir/tools
-+cp tools/* $libgrade_dir/tools
-+$ln_s $wd/compiler $libgrade_dir
-+$ln_s $wd/analysis $libgrade_dir
-+$ln_s $wd/robdd $libgrade_dir
-+$ln_s $wd/util $libgrade_dir
- exit 0
---- mercury-compiler-0.13.1.orig/scripts/prepare_tmp_dir_grade_part    2005-05-20 18:15:20.000000000 +1200
-+++ mercury-compiler-0.13.1/scripts/prepare_tmp_dir_grade_part 2006-12-04 21:19:06.000000000 +1300
-@@ -5,55 +5,57 @@
- # Public License - see the file COPYING in the Mercury distribution.
- #---------------------------------------------------------------------------#
- 
--rm -fr tmp_dir/boehm_gc
--rm -fr tmp_dir/runtime
--rm -fr tmp_dir/trace
--rm -fr tmp_dir/library
--rm -fr tmp_dir/mdbcomp
--rm -fr tmp_dir/browser
--mkdir tmp_dir/boehm_gc
--mkdir tmp_dir/boehm_gc/Mac_files
--mkdir tmp_dir/boehm_gc/cord
--mkdir tmp_dir/boehm_gc/include
--mkdir tmp_dir/boehm_gc/include/private
--cp boehm_gc/Makefile* tmp_dir/boehm_gc
--cp boehm_gc/Mmake* tmp_dir/boehm_gc
--cp boehm_gc/ac* tmp_dir/boehm_gc
--cp boehm_gc/*.[chsS] tmp_dir/boehm_gc
--cp boehm_gc/Mac_files/*.[ch] tmp_dir/boehm_gc/Mac_files
--cp boehm_gc/cord/*.[ch] tmp_dir/boehm_gc/cord
--cp boehm_gc/include/*.[ch] tmp_dir/boehm_gc/include
--cp boehm_gc/include/private/*.[ch] tmp_dir/boehm_gc/include/private
--mkdir tmp_dir/runtime
--mkdir tmp_dir/runtime/machdeps
--cp runtime/Mmake* tmp_dir/runtime
--cp runtime/.mgnuc* tmp_dir/runtime
--cp runtime/*.in tmp_dir/runtime
--cp runtime/*.[ch] tmp_dir/runtime
--cp runtime/*.il tmp_dir/runtime
--cp runtime/machdeps/*.h tmp_dir/runtime/machdeps
--mkdir tmp_dir/trace
--cp trace/Mmake* tmp_dir/trace
--cp trace/.mgnuc* tmp_dir/trace
--cp trace/*.[ch] tmp_dir/trace
--mkdir tmp_dir/library
--cp library/Mmake* tmp_dir/library
--cp library/Mercury.* tmp_dir/library
--cp library/.mgnuc* tmp_dir/library
--cp library/*FLAGS* tmp_dir/library
--cp library/print_extra_inits tmp_dir/library
--cp library/library_strong_name.sn tmp_dir/library
--cp library/*.m tmp_dir/library
--mkdir tmp_dir/mdbcomp
--cp mdbcomp/Mmake* tmp_dir/mdbcomp
--cp mdbcomp/Mercury.* tmp_dir/mdbcomp
--cp mdbcomp/.mgnuc* tmp_dir/mdbcomp
--cp mdbcomp/*FLAGS* tmp_dir/mdbcomp
--cp mdbcomp/*.m tmp_dir/mdbcomp
--mkdir tmp_dir/browser
--cp browser/Mmake* tmp_dir/browser
--cp browser/Mercury.* tmp_dir/browser
--cp browser/.mgnuc* tmp_dir/browser
--cp browser/*FLAGS* tmp_dir/browser
--cp browser/*.m tmp_dir/browser
-+libgrade_dir=libgrades/$1
-+
-+rm -fr $libgrade_dir/boehm_gc
-+rm -fr $libgrade_dir/runtime
-+rm -fr $libgrade_dir/trace
-+rm -fr $libgrade_dir/library
-+rm -fr $libgrade_dir/mdbcomp
-+rm -fr $libgrade_dir/browser
-+mkdir $libgrade_dir/boehm_gc
-+mkdir $libgrade_dir/boehm_gc/Mac_files
-+mkdir $libgrade_dir/boehm_gc/cord
-+mkdir $libgrade_dir/boehm_gc/include
-+mkdir $libgrade_dir/boehm_gc/include/private
-+cp boehm_gc/Makefile* $libgrade_dir/boehm_gc
-+cp boehm_gc/Mmake* $libgrade_dir/boehm_gc
-+cp boehm_gc/ac* $libgrade_dir/boehm_gc
-+cp boehm_gc/*.[chsS] $libgrade_dir/boehm_gc
-+cp boehm_gc/Mac_files/*.[ch] $libgrade_dir/boehm_gc/Mac_files
-+cp boehm_gc/cord/*.[ch] $libgrade_dir/boehm_gc/cord
-+cp boehm_gc/include/*.[ch] $libgrade_dir/boehm_gc/include
-+cp boehm_gc/include/private/*.[ch] $libgrade_dir/boehm_gc/include/private
-+mkdir $libgrade_dir/runtime
-+mkdir $libgrade_dir/runtime/machdeps
-+cp runtime/Mmake* $libgrade_dir/runtime
-+cp runtime/.mgnuc* $libgrade_dir/runtime
-+cp runtime/*.in $libgrade_dir/runtime
-+cp runtime/*.[ch] $libgrade_dir/runtime
-+cp runtime/*.il $libgrade_dir/runtime
-+cp runtime/machdeps/*.h $libgrade_dir/runtime/machdeps
-+mkdir $libgrade_dir/trace
-+cp trace/Mmake* $libgrade_dir/trace
-+cp trace/.mgnuc* $libgrade_dir/trace
-+cp trace/*.[ch] $libgrade_dir/trace
-+mkdir $libgrade_dir/library
-+cp library/Mmake* $libgrade_dir/library
-+cp library/Mercury.* $libgrade_dir/library
-+cp library/.mgnuc* $libgrade_dir/library
-+cp library/*FLAGS* $libgrade_dir/library
-+cp library/print_extra_inits $libgrade_dir/library
-+cp library/library_strong_name.sn $libgrade_dir/library
-+cp library/*.m $libgrade_dir/library
-+mkdir $libgrade_dir/mdbcomp
-+cp mdbcomp/Mmake* $libgrade_dir/mdbcomp
-+cp mdbcomp/Mercury.* $libgrade_dir/mdbcomp
-+cp mdbcomp/.mgnuc* $libgrade_dir/mdbcomp
-+cp mdbcomp/*FLAGS* $libgrade_dir/mdbcomp
-+cp mdbcomp/*.m $libgrade_dir/mdbcomp
-+mkdir $libgrade_dir/browser
-+cp browser/Mmake* $libgrade_dir/browser
-+cp browser/Mercury.* $libgrade_dir/browser
-+cp browser/.mgnuc* $libgrade_dir/browser
-+cp browser/*FLAGS* $libgrade_dir/browser
-+cp browser/*.m $libgrade_dir/browser
- exit 0
---- mercury-compiler-0.13.1.orig/trace/Mmakefile       2006-11-15 03:09:20.000000000 +1300
-+++ mercury-compiler-0.13.1/trace/Mmakefile    2006-12-04 21:19:06.000000000 +1300
-@@ -204,6 +204,9 @@
-       @if test ! -f tags; then echo making tags; \
-       ctags $(CFILES) $(HDRS) $(RUNTIME_DIR)/*.c $(RUNTIME_DIR)/*.h ; fi
- 
-+.PHONY: libgrade
-+libgrade: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-+
- #-----------------------------------------------------------------------------#
- 
- # installation rules

diff --git a/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch b/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch
deleted file mode 100644 (file)
index f763fcb..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-mmake-params.patch
+++ /dev/null
@@ -1,4 +0,0 @@
---- mercury-compiler-0.13.1.orig/Mmake.params  2006-12-01 15:35:18.000000000 +0000
-+++ mercury-compiler-0.13.1/Mmake.params       2008-08-20 04:15:41.000000000 +0000
-@@ -0,0 +1 @@
-+GRADE=none.gc

diff --git a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch b/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
deleted file mode 100644 (file)
index cb25ceb..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-multilib.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- mercury-compiler-0.13.1.orig/Mmake.common.in       2006-08-07 16:47:53.000000000 +1200
-+++ mercury-compiler-0.13.1/Mmake.common.in    2007-01-13 12:50:48.000000000 +1300
-@@ -118,8 +118,8 @@
- # Set the installation prefix. This is done here as well as
- # in scripts/Mmake.vars to avoid accidentally overwriting an
- # existing installation when using an installed mmake.
--INSTALL_PREFIX                = @prefix@
--FINAL_INSTALL_PREFIX  = @prefix@
-+INSTALL_PREFIX                =
-+FINAL_INSTALL_PREFIX  =
- 
- INSTALLABLE_PREFIX    = @INSTALLABLE_PREFIX@
- 
---- mercury-compiler-0.13.1.orig/configure     2007-01-07 16:27:24.000000000 +1300
-+++ mercury-compiler-0.13.1/configure  2007-01-13 07:47:11.000000000 +1300
-@@ -1609,7 +1609,7 @@
- 
- 
- PREFIX="`$CYGPATH $PREFIX`"
--LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
-+LIBDIR="`$CYGPATH $libdir/mercury-$PACKAGE_VERSION`"
- NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
- 
- 
---- mercury-compiler-0.13.1.orig/scripts/Mmake.vars.in 2006-11-03 18:42:28.000000000 +1300
-+++ mercury-compiler-0.13.1/scripts/Mmake.vars.in      2007-01-13 12:54:16.000000000 +1300
-@@ -714,21 +714,21 @@
- # script (e.g. in the shell scripts mmc, ml, mmake, etc) that will not
- # be updated simply by overriding INSTALL_PREFIX.
- 
--INSTALL_PREFIX                = @prefix@
--FINAL_INSTALL_PREFIX  = @prefix@
--INSTALL_BINDIR                = $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR                = $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR  = $(FINAL_INSTALL_PREFIX)/lib/mercury
--INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
--INSTALL_INFO_DIR      = $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR               = $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR      = $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR                = $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR               = $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_MAN_DIR               = $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR      = $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR   = $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR     = $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_PREFIX                =
-+FINAL_INSTALL_PREFIX  =
-+INSTALL_BINDIR                = $(INSTALL_PREFIX)/@prefix@/bin
-+INSTALL_LIBDIR                = $(INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
-+FINAL_INSTALL_LIBDIR  = $(FINAL_INSTALL_PREFIX)/@libdir@/mercury-@PACKAGE_VERSION@
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/lib/java
-+INSTALL_INFO_DIR      = $(INSTALL_PREFIX)/@prefix@/info
-+INSTALL_DVI_DIR               = $(INSTALL_LIBDIR)/doc
-+INSTALL_TEXT_DIR      = $(INSTALL_LIBDIR)/doc
-+INSTALL_PS_DIR                = $(INSTALL_LIBDIR)/doc
-+INSTALL_PDF_DIR               = $(INSTALL_LIBDIR)/doc
-+INSTALL_MAN_DIR               = $(INSTALL_PREFIX)/@prefix@/man
-+INSTALL_HTML_DIR      = $(INSTALL_LIBDIR)/html
-+INSTALL_MDB_DOC_DIR   = $(INSTALL_LIBDIR)/mdb
-+INSTALL_ELISP_DIR     = $(INSTALL_LIBDIR)/elisp
- INSTALL_CGI_DIR               = @CGIDIR@
- 
- # You should not need to override anything below here
-@@ -741,7 +741,7 @@
- INSTALL_INC_DIR               = $(INSTALL_LIBDIR)/inc
- INSTALL_MMAKE_DIR     = $(INSTALL_LIBDIR)/mmake
- FULLARCH              = @FULLARCH@
--INSTALL_MERC_BIN_DIR  = $(INSTALL_PREFIX)/bin
-+INSTALL_MERC_BIN_DIR  = $(INSTALL_PREFIX)/@prefix@/bin
- INSTALL_MERC_GRADELESS_LIB_DIR = $(INSTALL_LIBDIR)/lib
- FINAL_INSTALL_MERC_GRADELESS_LIB_DIR = $(FINAL_INSTALL_LIBDIR)/lib
- INSTALL_MERC_LIB_DIR  = $(INSTALL_LIBDIR)/lib/$(GRADESTRING)

diff --git a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch b/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch
deleted file mode 100644 (file)
index 5db2cab..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-no-reconf.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur mercury-compiler-0.13.1.orig/runtime/Mmakefile mercury-compiler-0.13.1/runtime/Mmakefile
---- mercury-compiler-0.13.1.orig/runtime/Mmakefile     2006-11-15 03:09:20.000000000 +1300
-+++ mercury-compiler-0.13.1/runtime/Mmakefile  2008-11-30 18:05:17.000000000 +1300
-@@ -434,8 +434,6 @@
-       -[ -d $(INSTALL_MODULE_DIR) ] || mkdir -p $(INSTALL_MODULE_DIR)
-       -[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
-       -[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--      -[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--              mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifeq ($(findstring java,$(GRADE)),java)
- 
-@@ -481,7 +479,6 @@
-       rm -f $(INSTALL_INC_DIR)/mercury_conf.h
-       cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
-       -chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--      cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
-       cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
-diff -ur mercury-compiler-0.13.1.orig/scripts/Mmakefile mercury-compiler-0.13.1/scripts/Mmakefile
---- mercury-compiler-0.13.1.orig/scripts/Mmakefile     2006-04-04 19:41:49.000000000 +1200
-+++ mercury-compiler-0.13.1/scripts/Mmakefile  2008-11-30 18:05:32.000000000 +1300
-@@ -15,7 +15,6 @@
- #-----------------------------------------------------------------------------#
- 
- NONCONF_SCRIPTS = \
--      mercury_cleanup_install \
-       mprof_merge_runs \
-       mtags \
-       mtc \
-@@ -26,16 +25,12 @@
-       canonical_grade \
-       mdb \
-       mdprof \
--      mercury.bat \
--      mercury_config \
-       mercury_update_interface \
-       mgnuc \
--      mkfifo_using_mknod \
-       ml \
-       mmake \
-       mmc \
--      mprof \
--      prepare_tmp_dir_fixed_part
-+      mprof
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -103,8 +98,6 @@
-       [ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
-       [ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
-       [ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--      [ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--              mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -122,7 +115,6 @@
-       -for file in $(SCRIPTS); do \
-               chmod u+w $(INSTALL_BINDIR)/$$file ;\
-       done
--      cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
-       -rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config

diff --git a/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch b/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch
deleted file mode 100644 (file)
index 4b4e525..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-rebuild-mslice.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-0.13.1.orig/configure     2006-12-01 22:37:01.000000000 +1300
-+++ mercury-compiler-0.13.1/configure  2008-09-23 18:09:53.000000000 +1200
-@@ -9000,7 +9000,7 @@
-       compiler and library will be rebuilt with new grade
-       installation may take a long time" 1>&6
-               find library compiler browser mdbcomp analysis \
--                      profiler deep_profiler \
-+                      profiler deep_profiler slice \
-                       -name \*.c -o -name \*.c_date | \
-                       xargs rm > /dev/null 2>&1
-       fi

diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch
deleted file mode 100644 (file)
index ce4cebd..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-dir_test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp mercury-tests-0.13.1/hard_coded/dir_test.exp
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp  2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp       2007-01-07 15:51:35.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".\r
- "foo/"/"bar/baz" = "foo\bar\baz".\r
- checking whether `unwritable' is readable...ok\r
--unwritable file found to be unwritable\r
- make_directory succeeded\r
- make_directory succeeded\r
- dir.make_single_directory with non-existent parent failed as expected.\r
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2 mercury-tests-0.13.1/hard_coded/dir_test.exp2
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp2 2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp2      2007-01-07 15:51:35.000000000 +1300
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3 mercury-tests-0.13.1/hard_coded/dir_test.exp3
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.exp3 2003-07-29 03:50:45.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.exp3      2007-01-07 15:51:35.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- make_directory succeeded
- make_directory succeeded
- dir.make_single_directory with non-existent parent failed as expected.
-diff -urN mercury-tests-0.13.1.orig/hard_coded/dir_test.m mercury-tests-0.13.1/hard_coded/dir_test.m
---- mercury-tests-0.13.1.orig/hard_coded/dir_test.m    2006-03-29 20:08:00.000000000 +1200
-+++ mercury-tests-0.13.1/hard_coded/dir_test.m 2007-01-07 15:51:35.000000000 +1300
-@@ -50,16 +50,6 @@
-       io__write(ReadResult),
-       io__nl,
- 
--      io__check_file_accessibility("unwritable",
--              [read, write], WriteResult),
--      ( { WriteResult = ok } ->
--              io__write_string(
--              "Error: unwritable file found to be writable\n")
--      ;
--              io__write_string(
--              "unwritable file found to be unwritable\n")
--      ),
--
-       { Dir1 = "test_dir"/"d1" },
-       test0("make_directory", dir__make_directory(Dir1)),
-       % Test making a directory that already exists.

diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch
deleted file mode 100644 (file)
index e3e1c59..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-ho_and_type_spec_bug.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/valid/Mmakefile mercury-tests-0.13.1/valid/Mmakefile
---- mercury-tests-0.13.1.orig/valid/Mmakefile  2006-11-08 14:36:30.000000000 +1300
-+++ mercury-tests-0.13.1/valid/Mmakefile       2007-01-07 15:51:35.000000000 +1300
-@@ -400,3 +400,5 @@
-       rm -f *.err *.h
- 
- #-----------------------------------------------------------------------------#
-+
-+MCFLAGS-ho_and_type_spec_bug+=--no-optimize-higher-order

diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch
deleted file mode 100644 (file)
index 5c9a088..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-string_format.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -urN mercury-tests-0.13.1.orig/general/string_format/string_format_o.exp2 mercury-tests-0.13.1/general/string_format/string_format_o.exp2
---- mercury-tests-0.13.1.orig/general/string_format/string_format_o.exp2       2002-11-23 03:09:31.000000000 +1300
-+++ mercury-tests-0.13.1/general/string_format/string_format_o.exp2    2007-01-07 15:52:06.000000000 +1300
-@@ -308,7 +308,7 @@
-      %#-5o:'012  '
-      %#-5o:'0144 '
-      %#-5o:'0777777777777777777777'
--     %#.0o:''
-+     %#.0o:'0'
-      %#.0o:'01'
-      %#.0o:'012'
-      %#.0o:'0144'
-@@ -703,7 +703,7 @@
-     % 5.5o:'00012'
-     % 5.5o:'00144'
-     % 5.5o:'777777777777777777777'
--    %# .0o:''
-+    %# .0o:'0'
-     %# .0o:'01'
-     %# .0o:'012'
-     %# .0o:'0144'
-@@ -743,7 +743,7 @@
-     %#+ 5o:'  012'
-     %#+ 5o:' 0144'
-     %#+ 5o:'0777777777777777777777'
--    %#+.0o:''
-+    %#+.0o:'0'
-     %#+.0o:'01'
-     %#+.0o:'012'
-     %#+.0o:'0144'
-@@ -808,7 +808,7 @@
-     %#-+5o:'012  '
-     %#-+5o:'0144 '
-     %#-+5o:'0777777777777777777777'
--    %#-.0o:''
-+    %#-.0o:'0'
-     %#-.0o:'01'
-     %#-.0o:'012'
-     %#-.0o:'0144'
-@@ -828,7 +828,7 @@
-     %#-.5o:'00012'
-     %#-.5o:'00144'
-     %#-.5o:'0777777777777777777777'
--    %#0.0o:''
-+    %#0.0o:'0'
-     %#0.0o:'01'
-     %#0.0o:'012'
-     %#0.0o:'0144'
-@@ -848,7 +848,7 @@
-     %#0.5o:'00012'
-     %#0.5o:'00144'
-     %#0.5o:'0777777777777777777777'
--    %#1.0o:' '
-+    %#1.0o:'0'
-     %#1.0o:'01'
-     %#1.0o:'012'
-     %#1.0o:'0144'
-@@ -868,7 +868,7 @@
-     %#1.5o:'00012'
-     %#1.5o:'00144'
-     %#1.5o:'0777777777777777777777'
--    %#2.0o:'  '
-+    %#2.0o:' 0'
-     %#2.0o:'01'
-     %#2.0o:'012'
-     %#2.0o:'0144'
-@@ -888,7 +888,7 @@
-     %#2.5o:'00012'
-     %#2.5o:'00144'
-     %#2.5o:'0777777777777777777777'
--    %#5.0o:'     '
-+    %#5.0o:'    0'
-     %#5.0o:'   01'
-     %#5.0o:'  012'
-     %#5.0o:' 0144'
-@@ -1243,7 +1243,7 @@
-     %0#-5o:'012  '
-     %0#-5o:'0144 '
-     %0#-5o:'0777777777777777777777'
--    %0#.0o:''
-+    %0#.0o:'0'
-     %0#.0o:'01'
-     %0#.0o:'012'
-     %0#.0o:'0144'
-@@ -1448,7 +1448,7 @@
-     %05.5o:'00012'
-     %05.5o:'00144'
-     %05.5o:'777777777777777777777'
--   %# 0.0o:''
-+   %# 0.0o:'0'
-    %# 0.0o:'01'
-    %# 0.0o:'012'
-    %# 0.0o:'0144'
-@@ -1468,7 +1468,7 @@
-    %# 0.5o:'00012'
-    %# 0.5o:'00144'
-    %# 0.5o:'0777777777777777777777'
--   %# 1.0o:' '
-+   %# 1.0o:'0'
-    %# 1.0o:'01'
-    %# 1.0o:'012'
-    %# 1.0o:'0144'
-@@ -1488,7 +1488,7 @@
-    %# 1.5o:'00012'
-    %# 1.5o:'00144'
-    %# 1.5o:'0777777777777777777777'
--   %# 2.0o:'  '
-+   %# 2.0o:' 0'
-    %# 2.0o:'01'
-    %# 2.0o:'012'
-    %# 2.0o:'0144'
-@@ -1508,7 +1508,7 @@
-    %# 2.5o:'00012'
-    %# 2.5o:'00144'
-    %# 2.5o:'0777777777777777777777'
--   %# 5.0o:'     '
-+   %# 5.0o:'    0'
-    %# 5.0o:'   01'
-    %# 5.0o:'  012'
-    %# 5.0o:' 0144'
-@@ -1528,7 +1528,7 @@
-    %# 5.5o:'00012'
-    %# 5.5o:'00144'
-    %# 5.5o:'0777777777777777777777'
--   %#+ .0o:''
-+   %#+ .0o:'0'
-    %#+ .0o:'01'
-    %#+ .0o:'012'
-    %#+ .0o:'0144'
-@@ -1548,7 +1548,7 @@
-    %#+ .5o:'00012'
-    %#+ .5o:'00144'
-    %#+ .5o:'0777777777777777777777'
--   %#+0.0o:''
-+   %#+0.0o:'0'
-    %#+0.0o:'01'
-    %#+0.0o:'012'
-    %#+0.0o:'0144'
-@@ -1568,7 +1568,7 @@
-    %#+0.5o:'00012'
-    %#+0.5o:'00144'
-    %#+0.5o:'0777777777777777777777'
--   %#+1.0o:' '
-+   %#+1.0o:'0'
-    %#+1.0o:'01'
-    %#+1.0o:'012'
-    %#+1.0o:'0144'
-@@ -1588,7 +1588,7 @@
-    %#+1.5o:'00012'
-    %#+1.5o:'00144'
-    %#+1.5o:'0777777777777777777777'
--   %#+2.0o:'  '
-+   %#+2.0o:' 0'
-    %#+2.0o:'01'
-    %#+2.0o:'012'
-    %#+2.0o:'0144'
-@@ -1608,7 +1608,7 @@
-    %#+2.5o:'00012'
-    %#+2.5o:'00144'
-    %#+2.5o:'0777777777777777777777'
--   %#+5.0o:'     '
-+   %#+5.0o:'    0'
-    %#+5.0o:'   01'
-    %#+5.0o:'  012'
-    %#+5.0o:' 0144'
-@@ -1628,7 +1628,7 @@
-    %#+5.5o:'00012'
-    %#+5.5o:'00144'
-    %#+5.5o:'0777777777777777777777'
--   %#- .0o:''
-+   %#- .0o:'0'
-    %#- .0o:'01'
-    %#- .0o:'012'
-    %#- .0o:'0144'
-@@ -1668,7 +1668,7 @@
-    %#-+ 5o:'012  '
-    %#-+ 5o:'0144 '
-    %#-+ 5o:'0777777777777777777777'
--   %#-+.0o:''
-+   %#-+.0o:'0'
-    %#-+.0o:'01'
-    %#-+.0o:'012'
-    %#-+.0o:'0144'
-@@ -1688,7 +1688,7 @@
-    %#-+.5o:'00012'
-    %#-+.5o:'00144'
-    %#-+.5o:'0777777777777777777777'
--   %#-0.0o:''
-+   %#-0.0o:'0'
-    %#-0.0o:'01'
-    %#-0.0o:'012'
-    %#-0.0o:'0144'
-@@ -1708,7 +1708,7 @@
-    %#-0.5o:'00012'
-    %#-0.5o:'00144'
-    %#-0.5o:'0777777777777777777777'
--   %#-1.0o:' '
-+   %#-1.0o:'0'
-    %#-1.0o:'01'
-    %#-1.0o:'012'
-    %#-1.0o:'0144'
-@@ -1728,7 +1728,7 @@
-    %#-1.5o:'00012'
-    %#-1.5o:'00144'
-    %#-1.5o:'0777777777777777777777'
--   %#-2.0o:'  '
-+   %#-2.0o:'0 '
-    %#-2.0o:'01'
-    %#-2.0o:'012'
-    %#-2.0o:'0144'
-@@ -1748,7 +1748,7 @@
-    %#-2.5o:'00012'
-    %#-2.5o:'00144'
-    %#-2.5o:'0777777777777777777777'
--   %#-5.0o:'     '
-+   %#-5.0o:'0    '
-    %#-5.0o:'01   '
-    %#-5.0o:'012  '
-    %#-5.0o:'0144 '
-@@ -2108,7 +2108,7 @@
-    %0 5.5o:'00012'
-    %0 5.5o:'00144'
-    %0 5.5o:'777777777777777777777'
--   %0# .0o:''
-+   %0# .0o:'0'
-    %0# .0o:'01'
-    %0# .0o:'012'
-    %0# .0o:'0144'
-@@ -2148,7 +2148,7 @@
-    %0#+ 5o:'00012'
-    %0#+ 5o:'00144'
-    %0#+ 5o:'0777777777777777777777'
--   %0#+.0o:''
-+   %0#+.0o:'0'
-    %0#+.0o:'01'
-    %0#+.0o:'012'
-    %0#+.0o:'0144'
-@@ -2213,7 +2213,7 @@
-    %0#-+5o:'012  '
-    %0#-+5o:'0144 '
-    %0#-+5o:'0777777777777777777777'
--   %0#-.0o:''
-+   %0#-.0o:'0'
-    %0#-.0o:'01'
-    %0#-.0o:'012'
-    %0#-.0o:'0144'
-@@ -2233,7 +2233,7 @@
-    %0#-.5o:'00012'
-    %0#-.5o:'00144'
-    %0#-.5o:'0777777777777777777777'
--   %0#0.0o:''
-+   %0#0.0o:'0'
-    %0#0.0o:'01'
-    %0#0.0o:'012'
-    %0#0.0o:'0144'
-@@ -2253,7 +2253,7 @@
-    %0#0.5o:'00012'
-    %0#0.5o:'00144'
-    %0#0.5o:'0777777777777777777777'
--   %0#1.0o:' '
-+   %0#1.0o:'0'
-    %0#1.0o:'01'
-    %0#1.0o:'012'
-    %0#1.0o:'0144'
-@@ -2273,7 +2273,7 @@
-    %0#1.5o:'00012'
-    %0#1.5o:'00144'
-    %0#1.5o:'0777777777777777777777'
--   %0#2.0o:'  '
-+   %0#2.0o:' 0'
-    %0#2.0o:'01'
-    %0#2.0o:'012'
-    %0#2.0o:'0144'
-@@ -2293,7 +2293,7 @@
-    %0#2.5o:'00012'
-    %0#2.5o:'00144'
-    %0#2.5o:'0777777777777777777777'
--   %0#5.0o:'     '
-+   %0#5.0o:'    0'
-    %0#5.0o:'   01'
-    %0#5.0o:'  012'
-    %0#5.0o:' 0144'
-@@ -2553,7 +2553,7 @@
-    %0-5.5o:'00012'
-    %0-5.5o:'00144'
-    %0-5.5o:'777777777777777777777'
--  %#+ 0.0o:''
-+  %#+ 0.0o:'0'
-   %#+ 0.0o:'01'
-   %#+ 0.0o:'012'
-   %#+ 0.0o:'0144'
-@@ -2573,7 +2573,7 @@
-   %#+ 0.5o:'00012'
-   %#+ 0.5o:'00144'
-   %#+ 0.5o:'0777777777777777777777'
--  %#+ 1.0o:' '
-+  %#+ 1.0o:'0'
-   %#+ 1.0o:'01'
-   %#+ 1.0o:'012'
-   %#+ 1.0o:'0144'
-@@ -2593,7 +2593,7 @@
-   %#+ 1.5o:'00012'
-   %#+ 1.5o:'00144'
-   %#+ 1.5o:'0777777777777777777777'
--  %#+ 2.0o:'  '
-+  %#+ 2.0o:' 0'
-   %#+ 2.0o:'01'
-   %#+ 2.0o:'012'
-   %#+ 2.0o:'0144'
-@@ -2613,7 +2613,7 @@
-   %#+ 2.5o:'00012'
-   %#+ 2.5o:'00144'
-   %#+ 2.5o:'0777777777777777777777'
--  %#+ 5.0o:'     '
-+  %#+ 5.0o:'    0'
-   %#+ 5.0o:'   01'
-   %#+ 5.0o:'  012'
-   %#+ 5.0o:' 0144'
-@@ -2633,7 +2633,7 @@
-   %#+ 5.5o:'00012'
-   %#+ 5.5o:'00144'
-   %#+ 5.5o:'0777777777777777777777'
--  %#- 0.0o:''
-+  %#- 0.0o:'0'
-   %#- 0.0o:'01'
-   %#- 0.0o:'012'
-   %#- 0.0o:'0144'
-@@ -2653,7 +2653,7 @@
-   %#- 0.5o:'00012'
-   %#- 0.5o:'00144'
-   %#- 0.5o:'0777777777777777777777'
--  %#- 1.0o:' '
-+  %#- 1.0o:'0'
-   %#- 1.0o:'01'
-   %#- 1.0o:'012'
-   %#- 1.0o:'0144'
-@@ -2673,7 +2673,7 @@
-   %#- 1.5o:'00012'
-   %#- 1.5o:'00144'
-   %#- 1.5o:'0777777777777777777777'
--  %#- 2.0o:'  '
-+  %#- 2.0o:'0 '
-   %#- 2.0o:'01'
-   %#- 2.0o:'012'
-   %#- 2.0o:'0144'
-@@ -2693,7 +2693,7 @@
-   %#- 2.5o:'00012'
-   %#- 2.5o:'00144'
-   %#- 2.5o:'0777777777777777777777'
--  %#- 5.0o:'     '
-+  %#- 5.0o:'0    '
-   %#- 5.0o:'01   '
-   %#- 5.0o:'012  '
-   %#- 5.0o:'0144 '
-@@ -2713,7 +2713,7 @@
-   %#- 5.5o:'00012'
-   %#- 5.5o:'00144'
-   %#- 5.5o:'0777777777777777777777'
--  %#-+ .0o:''
-+  %#-+ .0o:'0'
-   %#-+ .0o:'01'
-   %#-+ .0o:'012'
-   %#-+ .0o:'0144'
-@@ -2733,7 +2733,7 @@
-   %#-+ .5o:'00012'
-   %#-+ .5o:'00144'
-   %#-+ .5o:'0777777777777777777777'
--  %#-+0.0o:''
-+  %#-+0.0o:'0'
-   %#-+0.0o:'01'
-   %#-+0.0o:'012'
-   %#-+0.0o:'0144'
-@@ -2753,7 +2753,7 @@
-   %#-+0.5o:'00012'
-   %#-+0.5o:'00144'
-   %#-+0.5o:'0777777777777777777777'
--  %#-+1.0o:' '
-+  %#-+1.0o:'0'
-   %#-+1.0o:'01'
-   %#-+1.0o:'012'
-   %#-+1.0o:'0144'
-@@ -2773,7 +2773,7 @@
-   %#-+1.5o:'00012'
-   %#-+1.5o:'00144'
-   %#-+1.5o:'0777777777777777777777'
--  %#-+2.0o:'  '
-+  %#-+2.0o:'0 '
-   %#-+2.0o:'01'
-   %#-+2.0o:'012'
-   %#-+2.0o:'0144'
-@@ -2793,7 +2793,7 @@
-   %#-+2.5o:'00012'
-   %#-+2.5o:'00144'
-   %#-+2.5o:'0777777777777777777777'
--  %#-+5.0o:'     '
-+  %#-+5.0o:'0    '
-   %#-+5.0o:'01   '
-   %#-+5.0o:'012  '
-   %#-+5.0o:'0144 '
-@@ -2893,7 +2893,7 @@
-   %-+ 5.5o:'00012'
-   %-+ 5.5o:'00144'
-   %-+ 5.5o:'777777777777777777777'
--  %0# 0.0o:''
-+  %0# 0.0o:'0'
-   %0# 0.0o:'01'
-   %0# 0.0o:'012'
-   %0# 0.0o:'0144'
-@@ -2913,7 +2913,7 @@
-   %0# 0.5o:'00012'
-   %0# 0.5o:'00144'
-   %0# 0.5o:'0777777777777777777777'
--  %0# 1.0o:' '
-+  %0# 1.0o:'0'
-   %0# 1.0o:'01'
-   %0# 1.0o:'012'
-   %0# 1.0o:'0144'
-@@ -2933,7 +2933,7 @@
-   %0# 1.5o:'00012'
-   %0# 1.5o:'00144'
-   %0# 1.5o:'0777777777777777777777'
--  %0# 2.0o:'  '
-+  %0# 2.0o:' 0'
-   %0# 2.0o:'01'
-   %0# 2.0o:'012'
-   %0# 2.0o:'0144'
-@@ -2953,7 +2953,7 @@
-   %0# 2.5o:'00012'
-   %0# 2.5o:'00144'
-   %0# 2.5o:'0777777777777777777777'
--  %0# 5.0o:'     '
-+  %0# 5.0o:'    0'
-   %0# 5.0o:'   01'
-   %0# 5.0o:'  012'
-   %0# 5.0o:' 0144'
-@@ -2973,7 +2973,7 @@
-   %0# 5.5o:'00012'
-   %0# 5.5o:'00144'
-   %0# 5.5o:'0777777777777777777777'
--  %0#+ .0o:''
-+  %0#+ .0o:'0'
-   %0#+ .0o:'01'
-   %0#+ .0o:'012'
-   %0#+ .0o:'0144'
-@@ -2993,7 +2993,7 @@
-   %0#+ .5o:'00012'
-   %0#+ .5o:'00144'
-   %0#+ .5o:'0777777777777777777777'
--  %0#+0.0o:''
-+  %0#+0.0o:'0'
-   %0#+0.0o:'01'
-   %0#+0.0o:'012'
-   %0#+0.0o:'0144'
-@@ -3013,7 +3013,7 @@
-   %0#+0.5o:'00012'
-   %0#+0.5o:'00144'
-   %0#+0.5o:'0777777777777777777777'
--  %0#+1.0o:' '
-+  %0#+1.0o:'0'
-   %0#+1.0o:'01'
-   %0#+1.0o:'012'
-   %0#+1.0o:'0144'
-@@ -3033,7 +3033,7 @@
-   %0#+1.5o:'00012'
-   %0#+1.5o:'00144'
-   %0#+1.5o:'0777777777777777777777'
--  %0#+2.0o:'  '
-+  %0#+2.0o:' 0'
-   %0#+2.0o:'01'
-   %0#+2.0o:'012'
-   %0#+2.0o:'0144'
-@@ -3053,7 +3053,7 @@
-   %0#+2.5o:'00012'
-   %0#+2.5o:'00144'
-   %0#+2.5o:'0777777777777777777777'
--  %0#+5.0o:'     '
-+  %0#+5.0o:'    0'
-   %0#+5.0o:'   01'
-   %0#+5.0o:'  012'
-   %0#+5.0o:' 0144'
-@@ -3073,7 +3073,7 @@
-   %0#+5.5o:'00012'
-   %0#+5.5o:'00144'
-   %0#+5.5o:'0777777777777777777777'
--  %0#- .0o:''
-+  %0#- .0o:'0'
-   %0#- .0o:'01'
-   %0#- .0o:'012'
-   %0#- .0o:'0144'
-@@ -3113,7 +3113,7 @@
-   %0#-+ 5o:'012  '
-   %0#-+ 5o:'0144 '
-   %0#-+ 5o:'0777777777777777777777'
--  %0#-+.0o:''
-+  %0#-+.0o:'0'
-   %0#-+.0o:'01'
-   %0#-+.0o:'012'
-   %0#-+.0o:'0144'
-@@ -3133,7 +3133,7 @@
-   %0#-+.5o:'00012'
-   %0#-+.5o:'00144'
-   %0#-+.5o:'0777777777777777777777'
--  %0#-0.0o:''
-+  %0#-0.0o:'0'
-   %0#-0.0o:'01'
-   %0#-0.0o:'012'
-   %0#-0.0o:'0144'
-@@ -3153,7 +3153,7 @@
-   %0#-0.5o:'00012'
-   %0#-0.5o:'00144'
-   %0#-0.5o:'0777777777777777777777'
--  %0#-1.0o:' '
-+  %0#-1.0o:'0'
-   %0#-1.0o:'01'
-   %0#-1.0o:'012'
-   %0#-1.0o:'0144'
-@@ -3173,7 +3173,7 @@
-   %0#-1.5o:'00012'
-   %0#-1.5o:'00144'
-   %0#-1.5o:'0777777777777777777777'
--  %0#-2.0o:'  '
-+  %0#-2.0o:'0 '
-   %0#-2.0o:'01'
-   %0#-2.0o:'012'
-   %0#-2.0o:'0144'
-@@ -3193,7 +3193,7 @@
-   %0#-2.5o:'00012'
-   %0#-2.5o:'00144'
-   %0#-2.5o:'0777777777777777777777'
--  %0#-5.0o:'     '
-+  %0#-5.0o:'0    '
-   %0#-5.0o:'01   '
-   %0#-5.0o:'012  '
-   %0#-5.0o:'0144 '
-@@ -3473,7 +3473,7 @@
-   %0-+5.5o:'00012'
-   %0-+5.5o:'00144'
-   %0-+5.5o:'777777777777777777777'
-- %#-+ 0.0o:''
-+ %#-+ 0.0o:'0'
-  %#-+ 0.0o:'01'
-  %#-+ 0.0o:'012'
-  %#-+ 0.0o:'0144'
-@@ -3493,7 +3493,7 @@
-  %#-+ 0.5o:'00012'
-  %#-+ 0.5o:'00144'
-  %#-+ 0.5o:'0777777777777777777777'
-- %#-+ 1.0o:' '
-+ %#-+ 1.0o:'0'
-  %#-+ 1.0o:'01'
-  %#-+ 1.0o:'012'
-  %#-+ 1.0o:'0144'
-@@ -3513,7 +3513,7 @@
-  %#-+ 1.5o:'00012'
-  %#-+ 1.5o:'00144'
-  %#-+ 1.5o:'0777777777777777777777'
-- %#-+ 2.0o:'  '
-+ %#-+ 2.0o:'0 '
-  %#-+ 2.0o:'01'
-  %#-+ 2.0o:'012'
-  %#-+ 2.0o:'0144'
-@@ -3533,7 +3533,7 @@
-  %#-+ 2.5o:'00012'
-  %#-+ 2.5o:'00144'
-  %#-+ 2.5o:'0777777777777777777777'
-- %#-+ 5.0o:'     '
-+ %#-+ 5.0o:'0    '
-  %#-+ 5.0o:'01   '
-  %#-+ 5.0o:'012  '
-  %#-+ 5.0o:'0144 '
-@@ -3553,7 +3553,7 @@
-  %#-+ 5.5o:'00012'
-  %#-+ 5.5o:'00144'
-  %#-+ 5.5o:'0777777777777777777777'
-- %0#+ 0.0o:''
-+ %0#+ 0.0o:'0'
-  %0#+ 0.0o:'01'
-  %0#+ 0.0o:'012'
-  %0#+ 0.0o:'0144'
-@@ -3573,7 +3573,7 @@
-  %0#+ 0.5o:'00012'
-  %0#+ 0.5o:'00144'
-  %0#+ 0.5o:'0777777777777777777777'
-- %0#+ 1.0o:' '
-+ %0#+ 1.0o:'0'
-  %0#+ 1.0o:'01'
-  %0#+ 1.0o:'012'
-  %0#+ 1.0o:'0144'
-@@ -3593,7 +3593,7 @@
-  %0#+ 1.5o:'00012'
-  %0#+ 1.5o:'00144'
-  %0#+ 1.5o:'0777777777777777777777'
-- %0#+ 2.0o:'  '
-+ %0#+ 2.0o:' 0'
-  %0#+ 2.0o:'01'
-  %0#+ 2.0o:'012'
-  %0#+ 2.0o:'0144'
-@@ -3613,7 +3613,7 @@
-  %0#+ 2.5o:'00012'
-  %0#+ 2.5o:'00144'
-  %0#+ 2.5o:'0777777777777777777777'
-- %0#+ 5.0o:'     '
-+ %0#+ 5.0o:'    0'
-  %0#+ 5.0o:'   01'
-  %0#+ 5.0o:'  012'
-  %0#+ 5.0o:' 0144'
-@@ -3633,7 +3633,7 @@
-  %0#+ 5.5o:'00012'
-  %0#+ 5.5o:'00144'
-  %0#+ 5.5o:'0777777777777777777777'
-- %0#- 0.0o:''
-+ %0#- 0.0o:'0'
-  %0#- 0.0o:'01'
-  %0#- 0.0o:'012'
-  %0#- 0.0o:'0144'
-@@ -3653,7 +3653,7 @@
-  %0#- 0.5o:'00012'
-  %0#- 0.5o:'00144'
-  %0#- 0.5o:'0777777777777777777777'
-- %0#- 1.0o:' '
-+ %0#- 1.0o:'0'
-  %0#- 1.0o:'01'
-  %0#- 1.0o:'012'
-  %0#- 1.0o:'0144'
-@@ -3673,7 +3673,7 @@
-  %0#- 1.5o:'00012'
-  %0#- 1.5o:'00144'
-  %0#- 1.5o:'0777777777777777777777'
-- %0#- 2.0o:'  '
-+ %0#- 2.0o:'0 '
-  %0#- 2.0o:'01'
-  %0#- 2.0o:'012'
-  %0#- 2.0o:'0144'
-@@ -3693,7 +3693,7 @@
-  %0#- 2.5o:'00012'
-  %0#- 2.5o:'00144'
-  %0#- 2.5o:'0777777777777777777777'
-- %0#- 5.0o:'     '
-+ %0#- 5.0o:'0    '
-  %0#- 5.0o:'01   '
-  %0#- 5.0o:'012  '
-  %0#- 5.0o:'0144 '
-@@ -3713,7 +3713,7 @@
-  %0#- 5.5o:'00012'
-  %0#- 5.5o:'00144'
-  %0#- 5.5o:'0777777777777777777777'
-- %0#-+ .0o:''
-+ %0#-+ .0o:'0'
-  %0#-+ .0o:'01'
-  %0#-+ .0o:'012'
-  %0#-+ .0o:'0144'
-@@ -3733,7 +3733,7 @@
-  %0#-+ .5o:'00012'
-  %0#-+ .5o:'00144'
-  %0#-+ .5o:'0777777777777777777777'
-- %0#-+0.0o:''
-+ %0#-+0.0o:'0'
-  %0#-+0.0o:'01'
-  %0#-+0.0o:'012'
-  %0#-+0.0o:'0144'
-@@ -3753,7 +3753,7 @@
-  %0#-+0.5o:'00012'
-  %0#-+0.5o:'00144'
-  %0#-+0.5o:'0777777777777777777777'
-- %0#-+1.0o:' '
-+ %0#-+1.0o:'0'
-  %0#-+1.0o:'01'
-  %0#-+1.0o:'012'
-  %0#-+1.0o:'0144'
-@@ -3773,7 +3773,7 @@
-  %0#-+1.5o:'00012'
-  %0#-+1.5o:'00144'
-  %0#-+1.5o:'0777777777777777777777'
-- %0#-+2.0o:'  '
-+ %0#-+2.0o:'0 '
-  %0#-+2.0o:'01'
-  %0#-+2.0o:'012'
-  %0#-+2.0o:'0144'
-@@ -3793,7 +3793,7 @@
-  %0#-+2.5o:'00012'
-  %0#-+2.5o:'00144'
-  %0#-+2.5o:'0777777777777777777777'
-- %0#-+5.0o:'     '
-+ %0#-+5.0o:'0    '
-  %0#-+5.0o:'01   '
-  %0#-+5.0o:'012  '
-  %0#-+5.0o:'0144 '
-@@ -3893,7 +3893,7 @@
-  %0-+ 5.5o:'00012'
-  %0-+ 5.5o:'00144'
-  %0-+ 5.5o:'777777777777777777777'
--%0#-+ 0.0o:''
-+%0#-+ 0.0o:'0'
- %0#-+ 0.0o:'01'
- %0#-+ 0.0o:'012'
- %0#-+ 0.0o:'0144'
-@@ -3913,7 +3913,7 @@
- %0#-+ 0.5o:'00012'
- %0#-+ 0.5o:'00144'
- %0#-+ 0.5o:'0777777777777777777777'
--%0#-+ 1.0o:' '
-+%0#-+ 1.0o:'0'
- %0#-+ 1.0o:'01'
- %0#-+ 1.0o:'012'
- %0#-+ 1.0o:'0144'
-@@ -3933,7 +3933,7 @@
- %0#-+ 1.5o:'00012'
- %0#-+ 1.5o:'00144'
- %0#-+ 1.5o:'0777777777777777777777'
--%0#-+ 2.0o:'  '
-+%0#-+ 2.0o:'0 '
- %0#-+ 2.0o:'01'
- %0#-+ 2.0o:'012'
- %0#-+ 2.0o:'0144'
-@@ -3953,7 +3953,7 @@
- %0#-+ 2.5o:'00012'
- %0#-+ 2.5o:'00144'
- %0#-+ 2.5o:'0777777777777777777777'
--%0#-+ 5.0o:'     '
-+%0#-+ 5.0o:'0    '
- %0#-+ 5.0o:'01   '
- %0#-+ 5.0o:'012  '
- %0#-+ 5.0o:'0144 '

diff --git a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch b/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
deleted file mode 100644 (file)
index a77ae47..0000000
--- a/dev-lang/mercury/files/mercury-0.13.1-tests-workspace.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mercury-tests-0.13.1.orig/Mmake.common     2006-01-25 20:03:44.000000000 +1300
-+++ mercury-tests-0.13.1/Mmake.common  2007-01-16 22:04:32.000000000 +1300
-@@ -73,8 +73,8 @@
- -include $(TESTS_DIR)/Mmake.params
- 
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
--ifdef WORKSPACE_FLAGS
--MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+ifdef WORKSPACE
-+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
- endif
- 
- # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-0.13.1.orig/configure     2006-12-01 09:37:01.000000000 +0000
-+++ mercury-compiler-0.13.1/configure  2008-08-21 03:17:23.000000000 +0000
-@@ -12301,9 +12301,9 @@
- then
-       test_flags="tests/TESTS_FLAGS"
- else
--      if test -e ../tests/TESTS_FLAGS.in
-+      if test -e ../mercury-tests-0.13.1/TESTS_FLAGS.in
-       then
--              test_flags="../tests/TESTS_FLAGS"
-+              test_flags="../mercury-tests-0.13.1/TESTS_FLAGS"
-       else
-               test_flags=""
-       fi

diff --git a/dev-lang/mercury/mercury-0.13.1-r2.ebuild b/dev-lang/mercury/mercury-0.13.1-r2.ebuild
deleted file mode 100644 (file)
index b989ea6..0000000
--- a/dev-lang/mercury/mercury-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,120 +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/mercury-0.13.1-r2.ebuild,v 1.11 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-compiler-0.13.1.tar.gz
-       test? ( ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/mercury-tests-0.13.1.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-src_unpack() {
-       unpack ${A}
-
-       epatch "${FILESDIR}"/${P}-mmake-params.patch
-       epatch "${FILESDIR}"/${P}-multilib.patch
-       epatch "${FILESDIR}"/${P}-libgrades.patch
-       epatch "${FILESDIR}"/${P}-docs.patch
-       epatch "${FILESDIR}"/${P}-no-reconf.patch
-       epatch "${FILESDIR}"/${P}-rebuild-mslice.patch
-
-       if use test; then
-               epatch "${FILESDIR}"/${P}-tests-dir_test.patch
-               epatch "${FILESDIR}"/${P}-tests-ho_and_type_spec_bug.patch
-               epatch "${FILESDIR}"/${P}-tests-string_format.patch
-               epatch "${FILESDIR}"/${P}-tests-workspace.patch
-       fi
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --enable-aditi-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               --disable-java-grades \
-               --with-llds-base-grade=none \
-               --with-default-grade=hlc.gc \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline) \
-               PACKAGE_VERSION=${PV}"
-
-       econf \
-               ${myconf} \
-               || die "econf failed"
-       emake \
-               EXTRA_MLFLAGS=--no-strip \
-               || die "emake failed"
-
-       emake \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               libgrades || die "emake libgrades failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/libgrades/${TEST_GRADE} ] ; then
-               TWS="${S}"/libgrades/${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_DEBUGGER_INIT="${TESTDIR}"/mdbrc \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               INSTALL_PREFIX="${D}" \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               install || die "make install failed"
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-}

diff --git a/dev-lang/mercury/mercury-10.04-r1.ebuild b/dev-lang/mercury/mercury-10.04-r1.ebuild
deleted file mode 100644 (file)
index 4e40cac..0000000
--- a/dev-lang/mercury/mercury-10.04-r1.ebuild
+++ /dev/null
@@ -1,158 +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/mercury-10.04-r1.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-       unpack ${A}
-
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/make.program_target.c \
-               "${S}"/scripts/Mmake.vars.in
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-aditi-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf \
-               ${myconf} \
-               || die "econf failed"
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               || die "emake failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-
-       if use erlang; then
-               dodoc README.Erlang
-       fi
-
-       if use java; then
-               dodoc README.Java
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild
deleted file mode 100644 (file)
index c73b707..0000000
--- a/dev-lang/mercury/mercury-10.04.1.ebuild
+++ /dev/null
@@ -1,178 +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/mercury-10.04.1.ebuild,v 1.6 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-       unpack ${A}
-
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/file_util.m \
-               "${S}"/compiler/libs.file_util.c \
-               "${S}"/compiler/make.program_target.m \
-               "${S}"/compiler/make.program_target.c \
-               "${S}"/scripts/Mmake.vars.in
-
-       touch "${S}"/compiler/*.date
-       touch "${S}"/compiler/*.date0
-       touch "${S}"/compiler/*.date3
-       touch "${S}"/compiler/*.int
-       touch "${S}"/compiler/*.int0
-       touch "${S}"/compiler/*.int2
-       touch "${S}"/compiler/*.int3
-       touch "${S}"/compiler/*.c_date
-       touch "${S}"/compiler/*.c
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-
-       cd "${S}"
-       eautoreconf
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf \
-               ${myconf} \
-               || die "econf failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               bootstrap_depend || die "emake depend failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               || die "emake failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-
-       if use erlang; then
-               dodoc README.Erlang
-       fi
-
-       if use java; then
-               dodoc README.Java
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-10.04.2-r1.ebuild b/dev-lang/mercury/mercury-10.04.2-r1.ebuild
deleted file mode 100644 (file)
index f039c6b..0000000
--- a/dev-lang/mercury/mercury-10.04.2-r1.ebuild
+++ /dev/null
@@ -1,213 +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/mercury-10.04.2-r1.ebuild,v 1.12 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="3"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-       unpack ${A}
-
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/scripts/Mmake.vars.in \
-               || die "sed libdir failed"
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-
-       cd "${S}"
-       eautoconf
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf ${myconf}
-
-       # Generate Mercury .m dependencies. This step will vacuously
-       # succeed if we do not have a bootstrappable instance of mmc
-       # already installed. This step is required as mmc does not wait
-       # for all dependencies to be generated before compiling .m files.
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               bootstrap_depend || die "emake depend failed"
-
-       # Build Mercury using base llds grade
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               || die "emake failed"
-
-       # We can now patch .m Mercury compiler files since we
-       # have just built mercury_compiler.
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}-mmc
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/file_util.m \
-               "${S}"/compiler/make.program_target.m \
-               || die "sed libdir failed"
-
-       # Rebuild Mercury compiler using the just built mercury_compiler
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               compiler || die "emake compiler failed"
-
-       # The default Mercury grade may not be the same as the grade used to
-       # compile the llds base grade. Since src_test() is run before
-       # src_install() we compile the default grade now
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-               || die "sed WORKSPACE failed"
-
-       # Mercury tests must be run in C locale since Mercury output is
-       # compared to hard-coded warnings/errors
-       LC_ALL="C" \
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-       if use erlang; then
-               dodoc README.Erlang || die
-       fi
-
-       if use java; then
-               dodoc README.Java || die
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}/samples
-               doins samples/{*.m,README,Mmakefile} || die
-               doins -r samples/c_interface \
-                       samples/diff \
-                       samples/muz \
-                       samples/rot13 \
-                       samples/solutions \
-                       samples/solver_types || die
-
-               if use java; then
-                       doins -r samples/java_interface || die
-               fi
-
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-10.04.2.ebuild b/dev-lang/mercury/mercury-10.04.2.ebuild
deleted file mode 100644 (file)
index aa3bfa2..0000000
--- a/dev-lang/mercury/mercury-10.04.2.ebuild
+++ /dev/null
@@ -1,178 +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/mercury-10.04.2.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-       unpack ${A}
-
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/file_util.m \
-               "${S}"/compiler/libs.file_util.c \
-               "${S}"/compiler/make.program_target.m \
-               "${S}"/compiler/make.program_target.c \
-               "${S}"/scripts/Mmake.vars.in
-
-       touch "${S}"/compiler/*.date
-       touch "${S}"/compiler/*.date0
-       touch "${S}"/compiler/*.date3
-       touch "${S}"/compiler/*.int
-       touch "${S}"/compiler/*.int0
-       touch "${S}"/compiler/*.int2
-       touch "${S}"/compiler/*.int3
-       touch "${S}"/compiler/*.c_date
-       touch "${S}"/compiler/*.c
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-
-       cd "${S}"
-       eautoreconf
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf \
-               ${myconf} \
-               || die "econf failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               bootstrap_depend || die "emake depend failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               || die "emake failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-
-       if use erlang; then
-               dodoc README.Erlang
-       fi
-
-       if use java; then
-               dodoc README.Java
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-10.04.ebuild b/dev-lang/mercury/mercury-10.04.ebuild
deleted file mode 100644 (file)
index a7f37ed..0000000
--- a/dev-lang/mercury/mercury-10.04.ebuild
+++ /dev/null
@@ -1,152 +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/mercury-10.04.ebuild,v 1.9 2011/08/12 21:38:37 xarthisius Exp $
-
-inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_P=${PN}-compiler-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.cs.mu.oz.au/download/files/mercury-tests-${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-       unpack ${A}
-
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/make.program_target.c \
-               "${S}"/scripts/Mmake.vars.in
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-}
-
-src_compile() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-aditi-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf \
-               ${myconf} \
-               || die "econf failed"
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               || die "emake failed"
-
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-
-       if use erlang; then
-               dodoc README.Erlang
-       fi
-
-       if use java; then
-               dodoc README.Java
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}

diff --git a/dev-lang/mercury/mercury-11.01_beta1.ebuild b/dev-lang/mercury/mercury-11.01_beta1.ebuild
deleted file mode 100644 (file)
index b8f1f1b..0000000
--- a/dev-lang/mercury/mercury-11.01_beta1.ebuild
+++ /dev/null
@@ -1,217 +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/mercury-11.01_beta1.ebuild,v 1.4 2011/08/12 21:38:37 xarthisius Exp $
-
-EAPI=2
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-MY_PV=${PV/%?/-2010-12-22}
-MY_P=${PN}-compiler-${MY_PV/_/-}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.01-beta/${MY_P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
-       test? ( http://www.mercury.csse.unimelb.edu.au/download/files/beta-releases/11.01-beta/mercury-tests-${MY_PV/_/-}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug emacs erlang examples java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-       !dev-util/mono-debugger
-       readline? ( sys-libs/readline )
-       erlang? ( dev-lang/erlang )
-       java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-       emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV/_/-}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-       cd "${WORKDIR}"
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/scripts/Mmake.vars.in \
-               || die "sed libdir failed"
-
-       if use test; then
-               epatch "${WORKDIR}"/${PV}-tests
-       fi
-
-       cd "${S}"
-       eautoconf
-}
-
-src_configure() {
-       strip-flags
-
-       local myconf
-       myconf="--libdir=/usr/$(get_libdir) \
-               --disable-gcc-back-end \
-               --disable-deep-profiler \
-               --disable-dotnet-grades \
-               $(use_enable erlang erlang-grade) \
-               $(use_enable java java-grade) \
-               $(use_enable debug debug-grades) \
-               $(use_enable threads par-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline)"
-
-       econf ${myconf}
-}
-
-src_compile() {
-       # Generate Mercury .m dependencies. This step will vacuously
-       # succeed if we do not have a bootstrappable instance of mmc
-       # already installed. This step is required as mmc does not wait
-       # for all dependencies to be generated before compiling .m files.
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               bootstrap_depend || die "emake depend failed"
-
-       # Build Mercury using base llds grade
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               || die "emake failed"
-
-       # We can now patch .m Mercury compiler files since we
-       # have just built mercury_compiler.
-       EPATCH_FORCE=yes
-       EPATCH_SUFFIX=patch
-       epatch "${WORKDIR}"/${PV}-mmc
-
-       sed -i -e "s/@libdir@/$(get_libdir)/" \
-               "${S}"/compiler/file_util.m \
-               "${S}"/compiler/make.program_target.m \
-               || die "sed libdir failed"
-
-       # Rebuild Mercury compiler using the just built mercury_compiler
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               compiler || die "emake compiler failed"
-
-       # The default Mercury grade may not be the same as the grade used to
-       # compile the llds base grade. Since src_test() is run before
-       # src_install() we compile the default grade now
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_MLFLAGS=--no-strip \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               default_grade || die "emake default_grade failed"
-}
-
-src_test() {
-       TEST_GRADE=`scripts/ml --print-grade`
-       if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-               TWS="${S}"/install_grade_dir.${TEST_GRADE}
-               cp browser/mer_browser.init "${TWS}"/browser/
-               cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-               cp runtime/mer_rt.init "${TWS}"/runtime/
-               cp ssdb/mer_ssdb.init "${TWS}"/ssdb/
-       else
-               TWS="${S}"
-       fi
-
-       cd "${TESTDIR}"
-       sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
-               || die "sed WORKSPACE failed"
-
-       # Mercury tests must be run in C locale since Mercury output is
-       # compared to hard-coded warnings/errors
-       LC_ALL="C" \
-       PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-       TERM="" \
-       WORKSPACE="${TWS}" \
-       MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-       MERCURY_CONFIG_DIR="${TWS}" \
-       MMAKE_DIR="${TWS}"/scripts \
-       MERCURY_SUPPRESS_STACK_TRACE=yes \
-       GRADE=${TEST_GRADE} \
-       MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-                                       -I${TWS}/boehm_gc/include \
-                                       -I${TWS}/runtime \
-                                       -I${TWS}/library \
-                                       -I${TWS}/mdbcomp \
-                                       -I${TWS}/browser \
-                                       -I${TWS}/trace" \
-               mmake || die "mmake test failed"
-}
-
-src_install() {
-       emake \
-               PARALLEL=${MAKEOPTS} \
-               EXTRA_LDFLAGS="${LDFLAGS}" \
-               EXTRA_LD_LIBFLAGS="${LDFLAGS}" \
-               MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-               INSTALL_PREFIX="${D}"/usr \
-               INSTALL_MAN_DIR="${D}"/usr/share/man \
-               INSTALL_INFO_DIR="${D}"/usr/share/info \
-               INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-               INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-               install || die "make install failed"
-
-       if use emacs; then
-               elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-                       || die "elisp-site-file-install failed"
-       fi
-
-       dodoc \
-               BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-               README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-               RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
-       if use erlang; then
-               dodoc README.Erlang || die
-       fi
-
-       if use java; then
-               dodoc README.Java || die
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}/samples
-               doins samples/{*.m,README,Mmakefile} || die
-               doins -r samples/c_interface \
-                       samples/diff \
-                       samples/muz \
-                       samples/rot13 \
-                       samples/solutions \
-                       samples/solver_types || die
-
-               if use java; then
-                       doins -r samples/java_interface || die
-               fi
-
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
-       fi
-}
-
-pkg_postinst() {
-       use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}