[gentoo-commits] repo/gentoo:master commit in: sys-boot/vboot-utils/

[Mikle Kolyada]

commit:     7c40b5af784e407446f512e1bc5ec76d00c6cb53
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 19:34:29 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 19:35:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c40b5af

sys-boot/vboot-utils: remove libressl support

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

 sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild | 7 ++-----
 sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild    | 7 +++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild 
b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
index 94e91a94c2f..caef3af6399 100644
--- a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
@@ -18,14 +18,13 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
+IUSE="minimal static"
 
 LIB_DEPEND="
        dev-libs/libyaml:=[static-libs(+)]
        app-arch/xz-utils:=[static-libs(+)]"
 LIB_DEPEND_MINIMAL="
-       !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-       libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+       dev-libs/openssl:0=[static-libs(+)]
        sys-apps/util-linux:=[static-libs(+)]
        dev-libs/libzip:=[static-libs(+)]"
 RDEPEND="!static? (
@@ -44,8 +43,6 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}
 
 src_prepare() {
-       eapply "${FILESDIR}"/${P}-libressl.patch
-
        default
        sed -i \
                -e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \

diff --git a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild 
b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
index 41a81054617..67f272d57fa 100644
--- a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,15 +22,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl +libzip minimal static"
+IUSE="+libzip minimal static"
 
 LIB_DEPEND="
        dev-libs/libyaml:=[static-libs(+)]
        app-arch/xz-utils:=[static-libs(+)]"
 LIB_DEPEND_MINIMAL="
        elibc_musl? ( sys-libs/fts-standalone:=[static-libs(+)] )
-       !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-       libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+       dev-libs/openssl:0=[static-libs(+)]
        libzip? ( dev-libs/libzip:=[static-libs(+)] )
        sys-apps/util-linux:=[static-libs(+)]"
 RDEPEND="!static? (