Version bump.
authorKeri Harris <keri@gentoo.org>
Mon, 27 Mar 2006 10:01:38 +0000 (10:01 +0000)
committerKeri Harris <keri@gentoo.org>
Mon, 27 Mar 2006 10:01:38 +0000 (10:01 +0000)
Package-Manager: portage-2.1_pre6-r6

dev-lang/swi-prolog/ChangeLog
dev-lang/swi-prolog/Manifest
dev-lang/swi-prolog/files/digest-swi-prolog-5.6.9 [new file with mode: 0644]
dev-lang/swi-prolog/files/swi-prolog-packages-test-r1.patch [new file with mode: 0644]
dev-lang/swi-prolog/files/swi-prolog-test.patch
dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild [new file with mode: 0644]

index b12b3da5046819750593677a77fa5533dc2a9718..d26f80a1c354b5b81f91d2a4847469de57336866 100644 (file)
@@ -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.2 2006/03/20 10:27:22 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.3 2006/03/27 10:01:38 keri Exp $
+
+*swi-prolog-5.6.9 (27 Mar 2006)
+
+  27 Mar 2006; Keri Harris <keri@gentoo.org>
+  +files/swi-prolog-packages-test-r1.patch, files/swi-prolog-test.patch,
+  +swi-prolog-5.6.9.ebuild:
+  Version bump.
 
   20 Mar 2006; Keri Harris <keri@gentoo.org> swi-prolog-5.6.8.ebuild:
   Add ~amd64 keyword
index 7ee177ee0c0397a98b8f159cd576aeecc4565dfd..215ffa69010b017ade2734bc86c117ea6875fd9f 100644 (file)
@@ -1,9 +1,12 @@
-MD5 8bba74015aa7d72d5be01a061e7edb3d ChangeLog 805
-RMD160 3ad1ee3df6f3c2adc48638888f11e6387eef4e0c ChangeLog 805
-SHA256 ba77a18f5e6a8fe463992c64fccedf36244d7b0232c7f5a3cacb11dd14f6063c ChangeLog 805
+MD5 7b54279e4794d78b304ef391f7fcd4c3 ChangeLog 1001
+RMD160 517a9e61bd246efe9285c02fa68034db1db7d453 ChangeLog 1001
+SHA256 930f5e9c86ac563903e988566e2caebab0de7d560c12c7d9d0048d9e47e2b427 ChangeLog 1001
 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
+MD5 7f79320644f3396674caa2ea26504317 files/digest-swi-prolog-5.6.9 229
+RMD160 2dd5623467a7ecf29f9e3b39646a226fe00e6d21 files/digest-swi-prolog-5.6.9 229
+SHA256 634619a85da8b9bfd587aa3f08f427b8ebd12ee6228c6547e2eaaef71d188e24 files/digest-swi-prolog-5.6.9 229
 MD5 bc91650feaf27f01c834bffd69a0b279 files/swi-prolog-CFLAGS.patch 8657
 RMD160 da997f0fb6a068744a81bcd91b15e7f35e025267 files/swi-prolog-CFLAGS.patch 8657
 SHA256 2626faefcfcac1a41ef4d1aaccf7ad80f5fe0ae9fbb3cb3dc692182712d40b71 files/swi-prolog-CFLAGS.patch 8657
@@ -22,15 +25,21 @@ SHA256 987a95a420a0c48e4381e906c095e3d3003e7274fae41c50d08306dc7532e627 files/sw
 MD5 e1f341b039d88c2f799a1277da1b7b48 files/swi-prolog-packages-portage.patch 2320
 RMD160 7b307fc6f95e408540a079dbf52911c9461a88d4 files/swi-prolog-packages-portage.patch 2320
 SHA256 6cd486d3eb0ecfb9719f50b2fa04a2405e8ad0c9d9fa288e19bdc1bcc422e330 files/swi-prolog-packages-portage.patch 2320
+MD5 70626dc7fc4256e9880c77b00abbc1b4 files/swi-prolog-packages-test-r1.patch 5831
+RMD160 30add8f9a9f4232cfeabe9ec8dd7ad0f1350238a files/swi-prolog-packages-test-r1.patch 5831
+SHA256 5a5d4178a3bc8f8c06cf04ec93ccaf3eecda9087acf6ec98b91a2ed4bc360b5b files/swi-prolog-packages-test-r1.patch 5831
 MD5 953e0b32292375070d1b90fa5e3e0632 files/swi-prolog-packages-test.patch 5296
 RMD160 8a4fd54e2615bd5a9b0731fcffb6326d6c1d22ca files/swi-prolog-packages-test.patch 5296
 SHA256 f33aa0e3125a16b38822aee781587aaef4138b68a4d651546842a9826f30bec8 files/swi-prolog-packages-test.patch 5296
