Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

5 files changed, 150 insertions, 16 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/Manifest b/sys-boot/vboot-utils/Manifest
index 6ebcc91cbcac..7a2fc266b356 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,18 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX vboot-utils-42_p20150219-cgpt-static.patch 1092 SHA256 2b437033206b7f79a4e84912475066e8678bbbee987cc973a4e0b7a39f81a621 SHA512 bb01fbb11d015bc8e817e14e4326908d5338a9a3bb657004c8539b561e0be21c7f3ee9d2b43d8fcadc302ee9991effb65778d22b2a8ade92faa5234041288d4f WHIRLPOOL 32bf0459e775ccc4be2721f029fded8e9f8942fa71b7e8c1abb97b34a4494c3660ba0b194ba88c7c64895a59d5bfa8016393be958affaa37851f9ae6c34ea08a
 DIST vboot-utils-20130222gite6cf2c2-3.fc19.src.rpm 2170079 SHA256 f20235e5f708bcbe3b30cb684a5aa9fa3f60d1fdea454375db0e62bebabd0c41 SHA512 ccb5320f01d270ff30465e6ffc234d245220afdb9628f9b5f9e8abc7c91c5e58085b5e8eefe217e85faa18166576d945cad9f757d99927389473cb0a4337a05f WHIRLPOOL 9da1a4f503619c9754e4c0b1c2d52deb4c687e693ba521213e2406cba417f5b8ce5645285ed2e106c0d05f56bd325dc7f929692c5de2ff1be2bb7fe191f74c68
+DIST vboot-utils-42_p20150219.tar.gz 34084175 SHA256 2bf541226197f4146065fc9e1b66e67379a10e6d75c3a946873d679e9ce4ba8a SHA512 164c00cc0cd5e9af56ea6ee3d0c815ac18d737df38ffc26afd9281e1854017b87f1c389673c3c36796a4211cc8cc1c1c2217e8d485ba87141dd26951f11dd635 WHIRLPOOL 98e11b33686d128eaa7ac75b4a92042a92993f8fe5d862e6ae3ebf54b230ce95949c06b4a699c073d355166cf126518348f8f507842bf4fc31ecdd5bd5a5baed
 EBUILD vboot-utils-1.0_p20130222.ebuild 1654 SHA256 99848d8dba1ff8f171ee4ea47d1cc260e091c64ffa85041b185433a72f4ab84d SHA512 113f4bbcce7a8de45e2194b1f31e07a6aa852091f6ebc91f871bdd1bd5b6918abfaf4653cf44a8d950cda958dfb9497aa8b23b202f37a9d94ee808da9801ae52 WHIRLPOOL a6c1646fb51c35fdc024199fe2dd165d31c5082e0c8672f798639561eff8e506d1dd995af51b68ba89888017dc059d3d7d5fdd002b63b52e61bc0708e18dafb0
