Do not rebuild C files in a stage1 bootstrap without a Mercury compiler handy.

(Portage version: 2.1.2_rc4-r2)
 (Unsigned Manifest commit)

3 files changed, 20 insertions, 106 deletions

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 162c34cc30d5..9a25b85008ff 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -10,10 +10,10 @@ AUX mercury-0.12.2-MAKEOPTS.patch 602 RMD160 866e63a6e48b4844f8dbe19d167030f6e22
 MD5 4930c851f3d1719419e107f92aa99873 files/mercury-0.12.2-MAKEOPTS.patch 602
 RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 files/mercury-0.12.2-MAKEOPTS.patch 602
 SHA256 42850d29291fd6d77074706e21eaebce1de74a050c73f7e7eb1785e1c46e7398 files/mercury-0.12.2-MAKEOPTS.patch 602
-AUX mercury-0.12.2-bootstrap.patch 2276 RMD160 60275fe011c88e4dd98d91094b3f7f1407a34a65 SHA1 0743019a5ed83b43743bbe04dbfbdde881941ffb SHA256 2caccbf233da0eaec5eaf0c7a797f3d8b04169b956bfc40dc4248b3142bd2f67
-MD5 d6fa0d146d1fda99b9d5e35590c6f92b files/mercury-0.12.2-bootstrap.patch 2276
-RMD160 60275fe011c88e4dd98d91094b3f7f1407a34a65 files/mercury-0.12.2-bootstrap.patch 2276
-SHA256 2caccbf233da0eaec5eaf0c7a797f3d8b04169b956bfc40dc4248b3142bd2f67 files/mercury-0.12.2-bootstrap.patch 2276
+AUX mercury-0.12.2-bootstrap.patch 3444 RMD160 643c5592bb2ad083f639543ee283c008f787d613 SHA1 38f3c7484e289454ad3782c43ac8f95c94b65c46 SHA256 ba9fe33b46e58892ce51c440763905a14c8d021f73f9e3247e8004303cace376
+MD5 c8f96bcee751100df3b7f1591e37cd7c files/mercury-0.12.2-bootstrap.patch 3444
+RMD160 643c5592bb2ad083f639543ee283c008f787d613 files/mercury-0.12.2-bootstrap.patch 3444
+SHA256 ba9fe33b46e58892ce51c440763905a14c8d021f73f9e3247e8004303cace376 files/mercury-0.12.2-bootstrap.patch 3444
 AUX mercury-0.12.2-deep_profiler.patch 2807 RMD160 533f90a2b4366279d030be3b9983cec05f8c743c SHA1 c09682feeb9d9c426d69635bc71140552f54fed8 SHA256 479546aaaf966c4665e444af187f099b51fb3c78479753297d78336701ef301f
 MD5 d60a4fa180d8a28cc2ab280c0cb33614 files/mercury-0.12.2-deep_profiler.patch 2807
 RMD160 533f90a2b4366279d030be3b9983cec05f8c743c files/mercury-0.12.2-deep_profiler.patch 2807
@@ -70,10 +70,6 @@ AUX mercury-0.12.2-tests.patch 7502 RMD160 88e9a509c696bb32d7982708261685a602322
 MD5 cdfafee8cc55f364644e65a4fc841b1c files/mercury-0.12.2-tests.patch 7502
 RMD160 88e9a509c696bb32d7982708261685a602322070 files/mercury-0.12.2-tests.patch 7502
 SHA256 8895bb246d111c3c09b309f3332a42f6bc3b6ea1f96f56537c2ccd2f82ac362f files/mercury-0.12.2-tests.patch 7502
-AUX mercury-0.12.2-unboxed_floats.patch 1791 RMD160 8cf53995aa73213ede8ca19b823f689d34ccf8e1 SHA1 27cedde6180ba1b8150737e6178173b6a1712843 SHA256 7d9c4da5744c2bad2bd8689a8a70b88652708e028d3b6f9ed7dc499125d2a414
-MD5 6ec6bd1348330a25ee1c6c0183e0d35e files/mercury-0.12.2-unboxed_floats.patch 1791
-RMD160 8cf53995aa73213ede8ca19b823f689d34ccf8e1 files/mercury-0.12.2-unboxed_floats.patch 1791
-SHA256 7d9c4da5744c2bad2bd8689a8a70b88652708e028d3b6f9ed7dc499125d2a414 files/mercury-0.12.2-unboxed_floats.patch 1791
 AUX mercury-0.13.0-CFLAGS.patch 1323 RMD160 7de97579d81eaad521232981d32f0e9f2113a03f SHA1 0bb34affd44043dd6df58aadaa17e85204468fbc SHA256 7be5d4a8563fc17ea06fc064814d5963a61b2ff9978565270a1f67f06185e383
 MD5 cdcf65c651f63996b24a247f1566a684 files/mercury-0.13.0-CFLAGS.patch 1323
 RMD160 7de97579d81eaad521232981d32f0e9f2113a03f files/mercury-0.13.0-CFLAGS.patch 1323
