gentoo resync : 25.11.2020

4 files changed, 8 insertions, 8 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index b742b0516257..9b8c09e29a2c 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,7 +16,7 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
-EBUILD busybox-1.31.1-r2.ebuild 9531 BLAKE2B 9b590ec44931fd6986385210681f607ab85f68ac5fc50cff9a31d6619735eb2b9c287a8d9a1917cd5e0f33ec0e89f1cc1ba0ee675f418d7853055273b1710a40 SHA512 c903448a82ce2889e203731aec408e93e89879ae935e5955b9ed2871662afcf3615d427cdcf5f0e206ac72defbb18f5c4bddf890f1f35c6af1f20f5d947226e3
-EBUILD busybox-1.32.0.ebuild 9495 BLAKE2B f0b5bbea9274936236b75b646726fc5bd5f95857aaccc702aad8a6ae16696399532dcf3dc75904c88078e914817027a041c372bc04815ab57e518bde1a3354db SHA512 c26f045878d30ed97c08686e77e7411ef5f3712208d6a4330900cfcc40885016739aa428e7ae82ae5bef80a27ca067efe9e6cf3d1be537b1973c7b30c2062b0e
-EBUILD busybox-9999.ebuild 9438 BLAKE2B fdfb82402864e50f294dffc3b93f06d1fec142734918ccf9042d520098e803deb4c14095fbe4f6b2c536e8a3b58066ce217e78ff277adecd1535d90fb20713ca SHA512 b718d6272b43efa50d38064cffed0a284c4d70e351642da996ed759bbe4e9de1119b645c0adb1349782635661aa5bcb76f1f71ae85bbf52c9730a6967d4a28fd
+EBUILD busybox-1.31.1-r3.ebuild 9529 BLAKE2B 1d46cd6f67af9ea4152607af1779f901c7c72779e8147e5408b3702b77e4a3e67f6c4b6e8e7d5968ba7b94e44809587d33662fe5516a870e7990a9ca7f6341fb SHA512 299260cb9e3d3127aaec5c0c71bf589a0deb5812c6337a1f16a5d1ae28d4370e41b1784bcb7097dd9bf3560423a8d2390001839ca0b1e0f67e6bf9ceabfe50d2
+EBUILD busybox-1.32.0-r1.ebuild 9493 BLAKE2B aa5309a1dbb2e863bdc820207c28f07ee0ec33b433508745d5df18e04623b08605564f22b347d908cffac38c832992482d4984e598c0a919e80e851a2754c9c8 SHA512 67025c4610d71461c775107f6fc391e574e1e9efc8298c7c198a89476b32e42e5c26a59c693a14cde7a6b0e630b0b5d1de2b0f4ec5f28fe8a77163e138e70a0b
+EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild
index 8457f9229a41..ad50d096b749 100644
--- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-r3.ebuild
@@ -303,7 +303,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
 		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
 		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
 		ewarn "If you are creating a binary only and not merging this is probably ok."
diff --git a/sys-apps/busybox/busybox-1.32.0.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
index e4d93e71de3f..6d7a58111698 100644
--- a/sys-apps/busybox/busybox-1.32.0.ebuild
+++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
@@ -302,7 +302,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
 		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
 		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
 		ewarn "If you are creating a binary only and not merging this is probably ok."
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index bf29c9fb1d87..a82a8aa33318 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -3,7 +3,7 @@
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic savedconfig toolchain-funcs
 
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	mdev? ( !<sys-apps/openrc-0.13 )"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 busybox_config_option() {
 	local flag=$1 ; shift
@@ -298,7 +298,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
 		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
 		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
 		ewarn "If you are creating a binary only and not merging this is probably ok."