New development snapshot incorporating support for threaded libgrades and src_test.

Package-Manager: portage-2.1

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 984b2458b636995fae164b09aae9585b1160490d..b302fd67f7b5f38911b49205370529f78aa7ce56 100644 (file)
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -30,41 +30,42 @@ AUX mercury-0.13.0_beta-CFLAGS.patch 1387 RMD160 50beda679059cfa2f1c4c0868c34d7f
 MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
 SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387
-AUX mercury-0.13.0_beta-LIBDIR.patch 2532 RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 SHA1 194eb109e0ace3fde4e294cebdf1ac0530215902 SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f
-MD5 163d4559496e9293a1db517ad609a285 files/mercury-0.13.0_beta-LIBDIR.patch 2532
-RMD160 81f976dc646a1cc8f2917388ca788f6aa6965df5 files/mercury-0.13.0_beta-LIBDIR.patch 2532
-SHA256 2ee03ae0663265ffefc765431939a0debafc32f9ea5aa1e0ab3a83f5b896ae6f files/mercury-0.13.0_beta-LIBDIR.patch 2532
 AUX mercury-0.13.0_beta-docs.patch 828 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 SHA1 29556a9a7aa2d568c37f0a9df33f16c10bfee906 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7
 MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828
 RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828
 SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 files/mercury-0.13.0_beta-docs.patch 828
-AUX mercury-0.13.0_beta-portage.patch 1608 RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d SHA1 68eb6d55cfc6f79485cdf1c5b300234eddd176bd SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9
-MD5 7b1cd28fdc808a7c8cdfadb8722013ea files/mercury-0.13.0_beta-portage.patch 1608
-RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d files/mercury-0.13.0_beta-portage.patch 1608
-SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9 files/mercury-0.13.0_beta-portage.patch 1608
+AUX mercury-0.13.0_beta-portage.patch 4230 RMD160 b2dcb76ff38bba0fde0d230e3e969d79c2f5be0e SHA1 db86c892762b2f6320671cb583e855de0184256e SHA256 282ede9e587274aba82985509eb1f18799f3f28aa5064dffb8b61fd24aabdd5b
+MD5 2f52059ee2307e452ea7c8535375fabf files/mercury-0.13.0_beta-portage.patch 4230
+RMD160 b2dcb76ff38bba0fde0d230e3e969d79c2f5be0e files/mercury-0.13.0_beta-portage.patch 4230
+SHA256 282ede9e587274aba82985509eb1f18799f3f28aa5064dffb8b61fd24aabdd5b files/mercury-0.13.0_beta-portage.patch 4230
+AUX mercury-0.13.0_beta-tests.patch 3337 RMD160 de647925736743ba92a53406a08755bc730dc1ce SHA1 fa239fb6411688d467a11221893d537393fa67e6 SHA256 f8f18efe6c92d23859c11f6944fcbead3b72b7967c019705f7be2d8d9d616f99
+MD5 9a7bd847f572b23244f6ee930a6f7f35 files/mercury-0.13.0_beta-tests.patch 3337
+RMD160 de647925736743ba92a53406a08755bc730dc1ce files/mercury-0.13.0_beta-tests.patch 3337
+SHA256 f8f18efe6c92d23859c11f6944fcbead3b72b7967c019705f7be2d8d9d616f99 files/mercury-0.13.0_beta-tests.patch 3337
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
-DIST mercury-compiler-0.13.0-beta-2006-06-09-unstable.tar.gz 15849120 RMD160 3dfe2e2229e5a8c47a71d1af5e8f305039cd53b3 SHA1 18f99b74bc67749c689f680efb0563132cbaf938 SHA256 3ff27dff11dbf45f82824d3c3bff1f3bbde0b24f36b709c5e334360127dd7c54
+DIST mercury-compiler-0.13.0-beta-2006-06-15-unstable.tar.gz 15853119 RMD160 7fc153df37a7e5977d5dca9abc18763684b8ba12 SHA1 9415d41de330f6be5dc49749bd5537ee07fbb896 SHA256 8f207aade2587849daaf2ba0b96e5a06ac84c30d0b50c8c2999e76dbd941ed75
 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
