Fix building with USE='tools', wrt bug #459112

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 68 insertions, 5 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 784cffe803b6..3592c24be653 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/boost
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.295 2013/08/27 08:47:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.296 2013/08/27 11:41:29 pinkbyte Exp $
+
+  27 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> boost-1.53.0.ebuild,
+  +files/boost-1.53.0-library_status.patch, boost-1.54.0.ebuild:
+  Fix building with USE='tools', wrt bug #459112
 
 *boost-1.54.0 (27 Aug 2013)
 
diff --git a/dev-libs/boost/boost-1.53.0.ebuild b/dev-libs/boost/boost-1.53.0.ebuild
index a98757f1e2d1..1046ce5e4ab6 100644
--- a/dev-libs/boost/boost-1.53.0.ebuild
+++ b/dev-libs/boost/boost-1.53.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0.ebuild,v 1.5 2013/07/10 11:54:02 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.53.0.ebuild,v 1.6 2013/08/27 11:41:29 pinkbyte Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -69,7 +69,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
 		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
 		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
+		"${FILESDIR}/${PN}-1.53.0-library_status.patch" # bug 459112
 
 	# Avoid a patch for now
 	for file in libs/context/src/asm/*.S; do
diff --git a/dev-libs/boost/boost-1.54.0.ebuild b/dev-libs/boost/boost-1.54.0.ebuild
index 63a0d8b06bcb..77826460b5e3 100644
--- a/dev-libs/boost/boost-1.54.0.ebuild
+++ b/dev-libs/boost/boost-1.54.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0.ebuild,v 1.1 2013/08/27 08:47:26 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.54.0.ebuild,v 1.2 2013/08/27 11:41:29 pinkbyte Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -69,7 +69,8 @@ src_prepare() {
 		"${FILESDIR}/${PN}-1.48.0-no_strict_aliasing_python2.patch" \
 		"${FILESDIR}/${PN}-1.48.0-disable_libboost_python3.patch" \
 		"${FILESDIR}/${PN}-1.48.0-python_linking.patch" \
-		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch"
+		"${FILESDIR}/${PN}-1.48.0-disable_icu_rpath.patch" \
+		"${FILESDIR}/${PN}-1.53.0-library_status.patch" # bug 459112
 
 	# Avoid a patch for now
 	for file in libs/context/src/asm/*.S; do
diff --git a/dev-libs/boost/files/boost-1.53.0-library_status.patch b/dev-libs/boost/files/boost-1.53.0-library_status.patch
new file mode 100644
index 000000000000..7d10461795f4
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.53.0-library_status.patch
@@ -0,0 +1,57 @@
+--- tools_orig/regression/src/library_status.cpp	2012-12-11 15:42:26.000000000 +0100
++++ tools/regression/src/library_status.cpp	2013-07-11 16:15:54.000000000 +0200
+@@ -171,16 +171,17 @@
+     //  find_element  ------------------------------------------------------------//
+ 
++    struct element_equal {
++        const string & m_name;
++       element_equal(const string & name) :
++           m_name(name)
++       {}
++       bool operator()(const xml::element_ptr & xep) const {
++          return xep.get()->name == m_name;
++       }
++    };
++
+     xml::element_list::const_iterator find_element(
+         const xml::element & root, const string & name 
+     ){
+-        struct element_equal {
+-            const string & m_name;
+-            element_equal(const string & name) :
+-                m_name(name)
+-            {}
+-            bool operator()(const xml::element_ptr & xep) const {
+-                return xep.get()->name == m_name;
+-            }
+-        };
+         return std::find_if(
+             root.elements.begin(), 
+@@ -203,17 +204,18 @@
+     //  attribute_value  ----------------------------------------------------------//
+ 
++    struct attribute_equal {
++       const string & m_name;
++       attribute_equal(const string & name) :
++       m_name(name)
++       {}
++       bool operator()(const xml::attribute & a) const {
++           return a.name == m_name;
++       }
++    };
++
+     const string & attribute_value( 
+         const xml::element & element,
+         const string & attribute_name 
+     ){
+-        struct attribute_equal {
+-            const string & m_name;
+-            attribute_equal(const string & name) :
+-                m_name(name)
+-            {}
+-            bool operator()(const xml::attribute & a) const {
+-                return a.name == m_name;
+-            }
+-        };
+         xml::attribute_list::const_iterator itr;
+         itr = std::find_if(