6 files changed, 79 insertions, 11 deletions
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 0ae4a9bcdad0..80f51276ba64 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,12 +1,13 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 AUX botan-2.8.0-build.patch 614 BLAKE2B 99a1d63c4703014d858dcd7296eb63d5d46ecb38d349532e9ad2fb7f57e97eefc9421fce9db6e0d28f0464ccad390995bccb7c985cc5498aeb05b063e429ff44 SHA512 0f2e089caa6a65acb955ef74a1776950eaf00b83c6c2bed1e0b6876dbcbb01487fb64be9e6492ddf6428ae7e513c38f49899280bfe23065ceb137678eb2cd9e5
+AUX botan-2.9.0-build.patch 1886 BLAKE2B 62f6b5f9c47ded4c460c6c6b3057cbbb95711b5b5db300523f45e25e6bc161277174ea4c461e872f24bfd23839510a7857c44733a333cb6054b7dc183faa3e2e SHA512 90948e75d5bb6f2620a92fe4aea37d05aaf25e98430b112651aa6ad635f19f8659658ae79d16e60e27ca61ec5da92d5dd1c234c4c9e2ae0fab44b92806bcafe0
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
 DIST Botan-2.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
 DIST Botan-2.8.0.tgz 7152674 BLAKE2B 7838423fc7cc3521b3feb95ab3958f8cd4df86534f1ef30d717b47e54a9a7ae0d2ed6618370b9adfd0a178b509750e5aacda8457caa89f408292837fe3426de0 SHA512 12f734eea3e60a956f75a5b58e9bd83fac7b0dbcd71fb9577b025d171702d87a9a11e2e73162320bdefb2d25f3900757d89dd7fe13089321c88d948efc2ba214
 DIST Botan-2.9.0.tgz 7216373 BLAKE2B 5ad2e15db871ccc3a32b29b7f54a02d69f251f0aca2ce656b557dbbb3814a793053a54905371b3414ad72952a64bece43e2383da91f205f68b0fe31be2f9439c SHA512 b88f3894a4a5b7b2fbff9be6eb0b774bf679a014bd2364811b7e63d4f323e22ca9ef916491afbc2cdf9db68727c1449fbeb6fd417e591560add0955517db3f65
-EBUILD botan-1.10.17-r2.ebuild 4274 BLAKE2B cc2cc4d510a95803463c477848e09cfec79a11e5246d9c9d5678502f1f279989b0ebb92840e62c445bc13a0fe1276a41b63a3c1a14ad4b8bde058f51ac91e586 SHA512 5e256c4785e2560bcb151d687136688b3a2daa11e8f87a46965aa9e687b781c7fb00cabce5ee90b6fba6aca800ff636ee9921093d1de8d22a1780d809f0613de
-EBUILD botan-2.7.0.ebuild 2480 BLAKE2B 3207ded4663f1cf2cd55153f4369fef6a4a93967703a1afbe8f91b2dc0cca944a89eeaef3dd64b3ee8253deb034b8c69e4adcc0c018f80b3dafbe145d0955ce1 SHA512 e5cd37b8ff517686c295b094e66305d5b3d5741d95ee42e62c03dc6e0d5b452257033bd7c740c59bc65e47b179c2e4b2ade7cd11ebbf629f12a0c2c842590ff7
-EBUILD botan-2.8.0.ebuild 2539 BLAKE2B b81003c69fd64e252e2fa20e79eeed1ae1340cbdd284ea5c9224ae8c2ccb55660510f1350e856615cc9fb8a21ff73ef8e483a823a0aaaf10255af347b5149b88 SHA512 5c332f6e8a7160333d54ded63285c3a8f56cf9ee1ce47d55ce5f3522014abf4cd53c2ab6699bef5724f50fc7daca5a1b2006e076ded7e03c6a0aa8b0685589a0
-EBUILD botan-2.9.0.ebuild 2494 BLAKE2B 8c11d04312a38dc971b1476451f979079b75449ffe31119715e3d8bb6fe3dc4dfd2b931bd7e5f4c07a7f5ba3a1ff6c18d070875500c5b36a4de9b3b29e28cafc SHA512 3a062c53638ba7a9d0f40bf0e122bff4a0f92c7cd365486cc6f1e2b331ef009113110549e1c1f8d48a35fd001ec237602f7fcece0ccc45e4e879af8b6f3eb873
+EBUILD botan-1.10.17-r2.ebuild 4270 BLAKE2B 7b8f1a4722002c8dee3d30c9f29c9aa27e2d1cf3e98e7b41ddc2b9b959e51b5b451b945cbaa9c13890f555e077843cbc94106f2c0032c9f4fb181513f159b432 SHA512 fd4b7886680da84254c19e546ddb4a96491263b228caf5408e48b01ad02c1156058ba11c8aef6722e99be92af6f6f5bd9599730f93820c40f0598513000ab9d7
+EBUILD botan-2.7.0.ebuild 2476 BLAKE2B eec45b4b7ac06952b9c93753d50ca45e2a4c00b7502f471a901a49ae9a8123eaf24f556b99dadd3706c97af3ec79328fc30d4fc2bb4e13a2f4a891dc8296a220 SHA512 11fe68f739d0090a9a2002ae7c2bbec51cf75efd974560236a9ec37bb30e6c5c1d57e2adb7075e8bf7c8ac25399fd87c9da143b17885151c802eba1f3079b8f8
+EBUILD botan-2.8.0.ebuild 2535 BLAKE2B 5985f79ecd22ecfae7f91743ebbfb85cffcfea39c8e60e3d8a2bef918a5579fe7e8cfd9ce1fde70ba65892f4ad9b17648535516d6013b03aaaf83aa03ba218f4 SHA512 bdfbefbbbb5f5e221f105470646fe2318284c941428f6d610d096903ae3b87da77f4be5583b3506fe6aa00f0cf38952b5384ed71b53a5cf6714f0611406c4de3
+EBUILD botan-2.9.0.ebuild 2531 BLAKE2B c231f9ac6f47478ec4d29bd2787b6e92a8771bea8f6a79edaaded0b640e3b710188efd0ec9453690d0dc3a4a35275613494b5a15b29a8b466788787e0e4b4d06 SHA512 2e772f90c51b641cb529eb5cb6cdc0aae84b6273de0fba8c7e8f2286b3ee3712ea9b52fe3d0a88213500befe6a73c6eeb5e2ad41d88ada48b091fc9aaccc77e3
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-1.10.17-r2.ebuild b/dev-libs/botan/botan-1.10.17-r2.ebuild
index 6e97aaa2be67..132f27c34fb1 100644
--- a/dev-libs/botan/botan-1.10.17-r2.ebuild
+++ b/dev-libs/botan/botan-1.10.17-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 10f8cd214c78..dbd4d804dc08 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.8.0.ebuild b/dev-libs/botan/botan-2.8.0.ebuild
index 4f995a89686a..e46dbb8f1ef7 100644
--- a/dev-libs/botan/botan-2.8.0.ebuild
+++ b/dev-libs/botan/botan-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
diff --git a/dev-libs/botan/botan-2.9.0.ebuild b/dev-libs/botan/botan-2.9.0.ebuild
index 8f92905d738a..90a1e9416b8d 100644
--- a/dev-libs/botan/botan-2.9.0.ebuild
+++ b/dev-libs/botan/botan-2.9.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
 
