Handle fpe in ri contrib package. Closes #193683

Package-Manager: portage-2.1.3.9

4 files changed, 53 insertions, 10 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index ce56ed83e78b..20382dc7ca67 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.7 2007/02/17 20:48:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.8 2007/09/29 05:49:54 keri Exp $
+
+  29 Sep 2007; keri <keri@gentoo.org> +files/mozart-1.3.2-ri-fpe.patch,
+  mozart-1.3.2.ebuild:
+  Handle fpe in ri contrib package. Closes bug #193683 reported by kaouete
 
   17 Feb 2007; keri <keri@gentoo.org> files/mozart-1.3.2-contrib.patch,
   files/mozart-1.3.2-portage.patch, mozart-1.3.2.ebuild:
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index d69775a1af6e..bc252df61d97 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -22,16 +22,20 @@ AUX mozart-1.3.2-portage.patch 9327 RMD160 767b30daefb5915fed5d3d8c85f6734011578
 MD5 a3842313f6c1dcfcca2e8cb1ebcaf5b4 files/mozart-1.3.2-portage.patch 9327
 RMD160 767b30daefb5915fed5d3d8c85f67340115782f9 files/mozart-1.3.2-portage.patch 9327
 SHA256 16b3be1fd3c49dd799bee440c54e1373a5ae1e5360b7d073e349d9375abd9fdb files/mozart-1.3.2-portage.patch 9327
+AUX mozart-1.3.2-ri-fpe.patch 1158 RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b SHA1 6ccc5ea52f8cabde2d92a9e01977c37d1d6dd8a0 SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211
+MD5 b04b71625a27ba0f10b65915b25d6da3 files/mozart-1.3.2-ri-fpe.patch 1158
+RMD160 d8741090acc8fe4bf67c55f873ad141bda01796b files/mozart-1.3.2-ri-fpe.patch 1158
+SHA256 544b2bdc701a80f69541417aeb05885155edc7111f2fd17581c1a0801eaee211 files/mozart-1.3.2-ri-fpe.patch 1158
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
-EBUILD mozart-1.3.2.ebuild 2384 RMD160 7d01863f3981d7be1c6d2e78d909c84628b93a27 SHA1 065dd8a527f713021e50a6e10a221a7298f2a2f7 SHA256 4cf749d06d18377ba213b4bd0ba22e9611b7788e21ec6150ff3cf295ef57e039
-MD5 93ca571bb24e32772db6fee02a9cff71 mozart-1.3.2.ebuild 2384
-RMD160 7d01863f3981d7be1c6d2e78d909c84628b93a27 mozart-1.3.2.ebuild 2384
-SHA256 4cf749d06d18377ba213b4bd0ba22e9611b7788e21ec6150ff3cf295ef57e039 mozart-1.3.2.ebuild 2384
-MISC ChangeLog 1228 RMD160 645c55967c183c8e4e261739b9f4e6b1b7abf66f SHA1 74d7f1483f3d30016dd1b6061d4e0497d4958e16 SHA256 7f3dcbf20fef696692247cef6305a7d30111a208c523d5212fc087ad19c21b6a
-MD5 6e58bbfd5bc4f72b9c21d38d6e8453f0 ChangeLog 1228
-RMD160 645c55967c183c8e4e261739b9f4e6b1b7abf66f ChangeLog 1228
-SHA256 7f3dcbf20fef696692247cef6305a7d30111a208c523d5212fc087ad19c21b6a ChangeLog 1228
+EBUILD mozart-1.3.2.ebuild 2424 RMD160 85e64159cc7923024b49a882159aab24977affd7 SHA1 df94da854d69e826ebde620b21b4d9f3477899e1 SHA256 cea3618f5f46af451e06ce4e7cc4f8c685b9fb6a0fa646b03c78d1831f4b3bd2
+MD5 6ce0ec0a0bf2d630c0f030c8b4d55def mozart-1.3.2.ebuild 2424
+RMD160 85e64159cc7923024b49a882159aab24977affd7 mozart-1.3.2.ebuild 2424
+SHA256 cea3618f5f46af451e06ce4e7cc4f8c685b9fb6a0fa646b03c78d1831f4b3bd2 mozart-1.3.2.ebuild 2424
+MISC ChangeLog 1399 RMD160 edc0b9814f1b554398bca2d1f008de2287d7c783 SHA1 46e92fd350334dca9cb38ea49d2e8a485944a1e7 SHA256 34d807c1f566d747e1be25e98fae7466b4106481de470635d5ca1ad973e3bc98
+MD5 64755379e9a60159c33b94883fc986df ChangeLog 1399
+RMD160 edc0b9814f1b554398bca2d1f008de2287d7c783 ChangeLog 1399
+SHA256 34d807c1f566d747e1be25e98fae7466b4106481de470635d5ca1ad973e3bc98 ChangeLog 1399
 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/mozart/files/mozart-1.3.2-ri-fpe.patch b/dev-lang/mozart/files/mozart-1.3.2-ri-fpe.patch
new file mode 100644
index 000000000000..0080caf8dd81
--- /dev/null
+++ b/dev-lang/mozart/files/mozart-1.3.2-ri-fpe.patch
@@ -0,0 +1,34 @@
+diff -ur mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in mozart-1.3.2.20060615/contrib/ri/Makefile.in
+--- mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in	2002-07-07 01:05:36.000000000 +1200
++++ mozart-1.3.2.20060615/contrib/ri/Makefile.in	2007-09-29 17:41:45.000000000 +1200
+@@ -60,8 +60,8 @@
+ 		modRI.spec
+ 
+ ifeq ($(PLATFORM), linux-i486)
+-CSRCS    	= fpgetset.c sigfpe.c
+-CFLAGS   	+= -DLINUX_IEEE
++CSRCS    	= 
++CFLAGS   	+=
+ endif
+ 
+ OZSRCS  	= RI.oz
+diff -ur mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.h mozart-1.3.2.20060615/contrib/ri/sigfpe.h
+--- mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.h	2006-03-21 20:36:08.000000000 +1200
++++ mozart-1.3.2.20060615/contrib/ri/sigfpe.h	2007-09-29 17:33:04.000000000 +1200
+@@ -6,7 +6,6 @@
+ #include <fpu_control.h>
+ #include <signal.h>
+ #include <unistd.h>
+-#include <linux/user.h> /* for user_i387_struct */
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -19,7 +18,7 @@
+ };
+ typedef struct siginfo siginfo_t;
+   */
+-typedef struct user_i387_struct ucontext_mozart_t;
++typedef void ucontext_mozart_t;
+ typedef int sigfpe_code_type;
+ typedef void (*sigfpe_handler_type)(int, siginfo_t * , ucontext_mozart_t *);
+ 
diff --git a/dev-lang/mozart/mozart-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild
index 49fd357da275..0606f593e9c5 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-2007 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.5 2007/02/17 20:48:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.6 2007/09/29 05:49:54 keri Exp $
 
 inherit eutils
 
@@ -38,6 +38,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	epatch "${FILESDIR}"/${P}-ozplatform.patch
+	epatch "${FILESDIR}"/${P}-ri-fpe.patch
 }
 
 src_compile() {