| 1 |
commit: 7c40b5af784e407446f512e1bc5ec76d00c6cb53 |
| 2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 2 19:34:29 2021 +0000 |
| 4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 2 19:35:20 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c40b5af |
| 7 |
|
| 8 |
sys-boot/vboot-utils: 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 |
sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild | 7 ++----- |
| 14 |
sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild | 7 +++---- |
| 15 |
2 files changed, 5 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild |
| 18 |
index 94e91a94c2f..caef3af6399 100644 |
| 19 |
--- a/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild |
| 20 |
+++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild |
| 21 |
@@ -18,14 +18,13 @@ SRC_URI="mirror://gentoo/${P}.tar.xz |
| 22 |
LICENSE="BSD" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" |
| 25 |
-IUSE="libressl minimal static" |
| 26 |
+IUSE="minimal static" |
| 27 |
|
| 28 |
LIB_DEPEND=" |
| 29 |
dev-libs/libyaml:=[static-libs(+)] |
| 30 |
app-arch/xz-utils:=[static-libs(+)]" |
| 31 |
LIB_DEPEND_MINIMAL=" |
| 32 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
| 33 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 34 |
+ dev-libs/openssl:0=[static-libs(+)] |
| 35 |
sys-apps/util-linux:=[static-libs(+)] |
| 36 |
dev-libs/libzip:=[static-libs(+)]" |
| 37 |
RDEPEND="!static? ( |
| 38 |
@@ -44,8 +43,6 @@ DEPEND="${RDEPEND} |
| 39 |
S=${WORKDIR} |
| 40 |
|
| 41 |
src_prepare() { |
| 42 |
- eapply "${FILESDIR}"/${P}-libressl.patch |
| 43 |
- |
| 44 |
default |
| 45 |
sed -i \ |
| 46 |
-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \ |
| 47 |
|
| 48 |
diff --git a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild |
| 49 |
index 41a81054617..67f272d57fa 100644 |
| 50 |
--- a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild |
| 51 |
+++ b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild |
| 52 |
@@ -1,4 +1,4 @@ |
| 53 |
-# Copyright 1999-2020 Gentoo Authors |
| 54 |
+# Copyright 1999-2021 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
EAPI=7 |
| 58 |
@@ -22,15 +22,14 @@ SRC_URI="mirror://gentoo/${P}.tar.xz |
| 59 |
LICENSE="BSD" |
| 60 |
SLOT="0" |
| 61 |
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" |
| 62 |
-IUSE="libressl +libzip minimal static" |
| 63 |
+IUSE="+libzip minimal static" |
| 64 |
|
| 65 |
LIB_DEPEND=" |
| 66 |
dev-libs/libyaml:=[static-libs(+)] |
| 67 |
app-arch/xz-utils:=[static-libs(+)]" |
| 68 |
LIB_DEPEND_MINIMAL=" |
| 69 |
elibc_musl? ( sys-libs/fts-standalone:=[static-libs(+)] ) |
| 70 |
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) |
| 71 |
- libressl? ( dev-libs/libressl:0=[static-libs(+)] ) |
| 72 |
+ dev-libs/openssl:0=[static-libs(+)] |
| 73 |
libzip? ( dev-libs/libzip:=[static-libs(+)] ) |
| 74 |
sys-apps/util-linux:=[static-libs(+)]" |
| 75 |
RDEPEND="!static? ( |
Archives