gentoo resync : 15.12.2019

8 files changed, 42 insertions, 214 deletions

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 03c0ee0a61e1..0f1dd87d94d1 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,13 +1,5 @@
 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
-DIST efivar-35.tar.bz2 95528 BLAKE2B c936114aade7a586f707af2464d350703234e0c3fb786fb568590737fb3939c3f74ff813f4f188aec230d75e75e73b0d07cbff5860f0b9f1285d2780b29c7689 SHA512 c7ba60b2112053f088ad0b74aaa834860601b7fe17118c35b012050176f5205d948fba9c4b6de35991249f702e3bc24832539e2eb3c235c4188e1eabc78965ee
+AUX efivar-37-makeguids_fix_host_compile.patch 1391 BLAKE2B 079bf271f2e2087fea63265713b5ce75e277f5010f8cb08e6b0608b6c7112ebe8b121238fbc9d07b65bbce38c75732829649d3ef7dd67fc456d52677372190d4 SHA512 50f560725f2ebb2dae9c1b3b603be46aec672d8764d6ba4218aab213d812302e636f8811fe6c51ae17e705e0d461d4141e1e58b8ba997154f42b0046e67f5177
 DIST efivar-37.tar.bz2 109431 BLAKE2B 813d477d31562b773f6e19f20e9e237b94beed437ce221771770e7d46ff0e657530285f035dc942cc20609185be92dc50319bfe8e10dee642c8bd88403ef6ffe SHA512 305a82ed103c7e3d8f723934019d552677c73558768dd5341f87d0364f5c60824d24f5a8e1bf90075e825908085083d4ecdccec5ac757fd38ee6ac8fea28c3e4
-EBUILD efivar-30.ebuild 956 BLAKE2B 617ae40f78ecb76e5b81c2b47fce467738394151021cddaaab484acc843a440d24b7af2d6a2b24f540d5f7f8bfb0af49ab5ad068e85b772ed0232747206cb824 SHA512 9c29f7fd850e4821ff642475828015c5960b47015114cbac0b913e2a02063c3cc1525e4458c9857cce1be9c32a82bb378fe49a4fb67eae60db35528da73491a9
-EBUILD efivar-31.ebuild 809 BLAKE2B d0ca028356842cadf5f052aa86c8383de0ce22d42edcc5146afb018f62d95cfbe2894ee60365d14fc2ab6df5177d282fc0f18c4bf9a4473d2e04cdf4235ce8d5 SHA512 63897e051ef4b474cb1bba5928935773d1de71ba18c2b18b439b6333570628375db6a9e20d33539187bb38eac60ecf06b265ae6609cd0686ae2fe8a1920066ae
-EBUILD efivar-32-r1.ebuild 946 BLAKE2B 815cbe5f43f3ffa65ee94d581b24d001b7f8d14d18b0ac831058555d12e1ac3e2bcca242f437d94326c35dc148154b1203088630e67b3bbc54fe8ec83b715921 SHA512 8c9c99a39b0fad8fdc4c96a24b281db6b1174c1dc4f9769fc789bddd0b0ae06ffdd36e7bda9f103240a136daace83883be0846de9d0975c2e9f002f2d3c01e46
-EBUILD efivar-32.ebuild 887 BLAKE2B 753d7b2b7a44e0123a5eeafa8ccb861731872873a064c9e5981d5b2f8202fac9be0cdc7e14249e81f25289acb25579da4ccc6bc85c7a2211b58ce3e30734de22 SHA512 22baa7fe2befa4f1c1858e2d955e31043c46a9b18fa3b192c69874b150d1815e5febb53c0d5d78fa0ef4e81b271ab381fcb050318052f52c67cbc2d6f4e6ca78
-EBUILD efivar-35.ebuild 854 BLAKE2B 9530db8cc261a2fb86502700764dbf77f16879b4746e210c064db97dc057c1c70fc9e16f52d888708dccdfe875a5127f06aaffdf975003ec57208602802647cd SHA512 ecaa5a9b57f6c62aa7a725eaebc53c93eb8df1a4178a6cfdd976cbff7f6eaf7ef2840d99a131afed9938585b8e2e5e2b853b8d2b4826dcf6653976b730cf4e86
-EBUILD efivar-37.ebuild 851 BLAKE2B d103357671bfe4b1d59019f154069f67048a460cd6faa6bafa4743b30c1172ae2451bf9dedd618d41e53b083568b51a721fee134e1609301818a9ea6de5bb550 SHA512 914877cdf55617c48d5435b25f809a48d38aea3b1f329aaacf28184f2dfe85c94b511d5ce161edf7c57e8de8ad0d94870cee96a993667f8588e5b8e434d745df
+EBUILD efivar-37-r1.ebuild 917 BLAKE2B 7946b77614ebed0a03055845df7aed2dad994e8e174f71162036a96b3b73e003f78dafb369b54cfd22fb51b8ad835c8366cccc85aa52dcad8d4781caf7506f25 SHA512 e7d6703547ff91db3487d6d18fc679bfd2289c15dc4e55dbabbcba18bb2cf6c0d74a8cdbb535f3e57fc0d484268945ed8db4e312a967162d929df49f13925e59
 MISC metadata.xml 329 BLAKE2B afbb6532a53f86d455f8e77511ef1064efaa3d231ddd9023176629863f396224f733f3b15a91465ecdd878542e1af189420d7125dcb7f1de65debd613f4182e7 SHA512 a349c5ce7e3ad96d816b52ee35e6547bfb1f4cf9ebd60426ac90b84d67adb0728ab9dcccf93754ad7c71614b0fbd82a1a02fc3fde07e15d12d960d1a7fc088df
