gentoo resync : 25.01.2018

4 files changed, 143 insertions, 0 deletions

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 4b0b97b2d79b..1ad3824701d2 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,5 +1,9 @@
+AUX efivar-32-efi_guid_ux_capsule.patch 2054 BLAKE2B c349cb606fabb96729af078547bdb3e425607599397a067684753565f6aa98f340885585acaee64e3642a1c284eecca313e3348014e6ccfc5cee1e72ec1885fa SHA512 7e8852b9adb3702b7a7a9a26ee734234c7163aa95d10114d79f62ab6dc918a9afb762fb0476913f4515b36db1cc2c80eb5a0b509f0252483e5aaf51d4d76df76
 DIST efivar-30.tar.bz2 73202 BLAKE2B 6b146cb6d664e3419361e72ab6fd1578522e7fc219613ae21566cb40a700fe70f18750cc753338faca2ad078e2bc933fb33a3a4cdfb148eabb0fc71b1319fb71 SHA512 0a6d7175762011c3fc67b531d3d19a45e82195c729b9ff498be02b3a6a73f6c3c4f9e14a27470c6744b741d7d54db9ef24c7882639af25fca1034b7b9f641b39
 DIST efivar-31.tar.bz2 82404 BLAKE2B d339aa8ab7dcd6a60cb067fccfbc2c42407fba211ca96eb39f227d57e9403462505940f427651dfaffa8272c9edfe70898f181b9f6ecddbae4745eb3262de949 SHA512 5055f690fd99cf59895dcf3d11103494d917d4923567626f0bee816ea5e4dd56cec23627ede5f21bdc57b7306522471ad19cc8ab22ae94591dbd1925c084f163
+DIST efivar-32.tar.gz 108102 BLAKE2B 7f9d27433b40ec6c044ab34ccc697001ad23e39a46862d2e04db0f9a3dfc26ae53b46a3c3a8c957bf76df0969710f78249f72f7bf38e67c0aa902034a07acf8f SHA512 e73eae182fd645183dfe587591a286670ee1123a113e3e19e4070fb910ab7794e320defdc0597540df7664947f2a0497abbb763a19b4dfa40511a512c7f3e490
 EBUILD efivar-30.ebuild 954 BLAKE2B 16a06384903a1107391d5a0c35e816c8ed1ecb58eb4a9c7bd74d2a6cce8535dbffb120cbbe8ed5066099a86c111f173cebbc8f44abdfc7ee9f207ff341dab0fc SHA512 75253eb96dbe9ad28a0f12e4ea46a92a49cfd4b5c1749c812b6ac1ae355336b28c0a28a819b97f5ad9d55936ebde29f5e82b68b9dc819fba92bad7afd44881c0
 EBUILD efivar-31.ebuild 808 BLAKE2B 08ec030f1b4e435aed0e11c323d31012fe07abe73f1ebcaac1c61fd3a2092a500e897783ee8baf0f95aa6b05c6e6b9d8054082e45f811b3a3b3d6901f7122e69 SHA512 65954b2b405e708b0d0116b4327d7d047bb1ee8799a81c775a63677ff3eef354d9adb5a5852f25d5a036823643fb9a78f530f0fad03f379ab3d4d9ea5733e8e9