-MD5 b705a1cfd4f32b71bfb41b10abf9bedf files/swi-prolog-test.patch 547
-RMD160 d5eb1cb65e4340900e2ec91f536fe5f3daf2fa52 files/swi-prolog-test.patch 547
-SHA256 f4ea799d4f450dafd3cf0e6a3e75a0c39c9c98169ea0f3b3cbcc445f725ca7e0 files/swi-prolog-test.patch 547
+MD5 7ab7ba6c84ff9a85c66105fdcb3434b9 files/swi-prolog-test.patch 549
+RMD160 c9e997ed980a1821a5113b8f42ee21444da91096 files/swi-prolog-test.patch 549
+SHA256 81fc9a77480226ad519a7020d3c97fb59be6e9bba8e3d8b3b22553c5c6fc7e30 files/swi-prolog-test.patch 549
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata.xml 159
 MD5 11c2fab69d1f4c2c4d2f72644a17180f swi-prolog-5.6.8.ebuild 3289
 RMD160 98b901c9299dc7ebf30abb8f5ffd3a715e3c2332 swi-prolog-5.6.8.ebuild 3289
 SHA256 dad5b9e422d16414545478591fa6792964ad1a83c91593e9ad0628f744cf207e swi-prolog-5.6.8.ebuild 3289
+MD5 52ad5db3e918a46e26de9a71a9e776c3 swi-prolog-5.6.9.ebuild 3292
+RMD160 6166a5546dae3995e44af73b0286a5958da0aebd swi-prolog-5.6.9.ebuild 3292
+SHA256 d9c4fd12f0e6b535290c75c315abf78aa42e60ac2e25a58700af26cc0ffbf340 swi-prolog-5.6.9.ebuild 3292
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.9 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.9
new file mode 100644 (file)
index 0000000..d0819e9
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 a2665b3989a238d9d6426aa39fe656fe pl-5.6.9.tar.gz 9317191
+RMD160 18c3d129b87ee539b270c5ab5e679fde31d054ea pl-5.6.9.tar.gz 9317191
+SHA256 0ad101b63d7e922d1c71cf9e4a09dccccd4d7c5d63dd6ac6550e3e43c789f9ba pl-5.6.9.tar.gz 9317191
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-test-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-test-r1.patch
new file mode 100644 (file)
index 0000000..9919dc2
--- /dev/null
@@ -0,0 +1,190 @@
+--- pl-5.6.4.orig/packages/clib/configure.in   2006-01-11 09:41:55.000000000 +1300
++++ pl-5.6.4/packages/clib/configure.in        2006-02-13 23:41:14.000000000 +1300
+@@ -19,6 +19,7 @@
+ AC_SUBST(TARGETS)
+ AC_SUBST(PLTARGETS)
+ AC_SUBST(CRYPTLIBS)
++AC_SUBST(MT)
+ AC_ARG_ENABLE(mt, [  --enable-mt                Enable Multi-threading],
+             [ case "$enableval" in
+--- pl-5.6.4.orig/packages/clib/Makefile.in    2006-02-04 04:38:49.000000000 +1300
++++ pl-5.6.4/packages/clib/Makefile.in 2006-02-13 23:43:17.000000000 +1300
+@@ -41,6 +41,8 @@
+ LD=@LD@
+ LDFLAGS=@LDSOFLAGS@
++CHECK_THREADS=@MT@
++
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+@@ -123,7 +125,9 @@
+ torture:      torture-socket
+ check-socket::
+-              $(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)'
++              @if test "$(CHECK_THREADS)" = "yes" ; then \
++                  $(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)' ; \
++              fi
+ torture-socket::
+               $(PL) -q -f stresssocket.pl -F none -g test,halt -t 'halt(1)'
+--- pl-5.6.4.orig/packages/semweb/configure.in 2006-02-07 04:59:54.000000000 +1300
++++ pl-5.6.4/packages/semweb/configure.in      2006-02-13 23:46:30.000000000 +1300
+@@ -17,13 +17,16 @@
+ AC_SUBST(SO)
+ AC_SUBST(LDSOFLAGS)
+ AC_SUBST(RUNTEX)
++AC_SUBST(ENABLE_CHECKS)
+ AC_ARG_ENABLE(mt, [  --enable-mt                Enable Multi-threading],
+             [case "$enableval" in
+                  yes) AC_DEFINE([_REENTRANT], 1,
+                                 [Define to prepare for multi-threading])
++                      ENABLE_CHECKS="yes"
++                      ;;
++                 *)   ENABLE_CHECKS="no"
+                       ;;
+-                 *)  ;;
+              esac])
+ if test -z "$PLINCL"; then
+--- pl-5.6.4.orig/packages/semweb/Makefile.in  2006-02-08 09:07:47.000000000 +1300
++++ pl-5.6.4/packages/semweb/Makefile.in       2006-02-13 23:48:32.000000000 +1300
+@@ -44,6 +44,8 @@
+ LD=@LD@
+ LDFLAGS=@LDSOFLAGS@
++ENABLE_CHECKS=@ENABLE_CHECKS@
++
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_DATA=@INSTALL_DATA@
+@@ -127,7 +129,9 @@
+ ################################################################
+ check::
+-              $(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)'
+-              $(PL) -q -f litmap_test.pl -g test,halt -t 'halt(1)'
++              @if test "$(ENABLE_CHECKS)" = "yes" ; then \
++                  $(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)' ; \
++                  $(PL) -q -f litmap_test.pl -g test,halt -t 'halt(1)' ; \
++              fi
+--- pl-5.6.9.orig/packages/ssl/ssl_test.pl     2006-02-14 04:27:41.000000000 +1300
++++ pl-5.6.9/packages/ssl/ssl_test.pl  2006-03-27 21:18:14.000000000 +1200
+@@ -130,8 +130,8 @@
+       ssl_init(SSL, client,
+                [ host('localhost'),
+                    port(1111),
+-%                  cert(true),
+-%                  peer_cert(true),
++                   cert(true),
++                   peer_cert(true),
+                  cacert_file('etc/demoCA/cacert.pem'),
+                  certificate_file('etc/client/client-cert.pem'),
+                  key_file('etc/client/client-key.pem'),
+--- pl-5.6.4.orig/packages/xpce/src/Makefile.in        2006-02-13 05:44:13.000000000 +1300
++++ pl-5.6.4/packages/xpce/src/Makefile.in     2006-02-13 23:59:59.000000000 +1300
+@@ -55,6 +55,7 @@
+ DESTDIR=
+ PCEHOME=@PCEHOME@
++PCEBUILD=$(PCEHOME)/src/xpce.sh
+ XINCLUDES=@XINCLUDES@
+ XLIB=@XLIB@
+@@ -896,7 +897,7 @@
+ ################################################################
+ check::
+-              $(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
++              $(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
+ ################################################################
+--- pl-5.6.4.orig/packages/xpce/src/test.pl    2005-11-03 04:10:22.000000000 +1300
++++ pl-5.6.4/packages/xpce/src/test.pl 2006-02-14 00:05:37.000000000 +1300
+@@ -35,6 +35,10 @@
+       ?- 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]).
+@@ -163,12 +167,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 +197,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 +206,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,13 +220,15 @@
+              ->  send(file(F), exists)
+              ;   \+ send(file(F), exists)
+              )).
+-file(utf8-1) :-
++file(ascii-1) :-
+       foreign(Name),
+       new(F, file(Name)),
++      send(F, encoding, iso_latin_1),
+       send(F, open, write),
+       send(F, append, 'Hello world\n'),
+       send(F, close),
+       new(F2, file(Name)),
++      send(F2, encoding, iso_latin_1),
+       exists_file(Name),
+       send(F2, exists),
+       get(F2, contents, string('Hello world\n')),
+@@ -312,12 +313,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) :-
index 99d052f2851904026fb2f461e92d2f1ce5e7c93c..96402cf60b38e9a675966c2b73be77f74deb5c41 100644 (file)
@@ -5,7 +5,7 @@
  
  check:
 -              $(DEVPL) -f $(srcdir)/test.pl -F none -g test,halt -t 'halt(1)'
