glibc2.10 fixes; amd64 chroot fixes

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

6 files changed, 67 insertions, 15 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index 116bfae6d5de..c7c24c24b71c 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.24 2009/08/10 06:33:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.25 2009/08/11 07:04:33 keri Exp $
+
+  11 Aug 2009; <keri@gentoo.org> mozart-1.3.2.ebuild,
+  mozart-1.3.2-r1.ebuild, +files/mozart-1.3.2-const-cast.patch,
+  files/mozart-1.3.2-ozplatform.patch:
+  glibc2.10 fixes; amd64 chroot fixes
 
   10 Aug 2009; <keri@gentoo.org> mozart-1.4.0.ebuild,
   +files/mozart-1.4.0-const-cast.patch,
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 0033e7813972..d96303892069 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,9 +1,10 @@
 AUX 50mozart-gentoo.el 482 RMD160 6c2b385419c73cadbd69ffa8de537b758c895592 SHA1 50e36c277313e19b9ebca416ccc878fe40a61b8f SHA256 0e008cf41eb34bf0d679215c08aeb6b8beb5c1466f62a1af490525e07bad8731
+AUX mozart-1.3.2-const-cast.patch 1161 RMD160 b21030d3adee6f26ec3ea83afe9db7b1ced3ec5e SHA1 579f540cc0bb13db95db66f1099a57a8c743db20 SHA256 6bb2151852cc2513c11db31a0d80a2b6a6ddcabfc1093cf3ee1d95175b2e4877
 AUX mozart-1.3.2-contrib.patch 12448 RMD160 00201c0d8c7e661136d26d92f6814c62fd3a131b SHA1 cc33953732d9818319d4be27087431e13d153215 SHA256 f4a81774f7335d05d2c708763ee7d21366dc376728ee94f5cd33e1649682bfb7
 AUX mozart-1.3.2-emubin.patch 1471 RMD160 2eddbeaf552856097ced86da21a28d849a74efbd SHA1 4470aec9e2b12aca1fadd56e2de12caefa8aa69d SHA256 6911112a3a0cb62bd63f2e6d7b78e18f5c7dc11215061e0febaae65ef93c87cc
 AUX mozart-1.3.2-gcc4.patch 1908 RMD160 e574c6f4b8fd7e3a2c6ff8d0ce62126807c02362 SHA1 21db591df0d2e89d96fa5aef8b424798eedfb0d6 SHA256 a921ff6ded2bf70b255bcd7c57683dc9b6018656147c2202a2748eeb5bb776db
 AUX mozart-1.3.2-nostrip.patch 329 RMD160 9d7e8059e0fc0baf556d7508cc266c6ead0b9a58 SHA1 9f6beaa7fd67a4b8edf9ba9812baa4d8e1d05237 SHA256 e4c503de5da5e9beadcfa6d058a6777924cb18bc26aa458de478c75806e75f95
-AUX mozart-1.3.2-ozplatform.patch 1446 RMD160 c6ad2a34716885280e3df45ebb0018f686b2b33d SHA1 659dd0894f80d8d3ce748a153fac97814ad1ebb8 SHA256 b993248d1f0fc556effb71ddc6d2333bd335a848f0f824f2a45425b1fee7272f
+AUX mozart-1.3.2-ozplatform.patch 1925 RMD160 416db4fbc216edc4022114d40f1cb44a8b1b55df SHA1 1e2335b1b39389f7b97be0a8727bb96c7fe8da31 SHA256 3d629fd1903645025f7a4698122136fefe7e28d929eda132dc723d11a8d83d38
 AUX mozart-1.3.2-portage.patch 11472 RMD160 3b58dce99cafc4f282f2a3a1faff39f25af0f6fa SHA1 012c7b508dea8c4978f73292f6babe8303ecc730 SHA256 0f75d6879abfaeac70ec1713e013f2d6608eb3c2e197db9d02ad54729b02986f
 AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b SHA1 6ccc5ea52f8cabde2d92a9e01977c37d1d6dd8a0 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211
 AUX mozart-1.4.0-const-cast.patch 1271 RMD160 fc8cf1073bd1ca89b96f3c2b4a28150860fd71ce SHA1 8ec6fcac24e483dd07fab0eb5d509402e145cace SHA256 4eb9e7f8ee5304717510a5423e49f1cfa333c28baa5f5d78dd77b6ad6d2332b5
