gentoo resync : 07.07.2018

15 files changed, 169 insertions, 18 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 101681417f3c..c0a1eac25d48 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 821cbef6ef87..86c7acddec69 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -17,7 +17,7 @@ DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41a
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
 EBUILD grub-0.97-r16.ebuild 9596 BLAKE2B ff6e369d331c18300a8a5b73232d5381ffecac3364ce2c789e3db2f510f1d0ebc929994eaafa41cec4193676c39022f4bda868afd95d5ee15dfa61fadba29bf8 SHA512 26aa6178cc463e79cf3416773517e35606aca9d8721da2f6aee0d5b7db223b32e4ca812188a488734784a5725646daceff24b3ae9d8e14452becad1ce25ebff1
 EBUILD grub-0.97-r18.ebuild 10141 BLAKE2B 7af15e1634c7e96930a7ddaa72d9ab7adae72a0b62729d65d52fd86262d7a7c2a27e2a59c412733463bccc83e9b30d62408d5bebb30f90c99135c05fabc140e7 SHA512 d9c481f77fa1d2f750b64de8cfa02f52be9a0d563607ca50117e4792add79b21e3fb34dc448beebbbb7a99153b9dc5cad01d447209fae154a8205864593c89d6
-EBUILD grub-2.02-r1.ebuild 7887 BLAKE2B 699241391c6c0d6b3a6f29ac8f969e001209fbda1b7f9a0ac7b52a4445356387c4e28341cf13e506cd8fb1e8c1790085f72e64f7e4074ec530dedf3d4b331fef SHA512 b592aee07225d6d4f8631f5196831b902b7d6483cc646146345339bb73c1c68697a25d4581dc2fdb3bf5764deab777cf252e541572c86accaf941d2fc7abc671
-EBUILD grub-2.02-r2.ebuild 7933 BLAKE2B 74ccf88e5255046c454e756cff3f1700e1b2f17ec5f93b98ea4a224b983141dc652f821bed59f45bf54605e1e5adb59b0c5ef64bbcb03ed9b75225b741688300 SHA512 51087b78d4463b8eeffa5ca93ba74114a113398334b4f21d746f347f175cfdb863e19a87d35c23db784062f1440704049235183adad844f451df90f08762d776
-EBUILD grub-9999.ebuild 7745 BLAKE2B 6056b651f5bda56bd64486248d86151635b63a9f2898e55958ce5e1410b6a2df14b39cd7e804cd510c7c2b961daea89a8ad77b85c060925beb8129ab208e39d2 SHA512 3f3fb69a63fb57c476a40c3f2a8c0b86b0739743d52c3da09309de27e6842c0f53c3a6062cb577db32b1d24ab2e41a3baecd89fabc861721af7ac580aa05d7ab
+EBUILD grub-2.02-r1.ebuild 7891 BLAKE2B 1ccd64146c92b5f09bc7f7f88b02d408dbe279f38e7192355c83f1975c70e34bcf2ff4f5c7f71529c03896057bf7ced795668f4036fd1339776de87014b21e0e SHA512 86a98dd513d6d01ae53d7de588c0f293ec6adaa2e5ef27feeb995113f6bfdc32983da9d026950a935a67a82168c8c0fce78b35726bd92cde04f8ee6cb5a48c02
+EBUILD grub-2.02-r2.ebuild 7937 BLAKE2B e619284956c6f0d1fe3fed6082ceef54b3b58c73d6baf3196074f83efbd4ae99cf548741bc291844ed404b900b2a72b34e23dc6803d6c4956c6d192cdc04cdf8 SHA512 6e2d03c0216d1ace6a5c3706a0f62112ebd375c15bc238aa8c9b6eb40d6d2824e9457d9266a3b433ad069040d51424799f3d55917dadabbad29eff932d223fa3
+EBUILD grub-9999.ebuild 7749 BLAKE2B b9b77ffb78ba01cf403d0fa842065a82aa13d1b2940ed27f2df6bb4bf8af6baa60b7059840b6c52cbff66ce7465663f55aed8e6730329198eddbca79d1fc9332 SHA512 9482b1a871347e3c027ef974a96c499b7035cdb87a305063013b3bf966221f47ea362fe2da00ab7db8bdfc3c1d40ab56f5cef94e47b7559066e473bc44cfe418
 MISC metadata.xml 1488 BLAKE2B 3aa41f3c6c45258892bcf2800bfe09b506d11aa69a3071977e58736e496b72b71df579cfcaf1d14a3b81db695aca0bf7dbcc7a18faf1c62dd05f033bdafb00c8 SHA512 71f3e48b73c3d20f213ae928b16499131417562d98b83f2d82a5fb026c8cc06ecddf9db32565d9e1602d4258f7a2cc1796eb523c4cb98fb6b7753328a29e93ba
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 01ea55f70e52..8b9bd593a870 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
 GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
 	inherit python-any-r1
 fi
 
