gentoo resync : 22.05.2021

6 files changed, 18 insertions, 8 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 0b541c6de825..b2bfe7c6d90b 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/efibootmgr/Manifest b/sys-boot/efibootmgr/Manifest
index 802ecfa172c1..b1a83d61f29e 100644
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@@ -6,6 +6,6 @@ DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e
 DIST efibootmgr-17.tar.gz 41643 BLAKE2B a1995a5df74766f762d2eb971fd6095edea8d0a498c9dd1100515866b40c38ae2f299aae51f12767850ec23fbe4709c2c7428dd48755fbec499669b69f6432c9 SHA512 10c7ad9a79f23dcd4708dc4f42701196af7aa11f5e9a6468ea51f7013d4caeba6c92527ba1304f6e3b2ef3b51b3b69ea1a30f81bb099a8aea49eeb30eb631e1d
 EBUILD efibootmgr-14.ebuild 601 BLAKE2B 609e08888d571faa2a73414e05e200d9b9b5931b97493c149fa1343f463aeb17a0eed1312feabceb56e535000ad0b24c8cd2281c24454084d4006323449bf8c1 SHA512 e93d46d6d3e6a2fab2b1652af0a667003381c2d21f56aee3fddeadf79d9f76078531548ddeec9200f210a0d36b8659bbd41a3f20b5eccb32f26e1435162b8144
 EBUILD efibootmgr-15.ebuild 625 BLAKE2B 7c98f668fc581ab2a44a262ff289ef2c22fd47d951d3f2840a647a74db0e6808e5defdb8dc106a60cbfa30592a5b07ffdac2ee2fbb70ce3485123465bc797b95 SHA512 08e0ab714b313a627a8189640d8266a1e97bb4f9186352ef9644edb9c9ab42675b38528fca6d4c7184344d3ac488feee06d6baf81e5ec59bac9bd482eca4fdec
-EBUILD efibootmgr-16.ebuild 686 BLAKE2B bfdbed885980cc66d809478e30ee12b70dc6f29dcdf23b1ee7b13781a2e50e1c5ef180c855f49e200d4baf32d8745a364c875054aeb247dc38ef4e5d7460bf08 SHA512 eee2b40b3d2958856c73c479b51c826a5040635282403a0d06e9fd53d873687fae633aa6eda8b23d69b609d255a2f6434d3060c760362a5f489a8dce6be9133a
-EBUILD efibootmgr-17.ebuild 769 BLAKE2B c6b54c18236fc0f1ec7a9754b6bbabbd5838fbc7eb0d11434ebb4def46792519eb9bc5c0649094cd8a1df947a40534c2bc2062f257564feba466d8998513f695 SHA512 fa736a11e5fc44eceabb76407aacbfaecac04ac66af7544ec5b7377ec4f015ce3396702bb2ef9ec49fe500e266ec02afb6da7a8699cd09492672b5585a104be8
+EBUILD efibootmgr-16.ebuild 708 BLAKE2B e8e920cc43e35753237705b3a3d08d08092b9f325640cfa8954c267bbcc5339971222953ffe6af203216daaed34e7991c92dd9e93cc2d794200835ba3f822c71 SHA512 877d5f55c7cdf36d182e382a569b44e4d982efc6448473afd816f66c89f8649249692dff83b7b9d3c50d1bdd3a0904a171388ce82d12d936b7c539a86b96cae6
+EBUILD efibootmgr-17.ebuild 797 BLAKE2B 6b2f12c4d40889ec27d30a790ff5b6b9e9e59817a2950e75ceedda138a9bc9cdd123c1d30212c4dfc7e8e66e3b6a528ffdd347cfe3541d1eb17a210472f006d9 SHA512 8cbc93837226107170ef789b471e5139c71f254cc68bc5de8b14565ba80c2aa4a3426bdfae60acf6708cf378aa8d3736c75b90a7500bd0bd10d779021a3e4558
 MISC metadata.xml 626 BLAKE2B d426af2d479b07fa3d8e482b5d1b84bd242f5da9399ab9cd2d2512d2192f815ccb099ca7c8d3ee91c8c87e1715c9649deaa565aa6ec025c26b518e778d84989e SHA512 d52646244bf9c0d10d8c5b986e110944905fc8f898c0330f65cd6c734e6d8cfabf72854cef362f411d3d63fed3f5e22207a7b94d1ea8076e566d8eff228bb33b
