Fix building with USE=context and GCC 5.1 and higher, wrt bugs #546882 and #555580

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x60C0742D1F357D42

5 files changed, 60 insertions, 11 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 205e283b9d14..55ffc909e1b4 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.361 2015/07/23 19:37:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.362 2015/07/27 13:06:41 pinkbyte Exp $
+
+  27 Jul 2015; Sergey Popov <pinkbyte@gentoo.org> boost-1.55.0-r2.ebuild,
+  boost-1.56.0-r1.ebuild, +files/boost-1.55.0-variadic-templates.patch:
+  Fix building with USE=context and GCC 5.1 and higher, wrt bugs #546882 and
+  #555580
 
   23 Jul 2015; Pacho Ramos <pacho@gentoo.org> boost-1.56.0-r1.ebuild:
   ppc stable wrt bug #554712
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 19b179249e0e..c38ffc7c9b59 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -15,6 +15,7 @@ AUX boost-1.53.0-glibc-2.18-compat.patch 949 SHA256 54e5e0000bcfb249a14cee584e37
 AUX boost-1.53.0-library_status.patch 1907 SHA256 21a3137fcac21f734c7160264523f8699eb242a84a79dcc88cc937f0b1f87e67 SHA512 f5579a8650c24d2ace95e8d9aaff94325090577fa27fd7122309f5197373ff22352092671153c6e35057757fa07ef9c21ea5e0234fe1d5b467ef65cf5f2901c5 WHIRLPOOL 5a0962b007adbbfe85c33f03b9542d9ebf1ef649bf1d97f483cba5b0229cea0630c0ed7912bab8f04d8dd791b99cfd6e33e222d3a983e30852d7a10fd66a3dc7
 AUX boost-1.55.0-context-x32.patch 1077 SHA256 1da4ff48b98416cac601c52594d4c4da3fb89d0a3e8908f119f05cc8ae76f9c7 SHA512 0e2e45abe5833396508666355e26bafe114fa4ada628b24d8d9953268edddcb2f8e3dcfe8bc7f27d6c1794418990dc9ef914c936dfa64ed6e5e647a40e3f8a73 WHIRLPOOL 0b7a3521a8ec513b833d0292fa3e3bcafc8232fa96d2e41afd25da8dc30bdb49ee4319c7c8555d95e7d3de55fc704d83e443ba49bf89d6961a3f5af73c024a71
 AUX boost-1.55.0-tools-c98-compat.patch 680 SHA256 08192ebf36a3087d3bce31d7b78c29c6e38bca6e5164744878783f648024beec SHA512 fc132898d9ef1a9fab607f277003f86080306fd0f30f89ab0916eb4c3217b390f15cfa00d1e410e79080d469714866a417ba72a3c0727189e8425cd72a1d6a47 WHIRLPOOL 17eb9e80ae33ef9fa8e4c442c511e35d1f5c2ac5251462931e9fbbd53bb29ef5adf699680729af71ef4c12ec87c6d83c821a8e30a03f7f1abedc2207c3125c1c
+AUX boost-1.55.0-variadic-templates.patch 1367 SHA256 12a3bb11de3cfda3c5ae9003a083d1927146d43ff5effe1fccf4a3c6bf685731 SHA512 0cec0f616d1c56991695709d101306a3c5dfd6c1439a7eb001647c79708d46ff53b1f99cb1350f60a9fa143c862d6cc0d510f518f1aeda87d8a82161babd6e1c WHIRLPOOL b729675343e10a32544b95f9fd0254b4548d31f7584b65bdd4bb1463e55a890e5b671466563396b45e4ed5dbd1926311db3e78805e97c73fb3f1bdaeae2e0985
 AUX boost-1.56.0-build-auto_index-tool.patch 408 SHA256 36bbd2652654b48c27eb4297d06968c8bdcdf78eec34127d775fad2b9689ac2a SHA512 916d7060003bceb6ee345de5fad9a4f44ec43473b119bab4cc057360d07b7be89bdab5e9d393df28171a4d1679ac0a3089f2096d5a6554ee2e00bc0805d2cbe2 WHIRLPOOL 172059b31b9128cda03e9119f6deac1a0fde373542e96493156f6e3527c65c7ec8fe16611568b0aed07b2f5ffc3440462386d47557ef7e84d855c8df2acbbea8
 AUX remove-toolset-1.48.0.patch 396 SHA256 59af4c05d71def0b14e22a7a5f756a054ca82e3f9686b7668335af7d9bed28fa SHA512 bbb01be2e4b4807eeb19faf13fc6c73e3cb8843953586312076a15c67ad5c5cac683fc3fb26f4e2902c60ab7930e83922f4d499756a85f78a20ac53399329f61 WHIRLPOOL 2490dac69a45b3f48e2513b4f21d75dc7cf5361411541dde96f027c66ca459df5390708902c86f11577d1129410f52d20de1ff275524fb51083a17eee6adc332
 DIST boost_1_52_0.tar.bz2 54421709 SHA256 222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92 SHA512 fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d WHIRLPOOL 73bbab4a1d2a652200f4b5e669440a2afcebcea96a1139ecc75213067ca32d5cadb0f060bb0ec2e29e9e31272fb7ec9d2cb960801032ee6c5dcb86564766411d