diff --git a/sys-boot/grub/grub-2.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
index bc92a886e21c..2b29ae727520 100644
--- a/sys-boot/grub/grub-2.02-r2.ebuild
+++ b/sys-boot/grub/grub-2.02-r2.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
 GRUB_AUTORECONF=1
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
 	inherit python-any-r1
 fi
 
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e540b36db349..43d920a97cc6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999  ]]; then
 fi
 
 if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
 	inherit python-any-r1
 fi
 
diff --git a/sys-boot/mokutil/Manifest b/sys-boot/mokutil/Manifest
new file mode 100644
index 000000000000..861d1820dd9b
--- /dev/null
+++ b/sys-boot/mokutil/Manifest
@@ -0,0 +1,3 @@
+DIST mokutil-0.3.0_p20170404.tar.gz 32590 BLAKE2B 867574b05a7a7c842869f75bd3b6a0cd0af083862ffc912b25b12fe6283946968ac6872b25a727d37185fb821871d5a2f958afddbb7e2bfefde854c6f434ab8f SHA512 ee64627089efe341bff466249a126dcdcc4a53878b17f651b17423650c3aea76d52dcae01ed689ba5bd317125dd9a669816563aa676d46d8ac36863f38f9ea16
+EBUILD mokutil-0.3.0_p20170404.ebuild 593 BLAKE2B 3391a97d8f30d1ec2ae56eb38a6c6019a2cb640955699998dc7b7a13eedcb260e2f34bd40a09be282f3fba879cabef5be13c3c9e82cfc349566db3440a59be94 SHA512 694a2b1c0bf144a338fafe5eee9237ee7468477131a71867f56829df4cb35557c10e43009db59c0598eeae97ff37ab77a3af9ac07cd431c0726dddd0b51300e5
+MISC metadata.xml 339 BLAKE2B bd74af3869aa4eb2b1288e07b6040b1b1d365b60ca93a7478d0eecc32430d64159a7f87bd81193151313620fa3f68fdf7128c62271ebce58f9dcce3e80e2acbe SHA512 5b7223ec67865be0739d020357f5e863f315b52b44bde1e66386949b2232093fa4e0dc1b8ec52c8500ea61fecc6dd35ba43609262ab99ed007667fa36da8839b
diff --git a/sys-boot/mokutil/metadata.xml b/sys-boot/mokutil/metadata.xml
new file mode 100644
index 000000000000..71aa8dfdc31d
--- /dev/null
+++ b/sys-boot/mokutil/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rapid7/metasploit-framework</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-boot/mokutil/mokutil-0.3.0_p20170404.ebuild b/sys-boot/mokutil/mokutil-0.3.0_p20170404.ebuild
new file mode 100644
index 000000000000..d50f17eba469
--- /dev/null
+++ b/sys-boot/mokutil/mokutil-0.3.0_p20170404.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="The utility to manipulate machines owner keys which managed in shim"
+HOMEPAGE="https://github.com/lcp/mokutil"
+GIT_HASH="e19adc575c1f9d8f08b7fbc594a0887ace63f83f"
+SRC_URI="https://github.com/lcp/mokutil/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl:=
+	sys-libs/efivar:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${GIT_HASH}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index b1a0fd520b63..527f0572a4d9 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -4,7 +4,9 @@ AUX 237-libshared-static.patch 659 BLAKE2B f97c3c4e9d6ef3da674bc74fce8326d18fe1e
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
+DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 EBUILD systemd-boot-233.ebuild 2118 BLAKE2B 02b1df09cf96432b865586699bc0c4da4d3bc064182ac5f55a6e16e3f24691467d8e7fec65d0c658a535dab7b79112cba645c81077772d398a6a963c06be4c0b SHA512 aa7f7259549b397403b7a539015f1435c47e2933d0f67c68e0a633393fc64ac4bb0fac99d7860d400e9da8f68dbc8235340426ceab715e51f4881fbc991ecfa8
 EBUILD systemd-boot-235.ebuild 2274 BLAKE2B 20cae085bbeabfd265d84c16cc80fa9a162cc9d46776984206e04c368697015a6eb4bdb2e16dca2b137417b3ef51ca02f4a368e7c118bb7ce92ccc436e06c290 SHA512 c016caa2373bd5b5893e7db7d0044c71dbed1d7393a8ac42252e2420e8e554624defd644e6d0a8e1ca32e52496b0e674a09c6feb98232293e19b05b2c890e39d
 EBUILD systemd-boot-237.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
