Conditionally build documentation (Bug #130268); Added support for ppc-macos (resolves Bug #129360); pkg_setup logic ensures nptl is in USE on amd64 and x86 (resolves Bug #119016).

(Portage version: 2.1_pre7-r5)

4 files changed, 48 insertions, 38 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 0877c22ed690..ac62351424b2 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.85 2006/04/04 15:35:38 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.86 2006/04/24 18:32:42 mkennedy Exp $
+
+  24 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org> sbcl-0.9.11.ebuild:
+  Conditionally build documentation (Bug #130268); Added support for ppc-macos
+  (resolves Bug #129360); pkg_setup logic ensures nptl is in USE on amd64 and
+  x86 (resolves Bug #119016).
 
 *sbcl-0.9.11 (04 Apr 2006)
 
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index faf26a8c0a74..23fb59f6d38a 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9b9eefa556e0fd293915ccb6d71ee88a ChangeLog 26658
-RMD160 625692afb722fc7f1ebaa4cd41fd308fab668eaa ChangeLog 26658
-SHA256 a8c9976d575541e2ea3430eb27875c6e04793a6846b5df63f2f7ee540bbbe344 ChangeLog 26658
+MD5 5570985537ac8acf22239a033fa7d4eb ChangeLog 26919
+RMD160 63f1660028dca803290d20546cc7c2421c57ca74 ChangeLog 26919
+SHA256 8795e306273fa8572f58f6444f9b666630af12964e04d0fcda64070e39837a05 ChangeLog 26919
 MD5 3cb740743587d3fe5dd697e9c955828d files/0.9.11/README.Gentoo 1162
 RMD160 b33a9bf09b27423498fdf37ea4a4387cfe951169 files/0.9.11/README.Gentoo 1162
 SHA256 fba87acce6b7402c34dcd97b1c314df500cc174967b13b593472f70180cda7ce files/0.9.11/README.Gentoo 1162
@@ -127,9 +124,9 @@ SHA256 82cad5d48298d227c528309e0099c52c0e03441e750cd569d789ff22b3ac2117 files/0.
 MD5 653f804ebcd167d167f8163756b7da17 files/0.9.9/sbclrc 639
 RMD160 b870bc61ce40aa29004b666bf759f4bfe075e085 files/0.9.9/sbclrc 639
 SHA256 45933ea112a45ec2d1fc6b46320e9dbd265b2e4a9fb1305287f4225a5f5f2334 files/0.9.9/sbclrc 639
-MD5 96be98efcafb92f718713bc55f71cbeb files/digest-sbcl-0.9.11 1743
-RMD160 72d22cd0c7cfb136db0abbb1623e9e05754e2052 files/digest-sbcl-0.9.11 1743
-SHA256 d919f64a4b8bf419995e4a6c7573d89acafdb9bd42d5be315509f99019bdd9cd files/digest-sbcl-0.9.11 1743
+MD5 c9ae86347077a688f032c777312891a1 files/digest-sbcl-0.9.11 2053
+RMD160 f278f6e64a0d289c25eadeae3dacaaf5c6d81f3d files/digest-sbcl-0.9.11 2053
+SHA256 b9bfbd2932aea105f85848d8b28c8277a3440b188526fec06801c08c2d86b142 files/digest-sbcl-0.9.11 2053
 MD5 7e5f4692a0e0debe2743ed6a086d29bb files/digest-sbcl-0.9.3 557
 RMD160 f3659ebd2d83ea874b7626354414a339171c0d70 files/digest-sbcl-0.9.3 557
 SHA256 8df9489c24d5d203ad2db9237054ecd4b428c44a8944b971d923b8e9c0a6d4f0 files/digest-sbcl-0.9.3 557
@@ -148,9 +145,9 @@ SHA256 3d94db40d844ba046bc2add74268ca1e2f2fb9024f06431cfe59ab7e411c494c files/di
 MD5 276b2c3efa0ff299306d94ad4704a9e2 metadata.xml 1004
 RMD160 79462681370688e5a3700593b5b6c9401bb7ccde metadata.xml 1004
 SHA256 4cb74fa43cdc4e8291063beae14ca74fb605508225913474763ad3fb7e6985d7 metadata.xml 1004
-MD5 ec28c65b7c4010f7fdc544b9ecc4d9f1 sbcl-0.9.11.ebuild 4828
-RMD160 c785faee9a21430b5d0bc17dfd9dc4bafb5508c3 sbcl-0.9.11.ebuild 4828
-SHA256 7cc0fd4d568c7fecee6f68638d1da0b57ac54d950039478fcc7cca359023d5e0 sbcl-0.9.11.ebuild 4828
+MD5 244e5f3b0657833a2e04b31e05d60912 sbcl-0.9.11.ebuild 5196
+RMD160 e31962c4e61f78de1d86f529def48911de5265f6 sbcl-0.9.11.ebuild 5196
+SHA256 19c0e991c4d8012241ee6f00b1b7573187b4d67421a546e476151080a5e6da64 sbcl-0.9.11.ebuild 5196
 MD5 e6a8dc74061cced7fd5fab222e795d5f sbcl-0.9.3.ebuild 5046
 RMD160 9b7534c50101d3ad08a55c0c1590d98ffe1165a6 sbcl-0.9.3.ebuild 5046
 SHA256 f9ddbf72faaeb6d376ba7b93825a8140b716d12a22654628d8af32370c5d38b9 sbcl-0.9.3.ebuild 5046
@@ -166,10 +163,3 @@ SHA256 a65e58b6990c7ae684047a4a14c0af473298dc224b83455d7f2dcdad6d660d44 sbcl-0.9
 MD5 030f4a7b6ffdd41a61b03dccc53bf573 sbcl-0.9.9.ebuild 4612
 RMD160 2805e3cf63da501077b8ff35c94e4340af805e41 sbcl-0.9.9.ebuild 4612
 SHA256 3d243e9360a19b50c894780b34f359b652b618e1b3eda14c1804bf6bdc69b6a9 sbcl-0.9.9.ebuild 4612
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENZDpI1lqEGTUzyQRAo1nAJwPTm9/MzN3eKm32CHCqO3ttxAVDwCdHwXZ
-TqbB6nKb6TKlxg/3tN4XlTk=
-=oRDH
------END PGP SIGNATURE-----
diff --git a/dev-lisp/sbcl/files/digest-sbcl-0.9.11 b/dev-lisp/sbcl/files/digest-sbcl-0.9.11
index 2551740033b4..c23e5c551a5a 100644
--- a/dev-lisp/sbcl/files/digest-sbcl-0.9.11
+++ b/dev-lisp/sbcl/files/digest-sbcl-0.9.11
@@ -1,18 +1,21 @@
-MD5 29ad145f1fc45c65b8d65b39013bc43f sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
 RMD160 d9c34e109dd307bfe652ef57d5837c83cbc60055 sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
 SHA256 90bff80973c3e295b5ecdd0b59525583ae04cb2d5967378af65e04ac77fad660 sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
-MD5 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
+MD5 29ad145f1fc45c65b8d65b39013bc43f sbcl-0.7.10-mips-linux-binary.tar.gz 7473873
 RMD160 0e73b6e96f0170d44be60dfde8bf580596d3a6ee sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
 SHA256 fef30a771530096c4f190c60d9d7c396844fc67a3ec2bbaae9b0ff497f925129 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
-MD5 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
+MD5 3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 6656148
 RMD160 41015dcfb41caf93b54a02a0f55eec994309accf sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
 SHA256 f0bc5fc11e9c0f1651ebe773b5c7e972da589cc4af2811d25438a099f490cc7d sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
+MD5 029b85186984d0bfc8b49c4de1e8e45e sbcl-0.8.15-sparc-linux-binary.tar.bz2 6903090
 MD5 b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 2722766
 RMD160 821b2d9eed87abb1ab7a2bcad0f6bbd10e94927a sbcl-0.9.11-source.tar.bz2 2722766
 SHA256 fb69460d5e466e97c9c3787b97130728731a71c2feb46eccb4fae6d5dfd20e4c sbcl-0.9.11-source.tar.bz2 2722766
+MD5 46d67859cac0d3b748310a93311b308a sbcl-0.9.11a-powerpc-darwin-binary.tar.bz2 6766401
+RMD160 c60dba2a0278acf787d53a93ebac4de03c1d5ed8 sbcl-0.9.11a-powerpc-darwin-binary.tar.bz2 6766401
+SHA256 5cb563b19d1dd828e55bde9763404f5b908c9f5a043ba8c443415291b969b3d9 sbcl-0.9.11a-powerpc-darwin-binary.tar.bz2 6766401
 MD5 900ae4d2353fd9371d6ebaef40180038 sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 RMD160 1e0c1b6cdbe7dc51200e63bc4b5641c27270e9ff sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
 SHA256 85b7861a203747a7584107eedcbfc44c33dfe8b9ff528095398d5ed91e35cb2b sbcl-0.9.8-x86-linux-binary.tar.bz2 7325645
-MD5 d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 RMD160 6899b82bda2af193783817a0f2ec054e76b08eeb sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
 SHA256 a2d7de87fbfcd7b19acd577ddefdf60adc69f80a15a0593a1e24aeee59aa048e sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
+MD5 d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 7102295
diff --git a/dev-lisp/sbcl/sbcl-0.9.11.ebuild b/dev-lisp/sbcl/sbcl-0.9.11.ebuild
index 068325bfe04b..c4fc0f66c930 100644
--- a/dev-lisp/sbcl/sbcl-0.9.11.ebuild
+++ b/dev-lisp/sbcl/sbcl-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.11.ebuild,v 1.1 2006/04/04 15:35:43 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-0.9.11.ebuild,v 1.2 2006/04/24 18:32:42 mkennedy Exp $
 
 inherit common-lisp-common-2 eutils
 
@@ -9,6 +9,7 @@ BV_PPC=0.8.15
 BV_SPARC=0.8.15
 BV_MIPS=0.7.10
 BV_AMD64=0.9.9
+BV_PPC_MACOS=0.9.11a
 
 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
 HOMEPAGE="http://sbcl.sourceforge.net/"
@@ -17,18 +18,19 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
 	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
 	mips? ( mirror://sourceforge/sbcl/${PN}-${BV_MIPS}-mips-linux-binary.tar.gz )
-	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )"
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )"
 
 LICENSE="MIT"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~amd64"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc-macos ~sparc ~x86"
 
-IUSE="hardened ldb nosource threads nptl unicode"
+IUSE="hardened ldb nosource threads nptl unicode doc"
 
 DEPEND=">=dev-lisp/common-lisp-controller-5.13
 	>=dev-lisp/cl-asdf-1.84
-	sys-apps/texinfo"
+	!doc? ( sys-apps/texinfo )"
 
 PROVIDE="virtual/commonlisp"
 
@@ -55,7 +57,7 @@ refer to Bug #119016 for more information.
 EOF
 		die
 	fi
-	if use ppc && use ldb; then
+	if ( use ppc-macos || use ppc ) && use ldb; then
 		sbcl_einfo <<'EOF'
 Building SBCL on PPC with LDB support is not a supported configuration
 in Gentoo. Please refer to Bug #121830 for more information.
@@ -71,7 +73,16 @@ src_unpack() {
 	cp ${FILESDIR}/${PV}/* ${MY_WORK}
 	sed -i "s,/usr/lib,/usr/$(get_libdir),g" ${MY_WORK}/*
 
-	for a in ${A}; do [[ $a == *binary* ]] && break; done
+	# `use ppc` returns true for both ppc linux and ppc-macos systems
+	# specify
+	if use ppc-macos ; then
+		a="${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2"
+	elif use ppc; then
+		a="${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2"
+	else
+		for a in ${A}; do [[ $a == *binary* ]] && break; done
+	fi
+
 	unpack $a
 	mv ${PN}* sbcl-binary || die
 
@@ -88,9 +99,6 @@ src_unpack() {
 	use ldb \
 		&& echo '(enable :sb-ldb)' \
 		>>${S}/customize-target-features.lisp
-#	use x86 \
-#		&& echo '(enable :sb-futex)' \
-#		>>${S}/customize-target-features.lisp
 	echo '(disable :sb-test)' >>${S}/customize-target-features.lisp
 	! use unicode \
 		&& echo '(disable :sb-unicode)' \
@@ -113,8 +121,10 @@ src_compile() {
 			--disable-debugger
 			--core ${bindir}/output/sbcl.core' \
 				|| die
-	cd ${S}/doc/manual
-	LANG=C make info html || die
+	if use doc; then
+			cd ${S}/doc/manual
+			LANG=C make info html || die
+	fi
 }
 
 src_install() {
@@ -139,9 +149,11 @@ src_install() {
 
 	dodoc BUGS COPYING CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README STYLE SUPPORT TLA TODO
 	dodoc ${MY_WORK}/README.Gentoo
-	dohtml doc/html/*
 
-	doinfo ${S}/doc/manual/*.info
+	if use doc; then
+		dohtml doc/html/*
+		doinfo ${S}/doc/manual/*.info
+	fi
 
 	keepdir /usr/$(get_libdir)/common-lisp/sbcl