Suppress zstream test on single-threaded engines.

Package-Manager: portage-2.1.2-r10

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index f1f9d3ed2b68103ed1f4e4b766535d2032fb3184..6dac77f807ff70936714fc0fabf98d3aa763a13e 100644 (file)
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,11 @@
 # 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.61 2007/02/13 07:43:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.62 2007/02/23 20:22:20 keri Exp $
+
+  23 Feb 2007; keri <keri@gentoo.org>
+  +files/swi-prolog-thread-tests-r1.patch, swi-prolog-5.6.25.ebuild,
+  swi-prolog-5.6.27.ebuild, swi-prolog-5.6.28.ebuild:
+  Suppress zstream test on single-threaded engines.
 
   13 Feb 2007; keri <keri@gentoo.org> +files/swi-prolog-errno.patch,
   swi-prolog-5.6.28.ebuild:

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index cde57319c199f73451b235246a0f0173bf151336..5b54fbe705acda59f4e801032f16ef972049f9cc 100644 (file)
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -142,6 +142,10 @@ AUX swi-prolog-test_date.patch 4324 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3
 MD5 aaac0d487788ab74f26c127a713923a0 files/swi-prolog-test_date.patch 4324
 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3ee6 files/swi-prolog-test_date.patch 4324
 SHA256 0998d9f89e0b84e53efb16a70fdc8c4a7f2ac0f700e9f8502fb53c1d8dd89388 files/swi-prolog-test_date.patch 4324
+AUX swi-prolog-thread-tests-r1.patch 2821 RMD160 0b99d2a1d94b3d974d03ed0040d235854f37dd96 SHA1 dbab7c3cf5d1d514ee6f808e0c703b7c35b2a7ed SHA256 fab16c1c5d1cda97f2f67b6693086870178f4679168a707baa096d58b1087872
+MD5 445f1faeb5404dc415e0dc16d457bb6f files/swi-prolog-thread-tests-r1.patch 2821
+RMD160 0b99d2a1d94b3d974d03ed0040d235854f37dd96 files/swi-prolog-thread-tests-r1.patch 2821
+SHA256 fab16c1c5d1cda97f2f67b6693086870178f4679168a707baa096d58b1087872 files/swi-prolog-thread-tests-r1.patch 2821
 AUX swi-prolog-thread-tests.patch 1959 RMD160 0b084ba7c27be1082ad531d123e97c88ea1af11e SHA1 3c85c1edbbd05d6381408a288af9d42c42127135 SHA256 8755a0c59f3a2c7715280d32dc0dccb2211df81d596987cde0dd2d1639a6162a
 MD5 5a98089626776999c86b616860a29a52 files/swi-prolog-thread-tests.patch 1959
 RMD160 0b084ba7c27be1082ad531d123e97c88ea1af11e files/swi-prolog-thread-tests.patch 1959
@@ -205,22 +209,22 @@ EBUILD swi-prolog-5.6.24.ebuild 3442 RMD160 e57b33a2d5e3f911cd5abc5e815191544342
 MD5 526d97ded7389423ff88faed8c9aeb91 swi-prolog-5.6.24.ebuild 3442
 RMD160 e57b33a2d5e3f911cd5abc5e8151915443426a9f swi-prolog-5.6.24.ebuild 3442
 SHA256 05a0ba0adb0321b21ac543124a86fd67719577f03d7308fd47b8ce6254512517 swi-prolog-5.6.24.ebuild 3442