+EBUILD systemd-boot-239.ebuild 2326 BLAKE2B 0525544b11bfe923ea0a9d75f0a3c2dc6af19cda15ee5c5d9855478533a83694e22ab77b8fd8efce7ae54b97b539b3343f9f238fc22633d984acd3939310d5f9 SHA512 f942a34573f78249a0ddc40ab927cf7acf88ded00420a4a3048b8b0ce66b11b75450fb3b1bd9ff914a9d9c9b8e5dbe07e75ff0c263a620b03e31ece738d80df1
 MISC metadata.xml 326 BLAKE2B f33138d9048d3a13295360f070b8d610a22909f99ee0127d3138bc1e0a066fc4590f580c4cd8fd539d5c86efc005b4662eb0dddeb085469719d0aa951c36af9a SHA512 7d33f5273a066af06b319d04f9a01c2d8f14a6de2102cf77918d7abdf6846fd0b271f5c5adb503354f93402eb341af280853f20dbb673264196c552aa24eb6fe
diff --git a/sys-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-239.ebuild
new file mode 100644
index 000000000000..48d61ac38b29
--- /dev/null
+++ b/sys-boot/systemd-boot/systemd-boot-239.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
+SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	>=dev-util/intltool-0.50
+	dev-util/gperf
+	>=sys-boot/gnu-efi-3.0.2
+	sys-libs/libcap
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/237-libshared-static.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-D blkid=true
+		-D efi=true
+		-D gnu-efi=true
+		-D efi-cc="$(tc-getCC)"
+		-D efi-ld="$(tc-getLD)"
+		-D split-usr=true
+		-D rootprefix="${EPREFIX:-/}"
+
+		-D acl=false
+		-D apparmor=false
+		-D audit=false
+		-D bzip2=false
+		-D elfutils=false
+		-D gcrypt=false
+		-D gnutls=false
+		-D kmod=false
+		-D libcryptsetup=false
+		-D libcurl=false
+		-D libidn=false
+		-D libidn2=false
+		-D libiptc=false
+		-D lz4=false
+		-D microhttpd=false
+		-D myhostname=false
+		-D pam=false
+		-D qrencode=false
+		-D seccomp=false
+		-D selinux=false
+		-D xkbcommon=false
+		-D xz=false
+	)
+	meson_src_configure
+}
+
+set_efi_arch() {
+	case "$(tc-arch)" in
+		amd64) efi_arch=x64 ;;
+		arm)   efi_arch=arm ;;
+		arm64) efi_arch=aa64 ;;
+		x86)   efi_arch=x86 ;;
+	esac
+}
+
+src_compile() {
+	local efi_arch
+	set_efi_arch
+	local targets=(
+		bootctl
+		man/bootctl.1
+		man/kernel-install.8
+		src/boot/efi/linux${efi_arch}.efi.stub
+		src/boot/efi/systemd-boot${efi_arch}.efi
+	)
+	eninja -C "${BUILD_DIR}" "${targets[@]}" || die
+}
+
+src_install() {
+	local efi_arch
+	set_efi_arch
+	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
+	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
+	exeinto usr/lib/kernel/install.d
+	doexe src/kernel-install/{50-depmod,90-loaderentry}.install
+	insinto usr/lib/systemd/boot/efi
+	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.efi.stub,systemd-boot${efi_arch}.efi}
+	einstalldocs
+}
diff --git a/sys-boot/systemrescuecd-x86-grub/Manifest b/sys-boot/systemrescuecd-x86-grub/Manifest
index 6205463b860c..1bda1f14830e 100644
--- a/sys-boot/systemrescuecd-x86-grub/Manifest
+++ b/sys-boot/systemrescuecd-x86-grub/Manifest
@@ -1,4 +1,4 @@
 AUX systemrescuecd.default 845 BLAKE2B 85c0685cc80caa52874ebe61476beea84f06a83d5410db2b05f61dc30adc4a18a26790120a135988d6ff613672eff5e4ece89b20fc7185144317d8be325a5853 SHA512 81aebf9999cfe82696fc72f520fc88355fc8d3077a1c76858175f3367d33119db96c6cb639935b01d32ab1f1d0aaa1c41b7ea3b12e1c732e474de519cb50b2d6
