Version bump.

(Portage version: 2.1.2_rc1-r7)

6 files changed, 351 insertions, 1 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 0e804f8a52d0..dbb1228bf901 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.52 2006/11/16 06:34:29 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.53 2006/11/29 09:01:13 keri Exp $
+
+*swi-prolog-5.6.24 (29 Nov 2006)
+
+  29 Nov 2006; keri <keri@gentoo.org> +files/swi-prolog-jpl-LDPATH-r1.patch,
+  +files/swi-prolog-jpl-junit.patch, +files/swi-prolog-xpce-test-r1.patch,
+  +swi-prolog-5.6.24.ebuild:
+  Version bump.
 
   16 Nov 2006; keri <keri@gentoo.org>
   +files/swi-prolog-PL_EV_THREADFINISHED.patch, swi-prolog-5.6.23.ebuild:
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24
new file mode 100644
index 000000000000..cdf2204cc610
--- /dev/null
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24
@@ -0,0 +1,3 @@
+MD5 cd084fc65886b09bd5eae30c3506cd73 pl-5.6.24.tar.gz 11561664
+RMD160 d26af2674bff916747bcc84a2f7df6119036c113 pl-5.6.24.tar.gz 11561664
+SHA256 7fb4548d86595825b67cebb9a02e5009cc4e1f6851df8aba433bff4707fff85f pl-5.6.24.tar.gz 11561664
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch
new file mode 100644
index 000000000000..cc0c15621be5
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch
@@ -0,0 +1,39 @@
+diff -ur pl-5.6.24.orig/packages/jpl/Makefile.in pl-5.6.24/packages/jpl/Makefile.in
+--- pl-5.6.24.orig/packages/jpl/Makefile.in	2006-11-28 22:16:43.000000000 +1300
++++ pl-5.6.24/packages/jpl/Makefile.in	2006-11-29 20:51:24.000000000 +1300
+@@ -36,6 +36,7 @@
+ JAVA=@JAVA@
+ JUNIT=@JUNIT@
+ JAVALIBS=@JAVALIBS@
++JAVALDPATH=@JAVALDPATH@
+ 
+ DOCTOTEX=$(PCEHOME)/bin/doc2tex
+ PLTOTEX=$(PCEHOME)/bin/pl2tex
+@@ -75,7 +76,7 @@
+ check:		check_pl check_java
+ 
+ check_pl::		
+-		$(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
++		LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
+ check_java::
+ 		CLASSPATH=$(JUNIT):jpl.jar:jpltest.jar $(JAVA) junit.textui.TestRunner jpl.test.TestJUnit
+ 
+diff -ur pl-5.6.24.orig/packages/jpl/configure pl-5.6.24/packages/jpl/configure
+--- pl-5.6.24.orig/packages/jpl/configure	2006-11-28 22:16:44.000000000 +1300
++++ pl-5.6.24/packages/jpl/configure	2006-11-29 20:50:13.000000000 +1300
+@@ -3979,6 +3979,7 @@
+ 
+ for d in $JNI_CLIENT_DIRS; do
+   LDSOFLAGS="$LDSOFLAGS -L$d"
++  JAVALDPATH="$JAVALDPATH:$d"
+ done
+ 
+ if test "$java_abs_paths" = yes; then
+@@ -5254,6 +5255,7 @@
+ s,@LDSOFLAGS@,$LDSOFLAGS,;t t
+ s,@JAVA_HOME@,$JAVA_HOME,;t t
+ s,@JAVALIBS@,$JAVALIBS,;t t
++s,@JAVALDPATH@,$JAVALDPATH,;t t
+ s,@JUNIT@,$JUNIT,;t t
+ s,@PLLD@,$PLLD,;t t
+ s,@MAKE@,$MAKE,;t t
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch
new file mode 100644
index 000000000000..5d1692c8011d
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-junit.patch
@@ -0,0 +1,11 @@
+--- pl-5.6.24.orig/packages/jpl/configure	2006-11-28 22:16:44.000000000 +1300
++++ pl-5.6.24/packages/jpl/configure	2006-11-29 21:55:34.000000000 +1300
+@@ -3986,7 +3987,7 @@
+ fi
+ 
+ if test "x$JUNIT" = "x"; then
+-   JUNIT=/usr/share/java/junit.jar
++   JUNIT="$(java-config --classpath junit)"
+ fi
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
diff --git a/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch
new file mode 100644
index 000000000000..42888099633a
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-xpce-test-r1.patch
@@ -0,0 +1,158 @@
+diff -urN pl-5.6.24.orig/packages/xpce/src/Makefile.in pl-5.6.24/packages/xpce/src/Makefile.in
+--- pl-5.6.24.orig/packages/xpce/src/Makefile.in	2006-11-11 01:54:39.000000000 +1300
++++ pl-5.6.24/packages/xpce/src/Makefile.in	2006-11-29 20:56:28.000000000 +1300
+@@ -125,6 +125,7 @@
+ PLBINDIR=$(PLBASE)/bin/$(PLARCH)
+ PL=@PL@
+ PLBUILD=@PLBUILD@
++PCEBUILD=$(PCEHOME)/src/xpce.sh
+ PLNAME=@PLNAME@
+ PLLD=@PLLD@
+ 
+@@ -897,7 +898,8 @@
+ ################################################################
+ 
+ check::
+-		$(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
++		$(PCEBUILD) -q -g "['./find_display.pl'],find_display,halt" -t 'halt(0)'
++		$(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
+ 
+ 
+ ################################################################
+diff -urN pl-5.6.24.orig/packages/xpce/src/find_display.pl pl-5.6.24/packages/xpce/src/find_display.pl
+--- pl-5.6.24.orig/packages/xpce/src/find_display.pl	1970-01-01 12:00:00.000000000 +1200
++++ pl-5.6.24/packages/xpce/src/find_display.pl	2006-11-29 20:56:28.000000000 +1300
+@@ -0,0 +1,13 @@
++:- asserta(library_directory('../prolog/lib')).
++:- use_module(library(pce)).
++
++find_display :-
++  current_input(InputStream),
++  open_null_stream(NullStream),
++  set_prolog_IO(InputStream, NullStream, NullStream),
++  (   exists_file('display_exists')
++  ->  delete_file('display_exists')
++  ;   true),
++  get(@display, visual_type, _),
++  open('display_exists', update, Fd),
++  close(Fd).
+diff -urN pl-5.6.24.orig/packages/xpce/src/test.pl pl-5.6.24/packages/xpce/src/test.pl
+--- pl-5.6.24.orig/packages/xpce/src/test.pl	2006-11-14 21:43:27.000000000 +1300
++++ pl-5.6.24/packages/xpce/src/test.pl	2006-11-29 20:58:13.000000000 +1300
+@@ -35,11 +35,23 @@
+ 	?- test.
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
+ 
++:- asserta(library_directory('../prolog/lib')).
++:- use_module(library(pce)).
++:- use_module(library(pce_util)).
++
+ :- get(@pce, version, V),
+    format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\
+           To run all tests run ?- test.~n~n', [V]).
+ 
++:- dynamic
++	display_enabled/0.
+ 
++:- format('Checking for usable X server~n', []),
++   (   exists_file('display_exists')
++   ->  format('X server found.~n~n', []),
++       assert(display_enabled)
++   ;   format('No usable X server found. Some tests are disabled.~n~n', [])
++   ).
+ 
+ 		 /*******************************
+ 		 *	      NAMES		*
+@@ -163,12 +175,12 @@
+ 		 *******************************/
+ 
+ srcsink(contents-1) :-
+-	numlist(32, 1000, L),
++	numlist(32, 255, L),
+ 	tmp_file(test, Tmp),
+-	open(Tmp, write, Out, [encoding(utf8)]),
++	open(Tmp, write, Out, [encoding(iso_latin_1)]),
+ 	maplist(put_code(Out), L),
+ 	close(Out),
+-	new(File, file(Tmp, utf8)),
++	new(File, file(Tmp, iso_latin_1)),
+ 	get(File, contents, String),
+ 	delete_file(Tmp),
+ 	get(String, value, Atom),
+@@ -193,7 +205,7 @@
+ 		 *******************************/
+ 
+ foreign(Name) :-
+-	atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]).
++	atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]).
+ 
+ file(env-1) :-
+ 	new(F, file('$PCEHOME/Defaults')),
+@@ -202,11 +214,6 @@
+ 	get(F, name, PceName),
+ 	same_file(PceName, PlName),
+ 	send(F, same, PlName).
+-file(home-1) :-
+-	new(F, file('~/foobar')),
+-	get(F, name, PceName),
+-	expand_file_name('~/foobar', [PlName]),
+-	same_file(PceName, PlName).
+ file(abs-1) :-
+ 	new(F, file(foobar)),
+ 	get(F, absolute_path, Abs),
+@@ -221,14 +228,16 @@
+ 	       ->  send(file(F), exists)
+ 	       ;   \+ send(file(F), exists)
+ 	       )).
+-file(utf8-1) :-
++file(ascii-1) :-
+ 	foreign(Name),
+ 	Text = 'Hello world\n',
+ 	new(F, file(Name)),
++	send(F, encoding, iso_latin_1),
+ 	send(F, open, write),
+ 	send(F, append, Text),
+ 	send(F, close),
+ 	new(F2, file(Name)),
++	send(F2, encoding, iso_latin_1),
+ 	exists_file(Name),
+ 	send(F2, exists),
+ 	get(F2, contents, string(Text)),
+@@ -313,12 +322,12 @@
+ 	atom_concat(hello, Wide, New).
+ textbuffer(file-1) :-
+ 	new(TB, text_buffer),
+-	numlist(32, 1000, L),
++	numlist(32, 255, L),
+ 	atom_codes(WAtom, L),
+ 	send(TB, append, WAtom),
+ 	tmp_file(test, Tmp),
+-	send(TB, save, file(Tmp, utf8)),
+-	get(file(Tmp, utf8), contents, string(Copy)),
++	send(TB, save, file(Tmp, iso_latin_1)),
++	get(file(Tmp, iso_latin_1), contents, string(Copy)),
+ 	delete_file(Tmp),
+ 	Copy == WAtom.
+ textbuffer(store-1) :-
+@@ -636,6 +645,10 @@
+ testset(regex).				% Regular expression matches
+ testset(type).				% Check type logic
+ 
++display_required(bom).
++display_required(selection).
++display_required(image).
++
+ %	testdir(Dir)
+ %	
+ %	Enumerate directories holding tests.
+@@ -684,6 +697,10 @@
+ 	).
+ 
+ runtest(Name) :-
++	display_required(Name),
++	\+display_enabled,
++	format('Disabling test set "~w"~n', [Name]).
++runtest(Name) :-
+ 	format('Running test set "~w" ', [Name]),
+ 	flush,
+ 	functor(Head, Name, 1),
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.24.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.24.ebuild
new file mode 100644
index 000000000000..7a8091d8202d
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.24.ebuild
@@ -0,0 +1,132 @@
+# 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.24.ebuild,v 1.1 2006/11/29 09:01:13 keri Exp $
+
+inherit eutils
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads X"
+
+DEPEND="!dev-lang/swi-prolog-lite
+	sys-libs/ncurses
+	odbc? ( dev-db/unixODBC )
+	berkdb? ( sys-libs/db )
+	readline? ( sys-libs/readline )
+	gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4
+		dev-java/junit )
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s/man boot library/boot library/" src/Makefile.in
+	epatch "${FILESDIR}"/${PN}-portage-r1.patch
+	epatch "${FILESDIR}"/${PN}-CFLAGS-r3.patch
+	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
+	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
+	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
+	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r1.patch
+	epatch "${FILESDIR}"/${PN}-jpl-junit.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-r1.patch
+}
+
+src_compile() {
+	einfo "Building SWI-Prolog compiler"
+
+	local threadconf
+	if use java && ! use minimal || use threads ; then
+		threadconf="--enable-mt"
+	else
+		threadconf="--disable-mt"
+	fi
+
+	cd "${S}"/src
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		${threadconf} \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		--disable-custom-flags \
+		|| die "econf failed"
+	emake || die "emake failed"
+
+	if ! use minimal ; then
+		einfo "Building SWI-Prolog additional packages"
+
+		cd "${S}/packages"
+		econf \
+			--libdir=/usr/$(get_libdir) \
+			${threadconf} \
+			$(use_enable !static shared) \
+			--without-C-sicstus \
+			--with-chr \
+			--with-clib \
+			--with-clpqr \
+			--with-cpp \
+			--with-cppproxy \
+			$(use_with berkdb db) \
+			--with-http \
+			--without-jasmine \
+			$(use_with java jpl) \
+			$(use_with tetex ltx2htm) \
+			--with-nlp \
+			$(use_with odbc) \
+			--with-semweb \
+			--with-sgml \
+			--with-sgml/RDF \
+			$(use_with ssl) \
+			--with-table \
+			$(use_with X xpce) \
+			|| die "packages econf failed"
+
+		emake || die "packages emake failed"
+	fi
+}
+
+src_install() {
+	make -C src DESTDIR="${D}" install || die "install src failed"
+
+	if ! use minimal ; then
+		make -C packages DESTDIR="${D}" install || die "install packages failed"
+		if use doc ; then
+			make -C packages DESTDIR="${D}" html-install || die "html-install failed"
+			make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed"
+		fi
+	fi
+
+	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION
+}
+
+src_test() {
+	cd "${S}/src"
+	make check || die "make check failed. See above for details."
+
+	if ! use minimal ; then
+		cd "${S}/packages"
+		make check || die "make check failed. See above for details."
+	fi
+}