Handle SGML_CATALOG_FILES environment variable containing non-existent catalogs. Thanks to Christian Faulhammer <gentoo@faulhammer.org> in #149662.

Package-Manager: portage-2.1.2_pre2-r5

8 files changed, 136 insertions, 40 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index b957188a671e..7b6faee35081 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.41 2006/10/03 21:36:21 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.42 2006/10/07 08:07:14 keri Exp $
+
+  07 Oct 2006; keri <keri@gentoo.org>
+  +files/swi-prolog-SGML_CATALOG_FILES.patch, swi-prolog-5.6.17-r1.ebuild,
+  swi-prolog-5.6.18.ebuild, swi-prolog-5.6.19.ebuild,
+  swi-prolog-5.6.20.ebuild, swi-prolog-5.6.21.ebuild:
+  Handle SGML_CATALOG_FILES environment variable containing non-existent
+  catalogs. Thanks to Christian Faulhammer <gentoo@faulhammer.org> in #149662.
 
   03 Oct 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   swi-prolog-5.6.17-r1.ebuild:
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index f1aa2177698c..4669f6949bf8 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX swi-prolog-5.6.18-CFLAGS.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 SHA1 ad41ac9eee26461506c13776aac1f3ed9cbf3be7 SHA256 85051afdbe983622900b9b3692acfb08da338da8ade1be296992ab78f8391986
 MD5 433655357c83157d2fb532efd135d7f5 files/swi-prolog-5.6.18-CFLAGS.patch 10475
 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 files/swi-prolog-5.6.18-CFLAGS.patch 10475
@@ -37,6 +34,10 @@ AUX swi-prolog-PLBASE.patch 3884 RMD160 b7b08ca7150503b9ee40f33e392147612dc3c2b9
 MD5 9709fe20e8ef457682eb0a5bff5d9940 files/swi-prolog-PLBASE.patch 3884
 RMD160 b7b08ca7150503b9ee40f33e392147612dc3c2b9 files/swi-prolog-PLBASE.patch 3884
 SHA256 c49a3fa0c40a16dc9cd11a3cbc4e7d05c527a6361b22a9660b069c99bd09ee91 files/swi-prolog-PLBASE.patch 3884
+AUX swi-prolog-SGML_CATALOG_FILES.patch 2737 RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 SHA1 e802aa9dd2b44d81dd8cc87c6e77ffa8d855c938 SHA256 f2a5060301dc70fb1ba49498a047e99e4beebe9cdc7d67a9ce8f1dbd9f505aba
+MD5 0aeafc6b2fe48baa70fd66135472894b files/swi-prolog-SGML_CATALOG_FILES.patch 2737
+RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 files/swi-prolog-SGML_CATALOG_FILES.patch 2737
+SHA256 f2a5060301dc70fb1ba49498a047e99e4beebe9cdc7d67a9ce8f1dbd9f505aba files/swi-prolog-SGML_CATALOG_FILES.patch 2737
 AUX swi-prolog-cppproxy-r1.patch 643 RMD160 66169ec055eddf90acddd1f8d158ae0517906487 SHA1 57177c4132188604829eef62b9bd071888c3e4f8 SHA256 1f03fe5b630776b55f91eb25b992ae9e254cec749ba2cc626290aa5ec769fe70
 MD5 63b514c534ab699a7dcb1ba9642a44c2 files/swi-prolog-cppproxy-r1.patch 643
 RMD160 66169ec055eddf90acddd1f8d158ae0517906487 files/swi-prolog-cppproxy-r1.patch 643
@@ -151,38 +152,38 @@ DIST pl-5.6.19.tar.gz 11532046 RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 S
 DIST pl-5.6.20.tar.gz 11528418 RMD160 3f8b25d8370485c7fc8f15d0c55d5a873869a93a SHA1 3decae180a5870684eba38492e45e479c7881e2f SHA256 10e09ce3fdd35c12fceb3e463a617a40f119b67dc23436068dd47a9388355981
 DIST pl-5.6.21.tar.gz 11543471 RMD160 f3d164199a727abf4603cb809f5b67aeb511709a SHA1 7a93a82ac9ba78fff3497e64486bfd8fae538f14 SHA256 e83326fee55b3026fd389a89c10a09110f318c430fd88056ca5dff2e7ab11ac1
 DIST pl-5.6.8.tar.gz 9157044 RMD160 449a866a9fadf13c068393f8a4f76862ecbd2207 SHA1 56de45066ba1680ebf6a74d3b7be6ab8cd23293a SHA256 4ccfd6ed684f56750c089a8103e2d640c6591873e3f36b47a2e2d39958cccdf3
