gentoo resync : 28.04.2019

4 files changed, 38 insertions, 315 deletions

diff --git a/dev-libs/boost/files/boost-1.63.0-fix-python.patch b/dev-libs/boost/files/boost-1.63.0-fix-python.patch
deleted file mode 100644
index 18ca2f566711..000000000000
--- a/dev-libs/boost/files/boost-1.63.0-fix-python.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- a/boostcpp.jam
-+++ b/boostcpp.jam
-@@ -104,7 +104,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) [*\\/:.\"\'] _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) [*\\/:\"\'] _ ] ;
- }
- 
- 
---- a/libs/python/build/Jamfile
-+++ b/libs/python/build/Jamfile
-@@ -30,22 +30,6 @@
-         ;
- }
- 
--rule find-py3-version
--{
--    local versions = [ feature.values python ] ;
--    local py3ver ;
--    for local v in $(versions)
--    {
--        if $(v) >= 3.0
--        {
--            py3ver = $(v) ;
--        }
--    }
--    return $(py3ver) ;
--}
--
--py3-version = [ find-py3-version ] ;
--
- project boost/python
-   : source-location ../src
-   ;
-@@ -53,10 +37,16 @@
- rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
- rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } }
- 
--rule lib_boost_python ( is-py3 ? )
-+rule lib_boost_python
- {
-+    local python_major_version = [ MATCH "^([^.]+)" : [ feature.values python ] ] ;
-+    local python2 ;
-+    if $(python_major_version) = 2
-+    {
-+        python2 = true ;
-+    }
- 
--    lib [ cond $(is-py3) : boost_python3 : boost_python ]
-+    lib boost_python
-         : # sources
-         numeric.cpp
-         list.cpp
-@@ -90,20 +80,9 @@
-         :   # requirements
-             <link>static:<define>BOOST_PYTHON_STATIC_LIB 
-             <define>BOOST_PYTHON_SOURCE
-+            [ cond $(python2) : <cxxflags>-fno-strict-aliasing ]
-           
--            # On Windows, all code using Python has to link to the Python
--            # import library.
--            #
--            # On *nix we never link libboost_python to libpython.  When
--            # extending Python, all Python symbols are provided by the
--            # Python interpreter executable.  When embedding Python, the
--            # client executable is expected to explicitly link to
--            # /python//python (the target representing libpython) itself.
--            #
--            # python_for_extensions is a target defined by Boost.Build to
--            # provide the Python include paths, and on Windows, the Python
--            # import library, as usage requirements.
--            [ cond [ python.configured ] : <library>/python//python_for_extensions ]
-+            [ cond [ python.configured ] : <library>/python//python ]
-             
-             # we prevent building when there is no python available
-             # as it's not possible anyway, and to cause dependents to
-@@ -112,7 +91,6 @@
-             <dependency>config-warning
- 
-             <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
- 
-             -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-             <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-@@ -125,51 +103,8 @@
-         ;
- }
- 
--rule lib_boost_numpy ( is-py3 ? )
--{
--    numpy-include = [ python.numpy-include ] ;
--    lib [ cond $(is-py3) : boost_numpy3 : boost_numpy ]
--        : # sources
--        numpy/dtype.cpp
--        numpy/matrix.cpp
--        numpy/ndarray.cpp
--	numpy/numpy.cpp
--	numpy/scalars.cpp
--	numpy/ufunc.cpp
--        :   # requirements
--            [ cond [ python.numpy ] : <library>/python//python_for_extensions ]
--            [ unless [ python.numpy ] : <build>no ]
--	    <include>$(numpy-include)
--	    <library>boost_python
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--            [ cond $(is-py3) : <python>$(py3-version) ]
--
--            -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
--            <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
--
--        :   # default build
--            <link>shared
--        :   # usage requirements
--            <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--        ;
--}
--
- libraries = boost_python ;
--libraries3 = boost_python3 ;
--if [ python.numpy ]
--{
--    libraries += boost_numpy ;
--    libraries3 += boost_numpy3 ;
--}
- 
- lib_boost_python ;
--lib_boost_numpy ;
--
--if $(py3-version)
--{
--    lib_boost_python yes ;
--    lib_boost_numpy yes ;
--    libraries += $(libraries3) ;
--}
- 
- boost-install $(libraries) ;
diff --git a/dev-libs/boost/files/boost-1.67.0-fix-python.patch b/dev-libs/boost/files/boost-1.67.0-fix-python.patch
deleted file mode 100644
index 6f51152d12e3..000000000000
--- a/dev-libs/boost/files/boost-1.67.0-fix-python.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Python module needs to be built without these extra renames.
-MPI module needs to reference correct python
-
-~Index: boost_1_64_0/libs/mpi/build/Jamfile.v2
-~===================================================================
-~--- boost_1_64_0.orig/libs/mpi/build/Jamfile.v2
-~+++ boost_1_64_0/libs/mpi/build/Jamfile.v2
-~@@ -61,10 +61,10 @@ libraries += boost_mpi ;
-~     lib boost_mpi_python
-~       : # Sources
-~         python/serialize.cpp
-~+        /user-config//boost_python_alias
-~       : # Requirements
-~         <library>boost_mpi
-~         <library>/mpi//mpi [ mpi.extra-requirements ]
-~-      	<library>/boost/python//boost_python
-~         <link>shared:<define>BOOST_MPI_DYN_LINK=1
-~         <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-~         <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-~@@ -92,8 +92,8 @@ libraries += boost_mpi ;
-~         python/skeleton_and_content.cpp
-~         python/status.cpp
-~         python/py_timer.cpp
-~+        /user-config//boost_python_alias
-~       : # Requirements
-~-      	<library>/boost/python//boost_python
-~         <library>boost_mpi_python
-~         <library>boost_mpi
-~         <library>/mpi//mpi [ mpi.extra-requirements ]
-Index: boost_1_67_0/libs/mpi/build/Jamfile.v2
-===================================================================
---- boost_1_67_0.orig/libs/mpi/build/Jamfile.v2
-+++ boost_1_67_0/libs/mpi/build/Jamfile.v2
-@@ -60,33 +60,13 @@ libraries += boost_mpi ;
-
-   if [ python.configured ]
-   {
--    py2-version = [ py-version 2 ] ;
--    py3-version = [ py-version 3 ] ;
--
--    # These library names are synchronized with those defined by Boost.Python, see libs/python/build/Jamfile.
--    lib_boost_python(2) = boost_python ;
--    lib_boost_python(3) = boost_python3 ;
--
--    lib_boost_python($(py2-version)) = $(lib_boost_python(2)) ;
--    lib_boost_python($(py3-version)) = $(lib_boost_python(3)) ;
--
--    lib_boost_mpi_python(2) = boost_mpi_python ;
--    lib_boost_mpi_python(3) = boost_mpi_python3 ;
--
--    lib_boost_mpi_python($(py2-version)) = $(lib_boost_mpi_python(2)) ;
--    lib_boost_mpi_python($(py3-version)) = $(lib_boost_mpi_python(3)) ;
--
--    for local N in 2 3
--    {
--        if $(py$(N)-version)
--        {
--            lib $(lib_boost_mpi_python($(py$(N)-version)))
-+    lib boost_mpi_python
-               : # Sources
-                 python/serialize.cpp
-               : # Requirements
-                 <library>boost_mpi
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
-+                <library>/boost/python//boost_python
-                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
-                 <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-@@ -94,12 +74,12 @@ libraries += boost_mpi ;
-                 -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag
-                 <tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).python-tag
-                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
-               : # Default build
-                 <link>shared
-               : # Usage requirements
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
-               ;
-+            libraries += boost_mpi_python ;
-
-             python-extension mpi
-               : # Sources
-@@ -116,8 +96,8 @@ libraries += boost_mpi ;
-                 python/status.cpp
-                 python/py_timer.cpp
-               : # Requirements
--                <library>/boost/python//$(lib_boost_python($(py$(N)-version)))
--                <library>$(lib_boost_mpi_python($(py$(N)-version)))
-+        <library>/boost/python//boost_python
-+        <library>boost_mpi_python
-                 <library>boost_mpi
-                 <library>/mpi//mpi [ mpi.extra-requirements ]
-                 <link>shared:<define>BOOST_MPI_DYN_LINK=1
-@@ -125,16 +105,7 @@ libraries += boost_mpi ;
-                 <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-                 <link>shared <runtime-link>shared
-                 <python-debugging>on:<define>BOOST_DEBUG_PYTHON
--                <python>$(py$(N)-version)
-               ;
--
--            libraries += $(lib_boost_mpi_python($(py$(N)-version))) ;
--        }
--        else
--        {
--            alias $(lib_boost_mpi_python($(N))) ;
--        }
--    }
-   }
- }
- else if ! ( --without-mpi in  [ modules.peek : ARGV ] )
-Index: boost_1_67_0/libs/python/Jamfile
-===================================================================
---- boost_1_67_0.orig/libs/python/Jamfile
-+++ boost_1_67_0/libs/python/Jamfile
-@@ -36,9 +36,10 @@ local rule split-version ( version )
- # For example, Boost.Python built for Python 2.7 uses the suffix "27"
- rule version-suffix ( version )
- {
--    local major-minor = [ split-version $(version) ] ;
--    local suffix = $(major-minor:J="") ;
--    return $(suffix) ;
-+    # local major-minor = [ split-version $(version) ] ;
-+    # local suffix = $(major-minor:J="") ;
-+    # return $(suffix) ;
-+    return "" ;
- }
-
-
-diff -ur boost_1_67_0.orig/boostcpp.jam boost_1_67_0/boostcpp.jam
---- boost_1_67_0.orig/boostcpp.jam	2018-07-30 16:26:03.346187542 -0700
-+++ boost_1_67_0/boostcpp.jam	2018-07-30 16:26:18.839081472 -0700
-@@ -105,7 +105,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
- }
-
-
-diff -ur boost_1_67_0.orig/libs/python/Jamfile boost_1_67_0/libs/python/Jamfile
---- boost_1_67_0.orig/libs/python/Jamfile	2018-07-30 14:56:15.591366992 -0700
-+++ boost_1_67_0/libs/python/Jamfile	2018-07-30 16:26:31.662993677 -0700
-@@ -47,7 +47,7 @@
- python-id = [ option.get "python-buildid" ] ;
- if $(python-id)
- {
--    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:.\"\']" _ ] ;
-+    PYTHON_ID = [ regex.replace $(python-id) "[*\\/:\"\']" _ ] ;
- }
-
- rule python-tag ( name : type ? : property-set )
diff --git a/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch b/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
deleted file mode 100644
index acf9a96777e5..000000000000
--- a/dev-libs/boost/files/boost-1.67.0-lockfree-next.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/671724
-
-From 12726cda009a855073b9bedbdce57b6ce7763da2 Mon Sep 17 00:00:00 2001
-From: Peter Dimov <pdimov@pdimov.com>
-Date: Sat, 2 Dec 2017 04:10:46 +0200
-Subject: [PATCH] Add #include <boost/next_prior.hpp>; no longer in utility.hpp
-
----
- include/boost/lockfree/spsc_queue.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/boost/lockfree/spsc_queue.hpp
-+++ b/boost/lockfree/spsc_queue.hpp
-@@ -17,6 +17,7 @@
- #include <boost/assert.hpp>
- #include <boost/static_assert.hpp>
- #include <boost/utility.hpp>
-+#include <boost/next_prior.hpp>
- #include <boost/utility/enable_if.hpp>
- #include <boost/config.hpp> // for BOOST_LIKELY
- 
--- 
-2.19.2
-
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
new file mode 100644
index 000000000000..9ee3d545d618
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
@@ -0,0 +1,38 @@
+--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+  *                                                                                      *
+  ****************************************************************************************/
+ 
++#ifdef __x86_64__
++#include "jump_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "jump_i386_sysv_elf_gas.S"
+ .text
+ .globl jump_fcontext
+@@ -81,3 +85,5 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++#endif
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+  *                                                                                      *
+  ****************************************************************************************/
+ 
++#ifdef __x86_64__
++#include "make_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "make_i386_sysv_elf_gas.S"
+ .text
+ .globl make_fcontext
+@@ -105,3 +109,5 @@
+ 
+ /* Mark that we don't need executable stack.  */
+ .section .note.GNU-stack,"",%progbits
++
++#endif