+DIST mercury-tests-0.13.0-beta-2006-06-15-unstable.tar.gz 980888 RMD160 21321ee66fc006442d3a80005a24447e7bdfc40d SHA1 06c65e295e736d3bf1c68a11e210d21e433d9ff3 SHA256 00745f179f8dbb8880bdff85cb4493931d7844247422f892126002b901c0c864
 EBUILD mercury-0.12.2-r1.ebuild 2004 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 SHA1 394830e247c97b6893bff8da65346d041298193d SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb
 MD5 8ac12895463559881728628ff9ce81cf mercury-0.12.2-r1.ebuild 2004
 RMD160 df7e09f85f3748560f9282b667c76b87b05948d1 mercury-0.12.2-r1.ebuild 2004
 SHA256 9aae052739461b696b10863110da7eab47406c6a629ce36d8792f258af0d2eeb mercury-0.12.2-r1.ebuild 2004
-EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 c0a8df3f11609daf1ccd6eec823be45ab57ec24f SHA1 2d7d1947097f21b5c8cea192ca94c04a5ee1703f SHA256 e223fedf0c90ade15625e3317fe8d1ea2a85bbd0069c6934d4afba3423ba56a0
-MD5 ff2bc9b91a0ab86b918fad587ada52f8 mercury-0.12.2-r2.ebuild 2049
-RMD160 c0a8df3f11609daf1ccd6eec823be45ab57ec24f mercury-0.12.2-r2.ebuild 2049
-SHA256 e223fedf0c90ade15625e3317fe8d1ea2a85bbd0069c6934d4afba3423ba56a0 mercury-0.12.2-r2.ebuild 2049
+EBUILD mercury-0.12.2-r2.ebuild 2049 RMD160 286e8b51c81abc84709a5bb3c4719d6dde080c87 SHA1 3421b672bd84f6cadd2937667a06ce9000202bd8 SHA256 19b2346e8cb3d86ebcb600ebd180d4fa2ebd9b79e285add3b34dd32363d75d61
+MD5 f4478bfcf7e5b674cd7e94c73ec9fb74 mercury-0.12.2-r2.ebuild 2049
+RMD160 286e8b51c81abc84709a5bb3c4719d6dde080c87 mercury-0.12.2-r2.ebuild 2049
+SHA256 19b2346e8cb3d86ebcb600ebd180d4fa2ebd9b79e285add3b34dd32363d75d61 mercury-0.12.2-r2.ebuild 2049
 EBUILD mercury-0.12.2.ebuild 1423 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 SHA1 8e8a9063248f02f94c4417a6c3f57626c04bd30b SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8
 MD5 6f79d42347ca00bfe02253c965d88574 mercury-0.12.2.ebuild 1423
 RMD160 9e5613b7a510ad5ba00c7ff079dffc3b788fb755 mercury-0.12.2.ebuild 1423
 SHA256 89e50f4a3ca1267ba3b9715b42015c3be397a85068d7588c121473d3de2b78c8 mercury-0.12.2.ebuild 1423
