Multilib support of libgrades.

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

2 files changed, 24 insertions, 75 deletions

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 2b394fe77ce9..bbd6e1d4bc8f 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -2,10 +2,6 @@ AUX mercury-0.12.2-CFLAGS.patch 1267 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5b
 MD5 f9d8db42316ea25a27a1bbc6806f60d7 files/mercury-0.12.2-CFLAGS.patch 1267
 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5bff1a files/mercury-0.12.2-CFLAGS.patch 1267
 SHA256 b27660a29a71b56071daa5e7fc6c62c697c53c55bf8b9068c1bc42002cdb00f1 files/mercury-0.12.2-CFLAGS.patch 1267
-AUX mercury-0.12.2-LIBDIR.patch 2436 RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2463f SHA1 b52da4e3e8b4e70e2a1633694fefc2f5e4af1c78 SHA256 e470e2a3a693a6d0294f6940a64fda3aa423322bf7620745474a76aeb1c83793
-MD5 cace61ef145e50a3d4ddeb284cc0bcd3 files/mercury-0.12.2-LIBDIR.patch 2436
-RMD160 05a57fe17f770a1dbfb862aea6669db1f7a2463f files/mercury-0.12.2-LIBDIR.patch 2436
-SHA256 e470e2a3a693a6d0294f6940a64fda3aa423322bf7620745474a76aeb1c83793 files/mercury-0.12.2-LIBDIR.patch 2436
 AUX mercury-0.12.2-MAKEOPTS.patch 602 RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 SHA1 56bcae5786f165e2367fad61e3d4247f5e089f38 SHA256 42850d29291fd6d77074706e21eaebce1de74a050c73f7e7eb1785e1c46e7398
 MD5 4930c851f3d1719419e107f92aa99873 files/mercury-0.12.2-MAKEOPTS.patch 602
 RMD160 866e63a6e48b4844f8dbe19d167030f6e22400e4 files/mercury-0.12.2-MAKEOPTS.patch 602
@@ -26,6 +22,10 @@ AUX mercury-0.12.2-libgrades.patch 13195 RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5b
 MD5 64362ae02fa273afc3abba66681420c8 files/mercury-0.12.2-libgrades.patch 13195
 RMD160 f31ba8ff5366b6b2bd0ff7bc26d3ae5ba5e54cae files/mercury-0.12.2-libgrades.patch 13195
 SHA256 ae6610ef3f61616601f03a8d6703595c2aaee7ca06fcbfaf15dbeb10cb358f6a files/mercury-0.12.2-libgrades.patch 13195
+AUX mercury-0.12.2-multilib.patch 2791 RMD160 f6456bae3951f02d212a84afbbe4e2f643d43e41 SHA1 bd7d58f7d8a72d8551a62ff9072411e1da4cad14 SHA256 9b6fcbcf9627bc64ca1c08d9f065d665344d24cb3152baf04ff00996b7530738
+MD5 5be175654c06cd1819819c3a8ad2dded files/mercury-0.12.2-multilib.patch 2791
+RMD160 f6456bae3951f02d212a84afbbe4e2f643d43e41 files/mercury-0.12.2-multilib.patch 2791
+SHA256 9b6fcbcf9627bc64ca1c08d9f065d665344d24cb3152baf04ff00996b7530738 files/mercury-0.12.2-multilib.patch 2791
 AUX mercury-0.12.2-parallel-install_grades.patch 633 RMD160 0a72929eae70dce478a02898049abb4c7d63ddab SHA1 b6780296ac385c24486625079f790a8dfe2bc37f SHA256 ecf22afde46cfc249ce9269453cb606d6fdee11cb074667e08423a165554fd3e
 MD5 b933cb0e2cd26859533c52bacbc4b7c1 files/mercury-0.12.2-parallel-install_grades.patch 633
 RMD160 0a72929eae70dce478a02898049abb4c7d63ddab files/mercury-0.12.2-parallel-install_grades.patch 633
