Upgrade libgrades compilation.

Package-Manager: portage-2.1.2_pre2-r5

3 files changed, 149 insertions, 22 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index ae84b30b6376..afaa87d920ba 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.51 2006/10/07 00:27:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.52 2006/10/12 08:52:52 keri Exp $
+
+  12 Oct 2006; keri <keri@gentoo.org> files/mercury-0.13.0-libgrades.patch:
+  Update libgrades compilation.
 
   07 Oct 2006; keri <keri@gentoo.org> mercury-0.12.2-r3.ebuild:
   Do not pre-strip binaries.
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 428329b375e8..5827a3c858bd 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -70,10 +70,10 @@ AUX mercury-0.13.0-docs.patch 796 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f
 MD5 07927ea891d5688ff041bc2c2bc82d2e files/mercury-0.13.0-docs.patch 796
 RMD160 f65bd4098e1a3c501f6adaf0da93377f6a8361f4 files/mercury-0.13.0-docs.patch 796
 SHA256 5ec2c671e14a07f087ae2c997b2ca5a7c2b176ee46685d86f8e995535f76625c files/mercury-0.13.0-docs.patch 796
-AUX mercury-0.13.0-libgrades.patch 9414 RMD160 aab042c7eb177d4d4c923db79bbff4fb520a2d3a SHA1 fc52cb8de79d7eb32efd1c0c119374d2e617cc7f SHA256 89d40980a5ca8373e210472bd06b3bbfefc926b3cb4b5643e32a7125f7daea66
-MD5 ddf843b0624b07d2c618f3b7c428c8f4 files/mercury-0.13.0-libgrades.patch 9414
-RMD160 aab042c7eb177d4d4c923db79bbff4fb520a2d3a files/mercury-0.13.0-libgrades.patch 9414
-SHA256 89d40980a5ca8373e210472bd06b3bbfefc926b3cb4b5643e32a7125f7daea66 files/mercury-0.13.0-libgrades.patch 9414
+AUX mercury-0.13.0-libgrades.patch 13854 RMD160 508cac88dd9abbde70861665ce4b3098b8c2643b SHA1 6628636cee4ef3221d8212dbc51625c153d12ed9 SHA256 5e5d2640c4ad2679b54c7d79106f64cdf4f1b47460bcbe8bafe142d3e7c62902
+MD5 1fdf1180e5bb0171e3dbdfca11ba83c2 files/mercury-0.13.0-libgrades.patch 13854
+RMD160 508cac88dd9abbde70861665ce4b3098b8c2643b files/mercury-0.13.0-libgrades.patch 13854
+SHA256 5e5d2640c4ad2679b54c7d79106f64cdf4f1b47460bcbe8bafe142d3e7c62902 files/mercury-0.13.0-libgrades.patch 13854
 AUX mercury-0.13.0-portage.patch 2891 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 SHA1 7ea86360ddfdd869640980fcfae78f933becc02e SHA256 5c33ae312869cf0fb8f0bc7c846bcf2abff5f5a1c574bc0b42cd050578daca0c
 MD5 c50f24a88e741f61d40a29cfa974607f files/mercury-0.13.0-portage.patch 2891
 RMD160 3a52b5c9d5940eee39be0a0254969aac39675d41 files/mercury-0.13.0-portage.patch 2891
@@ -106,10 +106,10 @@ EBUILD mercury-0.13.0.ebuild 3202 RMD160 7c92e72eeb7fe6b2a81ec6d8182ccabb823083b
 MD5 da6f8c788e1773b497557983ef71eb29 mercury-0.13.0.ebuild 3202
 RMD160 7c92e72eeb7fe6b2a81ec6d8182ccabb823083bd mercury-0.13.0.ebuild 3202
 SHA256 48eeeaf6005c0f1ea132b70e4d0c84ad5cc2e1cf14329ea54f489b109df7b929 mercury-0.13.0.ebuild 3202
-MISC ChangeLog 9603 RMD160 26fde24eda23aee45ddbb704528b49986b2f26d4 SHA1 9bc57b3a1b18c9072d9f8dac5958291b42d49491 SHA256 ad77bcc85b5596277282de8d42f47f4f4c63f250ef3b656dd0d02e24a8dd064e
-MD5 c13e834dd793ab969c8b79ce3f38b694 ChangeLog 9603
-RMD160 26fde24eda23aee45ddbb704528b49986b2f26d4 ChangeLog 9603
-SHA256 ad77bcc85b5596277282de8d42f47f4f4c63f250ef3b656dd0d02e24a8dd064e ChangeLog 9603
+MISC ChangeLog 9712 RMD160 0154484708a329927d67f8fd290c71d73dda3fb9 SHA1 f22b40897579fc4aa2818ec950bc5d24f0cc4eb7 SHA256 a1af06c346b512058e0b0d1b1ade9ff8f5d83f1c4c944a6fc09b8b8034b5292b
+MD5 4b6def359d3e13e41c21af8187f4f92a ChangeLog 9712
+RMD160 0154484708a329927d67f8fd290c71d73dda3fb9 ChangeLog 9712
+SHA256 a1af06c346b512058e0b0d1b1ade9ff8f5d83f1c4c944a6fc09b8b8034b5292b ChangeLog 9712
 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.13.0-libgrades.patch b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
index fe027c4d083d..e79d839d099f 100644
--- a/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
+++ b/dev-lang/mercury/files/mercury-0.13.0-libgrades.patch
@@ -214,29 +214,153 @@
  
  # installation rules
 --- mercury-compiler-0.13.0.orig/scripts/prepare_tmp_dir_fixed_part.in	2005-01-28 20:11:59.000000000 +1300
-+++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_fixed_part.in	2006-09-16 12:28:36.000000000 +1200
-@@ -12,7 +12,9 @@
++++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_fixed_part.in	2006-10-12 21:35:17.000000000 +1300
+@@ -12,18 +12,20 @@
  fi
  wd=`/bin/pwd`
  
 -mkdir tmp_dir
-+tmp_dir=libgrades/$1
+-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 tmp_dir
- cp Mmake* tmp_dir
- cp Mercury.* tmp_dir
- cp VERSION tmp_dir
++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.0.orig/scripts/prepare_tmp_dir_grade_part	2005-05-20 18:15:20.000000000 +1200
-+++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_grade_part	2006-09-16 12:30:47.000000000 +1200
-@@ -5,6 +5,8 @@
++++ mercury-compiler-0.13.0/scripts/prepare_tmp_dir_grade_part	2006-10-12 21:36:07.000000000 +1300
+@@ -5,55 +5,57 @@
  # Public License - see the file COPYING in the Mercury distribution.
  #---------------------------------------------------------------------------#
  
-+tmp_dir=libgrades/$1
+-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 tmp_dir/boehm_gc
- rm -fr tmp_dir/runtime
- rm -fr tmp_dir/trace
++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.0.orig/trace/Mmakefile	2006-04-04 19:42:03.000000000 +1200
 +++ mercury-compiler-0.13.0/trace/Mmakefile	2006-09-16 12:25:49.000000000 +1200
 @@ -204,6 +204,9 @@