Version bump

Package-Manager: portage-2.1.2_rc4-r2

7 files changed, 254 insertions, 5 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index f21e8fed739b..a84591b22fed 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.54 2006/12/01 19:56:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.55 2006/12/29 21:19:41 keri Exp $
+
+*swi-prolog-5.6.25 (29 Dec 2006)
+
+  29 Dec 2006; keri <keri@gentoo.org> +files/swi-prolog-jpl-LDPATH-r2.patch,
+  +files/swi-prolog-jpl-check_java.patch, +files/swi-prolog-zlib-test.patch,
+  +swi-prolog-5.6.25.ebuild:
+  Version bump.
 
   01 Dec 2006; keri <keri@gentoo.org> files/swi-prolog-thread-tests.patch:
   Use current_prolog_flag(threads,true) when determining multithreaded prolog
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index cfdb540db232..2b39eec5f294 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -62,6 +62,10 @@ AUX swi-prolog-jpl-LDPATH-r1.patch 1321 RMD160 64d27f8a16eadc2a482799f8d7bfaac2e
 MD5 3c22c81c4aab0ff719a64e20bb396264 files/swi-prolog-jpl-LDPATH-r1.patch 1321
 RMD160 64d27f8a16eadc2a482799f8d7bfaac2ef194cc5 files/swi-prolog-jpl-LDPATH-r1.patch 1321
 SHA256 3df8cbd22044eef1ae4f4fd8859b807d8b5a04e4eeaac3bdc2429e69c46b1040 files/swi-prolog-jpl-LDPATH-r1.patch 1321
+AUX swi-prolog-jpl-LDPATH-r2.patch 1554 RMD160 bac1bca466cc9eb028cc4bb949525b2ddef26f44 SHA1 ab772de1e05077ddd8d9818880721cbfb47e6746 SHA256 51ea6cc09af0275d69d9b31d37e50dfebc9fa412ba9f77ce5b4864fa7b0d1b35
+MD5 4275a6c54734c4a6895f42f8a3980ac2 files/swi-prolog-jpl-LDPATH-r2.patch 1554
+RMD160 bac1bca466cc9eb028cc4bb949525b2ddef26f44 files/swi-prolog-jpl-LDPATH-r2.patch 1554
+SHA256 51ea6cc09af0275d69d9b31d37e50dfebc9fa412ba9f77ce5b4864fa7b0d1b35 files/swi-prolog-jpl-LDPATH-r2.patch 1554
 AUX swi-prolog-jpl-LDPATH.patch 1184 RMD160 b80d7d4267e5bcdf9d8522dd8dab3862942429fe SHA1 9a1da78c7f9fe8f474a70bc7722d0775d666ae00 SHA256 368abd48148cbb62e00ceb519d8a04e3ebc429aa26596392302bb5a0ff154dca
 MD5 919da80fcc4982596c0523b8887ee13b files/swi-prolog-jpl-LDPATH.patch 1184
 RMD160 b80d7d4267e5bcdf9d8522dd8dab3862942429fe files/swi-prolog-jpl-LDPATH.patch 1184
@@ -70,6 +74,10 @@ AUX swi-prolog-jpl-PLARCH.patch 311 RMD160 91a4b95a41b7986da49e8b3443617bf51e287
 MD5 8d505cb837b5d78743b1be627063db3d files/swi-prolog-jpl-PLARCH.patch 311
 RMD160 91a4b95a41b7986da49e8b3443617bf51e287523 files/swi-prolog-jpl-PLARCH.patch 311
 SHA256 c3be68aad2be2e0bf08769cb743cece20b47fe198f3d3e87601554188bf0ec89 files/swi-prolog-jpl-PLARCH.patch 311