-EBUILD swi-prolog-5.6.17-r1.ebuild 3703 RMD160 0ddd5238249464e95c727525826d9123b290306f SHA1 2cdc6794303339f25e7a3ca45ac08ae0c8999600 SHA256 817a7fe29aee828251b88116b445473319e30f46d09083b397ac334481620c6a
-MD5 f0abaee561f9eff8cbb7ea05e2999e4c swi-prolog-5.6.17-r1.ebuild 3703
-RMD160 0ddd5238249464e95c727525826d9123b290306f swi-prolog-5.6.17-r1.ebuild 3703
-SHA256 817a7fe29aee828251b88116b445473319e30f46d09083b397ac334481620c6a swi-prolog-5.6.17-r1.ebuild 3703
+EBUILD swi-prolog-5.6.17-r1.ebuild 3755 RMD160 7cb8da6aadffb4e9160f8b0295506f04b90d4739 SHA1 601cf55cf0547e2670ad8ed7bc18940c4a6a5ba8 SHA256 438a77cb251948a8409179e47bfb8246bc3b2672025975e31664f80307e5e81a
+MD5 1f90ab8f9a7da6d73c64d01da73d0b3e swi-prolog-5.6.17-r1.ebuild 3755
+RMD160 7cb8da6aadffb4e9160f8b0295506f04b90d4739 swi-prolog-5.6.17-r1.ebuild 3755
+SHA256 438a77cb251948a8409179e47bfb8246bc3b2672025975e31664f80307e5e81a swi-prolog-5.6.17-r1.ebuild 3755
 EBUILD swi-prolog-5.6.17.ebuild 3640 RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 SHA1 f070a1c99bec57684e022353dbdf6c6b2630d0f0 SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a
 MD5 998a2c2b1b5ebda95e28f5dae96e8f80 swi-prolog-5.6.17.ebuild 3640
 RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 swi-prolog-5.6.17.ebuild 3640
 SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a swi-prolog-5.6.17.ebuild 3640
