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

[Zac Medico]

commit:     499b4a8c28fcaa5436c03fa68582990189391f04
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  3 22:19:25 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jan  3 22:21:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=499b4a8c

sys-boot/vboot-utils: remove old versions

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-boot/vboot-utils/Manifest                      |  3 -
 .../vboot-utils-42_p20150219-cgpt-static.patch     | 36 ---------
 .../files/vboot-utils-42_p20150219-sysmacros.patch | 43 -----------
 .../vboot-utils/vboot-utils-1.0_p20130222.ebuild   | 74 -------------------
 .../vboot-utils/vboot-utils-42_p20150219.ebuild    | 85 ----------------------
 .../vboot-utils/vboot-utils-51_p20160427.ebuild    | 84 ---------------------
 6 files changed, 325 deletions(-)

diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index 089754b6938..de1ea2d3981 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,4 +1 @@
-DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 BLAKE2B b05013b54a4a6a7c9bbdcaeca5b01c7cc75ff9d58e9594a47da914d49dfc0dc4b8d4a31c9f1af5b2414e911ac310f7200731ee78c8941dc3d5fceb97bc34e9bc SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f
-DIST vboot-utils-42_p20150219.tar.xz 18578108 BLAKE2B b5780f35a66ebed39b4c26b75820ac1574691d85c8bd222a3602c79aa92c1058448996bdefc501a3772b116fbf888e93139f8cce10465780d2956de877cc0377 SHA512 bf1b5579f80bfd3804d74f5fed5ca0f85ff3d66cc4efd1c5e744ab0de50309c7e5168fe9a751579e9fcc0cb7dda72fc98497b2e13437b357b0ad9bb063edd33a
-DIST vboot-utils-51_p20160427.tar.xz 18377808 BLAKE2B 7938c9fb69a0da7d4d8b62f1f9b5f911658d6a3673b198f603e20b5e2ed29d989fc92f74eb7553f0fec230fc062bb85785f6ac01ef537944ce144d87690551c2 SHA512 5b9af2815b8939ae21f4e430744902ccd811627d668eaba709354901eb70553e57050b9068b07fecdfec5bb2ece0c11f1cf0f1a01c0e5f886d1913e1478fe3d7
 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048

diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
deleted file mode 100644
index 3f53fc7be76..00000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9d437e9122019568df7fa2d602f911e6a873d78b Mon Sep 17 00:00:00 2001
-From: Anatol Pomazau <anatol@××××××.com>
-Date: Thu, 19 Feb 2015 05:11:51 -0800
-Subject: [PATCH] Remove duplicated linker flag
-
-We already set '-static' to LDFLAGS above no need to do it again here.
-
-TEST=build with 'make' and 'make STATIC=1'. Check that 'STATIC=1' adds '-static' linker flag.
-BUG=None
-
-Change-Id: I83e23984753094af203432eb4570930085788398
-Reviewed-on: https://chromium-review.googlesource.com/251151
-Reviewed-by: Mike Frysinger <vapier@××××××××.org>
-Reviewed-by: Hung-Te Lin <hungte@××××××××.org>
-Reviewed-by: Anatol Pomazau <anatol@××××××.com>
-Commit-Queue: Anatol Pomazau <anatol@××××××.com>
-Tested-by: Anatol Pomazau <anatol@××××××.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index dfa971c..c0c5f50 100644
---- a/Makefile
-+++ b/Makefile
-@@ -960,7 +960,6 @@ ${CGPT_WRAPPER}: ${CGPT_WRAPPER_OBJS} ${UTILLIB}
- .PHONY: cgpt
- cgpt: ${CGPT} ${CGPT_WRAPPER}
- 
--${CGPT}: LDFLAGS += -static
- ${CGPT}: LDLIBS += -luuid
- 
- ${CGPT}: ${CGPT_OBJS} ${UTILLIB}
--- 
-2.3.1
-

diff --git a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
deleted file mode 100644
index 508f5407676..00000000000
--- a/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-sysmacros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://chromium-review.googlesource.com/339680
-https://bugs.gentoo.org/580554
-
-From 7fff56afefd4e63dce2366636c084d4c1f1f95d4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@××××××××.org>
-Date: Tue, 19 Apr 2016 13:58:49 -0400
-Subject: [PATCH] include sys/sysmacros.h for major()
-
-The major() func is defined in the sys/sysmacros.h header, so include it
-explicitly for the prototype.  Upstream C libs are moving away from having
-sys/types.h include it all the time implicitly.
-
-BUG=None
-TEST=precq passes
-BRANCH=None
-
-Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71
----
-
-diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
-index dcfaab9..1716cdd 100644
---- a/cgpt/cgpt_wrapper.c
-+++ b/cgpt/cgpt_wrapper.c
-@@ -18,6 +18,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
-diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
-index 4fe990c..abf37ae 100644
---- a/futility/dump_kernel_config_lib.c
-+++ b/futility/dump_kernel_config_lib.c
-@@ -10,6 +10,7 @@
- #include <string.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 

