commit: b193699daf3ad6dea5092998cc1312eba321dd86 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Jun 1 20:23:05 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Jun 1 20:26:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b193699d
sys-boot/vboot-utils: drop 80_p20200108 This eliminates the need for static-libs support in libzip which prompted https://github.com/gentoo/gentoo/pull/42357. Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> profiles/package.mask | 6 -- sys-boot/vboot-utils/Manifest | 1 - .../vboot-utils/vboot-utils-80_p20200108.ebuild | 108 --------------------- 3 files changed, 115 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 4cde5ae3f646..358546e726d5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -36,12 +36,6 @@ #--- END OF EXAMPLES --- -# Andreas Sturmlechner <[email protected]> (2025-05-30) -# Last updated >5 years ago, stuck on EAPI 7, imposes static-libs pressure -# on its dependencies; many bugs. Removal on 2025-06-24. -# Bugs #937435, #833111, #721504, #875593, #675726, #625122, #590616 -sys-boot/vboot-utils - # Michael Orlitzky <[email protected]> (2025-05-28) # I added this for SageMath, but in hindsight do not think anyone is # using it. It has code issues and upstream is not terribly interested diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest index 965a419487b9..023225a57a64 100644 --- a/sys-boot/vboot-utils/Manifest +++ b/sys-boot/vboot-utils/Manifest @@ -1,2 +1 @@ DIST vboot-utils-138_p20250522.tar.xz 32405036 BLAKE2B 240ebe9622ce507253f57344f1de5aadb4dc82f3495bc29c9ea59ca37de5330c58f46039748b163cd166fb9faf98a0fb7c507011a3ae1166f874ec77894a4f7e SHA512 0c080b43da5501bc10699598725a11cf04d5806e15035dd4856b216977c9c3f46d04c8231fea8ff41fc879ceb9b222420f6f5b8d764bcb202aae7448161d4ccf -DIST vboot-utils-80_p20200108.tar.xz 18448212 BLAKE2B f7e375133fb6dc90def1e22c42c7511a3b649c34d067a447f44fb99c1ec37a73d034837c2212e5d6ad368a4f4b011c8cb9eb479e81db4a52b1160cda99382a77 SHA512 077d137d8fe89f35b6f7ec6408b2e9fc7a28765b0987646c1964e6e0c039e359711ab79958c45ee555a0fe810997217225d072a7f1011b1c73c4aefb4e57fcc1 diff --git a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild b/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild deleted file mode 100644 index e409d0298875..000000000000 --- a/sys-boot/vboot-utils/vboot-utils-80_p20200108.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -# Can't use gitiles directly until b/19710536 is fixed. -# This is the name of the latest release branch. -#RELEASE="release-R80-12739.B" -# This is the latest commit in the release-R80-12739.B branch. -#GIT_SHA1="236bd46bfb59f0262dcb1771a108ebb5e90df578" - -DESCRIPTION="Chrome OS verified boot tools" -HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ https://dev.chromium.org/chromium-os/chromiumos-design-docs/verified-boot"; -# Can't use gitiles directly until b/19710536 is fixed. -#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/refs/heads/${RELEASE}.tar.gz -> ${P}.tar.gz" -#SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86" -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(+)] ) - dev-libs/openssl:0=[static-libs(+)] - libzip? ( dev-libs/libzip:=[static-libs(+)] ) - sys-apps/util-linux:=[static-libs(+)]" -RDEPEND="!static? ( - ${LIB_DEPEND_MINIMAL//\[static-libs(+)]} - !minimal? ( ${LIB_DEPEND//\[static-libs(+)]} ) - )" -DEPEND="${RDEPEND} - static? ( - ${LIB_DEPEND_MINIMAL} - !minimal? ( ${LIB_DEPEND} ) - ) - app-crypt/trousers" -BDEPEND="virtual/pkgconfig" - -S=${WORKDIR} - -PATCHES=( - # Bug #687820 - "${FILESDIR}"/${PN}-80-musl-fts.patch -) - -src_prepare() { - default - - # Bug #687008 - if ! use libzip; then - sed -e 's|^\(LIBZIP_VERSION :=\).*|\1|' -i Makefile || die - fi - - sed -i \ - -e 's:${DESTDIR}/\(bin\|include\|${LIBDIR}\|share\):${DESTDIR}/usr/\1:g' \ - -e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \ - -e 's:${TEST_INSTALL_DIR}/bin:${TEST_INSTALL_DIR}/usr/bin:' \ - Makefile || die - sed -e 's:^BIN_DIR=${BUILD_DIR}/install_for_test/bin:BIN_DIR=${BUILD_DIR}/install_for_test/usr/bin:' \ - -i tests/common.sh || die -} - -_emake() { - - local arch=$(tc-arch) - emake \ - V=1 \ - QEMU_ARCH= \ - ARCH=${arch} \ - HOST_ARCH=${arch} \ - LIBDIR="$(get_libdir)" \ - DEBUG_FLAGS= \ - WERROR= \ - MINIMAL=$(usev minimal) \ - STATIC=$(usev static) \ - $(usex elibc_musl HAVE_MUSL=1 "") \ - "$@" -} - -src_compile() { - # -Werror=lto-type-mismatch in tests - # https://bugs.gentoo.org/880175 - filter-lto - - tc-export CC AR CXX PKG_CONFIG - _emake FUZZ_TEST_BINS= TEST_BINS= all -} - -src_test() { - _emake runtests -} - -src_install() { - _emake DESTDIR="${ED}" install install_dev - - insinto /usr/share/vboot/devkeys - doins tests/devkeys/* - - dodoc README -}
