From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3200B59CB2 for ; Wed, 13 Apr 2016 19:06:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B64421C002; Wed, 13 Apr 2016 19:06:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8DE1021C002 for ; Wed, 13 Apr 2016 19:06:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09BBD340CB8 for ; Wed, 13 Apr 2016 19:06:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C54C6822 for ; Wed, 13 Apr 2016 19:06:25 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1460574376.92a7e9f4284a9141aeedda4c3f736927254d5340.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/, dev-libs/boost/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/boost/boost-1.60.0.ebuild dev-libs/boost/files/boost-1.60.0-auto-pointer-python.patch X-VCS-Directories: dev-libs/boost/ dev-libs/boost/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 92a7e9f4284a9141aeedda4c3f736927254d5340 X-VCS-Branch: master Date: Wed, 13 Apr 2016 19:06:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b361c85e-afe1-4f20-9ed7-f42c16f1bebe X-Archives-Hash: 165e442f838e3b29541f1f8d593528d7 commit: 92a7e9f4284a9141aeedda4c3f736927254d5340 Author: David Seifert gentoo org> AuthorDate: Wed Apr 13 19:06:01 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Apr 13 19:06:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a7e9f4 dev-libs/boost: Add patch for ptr registration in libboost_python Gentoo-Bug: 579616 Package-Manager: portage-2.2.28 dev-libs/boost/boost-1.60.0.ebuild | 1 + .../files/boost-1.60.0-auto-pointer-python.patch | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dev-libs/boost/boost-1.60.0.ebuild b/dev-libs/boost/boost-1.60.0.ebuild index c8bf2ac..ab69ac9 100644 --- a/dev-libs/boost/boost-1.60.0.ebuild +++ b/dev-libs/boost/boost-1.60.0.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.55.0-context-x32.patch" "${FILESDIR}/${PN}-1.56.0-build-auto_index-tool.patch" "${FILESDIR}/${PN}-1.60.0-deprecated-header-ice_not.patch" + "${FILESDIR}/${PN}-1.60.0-auto-pointer-python.patch" ) python_bindings_needed() { diff --git a/dev-libs/boost/files/boost-1.60.0-auto-pointer-python.patch b/dev-libs/boost/files/boost-1.60.0-auto-pointer-python.patch new file mode 100644 index 0000000..1566c34 --- /dev/null +++ b/dev-libs/boost/files/boost-1.60.0-auto-pointer-python.patch @@ -0,0 +1,42 @@ +From f2c465ffa508459216f7093bf95ba001ad994206 Mon Sep 17 00:00:00 2001 +From: vslashg +Date: Mon, 29 Feb 2016 13:33:35 -0500 +Subject: [PATCH] Fix auto-pointer registration in Boost Python 1.60. + +The conditional instantiation magic of maybe_register_pointer_to_python() assumes that use_value_holder and use_back_reference will be one of the boost::mpl::bool_ types, but this assumption is no longer true in Boost 1.60, where they can be standard library bool wrappers instead. + +Explicitly defining these types as mpl::bool_ classes fixes https://github.com/boostorg/python/issues/56. +--- + boost/python/object/class_metadata.hpp | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/boost/python/object/class_metadata.hpp b/boost/python/object/class_metadata.hpp +index c71cf67..5009c17 100644 +--- a/boost/python/object/class_metadata.hpp ++++ b/boost/python/object/class_metadata.hpp +@@ -164,7 +164,7 @@ struct class_metadata + >::type held_type; + + // Determine if the object will be held by value +- typedef is_convertible use_value_holder; ++ typedef mpl::bool_::value> use_value_holder; + + // Compute the "wrapped type", that is, if held_type is a smart + // pointer, we're talking about the pointee. +@@ -175,10 +175,12 @@ struct class_metadata + >::type wrapped; + + // Determine whether to use a "back-reference holder" +- typedef mpl::or_< +- has_back_reference +- , is_same +- , is_base_and_derived ++ typedef mpl::bool_< ++ mpl::or_< ++ has_back_reference ++ , is_same ++ , is_base_and_derived ++ >::value + > use_back_reference; + + // Select the holder.