diff --git a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild b/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
deleted file mode 100644
index 8a5b61a8c14..00000000000
--- a/sys-boot/vboot-utils/vboot-utils-1.0_p20130222.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils rpm toolchain-funcs
-
-KEYWORDS="~amd64 ~arm ~x86"
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git"
-EGIT_COMMIT="e6cf2c21a1cd6fc46b6adcaadc865e2f8bd4874e"
-MY_VERSION="${PV##*_p}git${EGIT_COMMIT:0:7}"
-MY_PV="${PN}-${MY_VERSION}"
-SRC_URI="http://kojipkgs.fedoraproject.org/packages/${PN}/${MY_VERSION}/3.fc19/src/${MY_PV}-3.fc19.src.rpm"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/xz-utils:=
-	dev-libs/libyaml:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux:="
-
-DEPEND="app-crypt/trousers
-	${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	rpm_unpack ${A}
-	unpack ./${MY_PV}.tar.xz
-	mv ./${MY_PV}/* ./ || die
-}
-
-src_prepare() {
-	epatch *.patch
-	sed -e 's:-Werror ::g' -e 's:-nostdinc ::g' \
-		-i Makefile || die
-}
-
-src_compile() {
-	mkdir "${S}"/build-main || die
-	tc-export CC AR CXX PKG_CONFIG
-	emake \
-		-j1 \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=$(tc-arch) \
-		all
-	unset CC AR CXX PKG_CONFIG
-}
-
-src_test() {
-	# ARCH and HOST_ARCH must be identical in order
-	# to avoid calling qemu.
-	local arch=$(tc-arch)
-	[[ ${arch} == amd64 ]] && arch=x86_64
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		runtests
-}
-
-src_install() {
-	emake \
-		V=1 \
-		BUILD="${S}"/build-main \
-		DESTDIR="${ED}/usr/bin" \
-		install
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-	dodoc README
-}

diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
deleted file mode 100644
index 5b70868f8f2..00000000000
--- a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="f44ebbe36b2c1603437edc57b534244e89bfcd9c"
-
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://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/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cgpt-static.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580554
-	sed -i \
-		-e 's: -Werror : :g' \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || die
-}
-
-_emake() {
-	local arch=$(tc-arch)
-	emake \
-		V=1 \
-		QEMU_ARCH= \
-		ARCH=${arch} \
-		HOST_ARCH=${arch} \
-		LIBDIR="$(get_libdir)" \
-		DEBUG_FLAGS= \
-		MINIMAL=$(usev minimal) \
-		STATIC=$(usev static) \
-		"$@"
-}
-
-src_compile() {
-	tc-export CC AR CXX PKG_CONFIG
-	_emake TEST_BINS= all
-}
-
-src_test() {
-	_emake runtests
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-
-	insinto /usr/include/vboot
-	doins host/include/* \
-		firmware/include/gpt.h \
-		firmware/include/tlcl.h \
-		firmware/include/tss_constants.h
-
-	dolib.a build/libvboot_host.a
-
-	dodoc README
-}

diff --git a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild b/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild
deleted file mode 100644
index 67c54ce4119..00000000000
--- a/sys-boot/vboot-utils/vboot-utils-51_p20160427.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-# This is the latest commit in the latest branch.
-GIT_SHA1="48b1a50b086e39332d2e1e51a73434e39c40b329"
-
-DESCRIPTION="Chrome OS verified boot tools"
-HOMEPAGE="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/ http://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/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="libressl minimal static"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	sys-apps/util-linux:=[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	!minimal? (
-		app-arch/xz-utils:=
-		dev-libs/libyaml:=
-	)"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	app-crypt/trousers"
-
-S=${WORKDIR}
-
-src_prepare() {
-	sed -i \
-		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
-		-e 's:${DESTDIR}/default:${DESTDIR}/etc/default:g' \
-		Makefile || 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() {
-	tc-export CC AR CXX PKG_CONFIG
-	_emake TEST_BINS= all
-}
-
-src_test() {
-	_emake runtests
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-
-	insinto /usr/share/vboot/devkeys
-	doins tests/devkeys/*
-
-	insinto /usr/include/vboot
-	doins host/include/* \
-		firmware/include/gpt.h \
-		firmware/include/tlcl.h \
-		firmware/include/tss_constants.h
-
-	dolib.a build/libvboot_host.a
-
-	dodoc README
-}