Version bump.

(Portage version: 2.1.1_pre3-r3)

4 files changed, 292 insertions, 1 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 1406e9f215f9..2c04f95e47e7 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2006/07/08 05:21:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.21 2006/07/29 10:12:13 keri Exp $
+
+*swi-prolog-5.6.17 (29 Jul 2006)
+
+  29 Jul 2006; Keri Harris <keri@gentoo.org>
+  +files/swi-prolog-test_date.patch, +swi-prolog-5.6.17.ebuild:
+  Version bump.
 
   08 Jul 2006; Keri Harris <keri@gentoo.org>
   files/swi-prolog-packages-portage.patch:
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17
new file mode 100644
index 000000000000..56aaea0e1546
--- /dev/null
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17
@@ -0,0 +1,3 @@
+MD5 3858e1f3073deac18ca1f76986f8b69c pl-5.6.17.tar.gz 10652203
+RMD160 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab pl-5.6.17.tar.gz 10652203
+SHA256 4768761ec4ad4c7160373950bc21d6124c3641dfff9dbe5db4dd7c48433e0072 pl-5.6.17.tar.gz 10652203
diff --git a/dev-lang/swi-prolog/files/swi-prolog-test_date.patch b/dev-lang/swi-prolog/files/swi-prolog-test_date.patch
new file mode 100644
index 000000000000..dc11203a49de
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-test_date.patch
@@ -0,0 +1,141 @@
+--- pl-5.6.17.orig/src/Tests/library/test_date.pl	2006-07-28 08:29:29.000000000 +1200
++++ pl-5.6.17/src/Tests/library/test_date.pl	2006-07-29 21:44:38.000000000 +1200
+@@ -25,50 +25,50 @@
+ 		 *      TIME_FORMAT/3 TESTS	*
+ 		 *******************************/
+ 
+-ok(1152794050, '~a', 'Thu').
+-ok(1152794050, '~A', 'Thursday').
+-ok(1152794050, '~b', 'Jul').
+-ok(1152794050, '~B', 'July').
+-ok(1152794050, '~c', 'Thu Jul 13 14:34:10 2006').
+-ok(1152794050, '~p', ['P', 'PM']).
+-%ok(1152794050, '~P', 'pm').		% non-standard
+-ok(1152794050, '~x', '07/13/06').
+-ok(1152794050, '~X', '14:34:10').
+-ok(1152794050, '~C', '20').
+-ok(1152794050, '~d', '13').
+-ok(1152794050, '~D', '07/13/06').
+-ok(1152794050, '~e', '13').
++ok(1152794050, '%a', 'Thu').
++ok(1152794050, '%A', 'Thursday').
++ok(1152794050, '%b', 'Jul').
++ok(1152794050, '%B', 'July').
++ok(1152794050, '%c', 'Thu Jul 13 12:34:10 2006').
++ok(1152794050, '%p', ['P', 'PM']).
++%ok(1152794050, '%P', 'pm').		% non-standard
++ok(1152794050, '%x', '07/13/06').
++ok(1152794050, '%X', '12:34:10').
++ok(1152794050, '%C', '20').
++ok(1152794050, '%d', '13').
++ok(1152794050, '%D', '07/13/06').
++ok(1152794050, '%e', '13').
+ %ok(1152794050, '%E', '').
+-ok(1152794050, '~F', '2006-07-13').
+-ok(1152794050, '~g', '06').
+-ok(1152794050, '~G', '2006').
+-ok(1152794050, '~V', '28').
+-ok(1152794050, '~h', 'Jul').
+-ok(1152794050, '~H', '14').
+-ok(1152794050, '~I', '02').
+-ok(1152794050, '~j', '194').
+-ok(1152794050, '~k', '14').
+-ok(1152794050, '~l', ' 2').
+-ok(1152794050, '~m', '07').
+-ok(1152794050, '~M', '34').
+-ok(1152794050, '~n', '\n').
+-%ok(1152794050, '~O', '').
+-ok(1152794050, '~r', '02:34:10 PM').
+-ok(1152794050, '~R', '14:34').
+-ok(1152794050, '~s', '1152794050').
+-ok(1152794050, '~S', '10').
+-ok(1152794050, '~t', '\t').
+-ok(1152794050, '~T', '14:34:10').
+-ok(1152794050, '~u', '4').
+-ok(1152794050, '~U', '28').
+-ok(1152794050, '~w', '4').
+-ok(1152794050, '~W', '28').
+-ok(1152794050, '~y', '06').
+-ok(1152794050, '~Y', '2006').
+-ok(1152794050, '~z', '+0200').
+-ok(1152794050, '~Z', 'CEST').
+-ok(1152794050, '~+', 'Thu Jul 13 14:34:10 2006').
+-ok(1152794050, '~~', '~').
++ok(1152794050, '%F', '2006-07-13').
++ok(1152794050, '%g', '06').
++ok(1152794050, '%G', '2006').
++ok(1152794050, '%V', '28').
++ok(1152794050, '%h', 'Jul').
++ok(1152794050, '%H', '12').
++ok(1152794050, '%I', '00').
++ok(1152794050, '%j', '194').
++ok(1152794050, '%k', '12').
++ok(1152794050, '%l', ' 0').
++ok(1152794050, '%m', '07').
++ok(1152794050, '%M', '34').
++ok(1152794050, '%n', '\n').
++%ok(1152794050, '%O', '').
++ok(1152794050, '%r', '00:34:10 PM').
++ok(1152794050, '%R', '12:34').
++ok(1152794050, '%s', '1152794050').
++ok(1152794050, '%S', '10').
++ok(1152794050, '%t', '\t').
++ok(1152794050, '%T', '12:34:10').
++ok(1152794050, '%u', '4').
++ok(1152794050, '%U', '28').
++ok(1152794050, '%w', '4').
++ok(1152794050, '%W', '28').
++ok(1152794050, '%y', '06').
++ok(1152794050, '%Y', '2006').
++ok(1152794050, '%z', '-0000').
++ok(1152794050, '%Z', 'UTC').
++ok(1152794050, '%+', 'Thu Jul 13 12:34:10 2006').
++ok(1152794050, '%%', '%').
+ 
+ %	test_format/0
+ %	
+@@ -77,15 +77,16 @@
+ 
+ test_format :-
+ 	setlocale(time, OldLocale, 'C'),
+-	(   ok(Time, Fmt, Atom),
+-	    (	format_time(atom(A), Fmt, Time)
++	(   ok(TimeStamp, Fmt, Atom),
++	    stamp_date_time(TimeStamp, DateTime, 'UTC'),
++	    (	format_time(atom(A), Fmt, DateTime)
+ 	    ->	(   (   A == Atom
+ 		    ;	memberchk(A, Atom)
+ 		    )
+ 		->  true
+ 		;   format('~q: got ~q, expected ~q~n', [Fmt, A, Atom])
+ 		)
+-	    ;	format('format_time(~q, ~q, ~q) failed~n', [atom(A), Fmt, Time])
++	    ;	format('format_time(~q, ~q, ~q) failed~n', [atom(A), Fmt, DateTime])
+ 	    ),
+ 	    fail
+ 	;   true
+@@ -100,7 +101,7 @@
+ %	test_date(+Date, +Time, -FormatTests).
+ 
+ test_date(1970-1-1, 0:0:0.0,		% Epoch
+-	  [ '~s' = '0'
++	  [ '%s' = '0'
+ 	  ]).
+ test_date(0-1-1, 0:0:0.0, []).		% Year 0
+ test_date(2000-1-1, 0:0:0.0, []).	% Year 2000
+@@ -141,13 +142,13 @@
+ russian_day(A) :-
+ 	setlocale(time, Old, 'ru_RU.utf8'),
+ 	get_time(X),
+-	format_time(atom(A), '~A', X),
++	format_time(atom(A), '%A', X),
+ 	setlocale(time, _, Old).
+ 
+ utc :-
+ 	get_time(Stamp),
+ 	stamp_date_time(Stamp, DateTime, 'UTC'),
+-	format_time(current_output, '~F ~T ~Z', DateTime).
++	format_time(current_output, '%F %T %Z', DateTime).
+ 
+ 		 /*******************************
+ 		 *	      ERROR		*
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
new file mode 100644
index 000000000000..6e1491636c26
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
@@ -0,0 +1,141 @@
+# 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.ebuild,v 1.1 2006/07/29 10:12:13 keri Exp $
+
+inherit autotools eutils flag-o-matic
+
+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 ~ppc-macos ~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 )
+	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 )
+		virtual/x11 ) )"
+
+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}-CFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-PLBASE.patch
+	epatch "${FILESDIR}"/${PN}-test.patch
+	epatch "${FILESDIR}"/${PN}-test_date.patch
+
+	if ! use minimal ; then
+		epatch "${FILESDIR}"/${PN}-packages-portage.patch
+		epatch "${FILESDIR}"/${PN}-packages-cppproxy.patch
+		epatch "${FILESDIR}"/${PN}-packages-jpl-arch.patch
+		epatch "${FILESDIR}"/${PN}-packages-jpl-install.patch
+		epatch "${FILESDIR}"/${PN}-packages-ltx2htm.patch
+		epatch "${FILESDIR}"/${PN}-packages-test.patch
+	fi
+}
+
+src_compile() {
+	append-flags -fno-strict-aliasing
+
+	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 -j1 || die "emake failed"
+
+	if ! use minimal ; then
+		einfo "Building SWI-Prolog additional packages"
+
+		for package in clib cppproxy db jpl ltx2htm nlp odbc semweb sgml ssl table xpce/src
+		do
+			cd "${S}/packages/${package}"
+			eautoreconf
+		done
+
+		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 -j1 || 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
+}