@@ -27,16 +28,20 @@ DIST boost_1_58_0.tar.bz2 70394057 SHA256 fdfc204fc33ec79c99b9a74944c3e54bd78be4
 EBUILD boost-1.52.0-r7.ebuild 10032 SHA256 4da306bc39ade5bc4236ed06e0b400cd445f9b0ec071d0e1a6b8dd6fcfff618b SHA512 d7328631a6c639bafce3eb4fc3de08ce4addd25738f102a169210e9bd775383fcb228a0a8c36040d19f5683699bd787b9ff498db590f9eeaed7978d726160e78 WHIRLPOOL b1804a8d6fa731720d8e120054d1af2bfd6183c1e117caa6be323eb656be506e89cec3b1fe5804ca1e5a3317cf90f530f60a0467a76094dcb07bf4586ce9aac9
 EBUILD boost-1.53.0-r1.ebuild 10545 SHA256 68e732e4b74f2160aea1343c6f7d8cc62e27bef8678b2ec161b6a631d16fdfe3 SHA512 b9220d8b8eddd30efd737272f4a2bc586521464c9cdac3adc3f1c4f4495db6dd7564b10a9433634383d113c1d08913b23ea0cf4080dbbf34ecb37aa1363c3102 WHIRLPOOL d1aee94c909f9ab75cf13b237cf3cf6e99304467c744816503db3c68cc273e67b4917dbc4412274022273a398ded7807d20069e513e5da37ef3849061e6dca0a
 EBUILD boost-1.54.0-r1.ebuild 10565 SHA256 71ca74dc42fe85956cf0d3999ada4c95c7656a47abe4ffe9592ee049af29a312 SHA512 cd7615045137c8084168fa36308cb25ebedef99e97627525af95abcea6b5168635b0e5a110bb4e96dcc016be4e65ff879632153d269826bdf34e39ef965cb7a6 WHIRLPOOL 1c8d19f73908de3445da39c8dbbce6dcfd32cdd28aef09d923de57e6287711f19c9a652e73374fac277c6d0491f5d85a0bf96bb94612f4f4f438177fa66b4fbf