+AUX swi-prolog-jpl-check_java.patch 1393 RMD160 792b9a91c16d9f8f5ab918d62461a6f5879d9ed5 SHA1 ac60bc1cd23547ea812f86635163c157f9481d4c SHA256 f81f7cfd1feb56ccb8ec54e403179210901c239b1f1036f4c9ae8739192d8081
+MD5 9cc6037fda797f0abbf2ef9a4745a413 files/swi-prolog-jpl-check_java.patch 1393
+RMD160 792b9a91c16d9f8f5ab918d62461a6f5879d9ed5 files/swi-prolog-jpl-check_java.patch 1393
+SHA256 f81f7cfd1feb56ccb8ec54e403179210901c239b1f1036f4c9ae8739192d8081 files/swi-prolog-jpl-check_java.patch 1393
 AUX swi-prolog-jpl-install.patch 557 RMD160 db14237ac6951b5bb26276759114ef575776415b SHA1 cf661d9f9d502e30febb85de8d1e920e498dad67 SHA256 497b5c80dd316f55a21c5c954208449543bd6988d40e71719a067278daeeab78
 MD5 689af0808e7024052c262d6be879076c files/swi-prolog-jpl-install.patch 557
 RMD160 db14237ac6951b5bb26276759114ef575776415b files/swi-prolog-jpl-install.patch 557
@@ -134,6 +142,10 @@ AUX swi-prolog-xpce-test.patch 4534 RMD160 2d2b04ae715eb04e53825d8eb4ce3f60e4c25
 MD5 3ef8db1add28c3d49a27892307e86794 files/swi-prolog-xpce-test.patch 4534
 RMD160 2d2b04ae715eb04e53825d8eb4ce3f60e4c253f1 files/swi-prolog-xpce-test.patch 4534
 SHA256 315591c9375734f4ed06096b58ee696df3b4e560236564b8538e71377bc94d3c files/swi-prolog-xpce-test.patch 4534
+AUX swi-prolog-zlib-test.patch 669 RMD160 cb66f6cf40905157e803b83ef6a5821fb7dc8ba6 SHA1 93090511f529c6e23489bb3bdf3bb74e713f06e7 SHA256 8358411af197fd15120ecd27589f12a53d7b19f4072491984ca2236bde193c3e
+MD5 554be5bcca6e4b323af134d19549d602 files/swi-prolog-zlib-test.patch 669
+RMD160 cb66f6cf40905157e803b83ef6a5821fb7dc8ba6 files/swi-prolog-zlib-test.patch 669
+SHA256 8358411af197fd15120ecd27589f12a53d7b19f4072491984ca2236bde193c3e files/swi-prolog-zlib-test.patch 669
 DIST pl-5.6.17.tar.gz 10652203 RMD160 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab SHA1 e46e98b3ec8a69de3dc2eb147a9df9cbd1a17399 SHA256 4768761ec4ad4c7160373950bc21d6124c3641dfff9dbe5db4dd7c48433e0072
 DIST pl-5.6.18.tar.gz 11517892 RMD160 238554526c0e0367c770d6aabb9a55900ca358b7 SHA1 4ded148ea657f43c78c951212f19f60e62db27b2 SHA256 85d33e30bf45c159cab90dc709fb7568621cf4e20769cf1dcc7e1238248231fb
 DIST pl-5.6.19.tar.gz 11532046 RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 SHA1 95ed5c17fbe9c0159174b8ad1e8eefbbc8a8d3db SHA256 9897a7a08cd920ee6ad48f3da38d9add92f2992cf9e4339c9b17d055118702d8