@@ -130,10 +126,10 @@ AUX mercury-0.13.1-MAKEOPTS.patch 602 RMD160 505638677ca880c4384070adeb88ce72d59
 MD5 a3b273c80f9971fd2d335a6c457e62a0 files/mercury-0.13.1-MAKEOPTS.patch 602
 RMD160 505638677ca880c4384070adeb88ce72d5976aba files/mercury-0.13.1-MAKEOPTS.patch 602
 SHA256 1e1f52b6037d69bac0f51c58e0a6f667a8e276fcbdacb3f317738d05471262de files/mercury-0.13.1-MAKEOPTS.patch 602
-AUX mercury-0.13.1-bootstrap.patch 2277 RMD160 d82c7285c1c0c694527ecfd8ea8d4d328dbba4b0 SHA1 4229978bdec69b780d55160bf05e0c531d9ad524 SHA256 ad8e9e4b92a0d534b254e15b4f1d1ddc4e06398c29c63ad65471b8e2dbc5a634
-MD5 b61fbd37f1c0a9ea9320f3ffcf5e06d7 files/mercury-0.13.1-bootstrap.patch 2277
-RMD160 d82c7285c1c0c694527ecfd8ea8d4d328dbba4b0 files/mercury-0.13.1-bootstrap.patch 2277
-SHA256 ad8e9e4b92a0d534b254e15b4f1d1ddc4e06398c29c63ad65471b8e2dbc5a634 files/mercury-0.13.1-bootstrap.patch 2277
+AUX mercury-0.13.1-bootstrap.patch 5272 RMD160 4121e9562cccf4e4ddff35769caf96e23729b775 SHA1 937b7da139ab546c10edf7c10172305a3974e41d SHA256 0619ab7c993cb382798fe1b9489563f2618c6ca25d186483a4b5553043354c47
+MD5 f942031fc792664f1216b2af77abdfde files/mercury-0.13.1-bootstrap.patch 5272
+RMD160 4121e9562cccf4e4ddff35769caf96e23729b775 files/mercury-0.13.1-bootstrap.patch 5272
+SHA256 0619ab7c993cb382798fe1b9489563f2618c6ca25d186483a4b5553043354c47 files/mercury-0.13.1-bootstrap.patch 5272
 AUX mercury-0.13.1-deep_profiler.patch 2807 RMD160 f7b3c9efb95a81b5f076fa6385c21dd3b63aacdb SHA1 0a8a267ba6d1f1fb64e1993866136e3f443efdfb SHA256 2871b0d82e8442019611cf2ed9b563f85b1067a68967c54e06e2131e6cf08430
 MD5 6e97f243c0169bad8ca196660b31811e files/mercury-0.13.1-deep_profiler.patch 2807
 RMD160 f7b3c9efb95a81b5f076fa6385c21dd3b63aacdb files/mercury-0.13.1-deep_profiler.patch 2807
@@ -182,10 +178,6 @@ AUX mercury-0.13.1-tests.patch 15074 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed
 MD5 8f12e666c9f377c1af363f9af1d1a0c8 files/mercury-0.13.1-tests.patch 15074
 RMD160 26594fb4404d3620ea454ec24ed3e6bb34ed501a files/mercury-0.13.1-tests.patch 15074
 SHA256 64892634aad5abc0df4fb0be940b9956b8e85ce713818a75b9176b9e9feff647 files/mercury-0.13.1-tests.patch 15074
-AUX mercury-0.13.1-unboxed_floats.patch 1791 RMD160 d6a3629b5bbd13d41b9c364fe428ca21c9f7eeec SHA1 5a9a3fc0048d5aa68f842c0055c20e66b03c4353 SHA256 5c05c685da1f077a012d37eacda4160e0b877fa13235732efa014137172b6b37
-MD5 9c5abdaf7b52ea92e63d4e84dbda7df1 files/mercury-0.13.1-unboxed_floats.patch 1791
-RMD160 d6a3629b5bbd13d41b9c364fe428ca21c9f7eeec files/mercury-0.13.1-unboxed_floats.patch 1791
-SHA256 5c05c685da1f077a012d37eacda4160e0b877fa13235732efa014137172b6b37 files/mercury-0.13.1-unboxed_floats.patch 1791
 DIST mercury-compiler-0.12.2.tar.gz 15074997 RMD160 227a3e1796d96ad77324d9f1d39efd6be7fce80e SHA1 96b7a878370bb256da28c8ffa1c4b0a4bc3711d6 SHA256 7fa1df8030cdc3d4dc848d102ba64bf23c12004461c985290622b81753b89572
 DIST mercury-compiler-0.13.0.tar.gz 15861463 RMD160 4fa5f45d6c7496679bc1e957bb45541020244d5b SHA1 7a9362225e1b51d7d1b342c39203ad0ef1b9f952 SHA256 0edf3855dab94f4562d972a3a401dff2f722a2b20b1617b6c4ce9ba68e576342
 DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230bd1efe795c5f SHA1 919eb45ba34c503fc2e7391225e52a5cfbb80616 SHA256 b1f4984e00ad917824d3340dcf2a41bede39fe02ef2e516351467f4761985196