+EBUILD efivar-32-r1.ebuild 944 BLAKE2B eb0a3d778f8e5b370dc0fe3e1034cad111163e33091bf2439c92c23cd2c8f88f3e9572e14e8c94186e1371ace5a6c7f358af3f416c29b0e05d414d1d459a16cf SHA512 044f127958f61bc352030eb6526b2d84d886d6548fd64b428ad76ac05cb02c707142c0398d5b5e4bb410166369ddbf28a745255a627dc96d12b300075bf292b0
+EBUILD efivar-32.ebuild 885 BLAKE2B b994d6fc214667ba5af12bfabe189874dbbf882f93b134a9af43667f940c073d34f325dc1562c4d194bb30da2a9810caa51de11b7d582a0928b78adc7284bcd4 SHA512 88b639e7b6cc705d681ce709612bd5aaa396f09326ea6e47dc33c0c9f1bf192c6152c63f601536f8dad282d59d6022a4e4f9e91b69dd4967afe4dc64a889b270
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild
new file mode 100644
index 000000000000..2ae5a0644a86
--- /dev/null
+++ b/sys-libs/efivar/efivar-32-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar"
+#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-efi_guid_ux_capsule.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+	tc-export CC
+	tc-ld-disable-gold
+	export libdir="/usr/$(get_libdir)"
+	unset LIBS # Bug 562004
+
+	if [[ -n ${GCC_SPECS} ]]; then
+		# The environment overrides the command line.
+		GCC_SPECS+=":${S}/gcc.specs"
+	fi
+}
diff --git a/sys-libs/efivar/efivar-32.ebuild b/sys-libs/efivar/efivar-32.ebuild
new file mode 100644
index 000000000000..43993d90bc5f
--- /dev/null
+++ b/sys-libs/efivar/efivar-32.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tools and library to manipulate EFI variables"
+HOMEPAGE="https://github.com/rhinstaller/efivar"
+#SRC_URI="https://github.com/rhinstaller/efivar/releases/download/${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/rhinstaller/efivar/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+RDEPEND="dev-libs/popt"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed -i -e s/-Werror// gcc.specs || die
+}
+
+src_configure() {
+	tc-export CC
+	tc-ld-disable-gold
+	export libdir="/usr/$(get_libdir)"
+	unset LIBS # Bug 562004
+
+	if [[ -n ${GCC_SPECS} ]]; then
+		# The environment overrides the command line.
+		GCC_SPECS+=":${S}/gcc.specs"
+	fi
+}
diff --git a/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
new file mode 100644
index 000000000000..8a5a72f66fb0
--- /dev/null
+++ b/sys-libs/efivar/files/efivar-32-efi_guid_ux_capsule.patch
@@ -0,0 +1,59 @@
+From cd732494ba7685feaf71b9ee58619ca6aef39fc9 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 12 Sep 2017 10:45:31 -0400
+Subject: [PATCH] Make efi_guid_ux_capsule actually work.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+---
+ src/abignore         | 11 ++++++++++-
+ src/guids.txt        |  2 +-
+ src/libefivar.map.in |  4 ++++
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/src/abignore b/src/abignore
+index 74b5160..479b5c3 100644
+--- a/src/abignore
++++ b/src/abignore
+@@ -14,7 +14,16 @@
+ #               'efidp_wifi __anonymous_union__::wifi' at efivar-dp.h:868:1
+ #
+ [suppress_type]
+-  soname_regexp = libefi(var|boot)\\.so
++  soname_regexp = libefi(var|boot)\\.so\\..*
+   name = efidp_data
+   type_kind = typedef
+   has_data_member_inserted_at = end
++
++# 1 Added variable:
++#
++#  'const __anonymous_struct__ efi_guid_ux_capsule'    {efi_guid_ux_capsule@@LIBEFIVAR_1.32}
++#
++[suppress_variable]
++  soname_regexp = ^libefivar\\.so\\.[[:digit:]]+
++  symbol_name_regexp = ^efi_guid_[[:alnum:]_]+$
++  change_kind = add-variable
+diff --git a/src/guids.txt b/src/guids.txt
+index 87e2f61..06081ed 100644
+--- a/src/guids.txt
++++ b/src/guids.txt
+@@ -3,7 +3,7 @@
+ 0abba7dc-e516-4167-bbf5-4d9d1c739416	redhat	Red Hat
+ 0b6e5233-a65c-44c9-9407-d9ab83bfc8bd	sha224	SHA-224
+ 126a762d-5758-4fca-8531-201a7f57f850	lenovo_boot_menu	Lenovo Boot Menu
+-3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule_guid	Firmware update localized text image
++3b8c8162-188c-46a4-aec9-be43f1d65697	ux_capsule	Firmware update localized text image
+ 3bd2a492-96c0-4079-b420-fcf98ef103ed	x509_sha256	SHA256 hash of X.509 Certificate
+ 3c5766e8-269c-4e34-aa14-ed776e85b3b6	rsa2048	RSA 2048
+ 3CC24E96-22C7-41D8-8863-8E39DCDCC2CF	lenovo	Lenovo
+diff --git a/src/libefivar.map.in b/src/libefivar.map.in
+index ba51d55..a95a505 100644
+--- a/src/libefivar.map.in
++++ b/src/libefivar.map.in
+@@ -110,3 +110,7 @@ LIBEFIVAR_1.30 {
+ 		efi_error_get;
+ 		efi_error_clear;
+ } LIBEFIVAR_1.29;
++
++LIBEFIVAR_1.32 {
++	global: efi_guid_ux_capsule;
++} LIBEFIVAR_1.30;