gentoo resync 08.09.2018

6 files changed, 8 insertions, 333 deletions

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 98ea442c5f59..d669c62c9c10 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -13,13 +13,11 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
-DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
 DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
 DIST busybox-1.29.1.tar.bz2 2304866 BLAKE2B b8fb576507b952c241f733b76980a246fc0fad0bb5c97fe39a63d7e780e9934fae325d27e997641250248d1c7dc9f480ed42a09fdfc9b0bedc9eb909137c6ca9 SHA512 4506c149abb9ce0d98c75ee1f73d2915b124b8d1975cd9d20b9cd894b47226ea492c4fa802b28cfaae3082991fb7ab127f2376713401545ce4aea8810c36da76
 DIST busybox-1.29.2.tar.bz2 2305093 BLAKE2B 04344bab3dbce6ff01746ce60c7966a883af42987cbc3ef43c9a4c831872aaf5c2727e3ed89e2c8f71f547a7f2cb87b31a302367546cb5149c6f65cd9023a663 SHA512 16191a0773f51fb53ba54765813754982621e0ab391a1d07f66a3fb52d28c567ebff019e39f151cdf29f3c878d691f0fb7cdb4cb67e29b732d45224953c5d70f
-EBUILD busybox-1.28.0.ebuild 9290 BLAKE2B bb09b1b547fcdefed76ef91c549a4865a807707376f8d100f97585661b4d57a25b628cd62d572b509495be61b787cdc40192ec11152979318a4e78a7a93497f8 SHA512 9b59a7ae3585432c9ac89eedd0fbcfdd9782f429d171eca6c8856a6181f4976a2733b4128e02b9fb3b81cf69582483bb1eecc4184f23679236c437df3a3be8ff
-EBUILD busybox-1.29.0.ebuild 9294 BLAKE2B 5718003244b0d4b4a6fb4cb357c607406ac1549d8fcb7020defd274570ed23204196b75223eb2034d0f44e098fdfb1a8b84bf55ed928cfd772f20bba02b3ee9b SHA512 dc614c110c37a32d5baa39610d2d805982b412dcb9cc6c7a77dd671b3207a256e523b08b3364bdee4220fd9c38d2e13f139134f6dd04ef21b3b6fae5a495c834
-EBUILD busybox-1.29.1.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
-EBUILD busybox-1.29.2.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
-EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
+EBUILD busybox-1.29.0.ebuild 9283 BLAKE2B 3be1ae9bfc0a48820d9c10dbb860f89a6820705ecf5e72bb90293fd92030f1a6b5db5a53f2b88e0659598584b0368208b18c25a7c4e6db4d4847cc537aba9d02 SHA512 92e340e82758fd35734efa042d65ea3b0214aab6565eb7c54f2ad33c56738ae297741dc5c4f6083926c1bd348fd767675401cd58f1ac37b059fc45e652a21595
+EBUILD busybox-1.29.1.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
+EBUILD busybox-1.29.2.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
+EBUILD busybox-9999.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
deleted file mode 100644
index 22dbcd657e39..000000000000
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-src_prepare() {
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#	epatch "${FILESDIR}"/${P}-*.patch
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	dohtml *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${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."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.29.0.ebuild b/sys-apps/busybox/busybox-1.29.0.ebuild
index 0a9ed10874c1..216ef19212c8 100644
--- a/sys-apps/busybox/busybox-1.29.0.ebuild
+++ b/sys-apps/busybox/busybox-1.29.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.29.1.ebuild b/sys-apps/busybox/busybox-1.29.1.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-1.29.1.ebuild
+++ b/sys-apps/busybox/busybox-1.29.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.29.2.ebuild b/sys-apps/busybox/busybox-1.29.2.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-1.29.2.ebuild
+++ b/sys-apps/busybox/busybox-1.29.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index ea0b4ce81fb0..4d493a7ed4f5 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only