[gentoo-commits] repo/gentoo:master commit in: dev-libs/apr-util/

[Mikle Kolyada]

commit:     90a9a8a2f41996e5bb6c30d485710a802aaf39f1
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 17:50:41 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 18:01:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90a9a8a2

dev-libs/apr-util: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-libs/apr-util/apr-util-1.6.1-r6.ebuild | 5 ++---
 dev-libs/apr-util/metadata.xml             | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

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
index e3c1c382315..f46a637c7f2 100644
--- a/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
+++ b/dev-libs/apr-util/apr-util-1.6.1-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/apr/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1"
 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"
-IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite 
static-libs"
+IUSE="berkdb doc gdbm ldap mysql nss odbc openssl postgres sqlite static-libs"
 #RESTRICT="test"
 
 RDEPEND="
@@ -32,8 +32,7 @@ RDEPEND="
        nss? ( dev-libs/nss )
        odbc? ( dev-db/unixODBC )
        openssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
+               dev-libs/openssl:0=
        )
        postgres? ( dev-db/postgresql:= )
        sqlite? ( dev-db/sqlite:3 )

diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml
index fbfc99a2fed..8b3fb692444 100644
--- a/dev-libs/apr-util/metadata.xml
+++ b/dev-libs/apr-util/metadata.xml
@@ -6,8 +6,6 @@
                <name>Lars Wendler</name>
        </maintainer>
        <use>
-               <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> instead 
of
-                       <pkg>dev-libs/openssl</pkg> for 'openssl' USE 
flag</flag>
                <flag name="nss">Install apr_crypto_nss module</flag>
                <flag name="openssl">Install apr_crypto_openssl module</flag>
        </use>