-EBUILD mercury-0.13.0_beta20060609.ebuild 1845 RMD160 354f5bb90e5dda319de58063c5a3c5bec4b71d61 SHA1 41d65cc790d6e6049e380caa842aa5f2a5f3ff35 SHA256 58d18b4dbc89ab02c776b9f81b164e0d77c30c0fb695e8cfec0fd7c470a6238f
-MD5 5c1e60c4336b3b9feae61b32cfe6c65d mercury-0.13.0_beta20060609.ebuild 1845
-RMD160 354f5bb90e5dda319de58063c5a3c5bec4b71d61 mercury-0.13.0_beta20060609.ebuild 1845
-SHA256 58d18b4dbc89ab02c776b9f81b164e0d77c30c0fb695e8cfec0fd7c470a6238f mercury-0.13.0_beta20060609.ebuild 1845
-MISC ChangeLog 5273 RMD160 5aa5c26e327f7b05e596cc7781b8a515235e583e SHA1 8d0aa3f3425117826a16a36cb568d56f7d3f53b5 SHA256 e848cb64d9375792a295ad23a7b02db66cdfd9f325e44501cff7ef4c6bc8cb19
-MD5 9308558a0b22005c0ed354eef89deec7 ChangeLog 5273
-RMD160 5aa5c26e327f7b05e596cc7781b8a515235e583e ChangeLog 5273
-SHA256 e848cb64d9375792a295ad23a7b02db66cdfd9f325e44501cff7ef4c6bc8cb19 ChangeLog 5273
+EBUILD mercury-0.13.0_beta20060615.ebuild 2359 RMD160 4a9975cd4dcb54bbaa30f600a14644f2e97c2506 SHA1 eb37bea066ac5c279d37b7c9886fc13b9aa3530e SHA256 12183de64fd9180466255f424600a5f96449485e1971ac3aca8acb41d9d22518
+MD5 83c24853dd034ed3451ce54f764a49d0 mercury-0.13.0_beta20060615.ebuild 2359
+RMD160 4a9975cd4dcb54bbaa30f600a14644f2e97c2506 mercury-0.13.0_beta20060615.ebuild 2359
+SHA256 12183de64fd9180466255f424600a5f96449485e1971ac3aca8acb41d9d22518 mercury-0.13.0_beta20060615.ebuild 2359
+MISC ChangeLog 5681 RMD160 fbf296f9ea39e529dd40e804e2330d54766614dc SHA1 f5056decd60292afa0e2964a6ee4fe6438a83d34 SHA256 2084f5ea7072b0457de9a72eeb0386a4cd4fcbc20140bc6c95d14edd51d41aa3
+MD5 ca380b71a8ee78ead0e03267af586ec3 ChangeLog 5681
+RMD160 fbf296f9ea39e529dd40e804e2330d54766614dc ChangeLog 5681
+SHA256 2084f5ea7072b0457de9a72eeb0386a4cd4fcbc20140bc6c95d14edd51d41aa3 ChangeLog 5681
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -78,6 +79,6 @@ SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/di
 MD5 0d30492cc04519cf02a3453c452710c5 files/digest-mercury-0.12.2-r2 539
 RMD160 6be0bed956edd23408af2bcf449cd393419f64c0 files/digest-mercury-0.12.2-r2 539
 SHA256 76206eb085f179635a04f8ad1b2b53b1e4a2b4e1dccab1d25bac557e609f7df2 files/digest-mercury-0.12.2-r2 539
-MD5 457220c8f04fd9572c27674a4815623d files/digest-mercury-0.13.0_beta20060609 352
-RMD160 5eb045511b07f5b0592d3da95fa44a1c88e793a0 files/digest-mercury-0.13.0_beta20060609 352
-SHA256 de54e3fa9defbe8da86bc8ed33ef0d3cccae339ad7c7c66d324ebec7611296da files/digest-mercury-0.13.0_beta20060609 352
+MD5 cd72ff9ad070a7faac996df284d309ab files/digest-mercury-0.13.0_beta20060615 689
+RMD160 13087aa219bec01cf050cfb4cc90faa3f4756d9f files/digest-mercury-0.13.0_beta20060615 689
+SHA256 d73f635afb8003efb83d818584449693c032221760eaa4703fddcd7d28d2cf19 files/digest-mercury-0.13.0_beta20060615 689

diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060609 b/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060609
deleted file mode 100644 (file)
index 079a495..0000000
--- a/dev-lang/mercury/files/digest-mercury-0.13.0_beta20060609
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6420c871e1bee6e2caade8b715027d2d mercury-compiler-0.13.0-beta-2006-06-09-unstable.tar.gz 15849120
-RMD160 3dfe2e2229e5a8c47a71d1af5e8f305039cd53b3 mercury-compiler-0.13.0-beta-2006-06-09-unstable.tar.gz 15849120
-SHA256 3ff27dff11dbf45f82824d3c3bff1f3bbde0b24f36b709c5e334360127dd7c54 mercury-compiler-0.13.0-beta-2006-06-09-unstable.tar.gz 15849120

diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
deleted file mode 100644 (file)
index 05c06d9..0000000
--- a/dev-lang/mercury/files/mercury-0.13.0_beta-LIBDIR.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/configure     2006-06-01 22:35:57.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-01/configure  2006-06-09 19:14:47.000000000 +1200
-@@ -1609,7 +1609,7 @@
- 
- 
- PREFIX="`$CYGPATH $PREFIX`"
--LIBDIR="`$CYGPATH $PREFIX/lib/mercury`"
-+LIBDIR="`$CYGPATH $PREFIX/lib/mercury-$PACKAGE_VERSION`"
- NONSHARED_LIB_DIR=${MERCURY_NONSHARED_LIB_DIR=$PREFIX/lib/nonshared}
- 
- 
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/scripts/Mmake.vars.in 2006-05-23 18:46:54.000000000 +1200
-+++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/Mmake.vars.in      2006-06-09 19:14:47.000000000 +1200
-@@ -717,18 +717,18 @@
- 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_LIBDIR                = $(INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+FINAL_INSTALL_LIBDIR  = $(FINAL_INSTALL_PREFIX)/lib/mercury-@PACKAGE_VERSION@
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_LIBDIR)/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_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)/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_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
---- mercury-compiler-0.13.0-beta-2006-06-01.orig/scripts/mercury_config.in     2005-10-27 14:48:24.000000000 +1300
-+++ mercury-compiler-0.13.0-beta-2006-06-01/scripts/mercury_config.in  2006-06-09 19:14:47.000000000 +1200
-@@ -90,8 +90,8 @@
-       shift
- done
- 
--input_libdir="$input_prefix/lib/mercury"
--output_libdir="$output_prefix/lib/mercury"
-+input_libdir="$input_prefix/lib/mercury-@PACKAGE_VERSION@"
-+output_libdir="$output_prefix/lib/mercury-@PACKAGE_VERSION@"
- 
- # mercury_config regenerates itself, so we can't just execute it in place.
- case $recursive in

diff --git a/dev-lang/mercury/mercury-0.13.0_beta20060609.ebuild b/dev-lang/mercury/mercury-0.13.0_beta20060609.ebuild
deleted file mode 100644 (file)
index b94d089..0000000
--- a/dev-lang/mercury/mercury-0.13.0_beta20060609.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta20060609.ebuild,v 1.1 2006/06/12 07:47:04 keri Exp $
-
-inherit eutils versionator
-
-BETA_V=$(get_version_component_range 4 $PV)
-BETA_V_YYYY=${BETA_V:4:4}
-BETA_V_MM=${BETA_V:8:2}
-BETA_V_DD=${BETA_V:10:2}
-MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD}
-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="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/0.13.0-beta/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="debug minimal readline"
-
-DEPEND="readline? ( sys-libs/readline )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}"/${P/${BETA_V}/beta}-portage.patch
-       epatch "${FILESDIR}"/${P/${BETA_V}/beta}-CFLAGS.patch
-       epatch "${FILESDIR}"/${P/${BETA_V}/beta}-LIBDIR.patch
-       epatch "${FILESDIR}"/${P/${BETA_V}/beta}-docs.patch
-}
-
-src_compile() {
-       econf \
-               --disable-dotnet-grades \
-               $(use_enable debug debug-grades) \
-               $(use_enable !minimal most-grades) \
-               $(use_with readline) \
-               PACKAGE_VERSION=${PV} \
-               || die "econf failed"
-       emake || die "emake failed"
-}
-
-src_install() {
-       make \
-               MERCURY_COMPILER="${D}"/usr/bin/${PN}_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 || die "make install failed"
-
-       dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-}