Fixed broken links in documentation (bug #194789) and added '-q' to the bjam call to make boost-build fail on first error (bug #197465)

Package-Manager: portage-2.1.3.19

3 files changed, 28 insertions, 18 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 81e14359e94c..aaaf7054b26d 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.122 2007/10/06 20:43:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.123 2007/11/18 12:15:12 dev-zero Exp $
+
+  18 Nov 2007; Tiziano Müller <dev-zero@gentoo.org> boost-1.34.1.ebuild:
+  Fixed broken links in documentation (bug #194789) and added '-q' to the bjam
+  call to make boost-build fail on first error (bug #197465)
 
   06 Oct 2007; Fabian Groffen <grobian@gentoo.org> boost-1.34.1.ebuild:
   Revert my changes made to this ebuild per a pending conflict with its
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index dd9c99eaaeb2..0a33c55ce8bb 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -29,14 +29,14 @@ EBUILD boost-1.34.0-r1.ebuild 6708 RMD160 e6ac1bdcfbfddcbd5b814a31ae5f189d4237b9
 MD5 3012aca3d69e9059b4f6152e6b7fcfb3 boost-1.34.0-r1.ebuild 6708
 RMD160 e6ac1bdcfbfddcbd5b814a31ae5f189d4237b948 boost-1.34.0-r1.ebuild 6708
 SHA256 e8642b5d9ab9378ff0e253e87e744c9690af6f8c831785da3fe5fd3b43a342d1 boost-1.34.0-r1.ebuild 6708
-EBUILD boost-1.34.1.ebuild 6651 RMD160 376484efdcd6e4a59b24ebb46649ec7a22317838 SHA1 b50126ef9ad53650d78e96a4903765759a951a7f SHA256 2b9d4e78668e1f2117e5771fbf5e992bbbb49b2cd62aa97c81b86b906dfc362d
-MD5 e28902d531681c23fcd72af98082964a boost-1.34.1.ebuild 6651
-RMD160 376484efdcd6e4a59b24ebb46649ec7a22317838 boost-1.34.1.ebuild 6651
-SHA256 2b9d4e78668e1f2117e5771fbf5e992bbbb49b2cd62aa97c81b86b906dfc362d boost-1.34.1.ebuild 6651
-MISC ChangeLog 16773 RMD160 bb59985a4b7d57e5cbf5bcfdb91327ee58b12e4c SHA1 9a6778dcea309c415abab56c57023599685925d9 SHA256 0bf42e651e59e0c84d724bfc4e007fad3850faa0cf5c45e45b843f8d5dcd4b5e
-MD5 c76740c3649dfba0b65818760bb8c423 ChangeLog 16773
-RMD160 bb59985a4b7d57e5cbf5bcfdb91327ee58b12e4c ChangeLog 16773
-SHA256 0bf42e651e59e0c84d724bfc4e007fad3850faa0cf5c45e45b843f8d5dcd4b5e ChangeLog 16773
+EBUILD boost-1.34.1.ebuild 6819 RMD160 52a738cd2cbf1a6bb16ff3b633ad9463aa255660 SHA1 0b5b54761ea33bccf37519118b58d36fcb264135 SHA256 a8aad3dc21a1b7083de7858545d31a64a337728683d91808fe349d92b78b6a99
+MD5 95800690dc6be794cdf7c83297da4bf0 boost-1.34.1.ebuild 6819
+RMD160 52a738cd2cbf1a6bb16ff3b633ad9463aa255660 boost-1.34.1.ebuild 6819
+SHA256 a8aad3dc21a1b7083de7858545d31a64a337728683d91808fe349d92b78b6a99 boost-1.34.1.ebuild 6819
+MISC ChangeLog 16989 RMD160 2262ef32c6b39ae89361965215c140ee4d8de02d SHA1 b5479a2c5ea9c31ad8279aa1b53597b1f659d30a SHA256 5f03d4662b02bbf5e8cadb19afebebdce14015205c96987f1b6411c4f9e06756
+MD5 5d660e476405582112a0db122c3d5874 ChangeLog 16989
+RMD160 2262ef32c6b39ae89361965215c140ee4d8de02d ChangeLog 16989
+SHA256 5f03d4662b02bbf5e8cadb19afebebdce14015205c96987f1b6411c4f9e06756 ChangeLog 16989
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349
 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349
diff --git a/dev-libs/boost/boost-1.34.1.ebuild b/dev-libs/boost/boost-1.34.1.ebuild
index 8d5b62ec6afa..d32c838df55b 100644
--- a/dev-libs/boost/boost-1.34.1.ebuild
+++ b/dev-libs/boost/boost-1.34.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34.1.ebuild,v 1.5 2007/10/06 20:43:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34.1.ebuild,v 1.6 2007/11/18 12:15:12 dev-zero Exp $
 
 inherit distutils flag-o-matic multilib toolchain-funcs versionator check-reqs
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.boost.org/"
 SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 LICENSE="freedist Boost-1.0"
 SLOT="0"
-IUSE="debug doc icu pyste tools userland_Darwin"
+IUSE="debug doc icu pyste tools"
 
 DEPEND="icu? ( >=dev-libs/icu-3.2 )
 		sys-libs/zlib
@@ -88,9 +88,10 @@ generate_userconfig() {
 	distutils_python_version
 
 	local compiler compilerVersion compilerExecutable
-	if use userland_Darwin ; then
+	if [[ ${CHOST} == *-darwin* ]] ; then
 		compiler=darwin
-		compilerExecutable=c++
+		compilerVersion=$(gcc-version)
+		compilerExecutable=$(tc-getCXX)
 		append-ldflags -ldl
 	else
 		compiler=gcc
@@ -122,7 +123,7 @@ src_compile() {
 
 	for linkoption in ${LINK_OPTIONS} ; do
 		einfo "Building ${linkoption} libraries"
-		bjam ${NUMJOBS} \
+		bjam ${NUMJOBS} -q \
 			${OPTIONS} \
 			threading=single,multi \
 			runtime-link=${linkoption} link=${linkoption} \
@@ -140,7 +141,7 @@ src_compile() {
 		cd "${S}/tools/"
 		# We have to set optimization to -O0 or -O1 to work around a gcc-bug
 		# optimization=off adds -O0 to the compiler call and overwrites our settings.
-		bjam ${NUMJOBS} \
+		bjam ${NUMJOBS} -q \
 			release debug-symbols=none \
 			optimization=off \
 			--prefix="${D}/usr" \
@@ -151,7 +152,7 @@ src_compile() {
 
 	if has test ${FEATURES} ; then
 		cd "${S}/tools/regression/build"
-		bjam \
+		bjam -q \
 			${OPTIONS} \
 			--prefix="${D}/usr" \
 			--layout=system \
@@ -168,7 +169,7 @@ src_install () {
 	export BOOST_BUILD_PATH=/usr/share/boost-build
 
 	for linkoption in ${LINK_OPTIONS} ; do
-		bjam \
+		bjam -q \
 			${OPTIONS} \
 			threading=single,multi \
 			runtime-link=${linkoption} link=${linkoption} \
@@ -183,8 +184,13 @@ src_install () {
 
 	if use doc ; then
 		dohtml -A pdf,txt \
-			*.htm *.gif *.css \
+			*.htm *.png *.css \
 			-r doc libs more people wiki
+
+		insinto /usr/share/doc/${PF}/html
+		doins LICENSE_1_0.txt
+
+		dosym /usr/include/boost /usr/share/doc/${PF}/html/boost
 	fi
 
 	cd "${D}/usr/$(get_libdir)"