-EBUILD swi-prolog-5.6.18.ebuild 3308 RMD160 dd92ad0d44042dd2bb9f3a8eba090cf29204a5ec SHA1 27a793026ed1717edf15ee811471df33b876cc26 SHA256 45a735531782d3d5ddde2642b0d8b502188eec5f11615683c1848f4bb270a24c
-MD5 2b0aa008d3e670082b47c45cbfeee122 swi-prolog-5.6.18.ebuild 3308
-RMD160 dd92ad0d44042dd2bb9f3a8eba090cf29204a5ec swi-prolog-5.6.18.ebuild 3308
-SHA256 45a735531782d3d5ddde2642b0d8b502188eec5f11615683c1848f4bb270a24c swi-prolog-5.6.18.ebuild 3308
-EBUILD swi-prolog-5.6.19.ebuild 3322 RMD160 f64dee5d199a480d9aa4440e385c8ceaf853a941 SHA1 a975092c909f6eacbe3021dd6d8de1ee6fa15061 SHA256 0720690a65f1a9372643c2c3d46e9f45790f633eb91d4faee81499993cb4b023
-MD5 787058e6c4a652940293a4e361fe70b5 swi-prolog-5.6.19.ebuild 3322
-RMD160 f64dee5d199a480d9aa4440e385c8ceaf853a941 swi-prolog-5.6.19.ebuild 3322
-SHA256 0720690a65f1a9372643c2c3d46e9f45790f633eb91d4faee81499993cb4b023 swi-prolog-5.6.19.ebuild 3322
-EBUILD swi-prolog-5.6.20.ebuild 3322 RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c1278ba SHA1 6c56d8106f9c78abdf82eda7d56c222f5812b245 SHA256 44a4d314a7ce1c8523d527f133f904c077ee963a7237edec43b0b3d1a2238fe1
-MD5 f4988adb9134d24afa4e60b410cc685b swi-prolog-5.6.20.ebuild 3322
-RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c1278ba swi-prolog-5.6.20.ebuild 3322
-SHA256 44a4d314a7ce1c8523d527f133f904c077ee963a7237edec43b0b3d1a2238fe1 swi-prolog-5.6.20.ebuild 3322
-EBUILD swi-prolog-5.6.21.ebuild 3273 RMD160 9dd7e2d9e5e451d5bb7a668cf454c174aa8d3d45 SHA1 36c72882949f09b0e5f7b0c4c1cc7223c53ef69b SHA256 2b22992b551fc1b57980b127de370a514c10e7b133c6311b6c3e4a2c78dea3cc
-MD5 77c2aa6b6604f786d9100bb6c09c75ce swi-prolog-5.6.21.ebuild 3273
-RMD160 9dd7e2d9e5e451d5bb7a668cf454c174aa8d3d45 swi-prolog-5.6.21.ebuild 3273
-SHA256 2b22992b551fc1b57980b127de370a514c10e7b133c6311b6c3e4a2c78dea3cc swi-prolog-5.6.21.ebuild 3273
+EBUILD swi-prolog-5.6.18.ebuild 3361 RMD160 ac69208c78234bdcdfed3fe8f34922087b60abe4 SHA1 c345a2db4fcf34854f7fd395c0c87ef51875147a SHA256 daa5ea73d61f360c9ee9d355a768fc20895fb10a74a34b960bbe3cf895fcb208
+MD5 2b85cff3ccb1919a17e8d77cbd1a4593 swi-prolog-5.6.18.ebuild 3361
+RMD160 ac69208c78234bdcdfed3fe8f34922087b60abe4 swi-prolog-5.6.18.ebuild 3361
+SHA256 daa5ea73d61f360c9ee9d355a768fc20895fb10a74a34b960bbe3cf895fcb208 swi-prolog-5.6.18.ebuild 3361
+EBUILD swi-prolog-5.6.19.ebuild 3375 RMD160 c48c2b300db906161e8c7fafdb6eb5b9cc67c2e7 SHA1 5c354093e94d03d15caf7f541e7a3c401c5ed34a SHA256 e340afbd30342eaa64e6764ba191e65a3ff1c58885ff95be6719af4431183c81
+MD5 30e5255e9293c3553ab91c6b63a58696 swi-prolog-5.6.19.ebuild 3375
+RMD160 c48c2b300db906161e8c7fafdb6eb5b9cc67c2e7 swi-prolog-5.6.19.ebuild 3375
+SHA256 e340afbd30342eaa64e6764ba191e65a3ff1c58885ff95be6719af4431183c81 swi-prolog-5.6.19.ebuild 3375
+EBUILD swi-prolog-5.6.20.ebuild 3375 RMD160 19763ce04d01a94201691da0ec6de2675739483a SHA1 10e7ef698c4e51c0664a089c856031b59427567f SHA256 9cad5df87a75e17a25d777b3c986316c1236212e1b91bf3955dd11bd53e79081
+MD5 0fb327719344deb03cec5726134f1a3f swi-prolog-5.6.20.ebuild 3375
+RMD160 19763ce04d01a94201691da0ec6de2675739483a swi-prolog-5.6.20.ebuild 3375
+SHA256 9cad5df87a75e17a25d777b3c986316c1236212e1b91bf3955dd11bd53e79081 swi-prolog-5.6.20.ebuild 3375
+EBUILD swi-prolog-5.6.21.ebuild 3326 RMD160 04c681f9c9c286e312ef375a9d26150d7478dd1c SHA1 8b160ed2b64c930c917ea475c374d6ef87d96499 SHA256 821be16feb867262632158fa223dfbb39d8a534038982aaa3f93ea637abd7987
+MD5 701c945bdf6337910352ea07b26fe9c6 swi-prolog-5.6.21.ebuild 3326
+RMD160 04c681f9c9c286e312ef375a9d26150d7478dd1c swi-prolog-5.6.21.ebuild 3326
+SHA256 821be16feb867262632158fa223dfbb39d8a534038982aaa3f93ea637abd7987 swi-prolog-5.6.21.ebuild 3326
 EBUILD swi-prolog-5.6.8.ebuild 3503 RMD160 db4322b8c734af20011e4845a93427a8328ae113 SHA1 5fd4712a46f68f40565e2150be372a1831057de0 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a
 MD5 6bc8df3140ced306811de8495f5e625d swi-prolog-5.6.8.ebuild 3503
 RMD160 db4322b8c734af20011e4845a93427a8328ae113 swi-prolog-5.6.8.ebuild 3503
 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a swi-prolog-5.6.8.ebuild 3503