@@ -142,6 +154,7 @@ DIST pl-5.6.21.tar.gz 11543471 RMD160 f3d164199a727abf4603cb809f5b67aeb511709a S
 DIST pl-5.6.22.tar.gz 11553934 RMD160 bd45af82adc55b66eacaf41c3a256a0db5baa609 SHA1 be5e2a21cb56577ad958b912d064613b1ba450bb SHA256 0efb8fb7aa349d3626fa244557d121b9db18ff0a8d139a56b018c51e98b25523
 DIST pl-5.6.23.tar.gz 11547357 RMD160 51b52d8d6c8a2ddd7e245f4b7c3a1104bba999ce SHA1 8822763f50a78d8b006a74e7e0331e7d85509427 SHA256 45a16a49290401e69a47584e154eb2b0588f65a141de53b15c762cdf7afe7c9a
 DIST pl-5.6.24.tar.gz 11561664 RMD160 d26af2674bff916747bcc84a2f7df6119036c113 SHA1 85737b3b9ef29aeac97c3e334e6ed18df3426d35 SHA256 7fb4548d86595825b67cebb9a02e5009cc4e1f6851df8aba433bff4707fff85f
+DIST pl-5.6.25.tar.gz 11651158 RMD160 298bb9946089276ad3504c7b692ab5b43d81a7b2 SHA1 f0576e387d0dc719065a61d828838e8a01dc5f16 SHA256 fbe20123e62e630ec85487775fee391f94d51559cb5c24ccbc91e6760da7609e
 EBUILD swi-prolog-5.6.17-r1.ebuild 3743 RMD160 4fa0e1604760af2775a01e5a7a797e30f904d324 SHA1 9db4c70d9b1855de3234fa1ece83150ecb735674 SHA256 f3f4a2b29d29dc8ebf3ac2dd7cdf5edb6b2815cf7afd8ba7d68a05c2f751c47f
 MD5 c1ebf8f765ce99d7ae9f428a47eab81d swi-prolog-5.6.17-r1.ebuild 3743
 RMD160 4fa0e1604760af2775a01e5a7a797e30f904d324 swi-prolog-5.6.17-r1.ebuild 3743
@@ -174,10 +187,14 @@ EBUILD swi-prolog-5.6.24.ebuild 3427 RMD160 b56ed79ceea825b2ad4e923dab90c0513ddd
 MD5 171154881ffaef618a019afe1f33a652 swi-prolog-5.6.24.ebuild 3427
 RMD160 b56ed79ceea825b2ad4e923dab90c0513ddd8b66 swi-prolog-5.6.24.ebuild 3427
 SHA256 7fb1f5e52fbdc6559a438b25ae11aedf0864319667d3754f6734febd62579b11 swi-prolog-5.6.24.ebuild 3427
-MISC ChangeLog 10696 RMD160 7a78e9403a62a2912812195b17bd140fc301f0f8 SHA1 98e25be7252815637643eb654a0fc6d5fa9d1014 SHA256 fce3905b8e9928a1aea0cb3edcca28e15a10bf2d882f0f3a30f4f3ef4b4ade0c
-MD5 69dba6ecd4bfe3a33dd9d35a96cb9107 ChangeLog 10696
-RMD160 7a78e9403a62a2912812195b17bd140fc301f0f8 ChangeLog 10696
-SHA256 fce3905b8e9928a1aea0cb3edcca28e15a10bf2d882f0f3a30f4f3ef4b4ade0c ChangeLog 10696
+EBUILD swi-prolog-5.6.25.ebuild 3609 RMD160 3da98d00a33cbb7d532355532f62e188a12cadcf SHA1 7091e00dd6216fbdad00d17cf3f4c3eda8cd709e SHA256 ab61db190dc286b3dc8187b4963303ae45c393e4ae6b00ca62641bbcc6827ae6
+MD5 ee73a89b5cff9c8d28b6ab326bd95119 swi-prolog-5.6.25.ebuild 3609
+RMD160 3da98d00a33cbb7d532355532f62e188a12cadcf swi-prolog-5.6.25.ebuild 3609
+SHA256 ab61db190dc286b3dc8187b4963303ae45c393e4ae6b00ca62641bbcc6827ae6 swi-prolog-5.6.25.ebuild 3609
+MISC ChangeLog 10930 RMD160 20287654d6dcc4b37dd3e48b19fc4bd9757a11ac SHA1 1fc5f5dce9eb211cad2873392e60c531be122c86 SHA256 38a8988edd4b56943aa4211eb03282a1253b2b9be933b182097556b7d609b904
+MD5 fe286836d70d68b881a74e1e5c7f0a64 ChangeLog 10930
+RMD160 20287654d6dcc4b37dd3e48b19fc4bd9757a11ac ChangeLog 10930
+SHA256 38a8988edd4b56943aa4211eb03282a1253b2b9be933b182097556b7d609b904 ChangeLog 10930
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -206,3 +223,6 @@ SHA256 03e00cdce17c1fe2bb70a96610387d5b90734ab93c5958e376779a2be0281e2e files/di
 MD5 ff2fed7dd818675ca14887296ab0bb9f files/digest-swi-prolog-5.6.24 235
 RMD160 1dd0c5d7be3cba6f89855b3b05f18e3d9aea4817 files/digest-swi-prolog-5.6.24 235
 SHA256 7a995ec1086f26d1aa65eba3f7b178a02101a74f69b705ee92ab613c70f92b07 files/digest-swi-prolog-5.6.24 235