-EBUILD boost-1.55.0-r2.ebuild 11312 SHA256 2570e7d6d1ae6bd2b98ac35c8fb6fffff841a500d6829d5abf9f946b1b39dc10 SHA512 63ee682989487042f7371eaaf59666b99d0a4d6bb0cf97adb6fe5770aca29e61229f42af44a26ac751e214b02047e7a264404f717edc31f2cd483726c14dc995 WHIRLPOOL a139bec8af17a79ef3662106d7ebf8656391fa8063331d6a72d4289b3d0a6ebaaf1fd78d6c37eb093ef71f177c7839103490a46d5903ab845e63c0b378f01c5e
-EBUILD boost-1.56.0-r1.ebuild 11850 SHA256 bec044d12d18ece7df83cba0383c91a287047d0c7deb4647e1a2899690729b9b SHA512 fae2a024b63ef4743163c45eefef736d755dfb7d166e122b76d7f22a293ac65bb86b3f998c3f5fd3e146bf4f31cdcbb70098ed9437776e423653cb5412de4356 WHIRLPOOL a09d4ea77c4538168342a1ec3ceea678fe6b764ddd7ac6cbac553d8db5788de8e5b2830454c7e5addf3033b06ca7b39169ec453e3d57b76fae2fe00e3a827fc4
+EBUILD boost-1.55.0-r2.ebuild 11369 SHA256 6268a7fa48b7e0f53fedefc1a01a3ddffebbb6f80479e5bb5a3e43821da960b7 SHA512 8393e70815de18734f8a2626656ddcdaa943b405bf6d6675537dc99b99a92b0466138fb48a217b5567d318bdcfe12cad6644671b423df26258008e616107fba6 WHIRLPOOL eb69ef75b5f05cfc22e440214db2c0a94f7c21abb6692fabcdb923f01a4ac759f312be80531b4ae781845c19dd724a27c8ca49bc6804f4f0121fa16312faf6fb
+EBUILD boost-1.56.0-r1.ebuild 11909 SHA256 1a6866a0cb91ca319ce5c9e20f9e4dcc51580c3778412855ef947cf0ca4ed2e5 SHA512 b51907b51b7f8fea495a1da60b9d4c62f7412546bf99f6dea061f8ccf1849a7753c989e36b01b40a49ac8fa399dc60f60b3d756160283f8bca1d54d1ae642369 WHIRLPOOL 79b0c8c44895ee3c23ffd426cf518aec483d829d7484414fec53c390f5ec7af23937823f1dcbf0a39f81cae15867233ba06527859d39c8fb33fba498affbe39e
 EBUILD boost-1.57.0.ebuild 11854 SHA256 9e544f22ce30612be9c5264f30fce874f3dff569fe17ab6b48895f18e14b60d3 SHA512 f250657a1af67c7a7dfbeff32d3f82d0fd32a177055da71654f0d124eb53a57013ec75628e96d08a55396fb9c12a916195eadb04311a732aa37da4f9ae7c166e WHIRLPOOL a3084e0e71ada473992d7096bdbd54d2750eda6ab9fa3839de7f6fabf7022c5363a42b5fbb200abf901a218c0d58844e9de9580920299301ac47b19e17bf695f
 EBUILD boost-1.58.0.ebuild 11784 SHA256 073b4599a2a326aeb22d415a2093fb4e2aa92d905b3da90c44a3989c14cebc24 SHA512 70889cc844dc386a7acc3fd04cd96b190b996c932831fcd28e328d1a4a20599edaab1057f4c5ab9cd7e8b843441e824e77ef5258de9d4b39429f844649cd8ea6 WHIRLPOOL 48f894fe7af1f4d8632d53abb82d9611a468518c7c260e76bb686c7836128910ae4e74de722b0ef8b0e9ca456522d97d9bbf73c99d7f96881958af78034d72a1
-MISC ChangeLog 60235 SHA256 e71a7da730aef50a51181f48dd7219b671debc8e42cecb8dad6d59b12eab89c6 SHA512 70e5039ed0d71585d03a7e3219947fd35d5d341f7bc19b336bda130308276d13bbb7fd42bd1495a9e070c30e8cf11a2de99379ea4549f5cec431dc48eb57e0ff WHIRLPOOL 4f0cfce66b9a821503e5a1ddcaf3752f5b78d9d1bb11b5e31d6fd1b81ff9ab03e46fe46c3462aa6403fe2006d1b4784e5bef5dc28b607e7cc2750f074a67d95a
+MISC ChangeLog 60472 SHA256 73ad290467978472fd523a24036541ee1f460591a4d0f09b88be1df03f0589c6 SHA512 930f98052304405082ea5cd698b351ecadd61d341c0cb74e2119a4e6b24b74df18af321d81a5c3d9c8054186022cf811b426884b3a25dba6eccff5154bb25b3e WHIRLPOOL e9a0acbefab0d08ffea85b0e5cce91fe204834e1ce47a256bed80723e2d92286566d3d3cb098ea2afed057f914156753a351913b5c0d9eca8dc99f03f715c205
 MISC metadata.xml 1421 SHA256 e8165c32ec94a53a4a7506562266a61923cab8ba8c4ed4a66eb63a765405b0e3 SHA512 71872caa09cd6f240b4ba83e98207cec33d7391feaafc40d5ca5b6939983e7f6efd1e177a0f60f365054b046db4d7a0147f7455123e8eee9f942db15809fdbd7 WHIRLPOOL fcdd5e2b37239c17a1a6c1e136d4835539efadab230544651a8c7b0814f14c8a861a8440f08694a228de4a0b4769961f6d01b81730af06d1a98eafb3af937e13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWxQl4ACgkQCaWpQKGI+9Ra3gCeOYTmdP0iNvdD9tfWX0yK4Whn
