From 532f3c6baad1718c9c1b25b8ce4e26cc4791511d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 29 Jan 2018 15:09:04 -0500 Subject: [PATCH] net-libs/nghttp2: depend on ssl for USE=cxx too #561492 Closes: https://bugs.gentoo.org/561492 --- net-libs/nghttp2/nghttp2-1.29.0.ebuild | 12 +++++++++--- net-libs/nghttp2/nghttp2-9999.ebuild | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/net-libs/nghttp2/nghttp2-1.29.0.ebuild b/net-libs/nghttp2/nghttp2-1.29.0.ebuild index b3f6d04b3eac..f90872757737 100644 --- a/net-libs/nghttp2/nghttp2-1.29.0.ebuild +++ b/net-libs/nghttp2/nghttp2-1.29.0.ebuild @@ -22,14 +22,20 @@ LICENSE="MIT" SLOT="0/1.14" # . SONAMEs IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml" +SSL_DEPEND=" + !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) +" RDEPEND=" - cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] ) + cxx? ( + ${SSL_DEPEND} + dev-libs/boost:=[${MULTILIB_USEDEP},threads] + ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] ) utils? ( + ${SSL_DEPEND} >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] net-dns/c-ares:=[${MULTILIB_USEDEP}] ) diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild index f7c762907e06..7df2072eee13 100644 --- a/net-libs/nghttp2/nghttp2-9999.ebuild +++ b/net-libs/nghttp2/nghttp2-9999.ebuild @@ -22,14 +22,20 @@ LICENSE="MIT" SLOT="0/1.14" # . SONAMEs IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml" +SSL_DEPEND=" + !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) +" RDEPEND=" - cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] ) + cxx? ( + ${SSL_DEPEND} + dev-libs/boost:=[${MULTILIB_USEDEP},threads] + ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] ) utils? ( + ${SSL_DEPEND} >=dev-libs/libev-4.15[${MULTILIB_USEDEP}] - !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}] net-dns/c-ares:=[${MULTILIB_USEDEP}] ) -- 2.26.2