Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/
Date: Fri, 30 Apr 2021 18:01:16
Message-Id: 1619805669.90a9a8a2f41996e5bb6c30d485710a802aaf39f1.zlogene@gentoo
1 commit: 90a9a8a2f41996e5bb6c30d485710a802aaf39f1
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 30 17:50:41 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 30 18:01:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a9a8a2
7
8 dev-libs/apr-util: 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 dev-libs/apr-util/apr-util-1.6.1-r6.ebuild | 5 ++---
14 dev-libs/apr-util/metadata.xml | 2 --
15 2 files changed, 2 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
18 index e3c1c382315..f46a637c7f2 100644
19 --- a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
20 +++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
21 @@ -16,7 +16,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
22 LICENSE="Apache-2.0"
23 SLOT="1"
24 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
25 -IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
26 +IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
27 #RESTRICT="test"
28
29 RDEPEND="
30 @@ -32,8 +32,7 @@ RDEPEND="
31 nss? ( dev-libs/nss )
32 odbc? ( dev-db/unixODBC )
33 openssl? (
34 - !libressl? ( dev-libs/openssl:0= )
35 - libressl? ( dev-libs/libressl )
36 + dev-libs/openssl:0=
37 )
38 postgres? ( dev-db/postgresql:= )
39 sqlite? ( dev-db/sqlite:3 )
40
41 diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml
42 index fbfc99a2fed..8b3fb692444 100644
43 --- a/dev-libs/apr-util/metadata.xml
44 +++ b/dev-libs/apr-util/metadata.xml
45 @@ -6,8 +6,6 @@
46 <name>Lars Wendler</name>
47 </maintainer>
48 <use>
49 - <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead of
50 - <pkg>dev-libs/openssl</pkg> for 'openssl' USE flag</flag>
51 <flag name="nss">Install apr_crypto_nss module</flag>
52 <flag name="openssl">Install apr_crypto_openssl module</flag>
53 </use>