-EBUILD swi-prolog-5.6.25.ebuild 3729 RMD160 03256e1e943c25531f520eb1d919519094d2711a SHA1 0fe4a7b1c8a974652b6ae0e633092b0335bb41c8 SHA256 5accf6c4f1a200f9f4a347b45366c873080edbb49d55b6b32e6d96134084dc7a
-MD5 7e8a11c71b904ac8624f823c83f8ba48 swi-prolog-5.6.25.ebuild 3729
-RMD160 03256e1e943c25531f520eb1d919519094d2711a swi-prolog-5.6.25.ebuild 3729
-SHA256 5accf6c4f1a200f9f4a347b45366c873080edbb49d55b6b32e6d96134084dc7a swi-prolog-5.6.25.ebuild 3729
-EBUILD swi-prolog-5.6.27.ebuild 3580 RMD160 97a0fa45643a3a935d4090dc7565b28122d17cfc SHA1 852d348cc400e6f879e8d439222b16a75101221b SHA256 b5d3199e3b09db4208cc96ea9353f16159ca0f124d7fbc217afa5d40a2ea4191
-MD5 485e42a4b067af402cf274c61c2c9678 swi-prolog-5.6.27.ebuild 3580
-RMD160 97a0fa45643a3a935d4090dc7565b28122d17cfc swi-prolog-5.6.27.ebuild 3580
-SHA256 b5d3199e3b09db4208cc96ea9353f16159ca0f124d7fbc217afa5d40a2ea4191 swi-prolog-5.6.27.ebuild 3580
-EBUILD swi-prolog-5.6.28.ebuild 3620 RMD160 eb031f04b04eab63a60f1370d91f752520a83890 SHA1 0f9d522de6eeb756db9c9858ddcaa122f34c5e65 SHA256 7c3385a6c7249c2d3b47543fc6fa6369cd0623f8143077d878cfbe5a0d03b2e7
-MD5 948e2477867879732d9e2e1f0a7a126e swi-prolog-5.6.28.ebuild 3620
-RMD160 eb031f04b04eab63a60f1370d91f752520a83890 swi-prolog-5.6.28.ebuild 3620
-SHA256 7c3385a6c7249c2d3b47543fc6fa6369cd0623f8143077d878cfbe5a0d03b2e7 swi-prolog-5.6.28.ebuild 3620
-MISC ChangeLog 12149 RMD160 ec5a31a7a4d29ad7886f1d4ab107b0fdce896143 SHA1 dbadfa463facf1a5e0ed1c41adfafb90d26abf25 SHA256 0e71531ed645df24e3c73ac8366b0a40fde4c7e6bb45055eb9467d55d57e456c
-MD5 b5bfe75a9c2f0aa3408b368060dbf8b5 ChangeLog 12149
-RMD160 ec5a31a7a4d29ad7886f1d4ab107b0fdce896143 ChangeLog 12149
-SHA256 0e71531ed645df24e3c73ac8366b0a40fde4c7e6bb45055eb9467d55d57e456c ChangeLog 12149
+EBUILD swi-prolog-5.6.25.ebuild 3732 RMD160 64f6fc8cfc4ddc3dde3348f0a16040477b46f101 SHA1 a63625ac56e6bec1ae80fcc3fb8340a89fba21e0 SHA256 52b4118b1d1ab2faabbb8622bc7153eec7291dad89a0cb97089d9777ed599852
+MD5 1fad203af1ba64e92ed3eef8585dd7ad swi-prolog-5.6.25.ebuild 3732
+RMD160 64f6fc8cfc4ddc3dde3348f0a16040477b46f101 swi-prolog-5.6.25.ebuild 3732
+SHA256 52b4118b1d1ab2faabbb8622bc7153eec7291dad89a0cb97089d9777ed599852 swi-prolog-5.6.25.ebuild 3732
+EBUILD swi-prolog-5.6.27.ebuild 3583 RMD160 344c5ec158f2d2770a7488bc78809a496b0e4df1 SHA1 cc159f0e7e7408008fb7d9fe74dace7bdcd95058 SHA256 cf0015ee877d123eaf3359d03b3b8eaa27ee36c2a464cf34ea5eab361fe93ca2
+MD5 7edd79d11a8b6b23042e435fffb8a23c swi-prolog-5.6.27.ebuild 3583
+RMD160 344c5ec158f2d2770a7488bc78809a496b0e4df1 swi-prolog-5.6.27.ebuild 3583
+SHA256 cf0015ee877d123eaf3359d03b3b8eaa27ee36c2a464cf34ea5eab361fe93ca2 swi-prolog-5.6.27.ebuild 3583
+EBUILD swi-prolog-5.6.28.ebuild 3623 RMD160 6defe7749d513b1eee12ca52304af1327e78cd9b SHA1 fb54fb65cea940327c771da582e71689b735d182 SHA256 7dab37b0244d740bfd873e2f748a5e844ceef18c92ae6a1ffcc865ab82db9d8f
+MD5 76bde1d45632a44771733d668491ba58 swi-prolog-5.6.28.ebuild 3623
+RMD160 6defe7749d513b1eee12ca52304af1327e78cd9b swi-prolog-5.6.28.ebuild 3623
+SHA256 7dab37b0244d740bfd873e2f748a5e844ceef18c92ae6a1ffcc865ab82db9d8f swi-prolog-5.6.28.ebuild 3623
+MISC ChangeLog 12363 RMD160 e82951f61f2e37c1bc139680ffba863b8b2278b9 SHA1 5ffa149c25c3dacb27b336d5864b38f72d9b31ae SHA256 046cc304b07c0b51fa8e6027629a579832df4a16679e7ef6a5a6619777779e6f
+MD5 6ddd3fcd8d1a9ff5c2c7570fb1c48336 ChangeLog 12363
+RMD160 e82951f61f2e37c1bc139680ffba863b8b2278b9 ChangeLog 12363
+SHA256 046cc304b07c0b51fa8e6027629a579832df4a16679e7ef6a5a6619777779e6f ChangeLog 12363
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159