-MISC ChangeLog 7988 RMD160 53c21f879f9a960dbdaf60a4762aa433d6eb3d21 SHA1 8971e8fdb5fc98a401f7f3b8aef2bbd8f0a6fc66 SHA256 71cb2bc634125aa3016cc24b2b51bf3bb5b636345d174660c702d525e9760c87
-MD5 7e6d675a3e85613cfc64b806cfdfae75 ChangeLog 7988
-RMD160 53c21f879f9a960dbdaf60a4762aa433d6eb3d21 ChangeLog 7988
-SHA256 71cb2bc634125aa3016cc24b2b51bf3bb5b636345d174660c702d525e9760c87 ChangeLog 7988
+MISC ChangeLog 8361 RMD160 e42f6f33c982a02cf03f54fbc5e1213fd7ed0fb9 SHA1 b078d410574d9b289e8299cfefaf6378245952f4 SHA256 a802bf47071742f1838fd41ee61792d845bd29470909b58d9b56dc54b63b9219
+MD5 14ebf53e2a029723582e3e96414112ca ChangeLog 8361
+RMD160 e42f6f33c982a02cf03f54fbc5e1213fd7ed0fb9 ChangeLog 8361
+SHA256 a802bf47071742f1838fd41ee61792d845bd29470909b58d9b56dc54b63b9219 ChangeLog 8361
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -208,10 +209,3 @@ SHA256 235ad468bd9bf33b3b4a8bbd93ffe683acf3be890fa519ea65749e025c9c2465 files/di
 MD5 69c20c79c5aeb698888e72036cb021c6 files/digest-swi-prolog-5.6.8 229
 RMD160 221664df6018bc92d6323e5c138dbb23e68f8d20 files/digest-swi-prolog-5.6.8 229
 SHA256 c74fedc27886eb5e2b6fb24da242d983b5f0f34c0502f0b46386dbd7355ce76a files/digest-swi-prolog-5.6.8 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFFIta3/NoSW7FuNV8RAm1iAJ46iN63OOYUom7MrkkwJwFjWzDKVACfU6oY