-AUX systemrescuecd.grub 1910 BLAKE2B a2ff7040952b39f61c0c8fb4e2e61741abcc9190d444399c5872641ec5c55ac6acf573ffdfc6c0b86f57103a227639c2d57c95e0e9272ac82abf4272b2ecfd50 SHA512 34c8f4445589d58ddf0e0088184bfdc56f8fab19bbffc2cf0ac2646710eefe8b654066de196b3eb18377198dba38a2fa4b9a9b89f130a15a3ac2a94b75c7366e
-EBUILD systemrescuecd-x86-grub-0.1.ebuild 759 BLAKE2B 1390bd66c583d3c5f544d3add2edd3b3bfa2217be798421d081824e68f60e86158f777c4ed29d74a01bd1e7430c3fc0d5c3198311a6d2dbdf095903b28575839 SHA512 43ea43f4532f6ef3a69089aef6ca286fba2ebfee6c1fec9295c5fb37eb6c1c350de67fd37ccb8c2c428ed7cc2c8a18ca1cc83a4db2ea21f4dbf71fbf0e8d7900
+AUX systemrescuecd.grub 1910 BLAKE2B 46a3bf8c61e47e1f6eb3223ae44a2ac2e668603cb3ab1ab1fef7ee8626b365b8ac4a5f03f37b871f4b45952c33f7c940c1d20a317b759a1a90950a77eb54e21d SHA512 955a0fb35a034e60f005cbff27fc95e77622a0481d8111b3ee9981dbf0df4a6aa01f0e65307f98acee754dfe050b5e2cf2529b74a6f22f16e4f9164de359a915
+EBUILD systemrescuecd-x86-grub-0.1-r1.ebuild 751 BLAKE2B e6d0ec0b5efc360a33a1ae9a89d4636d6d180a62deee0473ac45095f21cf9df9071c11b43dcb3e8efd895c0ea358d857438e25da04abb0fede9c774bd13ed43f SHA512 bd7e7b3aba56c64d3d624f6b1f1108452f79836a3fdcee6b782272647025108218b71fc6c980c1482613cb23234107b2674bc73d57272e200ac4b161d7091911
 MISC metadata.xml 610 BLAKE2B 2551878a7515db26498bab29653547aeef039e47292780ad7725606a618ca71384195e5b1e70e65e17085bae3651ee2602aef1e1479f47495f7efb783ac73816 SHA512 84101ca441d24894df8063a2d82ecf7f516bb6c3255d6b147b1448e27874f2ff634c5822f925a6648010fa83c6e75d60159237a44b99cd5a031e19174a17295d
