Fixed bug #181972, added fix for gcc-4.2

Package-Manager: portage-2.1.3_rc8

5 files changed, 51 insertions, 13 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 9b33a8957322..b26d226c6eb2 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,14 @@
 # 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.118 2007/07/15 10:55:30 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.119 2007/07/15 14:44:36 dev-zero Exp $
+
+*boost-1.34.0-r1 (15 Jul 2007)
+
+  15 Jul 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/boost-1.34.0-gcc42-atomicity.h.patch, -boost-1.34.0.ebuild,
+  +boost-1.34.0-r1.ebuild:
+  Added creation of symlinks when built with debug (bug #181972)
+  Added patch for gcc-4.2
 
   15 Jul 2007; Tiziano Müller <dev-zero@gentoo.org> boost-1.34.0.ebuild:
   Corrected dohtml usage (thanks to kolmodin)
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index bf76b965d880..06dee498be78 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,6 +2,10 @@ AUX boost-1.33.1-gcc41_visit_each.patch 338 RMD160 295e85b70cb27da6bb24eb6d757c8
 MD5 be654f750b09a2a826f3bf6948276d5d files/boost-1.33.1-gcc41_visit_each.patch 338
 RMD160 295e85b70cb27da6bb24eb6d757c8cc3465877d7 files/boost-1.33.1-gcc41_visit_each.patch 338
 SHA256 a9ced5f54e52ade899a7b09dff097e4c9ca958c85d51ae431c7e7521f53b441e files/boost-1.33.1-gcc41_visit_each.patch 338
+AUX boost-1.34.0-gcc42-atomicity.h.patch 413 RMD160 fba2ec98aa3e1e454856479732a63024bda7a545 SHA1 0075ef08eefb64357496111ec89cc764b0ecfd65 SHA256 2900f50da733c3f141c3cb651c665c7c1f44a40b2f7a9d8534beeee25c56f86a
+MD5 f93e7db6c66ed6343ef937e7e156919e files/boost-1.34.0-gcc42-atomicity.h.patch 413
+RMD160 fba2ec98aa3e1e454856479732a63024bda7a545 files/boost-1.34.0-gcc42-atomicity.h.patch 413
+SHA256 2900f50da733c3f141c3cb651c665c7c1f44a40b2f7a9d8534beeee25c56f86a files/boost-1.34.0-gcc42-atomicity.h.patch 413
 AUX boost-alpha-threads.patch 1111 RMD160 49fe6128f6dd9277389d25a83706b401705cdb40 SHA1 846f8a187dca02a998fb60bd298d2312e16620f0 SHA256 e7d1cb78cc73763023edb80cdb66e2a9389d9ef40f448be60cf8cd4f827e7623
 MD5 238bb8043f0cdc8bd91f81bd0b55f92a files/boost-alpha-threads.patch 1111
 RMD160 49fe6128f6dd9277389d25a83706b401705cdb40 files/boost-alpha-threads.patch 1111
@@ -20,14 +24,14 @@ EBUILD boost-1.33.1.ebuild 5698 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e
 MD5 85e241bdaa449cd9fd1f1dfd99915f64 boost-1.33.1.ebuild 5698
 RMD160 6c77b00c3027e82a9753419446d57fd489b93a5e boost-1.33.1.ebuild 5698
 SHA256 40ca99406b69fc646969eade68e3363279218df5fce358ec9d7ad98b289dc0f5 boost-1.33.1.ebuild 5698
-EBUILD boost-1.34.0.ebuild 6370 RMD160 4659953f67de98b2cdfca43a1735d6cf50e79321 SHA1 4ba7d4c7ba47546b027617fd4be6b3a99dde000e SHA256 686485fad20cb996315c904a5fd4a4eff7d3c8b38443aa41ad4b60d985aeb89b
-MD5 a86af12f85b71de87183094fafa79dc6 boost-1.34.0.ebuild 6370
-RMD160 4659953f67de98b2cdfca43a1735d6cf50e79321 boost-1.34.0.ebuild 6370
-SHA256 686485fad20cb996315c904a5fd4a4eff7d3c8b38443aa41ad4b60d985aeb89b boost-1.34.0.ebuild 6370
-MISC ChangeLog 16001 RMD160 e6d98dd6b5fe6d921bfeaf6fa6a8328484b23195 SHA1 4df4f0031bef773679fe67b588f72cebe73e5c62 SHA256 371d9754cc7d3b91eb177ef8acabdbedc030699dd9dbfc766e614a247d77a429
-MD5 21e6518e3a16d3fb6bbd1407c8c801d5 ChangeLog 16001
-RMD160 e6d98dd6b5fe6d921bfeaf6fa6a8328484b23195 ChangeLog 16001
-SHA256 371d9754cc7d3b91eb177ef8acabdbedc030699dd9dbfc766e614a247d77a429 ChangeLog 16001
+EBUILD boost-1.34.0-r1.ebuild 6708 RMD160 1923b6ab8b6f39ed6368ab49194f53c9474c4804 SHA1 de9838b2de910b437a592adb627d3c40b5ac21a9 SHA256 7f1c859c2a3abe47692222d1e51e1f3ab77d047049e7edbfe9ace591aaacfb26
+MD5 49e85a0b7aad685be4abedc363855e70 boost-1.34.0-r1.ebuild 6708
+RMD160 1923b6ab8b6f39ed6368ab49194f53c9474c4804 boost-1.34.0-r1.ebuild 6708
+SHA256 7f1c859c2a3abe47692222d1e51e1f3ab77d047049e7edbfe9ace591aaacfb26 boost-1.34.0-r1.ebuild 6708
+MISC ChangeLog 16274 RMD160 196ec6997d1f733428a214e53c6e0cbc92410e82 SHA1 0924cf443b9e660d8f89552ec5a305dc832db09a SHA256 0ed33ff7e452db3be0b8f22ab2689f489dce3bbebea341051771833a1e58fe66
+MD5 ad3fbaee1119726ef46d88cf91af74ae ChangeLog 16274
+RMD160 196ec6997d1f733428a214e53c6e0cbc92410e82 ChangeLog 16274
+SHA256 0ed33ff7e452db3be0b8f22ab2689f489dce3bbebea341051771833a1e58fe66 ChangeLog 16274
 MISC metadata.xml 349 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd SHA1 042144f72d878c355a55ad72a5212b2c2db88b9a SHA256 17524a0d3400af3c713289c5cf1f713cf63619264b9c6b535be3e2d543512cf6
 MD5 b0f631e883fed00f233ff27ce7ceb93d metadata.xml 349
 RMD160 d25d9702dc4a5438f4bf5f7a9e9fc1b0664b6bdd metadata.xml 349
@@ -38,6 +42,6 @@ SHA256 81d215f8a743fe6c248ca79c782decf96967f883a5e015840cdea311556a278b files/di
 MD5 afef39b54f8c7050345e448b9cfef207 files/digest-boost-1.33.1-r1 247
 RMD160 be54469c475e8d818c7af17b21f0d6bfc8bb328e files/digest-boost-1.33.1-r1 247
 SHA256 81d215f8a743fe6c248ca79c782decf96967f883a5e015840cdea311556a278b files/digest-boost-1.33.1-r1 247
-MD5 e510e76996ad15f10d2eebe80282d2a3 files/digest-boost-1.34.0 247
-RMD160 cc7660c3269f93cc7199ff0dd23b627ec5a16a4c files/digest-boost-1.34.0 247
-SHA256 e6ddb1f3228847ac03c8e2dfd4be96c94820020f987ea7d817caa474b1ea2b74 files/digest-boost-1.34.0 247
+MD5 e510e76996ad15f10d2eebe80282d2a3 files/digest-boost-1.34.0-r1 247
+RMD160 cc7660c3269f93cc7199ff0dd23b627ec5a16a4c files/digest-boost-1.34.0-r1 247
+SHA256 e6ddb1f3228847ac03c8e2dfd4be96c94820020f987ea7d817caa474b1ea2b74 files/digest-boost-1.34.0-r1 247
diff --git a/dev-libs/boost/boost-1.34.0.ebuild b/dev-libs/boost/boost-1.34.0-r1.ebuild
index bb94ac4fc24a..5aee08e6da74 100644
--- a/dev-libs/boost/boost-1.34.0.ebuild
+++ b/dev-libs/boost/boost-1.34.0-r1.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.0.ebuild,v 1.9 2007/07/15 10:55:30 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.34.0-r1.ebuild,v 1.1 2007/07/15 14:44:36 dev-zero Exp $
 
 inherit distutils flag-o-matic multilib toolchain-funcs versionator check-reqs
 
@@ -49,6 +49,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-gcc42-atomicity.h.patch"
+
 	rm boost-build.jam
 
 	# This enables building the boost.random library with /dev/urandom support
@@ -189,10 +191,19 @@ src_install () {
 
 	cd "${D}/usr/$(get_libdir)"
 
+	# If built with debug enabled, all libraries get a 'd' postfix,
+	# this breaks linking other apps against boost (bug #181972)
+	if use debug ; then
+		for lib in $(ls -1 libboost_*) ; do
+			dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-d\././' -e 's/d\././' <<< ${lib})"
+		done
+	fi
+
 	for lib in $(ls -1 libboost_thread-mt.*) ; do
 		dosym ${lib} "/usr/$(get_libdir)/$(sed -e 's/-mt//' <<< ${lib})"
 	done
 
+
 	if use pyste; then
 		cd "${S}/libs/python/pyste/install"
 		distutils_src_install
diff --git a/dev-libs/boost/files/boost-1.34.0-gcc42-atomicity.h.patch b/dev-libs/boost/files/boost-1.34.0-gcc42-atomicity.h.patch
new file mode 100644
index 000000000000..c2ca7f20512b
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.34.0-gcc42-atomicity.h.patch
@@ -0,0 +1,15 @@
+--- boost_1_34_0/boost/detail/atomic_count_gcc.hpp	2005/04/02 11:37:53	1.5
++++ boost_1_34_0/boost/detail/atomic_count_gcc.hpp	2007/05/21 01:34:43	1.5.8.1
+@@ -17,7 +17,11 @@
+ //  http://www.boost.org/LICENSE_1_0.txt)
+ //
+ 
+-#include <bits/atomicity.h>
++#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
++# include <ext/atomicity.h>
++#else
++# include <bits/atomicity.h>
++#endif
+ 
+ namespace boost
+ {
diff --git a/dev-libs/boost/files/digest-boost-1.34.0 b/dev-libs/boost/files/digest-boost-1.34.0-r1
index 792d3db7556c..792d3db7556c 100644
--- a/dev-libs/boost/files/digest-boost-1.34.0
+++ b/dev-libs/boost/files/digest-boost-1.34.0-r1