-NsvG4sc128hwYpdUCamCqtI=
-=k0hq
------END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch b/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch
new file mode 100644
index 000000000000..9ee6bca9424f
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-SGML_CATALOG_FILES.patch
@@ -0,0 +1,90 @@
+diff -ur pl-5.6.17.orig/packages/semweb/rdf_db_test.pl pl-5.6.17/packages/semweb/rdf_db_test.pl
+--- pl-5.6.17.orig/packages/semweb/rdf_db_test.pl	2006-03-09 03:32:48.000000000 +1300
++++ pl-5.6.17/packages/semweb/rdf_db_test.pl	2006-10-07 20:32:28.000000000 +1300
+@@ -13,6 +13,8 @@
+ :- use_module(rdfs).
+ :- use_module(library(xsdp_types)).
+ 
++:- unsetenv('SGML_CATALOG_FILES').
++
+ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ RDF-DB test file.  A test is a clause of the form:
+ 
+diff -ur pl-5.6.17.orig/packages/sgml/RDF/rdf_test.pl pl-5.6.17/packages/sgml/RDF/rdf_test.pl
+--- pl-5.6.17.orig/packages/sgml/RDF/rdf_test.pl	2005-07-05 02:07:43.000000000 +1200
++++ pl-5.6.17/packages/sgml/RDF/rdf_test.pl	2006-10-07 20:31:31.000000000 +1300
+@@ -34,6 +34,8 @@
+ 
+ :- set_prolog_flag(rdf_container, true).
+ 
++:- unsetenv('SGML_CATALOG_FILES').
++
+ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Test file for the SWI-Prolog RDF parser.  Toplevel predicates:
+ 
+diff -ur pl-5.6.17.orig/packages/sgml/Test/test.pl pl-5.6.17/packages/sgml/Test/test.pl
+--- pl-5.6.17.orig/packages/sgml/Test/test.pl	2005-03-01 02:49:58.000000000 +1300
++++ pl-5.6.17/packages/sgml/Test/test.pl	2006-10-07 09:14:41.000000000 +1300
+@@ -25,6 +25,7 @@
+ :- asserta(user:file_search_path(foreign, '..')).
+ :- use_module(library(sgml)).
+ 
++:- unsetenv('SGML_CATALOG_FILES').
+ 
+ test :-
+ 	testdir(.).
+@@ -52,27 +53,27 @@
+ 	    ->	format('ok')
+ 	    ;	format('WRONG'),
+ 	        format('~NOK:~n'),
+-		pp(TermOk),
++		format('~w~n',[TermOk]),
+ 		format('~NANSWER:~n'),
+-		pp(Term)
++		format('~w~n',[Term])
+ 	    ),
+ 	    error_terms(Errors),
+ 	    (	compare_errors(Errors, ErrorsOk)
+ 	    ->	true
+ 	    ;	format(' [Different errors]~nOK:~n'),
+-		pp(ErrorsOk),
++		format('~w~n',[ErrorsOk]),
+ 		format('~NANSWER:~n'),
+-		pp(Errors)
++		format('~w~n',[Errors])
+ 	    ),
+ 	    nl
+ 	;   show_errors,
+ 	    format('Loaded, no validating data~n'),
+-	    pp(Term)
++	    format('~w~n',[Term])
+ 	).
+ 
+ show(File) :-
+ 	load_file(File, Term),
+-	pp(Term).
++	format('~w~n',[Term]).
+ 
+ pass(File) :-
+ 	load_file(File, Term),
+diff -ur pl-5.6.17.orig/packages/sgml/Test/wrtest.pl pl-5.6.17/packages/sgml/Test/wrtest.pl
+--- pl-5.6.17.orig/packages/sgml/Test/wrtest.pl	2005-03-01 02:49:58.000000000 +1300
++++ pl-5.6.17/packages/sgml/Test/wrtest.pl	2006-10-07 09:20:18.000000000 +1300
+@@ -19,6 +19,8 @@
+ :- use_module(library(sgml)).
+ :- use_module(library(sgml_write)).
+ 
++:- unsetenv('SGML_CATALOG_FILES').
++
+ test :-					% default test
+ 	fp('.').
+ 
+@@ -114,7 +116,7 @@
+ 	open(File, write, Out, [encoding(iso_latin_1)]),
+ 	current_output(C0),
+ 	set_output(Out),
+-	pp(Term),
++	format('~w~n',[Term]),
+ 	set_output(C0),
+ 	close(Out).
+ 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
index 12d722fe23f9..5c4fa66b91a4 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.17-r1.ebuild,v 1.6 2006/10/03 21:36:21 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17-r1.ebuild,v 1.7 2006/10/07 08:07:14 keri Exp $
 
 inherit autotools eutils
 
@@ -52,6 +52,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-libtai.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
 	epatch "${FILESDIR}"/${PN}-semweb-sparc-alignment.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test.patch
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
index 19661130d120..28bea8e404af 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.18.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild,v 1.5 2006/10/07 08:07:14 keri Exp $
 
 inherit eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test.patch
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
index d9622f7d1d97..202eba8040d4 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.19.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild,v 1.5 2006/10/07 08:07:14 keri Exp $
 
 inherit eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test.patch
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
index 62c0a36117c0..961eaceebf4a 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.20.ebuild,v 1.4 2006/10/02 17:01:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild,v 1.5 2006/10/07 08:07:14 keri Exp $
 
 inherit eutils
 
@@ -46,6 +46,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test.patch
 }
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
index cabc9a5e8534..bdb1574da878 100644
--- a/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.21.ebuild,v 1.1 2006/10/02 17:12:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild,v 1.2 2006/10/07 08:07:14 keri Exp $
 
 inherit eutils
 
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
 	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
 	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
 	epatch "${FILESDIR}"/${PN}-thread-tests.patch
 	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
 	epatch "${FILESDIR}"/${PN}-xpce-test.patch