@@ -142,6 +142,10 @@ AUX mercury-0.13.1-libgrades.patch 13854 RMD160 0f4dd4b97390962524944e3e57ce8d5b
 MD5 6422dc7c8f69ffe64823b94a5cd0ef35 files/mercury-0.13.1-libgrades.patch 13854
 RMD160 0f4dd4b97390962524944e3e57ce8d5b405967ed files/mercury-0.13.1-libgrades.patch 13854
 SHA256 207d9af7c741845c1b0fcc098413952f8b002f4f71803fb38e474c63118d578f files/mercury-0.13.1-libgrades.patch 13854
+AUX mercury-0.13.1-multilib.patch 2752 RMD160 a466b396ef3fa2d7d381547e4896e2a3e3d45b37 SHA1 8212e6a473b3364dee816d186bc5ad5c390d7f80 SHA256 56a732bacd1949af1cf46041df6258183e00cd3d06ea638e10bfc08b2187bccc
+MD5 7e728102a664e0246d24058916145c05 files/mercury-0.13.1-multilib.patch 2752
+RMD160 a466b396ef3fa2d7d381547e4896e2a3e3d45b37 files/mercury-0.13.1-multilib.patch 2752
+SHA256 56a732bacd1949af1cf46041df6258183e00cd3d06ea638e10bfc08b2187bccc files/mercury-0.13.1-multilib.patch 2752
 AUX mercury-0.13.1-parallel-install_grades.patch 633 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 SHA1 fc90c6aebb4501178836d67ccc67a5b997f5314a SHA256 5630e0d82d4d76603817852601a6c0aeffe1f56e73b57f3c562ba29e5e5eeb1f
 MD5 d56589afef9155f41bb3a432d8c55c9e files/mercury-0.13.1-parallel-install_grades.patch 633
 RMD160 5492e49f5ab7c8f16f52148a2678cc56c9398071 files/mercury-0.13.1-parallel-install_grades.patch 633
@@ -188,30 +192,30 @@ DIST mercury-compiler-0.13.1.tar.gz 15938824 RMD160 a0a80cd2ac7393cf084b79d40230
 DIST mercury-tests-0.12.2.tar.gz 897454 RMD160 e7cf515b0d56aff5432c5ec3e535faa907ce2955 SHA1 1f80ff38f141b975fe472c2aee48d44b8e187c08 SHA256 6d3fd92d11ce2a9ce99cfa35990027557d1c70f00a3417639523b6e27f746280
 DIST mercury-tests-0.13.0.tar.gz 984910 RMD160 1b90b941488b9da57ff27ab1506b902b5fa5e170 SHA1 df5fa6725bb37fdba8085a441687bf056111e4e7 SHA256 227561407d63d177e6bfdf08d58481a9dcf6228d225ca2b67643c1af16cedc08
 DIST mercury-tests-0.13.1.tar.gz 986644 RMD160 779609ba5c985e562b0962434c9281c07ddaa5cb SHA1 7f08467e6642daa4fce9136e12b4e5ca2ac41b9d SHA256 f6c8250b9996584d3c7cd6cc0609716027b127e54b2aedf5ebfcab98a44159dc
-EBUILD mercury-0.12.2-r3.ebuild 3450 RMD160 99593c2d1e4112caa5f880a3fa28931a7ec700d3 SHA1 01641c7d20d7900c7a9bac9b4141d5b6947988d5 SHA256 3ab81255629af07fd28f594e335ac868cab5cf0e1c5ec668048da405aa82b5ac
-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 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.12.2-r3.ebuild 3480 RMD160 76aa125496eea3c83dd164a46f251981c4abcd3d SHA1 69ad4061c397804cd87733c19d2b8287dee54508 SHA256 ab2021cbf4a9c321844c043e1209b12f78860633154ae1e30352d12a34d950c2
+MD5 a23fff3e33f967e55271be97e02cc9e8 mercury-0.12.2-r3.ebuild 3480
+RMD160 76aa125496eea3c83dd164a46f251981c4abcd3d mercury-0.12.2-r3.ebuild 3480
+SHA256 ab2021cbf4a9c321844c043e1209b12f78860633154ae1e30352d12a34d950c2 mercury-0.12.2-r3.ebuild 3480
+EBUILD mercury-0.12.2-r4.ebuild 3812 RMD160 e324a875a6af507727359ed6ab10b7a75f427b72 SHA1 a1b828dcaae57d7c55d96f4fadceabaebe789590 SHA256 1894ee8da875f74594f8c2ad6f1c970b4ee3593499c67555d00a40b6e9af7ce7
+MD5 aabaad45ab2a0e5a17de09ecf8cc5465 mercury-0.12.2-r4.ebuild 3812
+RMD160 e324a875a6af507727359ed6ab10b7a75f427b72 mercury-0.12.2-r4.ebuild 3812
+SHA256 1894ee8da875f74594f8c2ad6f1c970b4ee3593499c67555d00a40b6e9af7ce7 mercury-0.12.2-r4.ebuild 3812
 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 3926 RMD160 a5afa99059e0d5b168d0efd7f7acacb34c5c4338 SHA1 7968e83a285270cc0efc88fd3faab307d3be2e97 SHA256 3613e3408b7446ebd63ea7888d6f84c55c53e9f95c13f067a1cf87b7b0e85eb5