diff --git a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
index e9695c4b4821..269b1eb76adb 100644
--- a/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
+++ b/sys-boot/systemrescuecd-x86-grub/files/systemrescuecd.grub
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 . /usr/share/grub/grub-mkconfig_lib
@@ -32,28 +32,28 @@ if [ -f "${srcd}" ]; then
 submenu "${longname}" --class submenu {
 	menuentry "${longname} (32bit standard${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/rescue32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (64bit standard${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/rescue64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (32bit alternative${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/altker32 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
 	}
 	menuentry "${longname} (64bit alternative${bootops}" --class rescue {
 ${grub_string}
-		set isofile=${srcd}
+		set isofile=${path}
 		loopback loop \${isofile}
 		linux (loop)/isolinux/altker64 ${SRCD_BOOTOPTIONS} isoloop=\${isofile}
 		initrd (loop)/isolinux/initram.igz
diff --git a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
index 3a5d11ae858b..80a820419133 100644
--- a/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1.ebuild
+++ b/sys-boot/systemrescuecd-x86-grub/systemrescuecd-x86-grub-0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Grub menu entries for the .iso image of systemrescuecd-x86"
 HOMEPAGE="http://www.sysresccd.org/"
@@ -10,7 +10,6 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT=0
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S=${WORKDIR}
 
diff --git a/sys-boot/woeusb/Manifest b/sys-boot/woeusb/Manifest
index 9260d94a3858..b20cfcb33dac 100644
--- a/sys-boot/woeusb/Manifest
+++ b/sys-boot/woeusb/Manifest
@@ -1,3 +1,3 @@
 DIST woeusb-3.1.5.tar.gz 399712 BLAKE2B d52b29249af680577299a02cb9a2c1436aef73a0240bff2525c494657c197a2fc0709e0ff6f35eb5d18592145347af284a998deacecff37effd95b75ab13bc9a SHA512 5cf4eb45b126d71bcb376148383faf9713bc06ec4ee3ccc2dfa6528d9fba382bceaae2cdd47f2d8ba775dad1ca8e6258af40fc6362336927894398193600c965
-EBUILD woeusb-3.1.5.ebuild 1038 BLAKE2B 37b0cbbb3becf15978702f8dd0e8d9d4deca181ccac043ba4448b8622d058aaa0f849fbebfb43f7b5c513749c4cf7383e0790d0501904d6569dc14361f18cde2 SHA512 5aa5d30c887963f1d4b6b7a1efec47635f2275c2fd8e1434360cd336f699e5b7e4df66b3aff19852eeb7150236a43d67b12ba4e681436f551939d084d5756c53
+EBUILD woeusb-3.1.5.ebuild 1037 BLAKE2B 92407e8c3cf98ad238afcd2fc9f571f03c92104f639d588cfa439bbe83d9186c905cb830f76f34ab4e496d181a61a5ab0d72c1012c7c49924e0feefbf614c755 SHA512 3498557fc17d2c77e03997ae998376ef337196848c84eafe5cb5e928fbc2bd49ba2ca324af5a19898fe89fef193c76e10962c20f21d693b18f6b18e18370dc79
 MISC metadata.xml 280 BLAKE2B 6e0485a0da47b477f5276aa17735ff1e9b269dbac220b12c615a80a2ad5a7a6f88aa5bcc9bd715355b5687ba50d78bb0cc45d1ef0ba82c52111691b895cffc8e SHA512 af2aa2fda44a73779e31b805313371a2cb6b9ab2846289a73083074fbff99ea1e7da2fefeaccf13b5f11c4c55b6ccb38390f21eab3f4ac1a61e00914ae38fff9
diff --git a/sys-boot/woeusb/woeusb-3.1.5.ebuild b/sys-boot/woeusb/woeusb-3.1.5.ebuild
index d1da40809082..803545692f5b 100644
--- a/sys-boot/woeusb/woeusb-3.1.5.ebuild
+++ b/sys-boot/woeusb/woeusb-3.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slacka/WoeUSB/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="minimal"
 
 RDEPEND="