Version bump.

Package-Manager: portage-2.1.2_pre1-r4

5 files changed, 165 insertions, 5 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 5f6d400e7156..e43b5baea060 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.39 2006/10/02 17:01:04 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.40 2006/10/02 17:12:57 keri Exp $
+
+*swi-prolog-5.6.21 (02 Oct 2006)
+
+  02 Oct 2006; keri <keri@gentoo.org>
+  +files/swi-prolog-xpce-parallel-build.patch, +swi-prolog-5.6.21.ebuild:
+  Version bump.
 
   02 Oct 2006; keri <keri@gentoo.org>
   +files/swi-prolog-gmp-sparc-alignment.patch, swi-prolog-5.6.17-r1.ebuild,
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 04e622548dce..6123ed2ddfaa 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -134,6 +134,10 @@ AUX swi-prolog-thread-tests.patch 1983 RMD160 a7a291dd8450ba410425173d98757695e2
 MD5 9aba6fad224825963ced3cf129919bcd files/swi-prolog-thread-tests.patch 1983
 RMD160 a7a291dd8450ba410425173d98757695e2d45eb8 files/swi-prolog-thread-tests.patch 1983
 SHA256 d48be25497fdeeb6f1e56068a4a0d78d0c67eccf59fd720c089e961e1c2d4b11 files/swi-prolog-thread-tests.patch 1983
+AUX swi-prolog-xpce-parallel-build.patch 411 RMD160 9d4ca51028ea39851e6083cb8290c6fe1ef9b690 SHA1 7f5b2f1b4d869438b0ff0d20f1db7cd4c634b406 SHA256 a373b88daf830e477ac08b2f6dac2a09ac0295b087725c22ece8f6f3150e5b64
+MD5 3befddaf3b1ecec41b725b155a75736a files/swi-prolog-xpce-parallel-build.patch 411
+RMD160 9d4ca51028ea39851e6083cb8290c6fe1ef9b690 files/swi-prolog-xpce-parallel-build.patch 411
+SHA256 a373b88daf830e477ac08b2f6dac2a09ac0295b087725c22ece8f6f3150e5b64 files/swi-prolog-xpce-parallel-build.patch 411
 AUX swi-prolog-xpce-test.patch 4534 RMD160 2d2b04ae715eb04e53825d8eb4ce3f60e4c253f1 SHA1 590d36578596e3f46b6c53bea240ff1888086d37 SHA256 315591c9375734f4ed06096b58ee696df3b4e560236564b8538e71377bc94d3c
 MD5 3ef8db1add28c3d49a27892307e86794 files/swi-prolog-xpce-test.patch 4534
 RMD160 2d2b04ae715eb04e53825d8eb4ce3f60e4c253f1 files/swi-prolog-xpce-test.patch 4534
@@ -142,6 +146,7 @@ DIST pl-5.6.17.tar.gz 10652203 RMD160 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab S
 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
 DIST pl-5.6.20.tar.gz 11528418 RMD160 3f8b25d8370485c7fc8f15d0c55d5a873869a93a SHA1 3decae180a5870684eba38492e45e479c7881e2f SHA256 10e09ce3fdd35c12fceb3e463a617a40f119b67dc23436068dd47a9388355981
+DIST pl-5.6.21.tar.gz 11543471 RMD160 f3d164199a727abf4603cb809f5b67aeb511709a SHA1 7a93a82ac9ba78fff3497e64486bfd8fae538f14 SHA256 e83326fee55b3026fd389a89c10a09110f318c430fd88056ca5dff2e7ab11ac1
 DIST pl-5.6.8.tar.gz 9157044 RMD160 449a866a9fadf13c068393f8a4f76862ecbd2207 SHA1 56de45066ba1680ebf6a74d3b7be6ab8cd23293a SHA256 4ccfd6ed684f56750c089a8103e2d640c6591873e3f36b47a2e2d39958cccdf3
 EBUILD swi-prolog-5.6.17-r1.ebuild 3703 RMD160 14f11f441068ea3e40885d1321653f8bfbc74953 SHA1 465e5bd9c5cef4de2bc46c9691d60e4a565de2bd SHA256 abbdf9a6950e4cc78c97b4dbcbf77b7af1dd9fd9534ac6ba1f2dd0d549369512
 MD5 3967792dc62273d0c4d0c276bcbbb800 swi-prolog-5.6.17-r1.ebuild 3703
@@ -163,14 +168,18 @@ EBUILD swi-prolog-5.6.20.ebuild 3322 RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c12
 MD5 f4988adb9134d24afa4e60b410cc685b swi-prolog-5.6.20.ebuild 3322
 RMD160 0b24d69f9fe788a2a66d3fe19dfe68aa5c1278ba swi-prolog-5.6.20.ebuild 3322
 SHA256 44a4d314a7ce1c8523d527f133f904c077ee963a7237edec43b0b3d1a2238fe1 swi-prolog-5.6.20.ebuild 3322