-6X4AnAjnjftiuimY+zYqEVLF8QRmi+bl
-=YTst
+iQEcBAEBCAAGBQJVtizgAAoJECo/aRed9267jOEIAIkkEEZiD2UW+HR2OYWWJrYD
+r7l37ItvrtqgfHX+4pzJ/EXnXCwEssLjqGVDvWXBWT1izZvOHd7tYhjci/uaVJqe
+1NjG6XFwBdP1ZJYw52HHLJ6XYt6PhYUECBFq8D73XDgCATFw/MoTZjCOX9YA9ujP
+9/Ox+XVNwddn3bMapnuyVjSagOrvLEEBDnJ5VCrEyclev6NJWs0wJqFsSXLtkBSM
+NyXfCV23qfiX4zluhEC6GLMtWLJzQvDroqoZHZE/2ECQJogMI8acI0+9fcWIiIsS
+p0ju0/eAKtt70I2vjV0m9EFoiI/wrYtdSCgHPVrxQuqVnlGOMcRkNswVxRucXUs=
+=o4f+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.55.0-r2.ebuild b/dev-libs/boost/boost-1.55.0-r2.ebuild
index 4a2713970e5d..d40aa1056be2 100644
--- a/dev-libs/boost/boost-1.55.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.55.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r2.ebuild,v 1.15 2015/04/16 12:55:41 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r2.ebuild,v 1.16 2015/07/27 13:06:41 pinkbyte Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -108,7 +108,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
 		"${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
 		"${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
-		"${FILESDIR}/${PN}-1.52.0-threads.patch"
+		"${FILESDIR}/${PN}-1.52.0-threads.patch" \
+		"${FILESDIR}/${PN}-1.55.0-variadic-templates.patch"
 
 	epatch_user
 
diff --git a/dev-libs/boost/boost-1.56.0-r1.ebuild b/dev-libs/boost/boost-1.56.0-r1.ebuild
index d8c86a00e4f5..552586e488a4 100644
--- a/dev-libs/boost/boost-1.56.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.56.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.12 2015/07/23 19:37:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.56.0-r1.ebuild,v 1.13 2015/07/27 13:06:41 pinkbyte Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -113,7 +113,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.55.0-context-x32.patch" \
 		"${FILESDIR}/${PN}-1.55.0-tools-c98-compat.patch" \
 		"${FILESDIR}/${PN}-1.52.0-threads.patch" \
-		"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch"
+		"${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" \
+		"${FILESDIR}/${PN}-1.55.0-variadic-templates.patch"
 
 	# Do not try to build missing 'wave' tool, bug #522682
 	# Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
diff --git a/dev-libs/boost/files/boost-1.55.0-variadic-templates.patch b/dev-libs/boost/files/boost-1.55.0-variadic-templates.patch
new file mode 100644
index 000000000000..547dbbd5caab
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.55.0-variadic-templates.patch
@@ -0,0 +1,37 @@
+From eec808554936ae068b23df07ab54d4dc6302a695 Mon Sep 17 00:00:00 2001
+From: jzmaddock <jzmaddock@gmail.com>
+Date: Sat, 23 Aug 2014 09:38:02 +0100
+Subject: [PATCH] Fix BOOST_NO_CXX11_VARIADIC_TEMPLATES definition - the
+ feature was introduced in GCC 4.4.
+
+---
+ boost/config/compiler/gcc.hpp | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/boost/config/compiler/gcc.hpp b/boost/config/compiler/gcc.hpp
+index f37159d..97d8a18 100644
+--- a/boost/config/compiler/gcc.hpp
++++ b/boost/config/compiler/gcc.hpp
+@@ -154,14 +154,6 @@
+ #  define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+ #  define BOOST_NO_CXX11_RVALUE_REFERENCES
+ #  define BOOST_NO_CXX11_STATIC_ASSERT
+-
+-// Variadic templates compiler:
+-//   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
+-#  if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
+-#    define BOOST_HAS_VARIADIC_TMPL
+-#  else
+-#    define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+-#  endif
+ #endif
+ 
+ // C++0x features in 4.4.n and later
+@@ -176,6 +168,7 @@
+ #  define BOOST_NO_CXX11_DELETED_FUNCTIONS
+ #  define BOOST_NO_CXX11_TRAILING_RESULT_TYPES
+ #  define BOOST_NO_CXX11_INLINE_NAMESPACES
++#  define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+ #endif
+ 
+ #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)