1 |
commit: 8fb68e8fdef4ca5b8b23592c073f2a09ad70dd07 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 07:01:21 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 07:01:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb68e8f |
7 |
|
8 |
gnustep-libs/sope: 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-libs/sope/sope-4.1.1.ebuild | 14 +++----------- |
14 |
gnustep-libs/sope/sope-4.3.2.ebuild | 14 +++----------- |
15 |
2 files changed, 6 insertions(+), 22 deletions(-) |
16 |
|
17 |
diff --git a/gnustep-libs/sope/sope-4.1.1.ebuild b/gnustep-libs/sope/sope-4.1.1.ebuild |
18 |
index a24c86a9565..7feec1b8304 100644 |
19 |
--- a/gnustep-libs/sope/sope-4.1.1.ebuild |
20 |
+++ b/gnustep-libs/sope/sope-4.1.1.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2019 Gentoo Authors |
23 |
+# Copyright 1999-2021 Gentoo Authors |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=7 |
27 |
@@ -12,15 +12,14 @@ SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.t |
28 |
LICENSE="LGPL-2" |
29 |
SLOT="0" |
30 |
KEYWORDS="~amd64 ~x86" |
31 |
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml" |
32 |
+IUSE="gnutls ldap mysql postgres +ssl +xml" |
33 |
|
34 |
RDEPEND=" |
35 |
sys-libs/zlib |
36 |
ldap? ( net-nds/openldap ) |
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 |
mysql? ( dev-db/mysql-connector-c:= ) |
44 |
postgres? ( dev-db/postgresql:= ) |
45 |
@@ -28,13 +27,6 @@ RDEPEND=" |
46 |
" |
47 |
DEPEND="${RDEPEND}" |
48 |
|
49 |
-pkg_pretend() { |
50 |
- if use ssl && use gnutls && use libressl ; then |
51 |
- ewarn "You have enabled both gnutls and libressl, but only" |
52 |
- ewarn "one provider can be active. Using gnutls!" |
53 |
- fi |
54 |
-} |
55 |
- |
56 |
src_configure() { |
57 |
local ssl_provider |
58 |
if use ssl ; then |
59 |
|
60 |
diff --git a/gnustep-libs/sope/sope-4.3.2.ebuild b/gnustep-libs/sope/sope-4.3.2.ebuild |
61 |
index 81e7c8a4a03..7feec1b8304 100644 |
62 |
--- a/gnustep-libs/sope/sope-4.3.2.ebuild |
63 |
+++ b/gnustep-libs/sope/sope-4.3.2.ebuild |
64 |
@@ -1,4 +1,4 @@ |
65 |
-# Copyright 1999-2020 Gentoo Authors |
66 |
+# Copyright 1999-2021 Gentoo Authors |
67 |
# Distributed under the terms of the GNU General Public License v2 |
68 |
|
69 |
EAPI=7 |
70 |
@@ -12,15 +12,14 @@ SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.t |
71 |
LICENSE="LGPL-2" |
72 |
SLOT="0" |
73 |
KEYWORDS="~amd64 ~x86" |
74 |
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml" |
75 |
+IUSE="gnutls ldap mysql postgres +ssl +xml" |
76 |
|
77 |
RDEPEND=" |
78 |
sys-libs/zlib |
79 |
ldap? ( net-nds/openldap ) |
80 |
gnutls? ( net-libs/gnutls:= ) |
81 |
!gnutls? ( |
82 |
- !libressl? ( dev-libs/openssl:0= ) |
83 |
- libressl? ( dev-libs/libressl:= ) |
84 |
+ dev-libs/openssl:0= |
85 |
) |
86 |
mysql? ( dev-db/mysql-connector-c:= ) |
87 |
postgres? ( dev-db/postgresql:= ) |
88 |
@@ -28,13 +27,6 @@ RDEPEND=" |
89 |
" |
90 |
DEPEND="${RDEPEND}" |
91 |
|
92 |
-pkg_pretend() { |
93 |
- if use ssl && use gnutls && use libressl ; then |
94 |
- ewarn "You have enabled both gnutls and libressl, but only" |
95 |
- ewarn "one provider can be active. Using gnutls!" |
96 |
- fi |
97 |
-} |
98 |
- |
99 |
src_configure() { |
100 |
local ssl_provider |
101 |
if use ssl ; then |