From: Alexey Korepanov <kaikaikai@yandex.ru>
Date: Mon, 9 Oct 2017 13:43:34 +0000 (+0100)
Subject: net-vpn/i2pd: fix build with libressl #597798
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2e7a33fb3961ecad6b5572dd2459f49d9fab82c3;p=gentoo.git

net-vpn/i2pd: fix build with libressl #597798

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---

diff --git a/net-vpn/i2pd/i2pd-2.13.0.ebuild b/net-vpn/i2pd/i2pd-2.13.0.ebuild
index d4c839774f70..aaa4ab6149e2 100644
--- a/net-vpn/i2pd/i2pd-2.13.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.13.0.ebuild
@@ -12,15 +12,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl >=dev-libs/boost-1.65 )
 			upnp? ( net-libs/miniupnpc )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl[static-libs] >=dev-libs/boost-1.65 )
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
diff --git a/net-vpn/i2pd/i2pd-2.14.0.ebuild b/net-vpn/i2pd/i2pd-2.14.0.ebuild
index 752102811a0f..8c20134989f9 100644
--- a/net-vpn/i2pd/i2pd-2.14.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.14.0.ebuild
@@ -12,15 +12,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl >=dev-libs/boost-1.65 )
 			upnp? ( net-libs/miniupnpc )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl[static-libs] >=dev-libs/boost-1.65 )
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
diff --git a/net-vpn/i2pd/i2pd-2.15.0.ebuild b/net-vpn/i2pd/i2pd-2.15.0.ebuild
index 4dbcc37bd004..436a526d78d9 100644
--- a/net-vpn/i2pd/i2pd-2.15.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.15.0.ebuild
@@ -12,16 +12,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl >=dev-libs/boost-1.65 )
 			upnp? ( net-libs/miniupnpc )
 			websocket? ( dev-cpp/websocketpp )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl[static-libs] >=dev-libs/boost-1.65 )
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"