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

(Portage version: 2.1.2_pre2-r5)

7 files changed, 108 insertions, 6 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/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