@@ -196,26 +188,26 @@ EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec7
 MD5 181fbbca5d6184eafcf27c498245e199 mercury-0.12.2-r3.ebuild 3450
 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 mercury-0.12.2-r3.ebuild 3450
 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac mercury-0.12.2-r3.ebuild 3450
-EBUILD mercury-0.12.2-r4.ebuild 3830 RMD160 8e286b7d1bc584ee38f3dfd6ce2c414cf5a8e0d2 SHA1 cb648e149d61f43adfdd7660aab5fe0d1c183e4f SHA256 f8b46cbc298270c582c7a77ca2d00f6acf37f57f04d59a127378d64eecc10d23
-MD5 a4e8ef2d1c41edb8e5ebe5ea5f965b8a mercury-0.12.2-r4.ebuild 3830
-RMD160 8e286b7d1bc584ee38f3dfd6ce2c414cf5a8e0d2 mercury-0.12.2-r4.ebuild 3830
-SHA256 f8b46cbc298270c582c7a77ca2d00f6acf37f57f04d59a127378d64eecc10d23 mercury-0.12.2-r4.ebuild 3830
+EBUILD mercury-0.12.2-r4.ebuild 3782 RMD160 c7110d7c11cadf06fc1fc28a114c5aab1fa9bee7 SHA1 0693e3efee695a38efca00af126072ca55162dbf SHA256 d7132f989ee366a0b75a2a3afb9db9bc5286a3d5a7d026e3d98b9c24d7377a96
+MD5 d5341c2696a26b998ca3b902887a9c3d mercury-0.12.2-r4.ebuild 3782
+RMD160 c7110d7c11cadf06fc1fc28a114c5aab1fa9bee7 mercury-0.12.2-r4.ebuild 3782
+SHA256 d7132f989ee366a0b75a2a3afb9db9bc5286a3d5a7d026e3d98b9c24d7377a96 mercury-0.12.2-r4.ebuild 3782
 EBUILD mercury-0.13.0.ebuild 3399 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 SHA1 01af1c835211afcdaedc253f718f5602d162ae28 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a
 MD5 b1c1a96d2f9339b78e135b1a8a06d5a3 mercury-0.13.0.ebuild 3399
 RMD160 24b4653ef73193e0de4d95d85a0aa7f589510f47 mercury-0.13.0.ebuild 3399
 SHA256 edf43ee4d3ca5cc66da22b7eac76f153017f8c1f453bdc8459067d7ab8b64f5a mercury-0.13.0.ebuild 3399
-EBUILD mercury-0.13.1-r1.ebuild 3665 RMD160 e00c5b28dbdeba00cff9ae81042d2433838f049a SHA1 966ec264021f9726af980606b7f8ec8c3afeb051 SHA256 5646e6ff5175b855047420c95505369214af92070aebc72ca99c4cab0d43aa54
-MD5 1d4bf3faa0bde3f63db65ea69248b977 mercury-0.13.1-r1.ebuild 3665
-RMD160 e00c5b28dbdeba00cff9ae81042d2433838f049a mercury-0.13.1-r1.ebuild 3665
-SHA256 5646e6ff5175b855047420c95505369214af92070aebc72ca99c4cab0d43aa54 mercury-0.13.1-r1.ebuild 3665
+EBUILD mercury-0.13.1-r1.ebuild 3617 RMD160 8f38ea9b061da6ec180ba625f314c2c9e2c6066f SHA1 f2ea2539f37377281daba7881acb5b3dc188605a SHA256 8f9fbf3e9de76f7b0417601d5803480e683913d155b992db3e791aef65ddf012
+MD5 0ffcb2f8328983daa8a3d848d4757a1f mercury-0.13.1-r1.ebuild 3617
+RMD160 8f38ea9b061da6ec180ba625f314c2c9e2c6066f mercury-0.13.1-r1.ebuild 3617
+SHA256 8f9fbf3e9de76f7b0417601d5803480e683913d155b992db3e791aef65ddf012 mercury-0.13.1-r1.ebuild 3617
 EBUILD mercury-0.13.1.ebuild 3346 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab SHA1 d8a9456db6ba4bfa5ece3334ffcda96c2dc4e5c5 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f
 MD5 f34187bbf12011057168c2a7583fff5c mercury-0.13.1.ebuild 3346
 RMD160 dd731ac257203aca48294fa67b9bdee4c636e6ab mercury-0.13.1.ebuild 3346
 SHA256 a27a34005f45e378df82bbad8409c9c8c30d253362982f9ebdcd5db883f66a7f mercury-0.13.1.ebuild 3346