+MD5 7401050ddff1a97dec98c6b40a1bc90c files/digest-swi-prolog-5.6.25 235
+RMD160 6d02db4db3cffd78905aeed29c39749c3a5ca399 files/digest-swi-prolog-5.6.25 235
+SHA256 0776caa3a1a58d0997f71f80ba673d3610b91786d6f033ca8d47c79dd8552674 files/digest-swi-prolog-5.6.25 235
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25
new file mode 100644
index 000000000000..9faf01aa278d
--- /dev/null
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.25
@@ -0,0 +1,3 @@
+MD5 cc14c841424346d2c8389d185f5c3ad1 pl-5.6.25.tar.gz 11651158
+RMD160 298bb9946089276ad3504c7b692ab5b43d81a7b2 pl-5.6.25.tar.gz 11651158
+SHA256 fbe20123e62e630ec85487775fee391f94d51559cb5c24ccbc91e6760da7609e pl-5.6.25.tar.gz 11651158
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch
new file mode 100644
index 000000000000..ed22caea0a78
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r2.patch
@@ -0,0 +1,42 @@
+diff -ur pl-5.6.25.orig/packages/jpl/Makefile.in pl-5.6.25/packages/jpl/Makefile.in
+--- pl-5.6.25.orig/packages/jpl/Makefile.in	2006-11-28 22:16:43.000000000 +1300
++++ pl-5.6.25/packages/jpl/Makefile.in	2006-12-29 22:03:31.000000000 +1300
+@@ -36,6 +36,7 @@
+ JAVA=@JAVA@
+ JUNIT=@JUNIT@
+ JAVALIBS=@JAVALIBS@
++JAVALDPATH=@JAVALDPATH@
+ 
+ DOCTOTEX=$(PCEHOME)/bin/doc2tex
+ PLTOTEX=$(PCEHOME)/bin/pl2tex
+@@ -75,9 +76,9 @@
+ 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
++		SWI_HOME_DIR=../.. LD_LIBRARY_PATH=.:../../lib/$(PLARCH)  CLASSPATH=$(JUNIT):jpl.jar:jpltest.jar $(JAVA) junit.textui.TestRunner jpl.test.TestJUnit
+ 
+ ################################################################
+ # Installation
+diff -ur pl-5.6.25.orig/packages/jpl/configure pl-5.6.25/packages/jpl/configure
+--- pl-5.6.25.orig/packages/jpl/configure	2006-12-22 02:41:37.000000000 +1300
++++ pl-5.6.25/packages/jpl/configure	2006-12-29 22:06:00.000000000 +1300
+@@ -4071,6 +4071,7 @@
+ 
+ for d in $JNI_CLIENT_DIRS; do
+   LDSOFLAGS="$LDSOFLAGS -L$d"
++  JAVALDPATH="$JAVALDPATH:$d"
+ done
+ 
+ if test "$java_abs_paths" = yes; then
+@@ -5346,6 +5347,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-check_java.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch
new file mode 100644
index 000000000000..631e964cb951
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java.patch
@@ -0,0 +1,21 @@
+diff -ur pl-5.6.25.orig/packages/jpl/src/java/jpl/test/TestJUnit.java pl-5.6.25/packages/jpl/src/java/jpl/test/TestJUnit.java
+--- pl-5.6.25.orig/packages/jpl/src/java/jpl/test/TestJUnit.java	2006-12-20 21:55:19.000000000 +1300
++++ pl-5.6.25/packages/jpl/src/java/jpl/test/TestJUnit.java	2006-12-29 21:58:25.000000000 +1300
+@@ -31,7 +31,7 @@
+ 	protected void setUp() {
+ 		// initialization code
+ 		// Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "set_prolog_flag(debug_on_error,false)", "-q" });
+-		Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "true", "-q" });
++		Prolog.set_default_init_args(new String[] { "libpl.dll", "-x", "../../src/pl.prc", "-f", "none", "-g", "true", "-q" });
+ 		assertTrue((new Query("consult(test_jpl)")).hasSolution());
+ 	}
+ 	protected void tearDown() {
+@@ -49,7 +49,7 @@
+ 	}
+ 	public void testSameLibVersions2() {
+ 		String java_lib_version = JPL.version_string();
+-		String pl_lib_version = ((Term) (new Query(new Compound("jpl_pl_lib_version", new Term[] { new Variable("V") })).oneSolution().get("V"))).name();
++		String pl_lib_version = ((Term) Query.oneSolution("jpl:jpl_pl_lib_version(V)").get("V")).name();
+ 		assertTrue("java_lib_version(" + java_lib_version + ") is same as pl_lib_version(" + pl_lib_version + ")", java_lib_version.equals(pl_lib_version));
+ 	}
+ 	public void testAtomName1() {
diff --git a/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch b/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch
new file mode 100644
index 000000000000..a6cff4bb9976
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-zlib-test.patch
@@ -0,0 +1,18 @@
+--- pl-5.6.25.orig/packages/zlib/ztest.pl	2006-12-06 01:19:44.000000000 +1300
++++ pl-5.6.25/packages/zlib/ztest.pl	2006-12-23 09:42:51.000000000 +1300
+@@ -2,12 +2,15 @@
+ 	  [
+ 	  ]).
+ :- asserta(user:file_search_path(foreign, '.')).
++:- asserta(user:file_search_path(foreign, '../clib')).
+ :- asserta(user:file_search_path(library, '.')).
+ :- asserta(user:file_search_path(library, '../plunit')).
++:- asserta(user:file_search_path(library, '../clib')).
+ 
+ :- use_module(user:library(zlib)).
+ :- use_module(user:library(plunit)).
+ :- use_module(user:library(readutil)).
++:- use_module(user:library(socket)).
+ 
+ read_file_to_codes(File, Codes) :-
+ 	open(File, read, In),
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
new file mode 100644
index 000000000000..c2fd0db0ee18
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.25.ebuild
@@ -0,0 +1,138 @@
+# 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.25.ebuild,v 1.1 2006/12/29 21:19:41 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 zlib X"
+
+DEPEND="!dev-lang/swi-prolog-lite
+	sys-libs/ncurses
+	zlib? ( sys-libs/zlib )
+	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-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
+	epatch "${FILESDIR}"/${PN}-jpl-check_java.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
+	epatch "${FILESDIR}"/${PN}-zlib-test.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-pldoc \
+			--with-plunit \
+			--with-semweb \
+			--with-sgml \
+			--with-sgml/RDF \
+			$(use_with ssl) \
+			--with-table \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			|| 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
+}