Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/
Date: Tue, 29 Sep 2020 20:39:54
Message-Id: 1601411981.cab20a25c0947446ea8486c147f9a679a56c2d73.asturm@gentoo
1 commit: cab20a25c0947446ea8486c147f9a679a56c2d73
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 11 16:08:37 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 20:39:41 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cab20a25
7
8 dev-qt/qtnetwork: add LibreSSL logic back
9
10 * This was dropped as the logic was not added to the Qt overlay. Will
11 fix this so future bumps do not drop support.
12
13 Closes: https://bugs.gentoo.org/741662
14 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild | 7 +++++--
18 1 file changed, 5 insertions(+), 2 deletions(-)
19
20 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
21 index 4cbbe349..3ac6956d 100644
22 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
23 +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9999.ebuild
24 @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
25 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
26 fi
27
28 -IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
29 +IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
30
31 DEPEND="
32 ~dev-qt/qtcore-${PV}:5=
33 @@ -21,7 +21,10 @@ DEPEND="
34 libproxy? ( net-libs/libproxy )
35 networkmanager? ( ~dev-qt/qtdbus-${PV} )
36 sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
37 - ssl? ( dev-libs/openssl:0=[bindist=] )
38 + ssl? (
39 + !libressl? ( dev-libs/openssl:0=[bindist=] )
40 + libressl? ( dev-libs/libressl:0= )
41 + )
42 "
43 RDEPEND="${DEPEND}
44 connman? ( net-misc/connman )