Backport fix for BOOST_FOREACH from upstream.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 91 insertions, 16 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 30952e33dfc9..80772b74145b 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.235 2012/01/23 22:23:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.236 2012/02/04 19:31:46 hwoarang Exp $
+
+  04 Feb 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/boost-1.48.0-BOOST_FOREACH.patch, boost-1.48.0-r1.ebuild:
+  Backport fix for BOOST_FOREACH from upstream.
 
 *boost-1.48.0-r1 (23 Jan 2012)
 
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 3a3db9484420..c447635279b5 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -14,6 +14,7 @@ AUX boost-1.42.0-template_arity-gcc45.patch 970 RMD160 0edcdbcaf0165e4e285b041f6
 AUX boost-1.45.0-lambda_bind.patch 1607 RMD160 ea61aaac83cfebfcb10c0e20de72022d4d4c1b27 SHA1 39856bef27d2a55f1ae2e0d7a7005264a8613289 SHA256 0ff6a7bf481d5311ec57be1eeaafdd0c0e9e0c09b896700d40295f67bf77be0b
 AUX boost-1.46.1-python32.patch 579 RMD160 bf659da8646379b73ce255d2432467724c33c4be SHA1 0d3f2896ca46179cf2138fa4571fb48f5f496a2d SHA256 6227eb2692777b70896fe63a6726b630239b07845f4ae1ae57d2e83a062dc57e
 AUX boost-1.47.0-exceptions.patch 748 RMD160 dbbf5f31a97306febdad393bb7e6530048faed19 SHA1 d6fae686665f8cc9bbab6ed2e3094f387b7072f6 SHA256 c19d6043851692c03d3c04d96f1a75b2c054322de0a20910262eab2bab643ecf
+AUX boost-1.48.0-BOOST_FOREACH.patch 1889 RMD160 44f9300a8b8b1bd67decb76b81492437161226c6 SHA1 b24969fcc8d19ec642c329be4f390f2ed9a4911d SHA256 4a82e034a59645d0ab407ca9cd91ee99ec9249c8b323c8b0e0e46e399253cc2d
 AUX boost-1.48.0-disable_icu_rpath.patch 1073 RMD160 3a31b1edfea4438d08eb233558164d06830f6c15 SHA1 814b8b53aaae586de580d3cc79727dcf30ebe04c SHA256 e1c947d20f0864e22f6dd2b091da6948bb51aec0d3323c37fe4264ddf57204b4
 AUX boost-1.48.0-disable_libboost_python3.patch 1509 RMD160 d5134496aa1ac560c545d83d5d8cc3e13fc6f31f SHA1 c8d295ad9e3cd72526608d8749e67244402e8c7b SHA256 0b229762863b72a5faa39ea57538f757548abc492325e6458d3801fd49e4804e
 AUX boost-1.48.0-mpi_python3.patch 2549 RMD160 9002feff5b234c7b134f3ffc67423b241ebfbdfc SHA1 7742a397ed5fc6760b66950eea88555f00733c02 SHA256 9120a660469fba15554e790150e03a665ea5497e94a79469053506147bd7dad1
@@ -60,23 +61,23 @@ EBUILD boost-1.45.0.ebuild 15793 RMD160 c583db21b892c47d7b9edd5fece5f2e214165309
 EBUILD boost-1.46.1-r1.ebuild 16224 RMD160 2a61c2f9bfae575018dd85f1d746ec27d38cf191 SHA1 920d8d3b118cd808f9ee311e63642398dd9c07b2 SHA256 9d7726f12645e301fcc9174880e45e44c9d1ae19d7a338da0503ce388e08138b
 EBUILD boost-1.47.0-r1.ebuild 15910 RMD160 501f37a32f879625facfd7134d342dc83688d95b SHA1 f9366a644df12335dfe9c960ced999b1acce5341 SHA256 f29520bcbd74fa8d75acfc6a1cd7f30329b401cc35b1197e67fc6da39e14ac00
 EBUILD boost-1.47.0.ebuild 15907 RMD160 72716bfd46f181c2bd096c34c977e3d2b02cb6c0 SHA1 3ca8410452f3198759f3e35a9a97b18631449082 SHA256 e79d396d32d06b5e3353664d3c95de05448b935d5a36a6df83d32b01047b7c46