diff --git a/sys-libs/efivar/efivar-30.ebuild b/sys-libs/efivar/efivar-30.ebuild
deleted file mode 100644
index e45c9ae1e97a..000000000000
--- a/sys-libs/efivar/efivar-30.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~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
-
-	# https://github.com/rhinstaller/efivar/issues/64
-	append-cflags -flto
-
-	tc-ld-disable-gold
-	export libdir="/usr/$(get_libdir)"
-	unset LIBS # Bug 562004
-}
-
-src_compile() {
-	# Avoid building static binary/libs
-	opts=(
-		BINTARGETS=efivar
-		STATICLIBTARGETS=
-	)
-	emake "${opts[@]}"
-}
-
-src_install() {
-	emake "${opts[@]}" DESTDIR="${D}" install
-}
diff --git a/sys-libs/efivar/efivar-31.ebuild b/sys-libs/efivar/efivar-31.ebuild
deleted file mode 100644
index 6eccd1d7ed33..000000000000
--- a/sys-libs/efivar/efivar-31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm ~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/efivar-32-r1.ebuild b/sys-libs/efivar/efivar-32-r1.ebuild
deleted file mode 100644
index b9a3ef43942b..000000000000
--- a/sys-libs/efivar/efivar-32-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~arm ~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
deleted file mode 100644
index bec7c857931f..000000000000
--- a/sys-libs/efivar/efivar-32.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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 ~arm ~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/efivar-35.ebuild b/sys-libs/efivar/efivar-35.ebuild
deleted file mode 100644
index b050cddcf60d..000000000000
--- a/sys-libs/efivar/efivar-35.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-
-LICENSE="GPL-2"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~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
-	export CC_FOR_BUILD=$(tc-getBUILD_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-37.ebuild b/sys-libs/efivar/efivar-37-r1.ebuild
index f9a608e46d22..878309f4b43a 100644
--- a/sys-libs/efivar/efivar-37.ebuild
+++ b/sys-libs/efivar/efivar-37-r1.ebuild
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-makeguids_fix_host_compile.patch"
+)
+
 src_prepare() {
 	default
 	sed -i -e 's/-Werror //' gcc.specs || die
diff --git a/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch
new file mode 100644
index 000000000000..f0172eb612eb
--- /dev/null
+++ b/sys-libs/efivar/files/efivar-37-makeguids_fix_host_compile.patch
@@ -0,0 +1,36 @@
+From 81346196bb262156fd436c78323d161af61dd6c1 Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <dtor@chromium.org>
+Date: Tue, 6 Aug 2019 09:22:25 -0700
+Subject: [PATCH] Make sure makeguids helper is compiled for the host's arch
+
+Currently makeguids is compiled with the same flags/settings as the rest
+of the package, which does not work in case of cross-compiles when arch
+of the build host and the target host are different. Let's force
+compiling for the native host arch to avoid this issue.
+
+Note that this is not a full cross-compile solution as this does not
+account for potential differences in host/target compilers (versions,
+clang vs gcc, etc), but it removes one of the issue with package build
+aborting due to invalid instruction on the host.
+
+Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index addfaa0..3729d2b 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,7 +52,7 @@ include/efivar/efivar-guids.h : makeguids guids.txt
+ 	./makeguids guids.txt guids.bin names.bin \
+ 		guid-symbols.c include/efivar/efivar-guids.h
+ 
+-makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT
++makeguids : CPPFLAGS+=-DEFIVAR_BUILD_ENVIRONMENT -march=native
+ makeguids : LIBS=dl
+ makeguids : $(MAKEGUIDS_SOURCES)
+ makeguids : CCLD=$(CCLD_FOR_BUILD)
+-- 
+2.23.0.866.gb869b98d4c-goog
+