From 962cf6b1eb3d27ee147785ebfccc66c1fc2378f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH] boost: update to 1.80.0.

---
 common/shlibs                                 |  65 +++---
 .../{boost-python1.72 => boost-python3-1.80}  |   0
 .../patches/0001-compat-glibc-2.34.patch      |  23 ---
 .../patches/0002-compat-glibc-2.34.patch      |  30 ---
 srcpkgs/boost/patches/exec_file.patch         |  45 ----
 .../boost/patches/install-strip-destdir.patch |  27 +++
 srcpkgs/boost/patches/mips.patch              |  11 -
 srcpkgs/boost/template                        | 194 +++++++++---------
 ...boost-python3-1.72 => libboost_atomic1.80} |   0
 ...ibboost_atomic1.72 => libboost_chrono1.80} |   0
 ...oost_chrono1.72 => libboost_container1.80} |   0
 ...ost_container1.72 => libboost_context1.80} |   0
 ...oost_context1.72 => libboost_contract1.80} |   0
 ...st_contract1.72 => libboost_coroutine1.80} |   0
 ...t_coroutine1.72 => libboost_date_time1.80} |   0
 ...boost_date_time1.72 => libboost_fiber1.80} |   0
 ...oost_fiber1.72 => libboost_filesystem1.80} |   0
 ...oost_filesystem1.72 => libboost_graph1.80} |   0
 ...boost_graph1.72 => libboost_iostreams1.80} |   0
 ...bboost_iostreams1.72 => libboost_json1.80} |   0
 ...ibboost_locale1.72 => libboost_locale1.80} |   0
 .../{libboost_log1.72 => libboost_log1.80}    |   0
 ...t_log_setup1.72 => libboost_log_setup1.80} |   0
 ...ost_math_c991.72 => libboost_math_c991.80} |   0
 ...t_math_c99f1.72 => libboost_math_c99f1.80} |   0
 ...t_math_c99l1.72 => libboost_math_c99l1.80} |   0
 ...ost_math_tr11.72 => libboost_math_tr11.80} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1f1.80} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1l1.80} |   0
 ...g_exec_monitor1.72 => libboost_nowide1.80} |   0
 ...ions1.72 => libboost_prg_exec_monitor1.80} |   0
 ...andom1.72 => libboost_program_options1.80} |   0
 ...libboost_regex1.72 => libboost_random1.80} |   0
 ...t_serialization1.72 => libboost_regex1.80} |   0
 ...dr2line1.72 => libboost_serialization1.80} |   0
 ...1.72 => libboost_stacktrace_addr2line1.80} |   0
 ...noop1.72 => libboost_stacktrace_basic1.80} |   0
 ...ystem1.72 => libboost_stacktrace_noop1.80} |   0
 ...ibboost_thread1.72 => libboost_system1.80} |   0
 ...libboost_timer1.72 => libboost_thread1.80} |   0
 ...st_type_erasure1.72 => libboost_timer1.80} |   0
 ...ramework1.72 => libboost_type_erasure1.80} |   0
 ...e1.72 => libboost_unit_test_framework1.80} |   0
 ...t_wserialization1.72 => libboost_wave1.80} |   0
 srcpkgs/libboost_wserialization1.80           |   1 +
 45 files changed, 163 insertions(+), 233 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
 delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
 delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
 delete mode 100644 srcpkgs/boost/patches/mips.patch
 rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
 rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
 create mode 120000 srcpkgs/libboost_wserialization1.80

diff --git a/common/shlibs b/common/shlibs
index d38ee63d0bb..50e0c005d39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
 libipq.so.0 iptables-1.4.7_1
 libnm.so.0 libnm-1.0.0_1
 libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
 libexempi.so.8 exempi-2.5.0_1
 libatasmart.so.4 libatasmart-0.17_1
 libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f..00000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
-           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
-           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
-           size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b..00000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
-                 from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
-                 from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
-   61 |           if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-      |                   ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
-           std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
--          if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+          if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
-           size = ((size+page_size-1)/page_size)*page_size;
-           int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4..00000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
-  Ed.: Paths were adapted from upstream commit
-  https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
-   if (local.is_none()) local = global;
-   // should be 'char const *' but older python versions don't use 'const' yet.
-   char *f = const_cast<char *>(filename);
--  // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
--  FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+  // Let python manage any UTF bits to avoid potential incompatibilities.
-+  PyObject *fo = Py_BuildValue("s", f);
-+  PyObject *fb = Py_None;
-+  PyUnicode_FSConverter(fo, &fb);
-+  f = PyBytes_AsString(fb);
-+  FILE *fs = fopen(f, "r");
-+  Py_DECREF(fo);
-+  Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+  // Let python open the file to avoid potential binary incompatibilities.
-   PyObject *fo = Py_BuildValue("s", f);
--  FILE *fs = _Py_fopen(fo, "r");
-+  FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
-   Py_DECREF(fo);
- #else
-+  // Let python open the file to avoid potential binary incompatibilities.
-   PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
-   if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
-   python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 00000000000..61047c5967b
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+     return $(path) ;
+ }
+ 
++local rule path-strip-destdir ( path )
++{
++    local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++    if $(parts)
++    {
++        path = $(parts[3]) ;
++    }
++    return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+     if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+     if [ path.is-rooted $(cmakedir) ]
+     {
+         local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++        cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+ 
+         print.text
+ 
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c..00000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp	2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp	2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- #  define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e..0d103e335b5 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
 wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
 maintainer="John <me@johnnynator.dev>"
 license="BSL-1.0"
 homepage="http://www.boost.org/"
 distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
 python_version=3
 
-CXXFLAGS="-std=c++14"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
 
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.80"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 do_build() {
-	CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
-		--prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+	# bootstrap.sh will reset CXX and CXXFLAGS (L229)
+	./bootstrap.sh --with-toolset=gcc \
+		--prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
 		--with-python-root=${XBPS_CROSS_BASE}/usr
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+	# toolset gcc will force gcc -x c++ -O2 -s
+	# toolset cxx will use CXX and CXXFLAGS
+	CXX_VERSION_OPT=--version ./build.sh cxx
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
-	using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
-	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+	using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
 
 	__EOF
-	# --no-cmake-config should be removed with boost-1.71 or later
 	./b2 ${makejobs} \
 		--user-config=${wrksrc}/user-config.jam --debug-building \
-		--no-cmake-config \
-		--toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+		--toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
 		threading=multi runtime-link=shared link=shared,static
 }
 do_install() {
 	# Install bjam
 	# XXX: make bjam a symlink to b2
-	for _b in bjam b2; do
+	for _b in b2; do
 		vbin tools/build/src/engine/${_b}
 	done
+	ln -sf b2 "$DESTDIR/usr/bin/bjam"
 
 	# Install headers/libs
 	./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
-		--user-config=${wrksrc}/user-config.jam --no-cmake-config \
-		python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+		--user-config=${wrksrc}/user-config.jam \
+		python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
 		install
 
 	# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
-	depends="boost python"
-	replaces="boost-python>=0"
-	short_desc+=" - Python bindings"
-	pkg_install() {
-		vmove "usr/lib/libboost_python2*.so.*"
-	}
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/lib/cmake
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove usr/lib/libboost_json.so.*
+	}
+}
+
+libboost_math_tr11.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove usr/lib/libboost_nowide.so.*
+	}
+}
+
+libboost_prg_exec_monitor1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 00000000000..baef819c48f
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file