[gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/

[Thomas Deutschmann]

commit:     f9b12654e76a35de5c98cbaf31bdc40cb9abca89
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  2 17:50:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 17:50:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b12654

app-admin/sudo: update live ebuild

Add changes from commit 163afe017bcc932e043a5422af897e5073df37da.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/sudo/sudo-9999.ebuild | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 39da1e74a42..7dded75d56c 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -31,20 +31,25 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux 
+sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux 
+sendmail skey sssd system-digest"
 
 CDEPEND="
        sys-libs/zlib:=
-       gcrypt? ( dev-libs/libgcrypt:= )
        ldap? (
                >=net-nds/openldap-2.1.30-r1
                dev-libs/cyrus-sasl
        )
-       openssl? ( dev-libs/openssl:0= )
        pam? ( virtual/pam )
        sasl? ( dev-libs/cyrus-sasl )
        skey? ( >=sys-auth/skey-1.1.5-r1 )
        sssd? ( sys-auth/sssd[sudo] )
+       system-digest? (
+               gcrypt? ( dev-libs/libgcrypt:= )
+               !gcrypt? (
+                       !libressl? ( dev-libs/openssl:0= )
+                       libressl? ( dev-libs/libressl:0= )
+               )
+       )
 "
 RDEPEND="
        ${CDEPEND}
@@ -65,7 +70,6 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
        pam? ( !skey )
        skey? ( !pam )
-       ?? ( gcrypt openssl )
 "
 
 MAKEOPTS+=" SAMPLES="
@@ -145,7 +149,6 @@ src_configure() {
                --without-opie
                $(use_enable gcrypt)
                $(use_enable nls)
-               $(use_enable openssl)
                $(use_enable sasl)
                $(use_with offensive insults)
                $(use_with offensive all-insults)
@@ -157,6 +160,13 @@ src_configure() {
                $(use_with selinux)
                $(use_with sendmail)
        )
+
+       if use system-digest && ! use gcrypt; then
+               myeconfargs+=("--enable-openssl")
+       else
+               myeconfargs+=("--disable-openssl")
+       fi
+
        econf "${myeconfargs[@]}"
 }