-MD5 0a42ff0b7047f827109f4f601a8f72e7 mercury-0.13.1-r1.ebuild 3926
-RMD160 a5afa99059e0d5b168d0efd7f7acacb34c5c4338 mercury-0.13.1-r1.ebuild 3926
-SHA256 3613e3408b7446ebd63ea7888d6f84c55c53e9f95c13f067a1cf87b7b0e85eb5 mercury-0.13.1-r1.ebuild 3926
+EBUILD mercury-0.13.1-r1.ebuild 3956 RMD160 947cc36d0888d23e3861794324d6142a485de89e SHA1 a3896bbbaeb92fd448f0c4a62864662b65d81d0b SHA256 c06850243311267c14787cc69c3aae358388306a0d7abcbc9e9aa0444ff280f5
+MD5 a81531e708d8ef0335a7797476605bd1 mercury-0.13.1-r1.ebuild 3956
+RMD160 947cc36d0888d23e3861794324d6142a485de89e mercury-0.13.1-r1.ebuild 3956
+SHA256 c06850243311267c14787cc69c3aae358388306a0d7abcbc9e9aa0444ff280f5 mercury-0.13.1-r1.ebuild 3956
 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 14400 RMD160 14b26de9a41c20ff2ee87d7fa158d5fbdebab543 SHA1 c4789b4a167c0c56a0234c040fa84dcbcf1d0e30 SHA256 9840ba3ae860101fe38f10ac1cfb5c447b98c1575d862d541bda2065babe6c34
-MD5 bc5d3479d9c9aca01e82e8dd28701ede ChangeLog 14400
-RMD160 14b26de9a41c20ff2ee87d7fa158d5fbdebab543 ChangeLog 14400
-SHA256 9840ba3ae860101fe38f10ac1cfb5c447b98c1575d862d541bda2065babe6c34 ChangeLog 14400
+MISC ChangeLog 472 RMD160 e65ad8ba44f398e1ba14942079a8f2f499b8ed74 SHA1 559117e59e5afe9ad93f3ca0a24f341589955c4a SHA256 b94a357057a7f2428354a0737125c5cec6673253ef1f2499616ea10d319112ba
+MD5 6365f92e6246f4887f4f07f173bd04e4 ChangeLog 472
+RMD160 e65ad8ba44f398e1ba14942079a8f2f499b8ed74 ChangeLog 472
+SHA256 b94a357057a7f2428354a0737125c5cec6673253ef1f2499616ea10d319112ba ChangeLog 472
 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-LIBDIR.patch b/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
deleted file mode 100644
index f81852240da8..000000000000
--- a/dev-lang/mercury/files/mercury-0.12.2-LIBDIR.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
-+++ mercury-compiler-0.12.2/configure	2006-06-06 20:57:45.000000000 +1200
-@@ -1599,7 +1599,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.12.2.orig/scripts/Mmake.vars.in	2005-08-17 03:57:40.000000000 +1200
-+++ mercury-compiler-0.12.2/scripts/Mmake.vars.in	2006-06-06 20:04:46.000000000 +1200
-@@ -716,18 +716,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.12.2.orig/scripts/mercury_config.in	2005-09-11 01:47:49.000000000 +1200
-+++ mercury-compiler-0.12.2/scripts/mercury_config.in	2006-06-07 18:55:12.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