-EBUILD boost-1.48.0-r1.ebuild 19575 RMD160 cac63df6f9da5131d91db770807e3ef77586e738 SHA1 9a25c73b36c76feabafddd2cccac5b2cf167126c SHA256 9587bed707c5565483cfdd321b086f674acf49c74f35af9d3f4bbfc649424f02
-MISC ChangeLog 37746 RMD160 b94c370f6ec0ccebf88830ffc6f829465e5efbf0 SHA1 df19fbcabd9555d0f78fdb7637254088e6b437cd SHA256 30da72bbbcbb4b85547e7053776505d5b20da85323d604cd34183545d1e7a9a6
+EBUILD boost-1.48.0-r1.ebuild 19622 RMD160 0b2a582ebe57b3fe08a1afe0046b9fd94fdc3ef2 SHA1 5abfe42d769329fa917afbea4aab73ac542720a0 SHA256 43f09b597c9b20e9bb4bb05ef49395adf393fb63e3d6d2d6fef2b6525cd5c6bc
+MISC ChangeLog 37915 RMD160 f66a494c82655ce2d49a2ffd8020e5cedc8fa82d SHA1 7ae437ecdea87ca0135114c04f37ebdf4a0fa4a3 SHA256 994836e41f3f1dc2a431fb8d030b885eafbcdc3d4de6bf366ff46cddf48c7063
 MISC metadata.xml 773 RMD160 3f4c57fa2861bb416fc5d92d839c41acb2b9861a SHA1 6c90f699901853658c41fbfdb3661eb617682040 SHA256 6563b78be463b4ae931f3dc07d5cd280281bf168c07ecea59fe5dc946f2d0ecf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPHd3XAAoJEPqDWhW0r/LCLgoQALCaHsDwpUD0UhCYJy5ZqH04
-kn+f9zqj9d5zXyvOFInxqMv8FE7Rad6H2A3yLrP1UzdQkV8EhfTV2eSY7Eb7P0LC
-ebK9Z5leaOWyD1pzU3VztN9x1zLtaoGa8uL733wMZh0pYMpFhBXQP+JsMb9f7tof
-UOazXspCkRQs2ZkAp+2quK9yFKhqaFMiBBDin5YOY2vGEz8a2LHZ7ZnXKsKpkhsN
-PpJOPiWyfql28FfZ43gqufjruioWOUffOpjbYw0d/X9b4YC8mSSCvnaBd6Mqp9fi
-GMDOddyXIqCaDhoXAA/3C3RUTNcl+UwREAaTxDvpija2cZXxMj5DjsPAp05o+3yO
-u0UbGE6SqfH7UeLmQ1fM1bGPtah9sYfM7Ry55t6MmgeoFL5EqBGOHN8PGzr3wK8P
-/cMV21FbtCUtN4AiAEYPnYphARL/FSL6KvJQTELRerhUI4RZkGk7fudnBnQfJpwW
-/rWhOhw2XVbkp2pOAsJ3QIGk+3GlNqCrjz3Q8CoNrkku6+0sggxCyWFtn9O3gfXr
-+FmV5RHSNGzSzi9lUT3hIIIAgLxHKaHhYUPHFPqwBTVN7ajqMFnooi1NWjhRhqOX
-Xp6fnpX9wDwid0RrMn0bwM5Q6q75jhzzCmbgl6RW/PgdIaVADhv76W99D+H+yT7m
-q5RtcHF7lyJf/beDilJS
-=Rfxu
+iQIcBAEBCgAGBQJPLYeeAAoJEPqDWhW0r/LCFSEP/jOCBIiBsloyYN7PuVGQ7Md1
+T7lAS0c0SYCN7QkDIUT21YwQV1nNSTWMtYkySZZU0h2f+BN2AQiPx1wRTBWB/xD1
+KN7N7JmGAeiZvoAU6V1F4qwL5sQMixayB2MRuqpX8GyZS/0nodXHjcZpv9mV+mW6
+mps2ML1nMhxacaQOEUeXPRwCSN/W+8C8b3cZ436x8csuAQdf57o+0qb2w4Qyfoen
+o5xZSz0BPcu1z3Jju8D54dclXBW1+mvJ3YJ/Mm+4DyzPZgFnOp64ebYJZvzJ6cfB
+F9NwyhNCWqD6Sa1U9oBB+KYDbyNCKDjvkRmmBE/35N26lhIHZqMckUt5sL/kRf9L
+2l5zdMP9ct6jZuWt//NJ9IDZGYW6sGoZ8ndcBlP5mry9TyYE2QS8gcCrSoC6dpWi
+cZmQtF0VMGWAghayaZocv0rfO/KM/XLQ+3KJC5ZnqpWTSSE9NC7IzI30kUD4XWHx
+9QxF9lUOTSNRSQeH48Mjml+xOzlP5VpsnKeNcuGhXcE29+6+DfgB6/O4SyvD54Cv
+XHwgFb/8V7iD3wpf7KbfZh9dadxJrsjqlTv2Spu1Jbeb1GA8oCKSUG1OgyGLQB5V
+uCYktFgYqDVJ6oLTOQFVqSsejXs/X1U1jKLgz4eIYM06Sy7H+TwZVHD6knKy3gzo
+EHFae8q4srbE5DA0InKr
+=ZTFI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.48.0-r1.ebuild b/dev-libs/boost/boost-1.48.0-r1.ebuild
index 5e043fbd1020..0bd4150fcdfe 100644
--- a/dev-libs/boost/boost-1.48.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.48.0-r1.ebuild
@@ -118,6 +118,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-BOOST_FOREACH.patch"
 	epatch "${FILESDIR}/${P}-mpi_python3.patch"
 	epatch "${FILESDIR}/${P}-respect_python-buildid.patch"
 	epatch "${FILESDIR}/${P}-support_dots_in_python-buildid.patch"
