net-libs/nghttp2: depend on ssl for USE=cxx too #561492

Closes: https://bugs.gentoo.org/561492

diff --git a/net-libs/nghttp2/nghttp2-1.29.0.ebuild b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
index b3f6d04b3eac13cffa2b2bc77bb3c5310fe374f4..f90872757737a43b6045835bd8a558e718f2db22 100644 (file)
--- 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" # <C++>.<C> 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 f7c762907e068fb2e404ad0acf91fecf16704e7a..7df2072eee134b4579eb9159e5b860481348c452 100644 (file)
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -22,14 +22,20 @@ LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> 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}]
        )