Handle bounded arithmetic in jpl test suite.

(Portage version: 2.1.2-r11)

6 files changed, 46 insertions, 5 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 92e6e621f92e..6ec41dfc54af 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.70 2007/02/27 09:07:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.71 2007/02/28 08:01:40 keri Exp $
+
+  28 Feb 2007; keri <keri@gentoo.org>
+  +files/swi-prolog-jpl-bounded-arith.patch, swi-prolog-5.6.25.ebuild,
+  swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild,
+  swi-prolog-5.6.29.ebuild:
+  Handle bounded arithmetic in jpl test suite. Reported by Christian
+  Faulhammer in #168534.
 
 *swi-prolog-5.6.29 (27 Feb 2007)
 
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch
new file mode 100644
index 000000000000..ef42960da2a9
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-bounded-arith.patch
@@ -0,0 +1,30 @@
+--- pl-5.6.25.orig/packages/jpl/jpl.pl	2006-12-20 21:55:19.000000000 +1300
++++ pl-5.6.25/packages/jpl/jpl.pl	2007-02-28 20:42:38.000000000 +1300
+@@ -4123,13 +4123,13 @@
+ 		    ;   I < 2**15   ->  T = char_short
+ 		    ;   I < 2**16   ->  T = char_int
+ 		    ;   I < 2**31   ->  T = int
+-		    ;   I < 2**63   ->  T = long
++		    ;   I =< 9223372036854775807   ->  T = long
+ 				    ;   T = overlong
+ 		    )
+ 	;   I >= -(2**7)    ->  T = byte
+ 	;   I >= -(2**15)   ->  T = short
+ 	;   I >= -(2**31)   ->  T = int
+-	;   I >= -(2**63)   ->  T = long
++	;   I >= -9223372036854775808       ->  T = long
+ 			;   T = overlong 
+ 	).
+ 
+--- pl-5.6.25.orig/packages/jpl/test_jpl.pl	2006-11-22 21:38:20.000000000 +1300
++++ pl-5.6.25/packages/jpl/test_jpl.pl	2007-02-28 20:34:39.000000000 +1300
+@@ -1038,7 +1038,8 @@
+ 	[	setup((
+ 			jpl_new( array(long), 3, A),
+ 			(	current_prolog_flag( bounded, true)
+-			->	current_prolog_flag( max_integer, V)
++			->	current_prolog_flag( max_integer, MI),
++				V is 10.0*MI
+ 			;	V is 2**63
+ 			)
+ 		)),
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
index ec37e2ca64a7..8a76afd6eb24 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.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/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.9 2007/02/28 08:01:40 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch
 	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
 	epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
index 3bb2f64f5390..ae06ee60144d 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.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/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.6 2007/02/27 07:57:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.7 2007/02/28 08:01:40 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch
 	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
 	epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
index f7e8025def4a..b2a9b809528b 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.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/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.8 2007/02/27 07:57:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.9 2007/02/28 08:01:40 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-errno.patch
 	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch
 	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
 	epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild
index 4bbc1aa93cd5..49d9a2567c91 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.29.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/swi-prolog/swi-prolog-5.6.29.ebuild,v 1.1 2007/02/27 09:07:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.29.ebuild,v 1.2 2007/02/28 08:01:40 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-bounded-arith.patch
 	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
 	epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch