Parallelize compile; filter install files; install examples to /usr/share/doc; use correct libdir

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 26 insertions, 10 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index 41212f25b451..1c32aa4be628 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.20 2010/07/08 08:38:56 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.21 2010/07/09 10:38:01 keri Exp $
+
+  09 Jul 2010; <keri@gentoo.org> xsb-3.2.ebuild:
+  Parallelize compile; filter install files; install examples to
+  /usr/share/doc; use correct libdir
 
   08 Jul 2010; <keri@gentoo.org> xsb-3.2.ebuild:
   Filter temporary c -> XSB files during install
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 597b2b694596..e1e5aca0a7d2 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -19,9 +19,9 @@ DIST XSB-unix.tar.gz 5773347 RMD160 78e31e7b26bf5f219c3f6b01a0c65b7de86c7e83 SHA
 DIST XSB.tar.gz 10808490 RMD160 66b4e79f9b47cd5db9f3f8b718929181f7f6c401 SHA1 3563a3ba4b469016697d704e65e5b17a75200710 SHA256 db190bc045a475e24a8ca305b6a77cf0a84c61ebaade1fadef09d13b7c4ee024
 DIST xsb-3.0.1-src.tar.gz 4523327 RMD160 6f71401ad3cc9031ec0ced16df7d9dfd594b3fb2 SHA1 8cbef419913731617ec8811dd69799406119b9ff SHA256 05e2a76befe6303ff624c8a22543444604a75815eae276e065e462a1d21ae801
 DIST xsb-3.1-gentoo-patchset-0.tar.gz 21394 RMD160 6a58fe5c11fce6620e6e453962c786d9e0b720d5 SHA1 df45cabc3deb6e27b4c4558109a5a9dc74d6e232 SHA256 a9435b13478e88763d659e75ce96f7ccebbcfe72fc78abcbe13bf2d2d9c92cf0
-DIST xsb-3.2-gentoo-patchset-1.tar.gz 20674 RMD160 db7711ffeddbd54cbb17b204d71331d8ad97c967 SHA1 0ca0ae086a15f4627883f2a18ad68ff102b80f97 SHA256 68d3036b36e6198233fb60d8b7c91e798b271a63d93b1f9003d561f60401e56b
+DIST xsb-3.2-gentoo-patchset-2.tar.gz 21049 RMD160 718dbae4388cc05ed68df0bdc3ce1d13c4a69b1a SHA1 a2c0055c976ddd344221e396da10372ebee23d66 SHA256 5bf546ee61b12145c6514f4f4f670864a938c732456c07d2d4cf4021a12789b7
 EBUILD xsb-3.0.1.ebuild 4622 RMD160 db8406a82cbbb5368d177a077df18e51cb7f56b2 SHA1 dc41686c5b1b53b9b9c96878ddcc3a9148a8411c SHA256 5c571e7b92811901c05a4dcffce94496116b40eeab68403299edf463a8cba695
 EBUILD xsb-3.1.ebuild 4136 RMD160 f6fdda4ded403f234f1a6338dbfaec43f664e938 SHA1 ba3c85a1a57b3afc301ff0b690e76f9909c699e8 SHA256 e794a19724b24a699f21174d970a62de1d2bb1921c26aab145892c06a6dddc3c
-EBUILD xsb-3.2.ebuild 4091 RMD160 9d39622e45c46966f99002e87a420f2ae75419b4 SHA1 a3ab497f80a348c60fcb0cdcc00236fa781e78d5 SHA256 d0099e68e6dfe5042407843c07a047ae2cc72e2149a84dbbd757872edb5d4226
-MISC ChangeLog 3860 RMD160 22cd4ea9848b2d5795c2c6beb1cc617e8cb187f1 SHA1 c3b68ee44f6e72d6a312a0f74a89a62ca93f74ef SHA256 707a9beb00ed6e4e1ca65738042c052aa306b95b94ed2ec315a655bfa4f2ad59
+EBUILD xsb-3.2.ebuild 4483 RMD160 6d54d9e894d9a3becc177b91e999d4f02c9b4a70 SHA1 4334e7c250e1d044785c7194987f0ca1de74bac3 SHA256 3018ccc45a6e5bef5393724b42946046841ceafbfb1b7b70a5b2baa9b9a508a1
+MISC ChangeLog 4012 RMD160 ac47bf67c9d7f4e39ac05b1694e1ad233c36d0f4 SHA1 733145fb00386e81d3385ec57b78f099c9f5e607 SHA256 d4efc0d6d180ca275491ff7aea7866209261b52d429a8c01e9ae84c1115a3e79
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/xsb/xsb-3.2.ebuild b/dev-lang/xsb/xsb-3.2.ebuild
index c1103c8c30fc..b943c12f0277 100644
--- a/dev-lang/xsb/xsb-3.2.ebuild
+++ b/dev-lang/xsb/xsb-3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2.ebuild,v 1.3 2010/07/08 08:38:56 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2.ebuild,v 1.4 2010/07/09 10:38:01 keri Exp $
 
 MY_P="XSB"
 
-PATCHSET_VER="1"
+PATCHSET_VER="2"
 
 inherit eutils autotools java-pkg-opt-2
 
@@ -16,7 +16,7 @@ SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug iodbc java libwww mysql odbc perl threads xml"
+IUSE="debug examples iodbc java libwww mysql odbc perl threads xml"
 
 RDEPEND="iodbc? ( dev-db/libiodbc )
 	java? ( >=virtual/jdk-1.4 )
@@ -57,7 +57,7 @@ src_compile() {
 		$(use_enable debug debug-verbose) \
 		$(use_enable debug profile) \
 		|| die "econf failed"
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 
 	if use libwww ; then
 		cd "${S}"/packages/libwww
@@ -79,6 +79,9 @@ src_compile() {
 		econf || die "econf xpath package failed"
 	fi
 
+	# All XSB Packages are compiled using a single Prolog engine.
+	# Consequently they must all be compiled using a single make job.
+
 	cd "${S}"/packages
 	rm -rf *.xwam
 	emake -j1 || die "emake packages failed"
@@ -108,10 +111,11 @@ src_install() {
 	cd "${S}"/build
 	make DESTDIR="${D}" install || die "make install failed"
 
-	dosym /usr/lib/xsb/bin/xsb /usr/bin/xsb
+	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
 
 	cd "${S}"/packages
-	local PACKAGES=/usr/lib/xsb/packages
+	local PACKAGES=${XSB_INSTALL_DIR}/packages
 	insinto ${PACKAGES}
 	doins *.xwam
 
@@ -189,6 +193,14 @@ src_install() {
 		doins xpath/cc/*.H
 	fi
 
+	if use examples ; then
+		cd "${S}"/build
+		make \
+			DESTDIR="${D}" \
+			install_examples="${D}"/usr/share/doc/${PF}/examples \
+			install_examples || die "make install_examples failed"
+	fi
+
 	cd "${S}"
 	dodoc FAQ README
 }