Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nghttp2/
Date: Mon, 29 Jan 2018 20:10:34
Message-Id: 1517256611.532f3c6baad1718c9c1b25b8ce4e26cc4791511d.vapier@gentoo
1 commit: 532f3c6baad1718c9c1b25b8ce4e26cc4791511d
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 29 20:09:04 2018 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 29 20:10:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532f3c6b
7
8 net-libs/nghttp2: depend on ssl for USE=cxx too #561492
9
10 Closes: https://bugs.gentoo.org/561492
11
12 net-libs/nghttp2/nghttp2-1.29.0.ebuild | 12 +++++++++---
13 net-libs/nghttp2/nghttp2-9999.ebuild | 12 +++++++++---
14 2 files changed, 18 insertions(+), 6 deletions(-)
15
16 diff --git a/net-libs/nghttp2/nghttp2-1.29.0.ebuild b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
17 index b3f6d04b3ea..f9087275773 100644
18 --- a/net-libs/nghttp2/nghttp2-1.29.0.ebuild
19 +++ b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
20 @@ -22,14 +22,20 @@ LICENSE="MIT"
21 SLOT="0/1.14" # <C++>.<C> SONAMEs
22 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
23
24 +SSL_DEPEND="
25 + !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
26 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
27 +"
28 RDEPEND="
29 - cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
30 + cxx? (
31 + ${SSL_DEPEND}
32 + dev-libs/boost:=[${MULTILIB_USEDEP},threads]
33 + )
34 hpack-tools? ( >=dev-libs/jansson-2.5 )
35 jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
36 utils? (
37 + ${SSL_DEPEND}
38 >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
39 - !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
40 - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
41 >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
42 net-dns/c-ares:=[${MULTILIB_USEDEP}]
43 )
44
45 diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
46 index f7c762907e0..7df2072eee1 100644
47 --- a/net-libs/nghttp2/nghttp2-9999.ebuild
48 +++ b/net-libs/nghttp2/nghttp2-9999.ebuild
49 @@ -22,14 +22,20 @@ LICENSE="MIT"
50 SLOT="0/1.14" # <C++>.<C> SONAMEs
51 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
52
53 +SSL_DEPEND="
54 + !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
55 + libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
56 +"
57 RDEPEND="
58 - cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
59 + cxx? (
60 + ${SSL_DEPEND}
61 + dev-libs/boost:=[${MULTILIB_USEDEP},threads]
62 + )
63 hpack-tools? ( >=dev-libs/jansson-2.5 )
64 jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
65 utils? (
66 + ${SSL_DEPEND}
67 >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
68 - !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
69 - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
70 >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
71 net-dns/c-ares:=[${MULTILIB_USEDEP}]
72 )