+EBUILD swi-prolog-5.6.21.ebuild 3273 RMD160 9dd7e2d9e5e451d5bb7a668cf454c174aa8d3d45 SHA1 36c72882949f09b0e5f7b0c4c1cc7223c53ef69b SHA256 2b22992b551fc1b57980b127de370a514c10e7b133c6311b6c3e4a2c78dea3cc
+MD5 77c2aa6b6604f786d9100bb6c09c75ce swi-prolog-5.6.21.ebuild 3273
+RMD160 9dd7e2d9e5e451d5bb7a668cf454c174aa8d3d45 swi-prolog-5.6.21.ebuild 3273
+SHA256 2b22992b551fc1b57980b127de370a514c10e7b133c6311b6c3e4a2c78dea3cc swi-prolog-5.6.21.ebuild 3273
 EBUILD swi-prolog-5.6.8.ebuild 3503 RMD160 db4322b8c734af20011e4845a93427a8328ae113 SHA1 5fd4712a46f68f40565e2150be372a1831057de0 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a
 MD5 6bc8df3140ced306811de8495f5e625d swi-prolog-5.6.8.ebuild 3503
 RMD160 db4322b8c734af20011e4845a93427a8328ae113 swi-prolog-5.6.8.ebuild 3503
 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a swi-prolog-5.6.8.ebuild 3503
-MISC ChangeLog 7702 RMD160 e31227f90eddbf4edd44a097614acf07b82e5cec SHA1 16a31096f9265621829116ddfa689bb48ac64f7a SHA256 9b38e3f1cd5b0a4d971a4ecdd35a4a9714cc483f17fde5cb9e1a50a2afe41aa6
-MD5 a583840f97f50ac776a779b88e0cb2f5 ChangeLog 7702
-RMD160 e31227f90eddbf4edd44a097614acf07b82e5cec ChangeLog 7702
-SHA256 9b38e3f1cd5b0a4d971a4ecdd35a4a9714cc483f17fde5cb9e1a50a2afe41aa6 ChangeLog 7702
+MISC ChangeLog 7865 RMD160 4aaf7e8f699d5555c6c6be28308797efee495ea8 SHA1 1079bff0e060a50cedcb54294d942e0f288129ec SHA256 62b46d4fe1325ad16a65903842c1a34b6a7f12f264d0c95683454a8a08e5ae0a
+MD5 7e1ca88b2a9bd78112a7b27e70d59cc1 ChangeLog 7865
+RMD160 4aaf7e8f699d5555c6c6be28308797efee495ea8 ChangeLog 7865
+SHA256 62b46d4fe1325ad16a65903842c1a34b6a7f12f264d0c95683454a8a08e5ae0a ChangeLog 7865
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -190,6 +199,9 @@ SHA256 c6418abe7bb66540ec715cf5624f1cfd430f880d89911dbc3fdc671d89c75ce8 files/di
 MD5 abf7531e4cab999a60ecf1bdc4dbea56 files/digest-swi-prolog-5.6.20 235
 RMD160 f7c684216ea485228302c17db80960ec758d571b files/digest-swi-prolog-5.6.20 235
 SHA256 d3c747b0e926a3c81bac41723a6428ae647c586fa7861ebaef61c95bb9955bfa files/digest-swi-prolog-5.6.20 235
+MD5 efc4749e00a68a1bcc3170f86fd45ca7 files/digest-swi-prolog-5.6.21 235
+RMD160 7bb7091c53efbaa82764c41080234646590c2d67 files/digest-swi-prolog-5.6.21 235
+SHA256 235ad468bd9bf33b3b4a8bbd93ffe683acf3be890fa519ea65749e025c9c2465 files/digest-swi-prolog-5.6.21 235
 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
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21
new file mode 100644
index 000000000000..f90733b99001
--- /dev/null
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21
@@ -0,0 +1,3 @@
+MD5 49fafcc6cea3beec6f0124995f32e00e pl-5.6.21.tar.gz 11543471
+RMD160 f3d164199a727abf4603cb809f5b67aeb511709a pl-5.6.21.tar.gz 11543471
+SHA256 e83326fee55b3026fd389a89c10a09110f318c430fd88056ca5dff2e7ab11ac1 pl-5.6.21.tar.gz 11543471
diff --git a/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch b/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch
new file mode 100644
index 000000000000..4954b2f63d5c
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-xpce-parallel-build.patch
@@ -0,0 +1,11 @@
+--- pl-5.6.20.orig/packages/xpce/src/Makefile.in	2006-09-11 00:25:06.000000000 +1200
++++ pl-5.6.20/packages/xpce/src/Makefile.in	2006-09-24 21:51:35.000000000 +1200
+@@ -298,7 +298,7 @@
+ # Building the directories
+ ################################################################
+ 
+-prepare:	directories names version h/interface.h
++prepare:	directories names h/interface.h
+ 
+ directories:	h $(MODULES) $(VWS)
+ 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
new file mode 100644
index 000000000000..cabc9a5e8534
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
@@ -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.21.ebuild,v 1.1 2006/10/02 17:12:57 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 ~ppc-macos ~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 )
+	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-r2.patch
+	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
+	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
+	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
+	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-thread-tests.patch
+	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-xpce-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-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
+}