-MISC ChangeLog 13658 RMD160 5f3ef5e36b176999239aabee0b2d9b452cc03afe SHA1 17c8c575a68f8605692ff7db7998734052221ca7 SHA256 bec1af81493bfc16a292d1d5a13160a834702144aa32ddde4988b7adf47fcb47
-MD5 8d732b63d008eebf7932ce50d71a7990 ChangeLog 13658
-RMD160 5f3ef5e36b176999239aabee0b2d9b452cc03afe ChangeLog 13658
-SHA256 bec1af81493bfc16a292d1d5a13160a834702144aa32ddde4988b7adf47fcb47 ChangeLog 13658
+MISC ChangeLog 14002 RMD160 67a432c5d53cddd2122ce0f446480ff9a44115d3 SHA1 5c3ad71f338fc676003a9f99ab87f8618a31dc38 SHA256 db400f179d1234e9d6312bfe55e0cbbecc71dd392a52a173c0082a4c17b42468
+MD5 8e6a970265b889124d76b4de187bccc7 ChangeLog 14002
+RMD160 67a432c5d53cddd2122ce0f446480ff9a44115d3 ChangeLog 14002
+SHA256 db400f179d1234e9d6312bfe55e0cbbecc71dd392a52a173c0082a4c17b42468 ChangeLog 14002
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch b/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch
deleted file mode 100644
index b8e91b7d9d06..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-unboxed_floats.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2007-01-07 16:19:08.000000000 +1300
-@@ -7232,21 +7232,21 @@
- 
- echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
- echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
--if test "$mercury_cv_unboxed_floats" = yes; then
--	if test "$BOOTSTRAP_MC" = ""; then
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&2;}
--		mercury_cv_unboxed_floats=no
--	fi
--fi
-+#if test "$mercury_cv_unboxed_floats" = yes; then
-+#	if test "$BOOTSTRAP_MC" = ""; then
-+#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&5
-+#echo "$as_me: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&2;}
-+#		mercury_cv_unboxed_floats=no
-+#	fi
-+#fi
- if test "$mercury_cv_unboxed_floats" = yes; then
- 	HAVE_BOXED_FLOATS="--unboxed-float"
- else
diff --git a/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch b/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch
deleted file mode 100644
index 13a68c2df81d..000000000000
--- a/dev-lang/mercury/files/mercury-0.13.1-unboxed_floats.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mercury-compiler-0.13.1.orig/configure	2007-01-07 16:27:24.000000000 +1300
-+++ mercury-compiler-0.13.1/configure	2007-01-07 16:26:47.000000000 +1300
-@@ -7410,21 +7410,21 @@
- 
- echo "$as_me:$LINENO: result: $mercury_cv_unboxed_floats" >&5
- echo "${ECHO_T}$mercury_cv_unboxed_floats" >&6
--if test "$mercury_cv_unboxed_floats" = yes; then
--	if test "$BOOTSTRAP_MC" = ""; then
--		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&5
--echo "$as_me: WARNING: Mercury compiler not yet installed -
--****	cannot use unboxed floats, bootstrapping using boxed floats
--****	after installation is complete you may want to reinstall
--****	from scratch so you can use unboxed floats, which are more
--****	efficient." >&2;}
--		mercury_cv_unboxed_floats=no
--	fi
--fi
-+#if test "$mercury_cv_unboxed_floats" = yes; then
-+#	if test "$BOOTSTRAP_MC" = ""; then
-+#		{ echo "$as_me:$LINENO: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&5
-+#echo "$as_me: WARNING: Mercury compiler not yet installed -
-+#****	cannot use unboxed floats, bootstrapping using boxed floats
-+#****	after installation is complete you may want to reinstall
-+#****	from scratch so you can use unboxed floats, which are more
-+#****	efficient." >&2;}
-+#		mercury_cv_unboxed_floats=no
-+#	fi
-+#fi
- if test "$mercury_cv_unboxed_floats" = yes; then
- 	HAVE_BOXED_FLOATS="--unboxed-float"
- else