@@ -21,8 +22,8 @@ DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 RMD160 1d0c9787ec1bbf28881060a2c360295c7f89d5e7 SHA1 308fdd1d835f5197795f31232ed2374b646bf26a SHA256 68c52cb7379504a5142af37459c89884355fb9cc020f585d7778e7d4b1f0cd9e
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 RMD160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 SHA1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f SHA256 5da73d80b5aa7fa42edca64159a1a076323f090e5c548f3747f94d0afc60b223
-EBUILD mozart-1.3.2-r1.ebuild 3308 RMD160 a02373eb100c708b6535a9857750f91f1bd8af08 SHA1 c720f852ca0d074e2b6cd3169321ed147d3e4daf SHA256 ffe3f06985bae86d85d45064c1ad5e6ad04c8b8d0f80286752392101d7039175
-EBUILD mozart-1.3.2.ebuild 2800 RMD160 6696a1e2ab0c4694890f1122d9aae8bc743d39f8 SHA1 246329f16b1dffbc8ef68d546d4b42e6f41960e7 SHA256 89985408b239fbdf331b968822152c915523b2b08ef212b06244ff2d1f7592d7
+EBUILD mozart-1.3.2-r1.ebuild 3353 RMD160 23eeed57eaa52152a1a80cf9342e2214b179a45d SHA1 a6f67779202464e8b3f424b3c2572fe4bef110d5 SHA256 8a6217db4b59b407e88c4dfcd74bdbc36821881cf8486eb3f83000009d5b227c
+EBUILD mozart-1.3.2.ebuild 2844 RMD160 b82d5f5f606dbb7159a8f9731f5666da49be2ccd SHA1 32c9b7b398be5dfa41765f1c2ed05646e4b7fd15 SHA256 812d800140a4ad6677f35e7be0f433a20c6eb0ace5411a81eb05bdedb9003fc7
 EBUILD mozart-1.4.0.ebuild 3292 RMD160 c616fd83c2485cbc9a1173651a0a60dd9079d2ba SHA1 d3fb06f395af9ea057893ddb6adeaa098bac764b SHA256 5e7c766d7a6ec9f572c9345b2f0b6cc06df3630ea4da57b38d78b3f270b4dd0c
-MISC ChangeLog 3820 RMD160 554c0cbd3ab1de01de3e65c9c8cfd3e8045612c3 SHA1 669062d80e53799860a8d065ae55d83c4916a413 SHA256 49bb8397c66f01045bec029f8c002f1003df15e8ff3463404899209f21332b75
+MISC ChangeLog 4016 RMD160 2f8348d092e7ae0e86588f2a7b9e898742596511 SHA1 8e6f68b9e3587638f484e6de44d5fc047dda0138 SHA256 12e6eecf2034fe3b23ae5a884652f6ca69e80360fd6c872f338ca0d5e38ad8c3
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch b/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch
new file mode 100644
index 000000000000..2ac12d888149
--- /dev/null
+++ b/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch
@@ -0,0 +1,31 @@
+--- mozart-1.3.2.20060615.orig/platform/emulator/urlc.cc	2005-05-19 17:48:45.000000000 +0000
++++ mozart-1.3.2.20060615/platform/emulator/urlc.cc	2009-08-10 20:32:43.000000000 +0000
+@@ -625,13 +625,13 @@
+     }
+     port = 21;
+ 
+-    p_collon = strchr(line, ':');
+-    p_at = strchr(line, '@');
++    p_collon = strchr(const_cast<char*>(line), ':');
++    p_at = strchr(const_cast<char*>(line), '@');
+     if(NULL != p_at) // we have a pass
+ 	p_slash = strchr(p_at + 1, '/');
+     else
+-	p_slash = strchr(line, '/'); 
+-    p_semi = strchr(line, ';'); // to avoid masking by pass
++	p_slash = strchr(const_cast<char*>(line), '/'); 
++    p_semi = strchr(const_cast<char*>(line), ';'); // to avoid masking by pass
+     
+     // sanity checks
+     if((NULL != p_collon) && (0 == p_collon[1]))
+@@ -1140,8 +1140,8 @@
+ 
+     if((NULL == line) || (0 == *line)) // emtpy line?
+ 	return (URLC_EEMPTY);
+-    p_collon = strchr(line, ':');
+-    p_slash = strchr(line, '/');
++    p_collon = strchr(const_cast<char*>(line), ':');
++    p_slash = strchr(const_cast<char*>(line), '/');
+     
+     // sanity checks
+     if((NULL != p_collon) && (0 == p_collon[1])) // nothing after :
diff --git a/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch b/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch
index 43c64c52f7d5..186853fd3bb7 100644
--- a/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch
+++ b/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch
@@ -1,5 +1,6 @@
---- mozart-1.3.2.20060615.orig/share/bin/Makefile.in	2001-08-05 10:24:41.000000000 +1200
-+++ mozart-1.3.2.20060615/share/bin/Makefile.in	2007-02-11 17:14:13.000000000 +1300
+diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/share/bin/Makefile.in
+--- mozart-1.3.2.20060615.orig/share/bin/Makefile.in	2001-08-04 22:24:41.000000000 +0000
++++ mozart-1.3.2.20060615/share/bin/Makefile.in	2009-08-10 21:24:55.000000000 +0000
 @@ -35,7 +35,7 @@
  INSTALL_BIN=	$(INSTALL) -m 555
  INSTALL_FILE=	$(INSTALL) -m 444
