Support -O0 in CFLAGS when compiling install_clause()

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

4 files changed, 23 insertions, 4 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index f33845846bf2..49aca1b0c3ae 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.34 2010/03/20 21:40:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.35 2010/04/10 00:10:30 keri Exp $
+
+  10 Apr 2010; <keri@gentoo.org> yap-6.0.3.ebuild,
+  +files/yap-6.0.3-install-clause.patch:
+  Support -O0 in CFLAGS when compiling install_clause()
 
 *yap-6.0.3 (20 Mar 2010)
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index f1988db2a4dd..7a99969a5626 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -21,6 +21,7 @@ AUX yap-6.0.2-mpi-include.patch 301 RMD160 04c779a7cbc61d98d762cf63d4f3dd2bb64c3
 AUX yap-6.0.2-multilib.patch 12454 RMD160 5191c4ec8e75bfc2ebf53e6848e1b78b16c65335 SHA1 2fa40faa799039432da03c85ce5342e4651362b4 SHA256 7ea723eedae1acb7ca4340cdceff82d1accd6b0d93a445327ea207da0de2e148
 AUX yap-6.0.2-myddas-include.patch 583 RMD160 90f54ecc28e8dac64edd7544358f356abc9ef9a4 SHA1 e40fb124b45fd59c4c504f63158ce0ef4d60e604 SHA256 e3c0de4e7cbcca60b02d8955969e48ec40615afa5ac812863f367aebd02393d2
 AUX yap-6.0.2-yapsharedir.patch 569 RMD160 547981acfd2793c2bd96f3551b373a372ced403c SHA1 61288eb0707a455b0429e7aa2dc76edaa1241bb1 SHA256 f02aa21276cb953f939dd020ab1656b05027af3334ac2352e8a05b38ac6e840d
+AUX yap-6.0.3-install-clause.patch 364 RMD160 06d30d47387b8491ba254e71d973fb323bd7bf2a SHA1 19f4701d791fb1131e202d35cd89f868625099c7 SHA256 7c6cd98cc35da96d25bdeeb66df1fbcd5ed1a80248fef04c1c6e5750c4d04edc
 AUX yap-6.0.3-yapsharedir.patch 520 RMD160 65417f2cfc659192f051c31e9fe2b02f9ecb9061 SHA1 ed3be8a6f477be9d40b6a6bdad6ff5f7db1702a8 SHA256 be04c9ba4c3712035fc585834c43692dfb195f1b1a0ee89e1c8532308f8ab6b3
 DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9
 DIST yap-6.0.1.tar.gz 3816766 RMD160 cf113bbe1b8658530b464d40759b0a6320719142 SHA1 97eedc5ce82e87c48ae7c04d7c3364503528fa3d SHA256 91c95702ccb08ce13d9e34aa7d95eacafedb9c628482e91a4f003475036845b9
@@ -29,6 +30,6 @@ DIST yap-6.0.3.tar.gz 3890926 RMD160 f24a386ff57589796c7d912f336ca79872967b03 SH
 EBUILD yap-5.1.3-r2.ebuild 2484 RMD160 bf366226c2bb9443d67a6a75e8103ff4677b2d1a SHA1 25f4113498ae52c7ba7bbbdceed58f4b0f73f5e3 SHA256 2fc47953ca86da7ae4a0459df2356be3a2eb45b9efcb59a6686fdfea68c388a3
 EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA1 79f8a10f95a3253d48b67952faba87e00f9cc11e SHA256 66468e95ab2c7d6cacd97bc08a7a005eb4e75ff56227dac7c40138bb3012a12b
 EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d
-EBUILD yap-6.0.3.ebuild 2197 RMD160 36add970c111f1a9ec5270ca42b10712cd3ae2d3 SHA1 30e9263fce3cef895d5cc5a3f5d1c62d58c146a6 SHA256 ef61bd80843a920c1fb97ade05c58c573c3b9689f5b75d02deb109507643bb7f
-MISC ChangeLog 6610 RMD160 6bc63bfd7f53a62a90af361bb11bcd5aa75f002b SHA1 d582299d31bae9f1b8670be053061c6c81e04799 SHA256 b840cd3d8e4d75c66309b8eff15f8a7fed0d2da57c66286d408b6b7c6387b3e8
+EBUILD yap-6.0.3.ebuild 2245 RMD160 797d6be7ec2451a20be613f17249914174d80531 SHA1 0112bf2a4d121a155041ea6d05bde7b005adfa0b SHA256 5bbdf1c9e6f958cd41b17c44c22eee59a743d51f98812ce37b1c59e736093a2c
+MISC ChangeLog 6759 RMD160 e3b23bb7741db00fe11d1d1ee8612a0aede46445 SHA1 116e1dd0c65a725279e19e55245d39c11f0c09b6 SHA256 6b626f832f7820a5ea802f903cee0e3805e603c73286668c757d56e5a7102724
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.0.3-install-clause.patch b/dev-lang/yap/files/yap-6.0.3-install-clause.patch
new file mode 100644
index 000000000000..2e2c9e8ce5e0
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.3-install-clause.patch
@@ -0,0 +1,13 @@
+--- yap-6.0.3.orig/C/index.c	2010-03-16 03:45:20.000000000 +1300
++++ yap-6.0.3/C/index.c	2010-04-10 12:02:06.000000000 +1200
+@@ -3475,10 +3475,6 @@
+       } else if (sp->pos) {
+ 	UInt argno = -sp->pos;
+ 	skip_to_arg(cls, ap, argno, FALSE);
+-	if (ArityOfFunctor((Functor)RepAppl(sp[-1].val))
+-	    != argno+1) {
+-	  last_arg = FALSE;
+-	}
+       }
+     }
+     sp++;
diff --git a/dev-lang/yap/yap-6.0.3.ebuild b/dev-lang/yap/yap-6.0.3.ebuild
index ae6c97ed77a4..b0d362302520 100644
--- a/dev-lang/yap/yap-6.0.3.ebuild
+++ b/dev-lang/yap/yap-6.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.3.ebuild,v 1.1 2010/03/20 21:40:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.3.ebuild,v 1.2 2010/04/10 00:10:30 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -29,6 +29,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-yapsharedir.patch
+	epatch "${FILESDIR}"/${P}-install-clause.patch
 }
 
 src_compile() {