diff --git a/dev-libs/boost/files/boost-1.48.0-BOOST_FOREACH.patch b/dev-libs/boost/files/boost-1.48.0-BOOST_FOREACH.patch
new file mode 100644
index 000000000000..02f7a013fbb8
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.48.0-BOOST_FOREACH.patch
@@ -0,0 +1,69 @@
+https://svn.boost.org/trac/boost/ticket/6131
+https://svn.boost.org/trac/boost/changeset/75540
+
+--- boost/foreach_fwd.hpp
++++ boost/foreach_fwd.hpp
+@@ -14,6 +14,8 @@
+ #ifndef BOOST_FOREACH_FWD_HPP
+ #define BOOST_FOREACH_FWD_HPP
+ 
++#include <utility> // for std::pair
++
+ // This must be at global scope, hence the uglified name
+ enum boost_foreach_argument_dependent_lookup_hack
+ {
+@@ -25,6 +27,9 @@
+ 
+ namespace foreach
+ {
++    template<typename T>
++    std::pair<T, T> in_range(T begin, T end);
++
+     ///////////////////////////////////////////////////////////////////////////////
+     // boost::foreach::tag
+     //
+@@ -46,6 +51,24 @@
+ 
+ } // namespace foreach
+ 
++// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
++namespace BOOST_FOREACH
++{
++    using foreach::in_range;
++    using foreach::tag;
++
++    template<typename T>
++    struct is_lightweight_proxy
++      : foreach::is_lightweight_proxy<T>
++    {};
++
++    template<typename T>
++    struct is_noncopyable
++      : foreach::is_noncopyable<T>
++    {};
++
++} // namespace BOOST_FOREACH
++
+ } // namespace boost
+ 
+ #endif
+--- boost/foreach.hpp
++++ boost/foreach.hpp
+@@ -165,7 +165,7 @@
+ //   this one works on legacy compilers. Overload boost_foreach_is_lightweight_proxy
+ //   at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_lightweight_proxy<T> *
++inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
+ boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
+ 
+ template<typename T>
+@@ -190,7 +190,7 @@
+ //   this one works on legacy compilers. Overload boost_foreach_is_noncopyable
+ //   at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_noncopyable<T> *
++inline boost::BOOST_FOREACH::is_noncopyable<T> *
+ boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
+ 
+ namespace boost