@@ -9,8 +10,9 @@
  LINKS=		ozengine text2pickle pickle2text oldpickle2text oztool
  LIB_SCRIPTS=	$(addprefix $(BINDIR)/,$(SCRIPTS))
  LIB_LINKS=	$(addprefix $(BINDIR)/,$(LINKS))
---- mozart-1.3.2.20060615.orig/share/bin/oz.in	2006-06-14 10:25:01.000000000 +1200
-+++ mozart-1.3.2.20060615/share/bin/oz.in	2007-02-11 19:28:21.000000000 +1300
+diff -ur mozart-1.3.2.20060615.orig/share/bin/oz.in mozart-1.3.2.20060615/share/bin/oz.in
+--- mozart-1.3.2.20060615.orig/share/bin/oz.in	2006-06-13 22:25:01.000000000 +0000
++++ mozart-1.3.2.20060615/share/bin/oz.in	2009-08-10 21:24:55.000000000 +0000
 @@ -4,7 +4,7 @@
  # to draw links from say /usr/local/bin to OZHOME/bin
  # see chapter "installation" in the users manual for more information
@@ -29,8 +31,9 @@
  : ${OZEMULATOR="$OZHOME/platform/$OZPLATFORM/emulator.exe"}
  : ${OZVERSION="@OZVERSION@"}
  : ${OZ_DOTOZ="$HOME/.oz/$OZVERSION"}
---- mozart-1.3.2.20060615.orig/share/bin/ozplatform	2006-05-04 00:17:13.000000000 +1200
-+++ mozart-1.3.2.20060615/share/bin/ozplatform	2007-02-17 17:12:32.000000000 +1300
+diff -ur mozart-1.3.2.20060615.orig/share/bin/ozplatform mozart-1.3.2.20060615/share/bin/ozplatform
+--- mozart-1.3.2.20060615.orig/share/bin/ozplatform	2006-05-03 12:17:13.000000000 +0000
++++ mozart-1.3.2.20060615/share/bin/ozplatform	2009-08-10 21:26:08.000000000 +0000
 @@ -40,7 +40,7 @@
     ;;
     m68k\ Linux\ *)      OZARCH=linux-m68k
@@ -40,3 +43,12 @@
     ;;
     9000/7*HP-UX*)	OZARCH=hpux-700
     ;;
+@@ -78,6 +78,8 @@
+    ;;
+    *i*86*Darwin*)       OZARCH=i486-darwin
+    ;;
++   x86_64\ Linux*)	OZARCH=linux-x86_64_32
++   ;;
+    *)  	                OZARCH=unknown-unknown
+    ;;
+ esac
diff --git a/dev-lang/mozart/mozart-1.3.2-r1.ebuild b/dev-lang/mozart/mozart-1.3.2-r1.ebuild
index 7ee84b9cb51d..71e95dc9150f 100644
--- a/dev-lang/mozart/mozart-1.3.2-r1.ebuild
+++ b/dev-lang/mozart/mozart-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2-r1.ebuild,v 1.5 2008/11/27 05:32:08 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2-r1.ebuild,v 1.6 2009/08/11 07:04:33 keri Exp $
 
 inherit elisp-common eutils
 
@@ -35,10 +35,12 @@ S="${WORKDIR}"/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${FILESDIR}"/${P}-portage.patch
 	epatch "${FILESDIR}"/${P}-contrib.patch
 	epatch "${FILESDIR}"/${P}-emubin.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-const-cast.patch
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	epatch "${FILESDIR}"/${P}-ozplatform.patch
 	epatch "${FILESDIR}"/${P}-ri-fpe.patch
diff --git a/dev-lang/mozart/mozart-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild
index b07e0ef0a35b..bd422ed95e1e 100644
--- a/dev-lang/mozart/mozart-1.3.2.ebuild
+++ b/dev-lang/mozart/mozart-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.14 2008/11/27 05:32:08 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.15 2009/08/11 07:04:33 keri Exp $
 
 inherit elisp-common eutils
 
@@ -39,6 +39,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-contrib.patch
 	epatch "${FILESDIR}"/${P}-emubin.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-const-cast.patch
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	epatch "${FILESDIR}"/${P}-ozplatform.patch
 	epatch "${FILESDIR}"/${P}-ri-fpe.patch