-MISC ChangeLog 655 SHA256 0a12508382a3318c32440f6b26afe6a04903b0cebb377830b7f10b1ca7cdf703 SHA512 1a3afc8d6c29cbd4d93dda4479b39a5350e88dac9485fd4cbe4575da5f94aae8cf6611a83beb92c91f9b148ac076383c948fd71fa7b2735d3d4014299b295d66 WHIRLPOOL 0751cf5d6e3f6c21a2b55fdad84069fd3551c6b85512c6d266013d0af1e91da487b24afa103b66a97816c40f316b6e6d052a0db907dd35f4f9388a39a2317930
-MISC metadata.xml 514 SHA256 8ab7175791be116d6cc0a27cb1b23fb29d605c651c826979189a6d481cc0233a SHA512 8840f2deb839275573f102260b12078614e7e078872e92572d0aba6f9b18adc2a159630a93d9b6dfc2fb3f12e7100ea8deeadfd31c1d34b3bd938773697735e5 WHIRLPOOL 13bd866d36a992c73472c48d1cca9d9b81f7ff8f6447060ede9d0d689ccf6129903831744c85ee75b0a8923dd579c521205f9d81c6a9211f2f9cf022de12a051
+EBUILD vboot-utils-42_p20150219.ebuild 1758 SHA256 a9ff09bbbbebce544b4dc85ec5cde8c725833d4517498cc09258916c5c172bf1 SHA512 e88b07fa1e6e7e8916354381d31a3e8154ef2895a4aa29435ff29b71289195e05c2f77b953aacccb9602f26da4f622d179c9762dde0a0149e3d160d7cb58a6c6 WHIRLPOOL 5828399fc6707ead52529abd0af3b27caa10f11e20263e3242757b5c823a7bfb06da0e3a9217240cfeec3b42b493c34857a89189b569d8a549d1abd94b3efccc
+MISC ChangeLog 867 SHA256 f603ddecb5569a5682bea667e700a05667992f2527c7ab38248702e691bdaac8 SHA512 2f1f98e6c5664ad29ff26718f8f4c6fca3ed730c8e9e1d0c2471cf97e8619835294367c9c32cd8dcf8fe39d944876cddf35b0c838b83e15fc227aa33c84fb119 WHIRLPOOL bdbcf569e17c3136e5f4dd4a593bf569bf3d775885645181a2ba4f6b96b461ce6563a66b4816734d4beb44a77743d24c6365f69457cc94f96b327f440b5d6fb6
+MISC metadata.xml 537 SHA256 e8d7bdf7bd471fe2b568799347fc759b7220b1e696bda4f668e5afdcdbc09734 SHA512 278af608ecd4d131bfa102825d333e3d0ab55cd6c8cae3bbba374324d5c4d9102306b8888bd38382f7627c8ff014ae34e27e0f2a7f6acd4855daba194e46945d WHIRLPOOL 86e3bdb7cbd304e5d6abc1580285fddb3775d0a92ebcd39878b8bf753f6e827263ec0eeeef8a1e05764fbc9b617ee120655a7199ebce3caf397550ec623ca6ee
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTDFR0AAoJEKwp3Cn9qpV+4TAH/Assi3rqVFxlMlrb1Qtk+1Jy
-ngmp5XOuw2b+4C7E87zP2IXWo2ISyc+BPfV/LKWNJNxUHw/Me9g8+z1AnJq3r614
-+rg/XpX0xgzbzMGPfcgiNvLeSn7jRiCT6MrvvECHVaI0LMwNoYuJY0XGBGZjSJIk
-km+dmpkY8zLhx8iHibSwcE8X4hyg6fLqwYMrQYVS9GEfX/l+jOe8oWXwvU8kGwSu
-1uwfu1dOIGrs+rFv5QWwqm5lWS961C/FdeOhgoruVoJYnlGmpENCS2aeFzpI5+TM
-09fNLdjD2GNoE9s2w1BL3WzyiCSvQy8+20tQrJA4+ceD/KkUxLZ+H+nbbErHBY8=
-=6xqE
+iQIcBAEBCAAGBQJVAS9fAAoJEPGu1DbS6WIAa/YP/3NvtG7SS3OcjLmcaS0u0zyI
+ESYoOzdwvxsVLRKNN6x2zwoF1BkAciFeC+q3VEH8ZvgAIYE0T1NVO63pwtP49+iB
+B8LymqWW1oU8qc2gNkICR8goP/qCcmRJdHYgzhQnvVjoNcZm3Qn2kNOA0faes5YZ
+CIJipIct/uXLbxCdsQVRpvY+h6+FVUM4NpYV/pS+T7YqaML3LPGwcL8F/f/nhtrg
+SJoe3EOjOy3Ci7lgDN+26UhXb3rlUUPYehGA/y3uZy8GfGoH/ZCPLQQP3xB6SoAD
+g6f3wE8t48XH8vuQ3oGB2z8ZjnFNzaApC1NmCvWeetBad+ltQElfnCEJjzBkMl7v
+8XMx3+dDOHAXFRfhrNxF5s2q3Ag/8OQDRCYFeMwdkO/f+nYcvemtoJ/7yUDX4pmR
+4somLq21oBTyg0lnkWaFGWdEdG9RXnYgCmIBM752xIQ2CW3oLquEQ7cnHZyh26Im
+Oxo2hc+9QBNL7gbADCsHuH62tyXeAY7fAp1lwWE9rpELE1b9NoEEsPvkubYRzo0f
+OaZE9MS8Glfhm4HvasZ2W7OYujDw6Wfg1Sls0lx8zqglnqZgkGaRCrkj8lks7iro
+/xYmzI4MqNbTzPWynvw364SJi/mNdoINpPpX1g7/F6ZThjLIxB8vvuz0PnaIPLfj
+X25uC6ZyC5ig0QuKVkhU
+=xtk5
 -----END PGP SIGNATURE-----
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
+}