diff --git a/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
new file mode 100644 (file)
index 0000000..88d6b0f
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-thread-tests-r1.patch
@@ -0,0 +1,78 @@
+diff -ur pl-5.6.25.orig/packages/clib/testsocket.pl pl-5.6.25/packages/clib/testsocket.pl
+--- pl-5.6.25.orig/packages/clib/testsocket.pl 2004-09-22 02:28:16.000000000 +1200
++++ pl-5.6.25/packages/clib/testsocket.pl      2007-02-24 08:55:29.000000000 +1300
+@@ -35,6 +35,12 @@
+           client/1                    % +Address
+         ]).
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling tcp_test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(user:file_search_path(foreign, '.')).
+ 
+ :- use_module(socket).
+diff -ur pl-5.6.25.orig/packages/semweb/litmap_test.pl pl-5.6.25/packages/semweb/litmap_test.pl
+--- pl-5.6.25.orig/packages/semweb/litmap_test.pl      2006-03-07 02:17:30.000000000 +1300
++++ pl-5.6.25/packages/semweb/litmap_test.pl   2007-02-24 08:55:29.000000000 +1300
+@@ -3,6 +3,13 @@
+           test/1,
+           test/2
+         ]).
++
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling literal map test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- use_module(library(debug)).
+ :- use_module(library(debug)).
+ :- asserta(user:file_search_path(foreign, '../sgml')).
+diff -ur pl-5.6.25.orig/packages/semweb/rdf_db_test.pl pl-5.6.25/packages/semweb/rdf_db_test.pl
+--- pl-5.6.25.orig/packages/semweb/rdf_db_test.pl      2006-11-10 22:44:56.000000000 +1300
++++ pl-5.6.25/packages/semweb/rdf_db_test.pl   2007-02-24 08:55:29.000000000 +1300
+@@ -29,6 +29,12 @@
+     the GNU General Public License.
+ */
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling RDF_DB test suite on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(file_search_path(foreign, '../sgml')).
+ :- asserta(file_search_path(library, '../sgml')).
+ :- asserta(file_search_path(library, '../sgml/RDF')).
+Only in pl-5.6.25/packages/semweb: rdf_db_test.pl.orig
+diff -ur pl-5.6.25.orig/packages/ssl/ssl_test.pl pl-5.6.25/packages/ssl/ssl_test.pl
+--- pl-5.6.25.orig/packages/ssl/ssl_test.pl    2006-06-21 19:51:59.000000000 +1200
++++ pl-5.6.25/packages/ssl/ssl_test.pl 2007-02-24 08:55:29.000000000 +1300
+@@ -29,6 +29,12 @@
+     the GNU General Public License.
+ */
+ 
++:- (   current_prolog_flag(threads, true)
++   ->  true
++   ;   format('Disabling SSL test on single-threaded engine~n~n', []),
++       halt
++   ).
++
+ :- asserta(user:file_search_path(foreign, '.')).
+ 
+ :- use_module(ssl).
+diff -ur pl-5.6.25.orig/packages/zlib/ztest.pl pl-5.6.25/packages/zlib/ztest.pl
+--- pl-5.6.25.orig/packages/zlib/ztest.pl      2006-12-06 01:19:44.000000000 +1300
++++ pl-5.6.25/packages/zlib/ztest.pl   2007-02-24 09:05:57.000000000 +1300
+@@ -56,7 +56,7 @@
+ 
+ %     zstream: test compressed stream flushing and processing
+ 
+-test(zstream) :-
++test(zstream, [condition(current_prolog_flag(threads, true))]) :-
+       server(Port),
+       debug(server, 'Server at ~w~n', [Port]),
+       client(Port),

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 42db263dba5b982c8f40a584e95579bef6e95736..efe62da988b33f27e44057cc3c6852b563288ae4 100644 (file)
--- 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.4 2007/02/03 03:28:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild,v 1.5 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -52,7 +52,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-semweb-bitmatrix.patch
        epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
        epatch "${FILESDIR}"/${PN}-ssl-SIO_FLUSHOUTPUT.patch
-       epatch "${FILESDIR}"/${PN}-thread-tests.patch
+       epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
        epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
        epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
        epatch "${FILESDIR}"/${PN}-zlib-test.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 3103326ed29c1ca531d0183eec933a1449c6c6f2..35e776ceaf57d4d67e17d03cb8fdc00fc59f1027 100644 (file)
--- 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.2 2007/02/03 03:28:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.3 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -50,7 +50,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
        epatch "${FILESDIR}"/${PN}-ltx2htm.patch
        epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-       epatch "${FILESDIR}"/${PN}-thread-tests.patch
+       epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
        epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
        epatch "${FILESDIR}"/${PN}-xpce-test-r1.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 208302c026dc501010516f4e47aa420c52c1c792..30b611d3444af59071f2ad249f6b2e4e0dfc54ea 100644 (file)
--- 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.2 2007/02/13 07:43:21 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.3 2007/02/23 20:22:20 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
@@ -51,7 +51,7 @@ src_unpack() {
        epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
        epatch "${FILESDIR}"/${PN}-ltx2htm.patch
        epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-       epatch "${FILESDIR}"/${PN}-thread-tests.patch
+       epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch
        epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
        epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
 }