Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnustep-apps/sogo/
Date: Mon, 03 May 2021 07:02:01
Message-Id: 1620025178.d12b81e15fd282c275da2bae0ff2c579885532eb.zlogene@gentoo
1 commit: d12b81e15fd282c275da2bae0ff2c579885532eb
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 3 06:59:38 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 06:59:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12b81e1
7
8 gnustep-apps/sogo: remove libressl support
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.2
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 gnustep-apps/sogo/sogo-4.3.2.ebuild | 14 +++-----------
14 1 file changed, 3 insertions(+), 11 deletions(-)
15
16 diff --git a/gnustep-apps/sogo/sogo-4.3.2.ebuild b/gnustep-apps/sogo/sogo-4.3.2.ebuild
17 index 4c79d63dc15..9f5285163bb 100644
18 --- a/gnustep-apps/sogo/sogo-4.3.2.ebuild
19 +++ b/gnustep-apps/sogo/sogo-4.3.2.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2020 Gentoo Authors
22 +# Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.t
27 LICENSE="GPL-2"
28 SLOT="0"
29 KEYWORDS="~amd64 ~x86"
30 -IUSE="activesync gnutls libressl +ssl"
31 +IUSE="activesync gnutls +ssl"
32
33 RDEPEND="
34 acct-user/sogo
35 @@ -23,20 +23,12 @@ RDEPEND="
36 activesync? ( dev-libs/libwbxml )
37 gnutls? ( net-libs/gnutls:= )
38 !gnutls? (
39 - !libressl? ( dev-libs/openssl:0= )
40 - libressl? ( dev-libs/libressl:= )
41 + dev-libs/openssl:0=
42 )
43 "
44 DEPEND="${RDEPEND}
45 >=gnustep-base/gnustep-make-2.6.3"
46
47 -pkg_pretend() {
48 - if use ssl && use gnutls && use libressl ; then
49 - ewarn "You have enabled both gnutls and libressl, but only"
50 - ewarn "one provider can be active. Using gnutls!"
51 - fi
52 -}
53 -
54 src_prepare() {
55 gnustep-base_src_prepare
56 sed -e "s/validateArgs$//" -i configure \