Version bump.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 131 insertions, 6 deletions

diff --git a/sys-boot/vboot-utils/ChangeLog b/sys-boot/vboot-utils/ChangeLog
index 476c8396655e..3c7dd44c5c95 100644
--- a/sys-boot/vboot-utils/ChangeLog
+++ b/sys-boot/vboot-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/vboot-utils
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/vboot-utils/ChangeLog,v 1.3 2014/02/25 08:29:44 steev Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/vboot-utils/ChangeLog,v 1.4 2015/03/12 06:17:01 vapier Exp $
+
+*vboot-utils-42_p20150219 (12 Mar 2015)
+
+  12 Mar 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/vboot-utils-42_p20150219-cgpt-static.patch,
+  +vboot-utils-42_p20150219.ebuild, metadata.xml:
+  Version bump.
 
   25 Feb 2014; Steev Klimaszewski <steev@gentoo.org>
   vboot-utils-1.0_p20130222.ebuild:
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
new file mode 100644
index 000000000000..3f53fc7be769
--- /dev/null
+++ b/sys-boot/vboot-utils/files/vboot-utils-42_p20150219-cgpt-static.patch
@@ -0,0 +1,36 @@
+From 9d437e9122019568df7fa2d602f911e6a873d78b Mon Sep 17 00:00:00 2001
+From: Anatol Pomazau <anatol@google.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@chromium.org>
+Reviewed-by: Hung-Te Lin <hungte@chromium.org>
+Reviewed-by: Anatol Pomazau <anatol@google.com>
+Commit-Queue: Anatol Pomazau <anatol@google.com>
+Tested-by: Anatol Pomazau <anatol@google.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/metadata.xml b/sys-boot/vboot-utils/metadata.xml
index 39a98832ee05..29458b570571 100644
--- a/sys-boot/vboot-utils/metadata.xml
+++ b/sys-boot/vboot-utils/metadata.xml
@@ -2,12 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
-		<bugs-to>http://crosbug.com</bugs-to>
-		<changelog>http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git;a=shortlog</changelog>
-		<doc>http://git.chromium.org/gitweb/?p=chromiumos/platform/vboot_reference.git;a=blob_plain;f=README</doc>
+		<bugs-to>http://crbug.com</bugs-to>
+		<changelog>https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+log/master</changelog>
+		<doc>https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/master/README</doc>
 	</upstream>
 	<maintainer>
 		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
+	</maintainer>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
new file mode 100644
index 000000000000..2021e73107b5
--- /dev/null
+++ b/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/vboot-utils/vboot-utils-42_p20150219.ebuild,v 1.1 2015/03/12 06:17:01 vapier Exp $
+
+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"
+SRC_URI="https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+archive/${GIT_SHA1}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+IUSE="minimal static"
+
+RDEPEND="dev-libs/openssl:0=
+	sys-apps/util-linux:=
+	!minimal? (
+		app-arch/xz-utils:=
+		dev-libs/libyaml:=
+	)"
+DEPEND="${RDEPEND}
+	app-crypt/trousers"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cgpt-static.patch
+	sed -i \
+		-e 's: -Werror : :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}/usr" install
+	if ! use minimal ; then
+		rm -r "${ED}"/usr/default || die
+	fi
+
+	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
+}