diff --git a/sys-boot/efibootmgr/efibootmgr-16.ebuild b/sys-boot/efibootmgr/efibootmgr-16.ebuild
index 35c97346021d..d16655fc906e 100644
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,10 @@ IUSE=""
 
 RDEPEND="sys-apps/pciutils
 	>=sys-libs/efivar-25:="
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
diff --git a/sys-boot/efibootmgr/efibootmgr-17.ebuild b/sys-boot/efibootmgr/efibootmgr-17.ebuild
index a6d695bcfe73..73e20c997bb1 100644
--- a/sys-boot/efibootmgr/efibootmgr-17.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-17.ebuild
@@ -18,6 +18,7 @@ RDEPEND="
 	>=sys-libs/efivar-37:=
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-efivar-37-conflict.patch"
diff --git a/sys-boot/mbr-gpt/Manifest b/sys-boot/mbr-gpt/Manifest
index 9ba97165d495..f592d32a023f 100644
--- a/sys-boot/mbr-gpt/Manifest
+++ b/sys-boot/mbr-gpt/Manifest
@@ -1,3 +1,3 @@
 DIST mbr-gpt_0.0.1.tar.gz 15861 BLAKE2B 00c6741fa5543af435cee97132510126d0301db2fb50712d438703165507125b4981844cb4a841b11bad075af5effb746fd3aa04e6834fb051536b250c01f7ad SHA512 eaabd84fc749ddee8fa40632ad49e15e894bf35a881fb7c35ba22796c2459a886e9bda601595e58d29567ff26959ae2befe6aec5db397d15e1dc5a292dafe165
-EBUILD mbr-gpt-0.0.1-r1.ebuild 1732 BLAKE2B 7d70ef486c3ff3ae3f37112df599377e287fa34e463ef0d89935aa6e6a9ef43f824de1b5246b024d0fbffa633b670af6a516cc9675c65e37331899c95aecb441 SHA512 3d84928160657a83270e7ec206d9bfa87d209b3899ab99753115212d9c6e5266ff0dd179432239c2e47422cb6f1c65177d061587957d878a6dbeebbf6e4ee1a7
+EBUILD mbr-gpt-0.0.1-r1.ebuild 1736 BLAKE2B fe763dc6620e620780b5b62b6e18b181de1d1e48611054a5423716fe289b432646e7c436ed5f5404fd1cda569f00ca4b1ab13bd26768cf138ea9e41806f4fefc SHA512 4cd5b1967c376b7209b7168587cfd162dad0be3ef22dbce63717b6aed269401c6a8bfbd8d3053594c8a7c760d94e7db3a69d29282051addfd00dbd6b28749c7e
 MISC metadata.xml 665 BLAKE2B ad75295ccf49280adce38241b7d2b09ea5461e9aafaa63f6e33eaa35b4639f91535b9ebd4212e91f832020e38ed8f638e03dc6629c6d74490548866b9d58a497 SHA512 b2b28b150ab2f6a983b82216b6d900e2a2893872092dfb8e2e608899c76e182cd581528311e0135177e60b576bca3f9923bd7eb0e54d9d7a8a434b4c87fa6883
diff --git a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild b/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
index 294caff68d95..3073a1e1cfed 100644
--- a/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
+++ b/sys-boot/mbr-gpt/mbr-gpt-0.0.1-r1.ebuild
@@ -3,19 +3,20 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An MBR that can handle BIOS-based boot on GPT"
 MY_P="${PN}_${PV}"
 HOMEPAGE="https://web.archive.org/web/20080704173538/http://aybabtu.com/mbr-gpt/"
 SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
 # This should probably NEVER go to stable. It's crazy advanced dangerous magic.
 # It's also pure ASM, so not suitable for elsewhere anyway.
 # Please don't remove it, robbat2 has a box that depends on it for # booting!
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
 # It only depends on binutils/gcc/make, and doesn't link against libc even.
 DEPEND=""
 RDEPEND=""
@@ -30,12 +31,15 @@ RESTRICT="binchecks strip"
 
 src_prepare() {
 	default
+
 	# Messy upstream
 	emake clean
 
 	# Need to build it 32-bit for the MBR
 	# Btw, no CFLAGS are respected, it's ASM!
-	use amd64 && sed -i -e 's/-Wall/-Wall -m32/g' "${S}"/Makefile
+	if use amd64 ; then
+		sed -i -e 's/-Wall/-Wall -m32/g' "${S}"/Makefile || die
+	fi
 }
 
 src_compile() {
@@ -47,9 +51,11 @@ src_install() {
 	# location.
 	insinto /usr/lib/${PN}
 	doins mbr
+
 	exeinto /usr/lib/${PN}
 	exeopts -m 700
 	doexe boot.elf
+
 	dodoc AUTHORS
 }