-+              $(DEVPL) -f $(srcdir)/test.pl -F none -g "asserta(user:file_search_path(clpr,'../packages/clpr')),asserta(user:file_search_path(library, '../packages/clpr')),test,halt" -t 'halt(1)'
++              $(DEVPL) -f $(srcdir)/test.pl -F none -g "asserta(user:file_search_path(clpr,'../packages/clpqr')),asserta(user:file_search_path(library, '../packages/clpqr')),test,halt" -t 'halt(1)'
  
  install:      @INSTALLTARGET@
  install-version: install-arch install-libs install-vbins
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.9.ebuild
new file mode 100644 (file)
index 0000000..d42e457
--- /dev/null
@@ -0,0 +1,128 @@
+# 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.9.ebuild,v 1.1 2006/03/27 10:01:38 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="~amd64 ~ppc ~x86"
+IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads X"
+
+DEPEND="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}-test.patch
+
+       if ! use minimal ; then
+               epatch "${FILESDIR}"/${PN}-packages-portage.patch
+               epatch "${FILESDIR}"/${PN}-packages-cppproxy.patch
+               epatch "${FILESDIR}"/${PN}-packages-db-db4.patch
+               epatch "${FILESDIR}"/${PN}-packages-jpl-arch.patch
+               epatch "${FILESDIR}"/${PN}-packages-ltx2htm.patch
+               epatch "${FILESDIR}"/${PN}-packages-test-r1.patch
+       fi
+}
+
+src_compile() {
+       append-flags -fno-strict-aliasing
+
+       einfo "Building SWI-Prolog compiler"
+       cd "${S}"/src
+       econf \
+               $(use_enable gmp) \
+               $(use_enable readline) \
+               $(use_enable !static shared) \
+               $(use_enable threads mt) \
+               --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 \
+                       $(use_enable !static shared) \
+                       $(use_enable threads mt) \
+                       --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
+}