@@ -12,7 +12,7 @@ DESCRIPTION="A C++ crypto library"
 HOMEPAGE="https://botan.randombit.net/"
 SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
@@ -34,6 +34,10 @@ RDEPEND="${DEPEND}
 BDEPEND="dev-lang/python:*
 	doc? ( dev-python/sphinx )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_configure() {
 	local disable_modules=()
 	use boost || disable_modules+=( "boost" )
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
new file mode 100755
index 000000000000..6208ffdbf0ad
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.9.0-build.patch
@@ -0,0 +1,63 @@
+From 86df247e4f090f984e050962ed5a4a536ec63b33 Mon Sep 17 00:00:00 2001
+From: Ralf van der Enden <Ralf.vanderEnden@deltares.nl>
+Date: Fri, 5 Apr 2019 14:58:14 +0200
+Subject: [PATCH] boost 1.70 compatibility
+
+Fixes issue #82
+---
+ src/cli/tls_http_server.cpp | 8 +++++++-
+ src/cli/tls_proxy.cpp       | 8 +++++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/src/cli/tls_http_server.cpp b/src/cli/tls_http_server.cpp
+index cc59a71c33..0a6428cd65 100644
+--- a/src/cli/tls_http_server.cpp
++++ b/src/cli/tls_http_server.cpp
+@@ -41,6 +41,12 @@
+ 
+ #include "credentials.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+ 
+ namespace {
+@@ -435,7 +441,7 @@ class TLS_Asio_HTTP_Server final
+       session::pointer make_session()
+          {
+          return session::create(
+-                   m_acceptor.get_io_service(),
++                   GET_IO_SERVICE(m_acceptor),
+                    m_session_manager,
+                    m_creds,
+                    m_policy);
+diff --git a/src/cli/tls_proxy.cpp b/src/cli/tls_proxy.cpp
+index 49ffbe3766..42ce156b12 100644
+--- a/src/cli/tls_proxy.cpp
++++ b/src/cli/tls_proxy.cpp
+@@ -33,6 +33,12 @@
+ 
+ #include "credentials.h"
+ 
++#if BOOST_VERSION >= 107000
++#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
++#else
++#define GET_IO_SERVICE(s) ((s).get_io_service())
++#endif
++
+ namespace Botan_CLI {
+ 
+ namespace {
+@@ -370,7 +376,7 @@ class tls_proxy_server final
+       session::pointer make_session()
+          {
+          return session::create(
+-                   m_acceptor.get_io_service(),
++                   GET_IO_SERVICE(m_acceptor),
+                    m_session_manager,
+                    m_creds,
+                    m_policy,