gentoo resync : 22.01.2019

58 files changed, 395 insertions, 1699 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 179f50ac6e84..0beac10bac7c 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2a3017db89d9..c78a970d26cb 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -15,7 +15,9 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
 DIST busybox-1.29.3.tar.bz2 2305384 BLAKE2B dffb26be6d21faf87c7443f233468ec88430a5e4176855c8eb32303eb3e457c63bb7bfa55b59f9fd9da573dceb1cb44815149e90c6d67f2f5e3595fab9eb4ef5 SHA512 bf90e24b4564071e0ac2785e2ee4ec4ea0e229a1ff330bb38befe7a27c5a529e7b0657354ce731473814325a27a0c181ab922e0a0a89d5023ba08a6d80472297
+DIST busybox-1.30.0.tar.bz2 7586319 BLAKE2B ffb2b156ec1b799351906cd373cee876d16756fdd885fa4874874cab944583d54a4c1ea05539b01229b5aa3dd6f2e06f0655d72574f24d8d01a5e580e09e2930 SHA512 c494278f6655cb855e8bd3a316d77b879cf6ee70fa5b0408705391b1108f298d45ab4c2921d939c17122f50c4a9d7b5c77e57bacf5e6c7ac4dc4f78c1bd70a79
 EBUILD busybox-1.29.0.ebuild 9283 BLAKE2B 3be1ae9bfc0a48820d9c10dbb860f89a6820705ecf5e72bb90293fd92030f1a6b5db5a53f2b88e0659598584b0368208b18c25a7c4e6db4d4847cc537aba9d02 SHA512 92e340e82758fd35734efa042d65ea3b0214aab6565eb7c54f2ad33c56738ae297741dc5c4f6083926c1bd348fd767675401cd58f1ac37b059fc45e652a21595
 EBUILD busybox-1.29.3.ebuild 9422 BLAKE2B a9e05d66e73612b76d290cb5e4defb6013a7d4adebf245f8330c1a128de30224f7c0361c8f701a45f02f63cd9c7cc6d2a2bf4be2b269959b855f90b9d572e1b7 SHA512 95718f919a1bbdd831c08dea60f8ee428e8ed24ada98af1489d365035df23325fca640935b567b7065ad383bf24ff4a828eea23ad90e8c9d572492ec40a2d601
+EBUILD busybox-1.30.0.ebuild 9328 BLAKE2B 5aa9db09c304598af10e582f9e0020736daa881c8bdfd419cd1cd09fdaa37cd06c8ed2d08bdf3e2f8c9016b91baa8855727d15deb830b3bd4a384cc94dc53350 SHA512 5499dc6f7aac5b1754b200c394c7d495bdea87761ee992aaea7b5478b2c0411c117cb5351acbc8d623a6c00ae05c0100e7eebb09521dd91ec7c742b1e64af98f
 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.30.0.ebuild b/sys-apps/busybox/busybox-1.30.0.ebuild
new file mode 100644
index 000000000000..f091f9def62d
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.30.0.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+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=""
+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
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	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
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# 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
+	docinto html
+	dodoc *.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/coreutils/Manifest b/sys-apps/coreutils/Manifest
index c56741d407f2..fb1a200defe0 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,5 +7,5 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 EBUILD coreutils-8.28-r1.ebuild 6502 BLAKE2B ed8697eed803159031c3a27bf22b299645742ae31cd0368930013ce8b58520c5d0e2ba4ec8435e05d7418c5e02046ff87c8b50f3ffa6bb7fa350338321063c6d SHA512 5478466f2dfe3060a660eefb1d307025c5bcd14eff5d0f248c5d6c9630d32411c2a45843d5d53f4c28a5e583e031a7a2d0f6b7a45cd11670e95c4dd9a6786885
 EBUILD coreutils-8.29-r1.ebuild 6149 BLAKE2B 3359149bb1b0e4868a0ead9d0a3aae236719cb473ed849ed949357eb96c4ae05655bb04a65f304a90589460efd430cf0090fa50e944d3e040302cc02a377ed58 SHA512 28308eea90dedb4b7141ab467540afb37ff38b5b6a38ecea9a75d0f654eea88b5a024cc2d853874efaf6d97761bd05e36e198d87639e87e088eedc244810ea21
-EBUILD coreutils-8.30.ebuild 6160 BLAKE2B e9b78b70c7af69174282ceab08462b7a1b482d45a927f5653f35a5487508b290a595b732e5ca7ede24bcc553b1c082d9a8edd66adbf4d48de6e6cf84ee9d30a2 SHA512 5edf497f202518748f411c8e0a4a32a0cb4870f5a2f26dae04fcb42a205f18c218d19e4cc39cde34d2f79bda0d788d8f543252712d207d95cf146681265bd2a8
+EBUILD coreutils-8.30.ebuild 6156 BLAKE2B b1c94d85ded27bb6c55fbbfdf45258da866e91a3bd50da9b9c388478dccfaba48b7a2a9a34d021bb3adeaeca6e3bda3f6e8c799acfd74ef46980eaa36d5cd3f9 SHA512 f7cb6ff75a71a7e45b808e24e0aa742c217d89ed7120fcc9e5897545328d839e70290b212bb7a0eea841faba2d9bd0b4f334c00622ce679d3e8e9059941d43ec
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index f77dd6933f3a..31b1c333ff23 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 6d58ddff4376..6b1c75732a23 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,8 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
-DIST dbus-1.12.10.tar.gz 2073510 BLAKE2B 27ecd31e2535666a06cb77ab8df4f4a0990e21d43bc9e18e62f2385b9c05515a2f7ea452d4a376ecb4f764379c05235c908cd6392303300b1ff14d9cfeb25554 SHA512 36a16393af6630c32474b971fb8864ded0fb5fe08c5ff5243a4ca312b95af4f20335c5f166b72526a0b8162c1ccfe6542ad6953c5d21a0542d920d7cb4a9ac76
 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
 EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
 EBUILD dbus-1.10.24.ebuild 7373 BLAKE2B 21ad1bff164e2e67786c1e9b7f74c5c9772316429763bf2dc597c2c85fe6b3706d6f87c20cbfe55c0f297dc99342bc58c6b2ab7e443dfefe1d1b4652c9de3bff SHA512 b820553d81073c0bfd754c56014a40639d26ccf6a42c967f97c74c7c4d71be96b5b534f616caded46774d5d29693985fffdecde10d401f30803b39da4400aca1
-EBUILD dbus-1.12.10.ebuild 7439 BLAKE2B 16efc9593e81017f0240d83353a5c5ddfa164ac2025bede136db78fc01018a598ebb935489cad5a58b4d12b1c6e2db7937968eba891034a327a4a8db33023dcc SHA512 69e05a16ad00c4abd3ea535ce0b9c39ce9269285f859a782d30019a847293dcaed666a48ce0068e33d593b6ffc75bd90880a6c9cf487ec7727e239d46cf55a47
-EBUILD dbus-1.12.12.ebuild 7722 BLAKE2B f9ad88ff728286cf74f223ffe008502ea2269b9bad9a3ef36546811f61a62ab0610046e44243c209f5ce2be3c86c7ffe954ac3498a483cc753529f6dd83bd204 SHA512 85bb3c3f4e4811c5dbc7fa31a21d6273ea9ddbff3e7afd32007e531ce90c3cebc18670b2414c54707326c5372f4ba831dade01d7e9bc2c9bff5b99691d7d5934
+EBUILD dbus-1.12.12.ebuild 7871 BLAKE2B 525ba456389035b775f0551c0f59a5ab58efa223764ad69285d50af489058dbd1ce24b1d85a5dda1b732e16359ade9d52fef3357f6944ff7c42b20e5da95666c SHA512 0e87e63a2ca596c959ed778acd2af9052476ff949a790e1a74bbc928c71d23f0780cd6de744e0c79a0959f1fe0504b65c0aada91d2c5f937841ce9e8e6b66323
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.10.ebuild b/sys-apps/dbus/dbus-1.12.10.ebuild
deleted file mode 100644
index c3168de14875..000000000000
--- a/sys-apps/dbus/dbus-1.12.10.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
-
-inherit autotools linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
-HOMEPAGE="https://dbus.freedesktop.org/"
-SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
-
-LICENSE="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug doc elogind selinux static-libs systemd test user-session X"
-
-#RESTRICT="test"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	test? ( debug )
-"
-
-CDEPEND="
-	>=dev-libs/expat-2.1.0
-	selinux? ( sys-libs/libselinux )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-"
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/expat
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.40:2
-		${PYTHON_DEPS}
-		)
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-dbus )
-"
-
-DOC_CONTENTS="
-	Some applications require a session bus in addition to the system
-	bus. Please see \`man dbus-launch\` for more information.
-"
-
-# out of sources build dir for make check
-TBD="${WORKDIR}/${P}-tests-build"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-enable-elogind.patch"
-)
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	default
-
-	# required for bug 263909, cross-compile so don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--disable-apparmor
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable elogind)
-		$(use_enable systemd)
-		$(use_enable user-session)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-session-socket-dir="${EPREFIX}"/tmp
-		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
-		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dbus-user=messagebus
-		$(use_with X x)
-	)
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=(
-			--enable-launchd
-			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
-		)
-	fi
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-elogind
-			--disable-systemd
-			--without-x
-
-			# expat is used for the daemon only
-			# fake the check for multilib library build
-			ac_cv_lib_expat_XML_ParserCreate_MM=yes
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}" || die
-		cd "${TBD}" || die
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	fi
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if use test; then
-			einfo "Running make in ${TBD}"
-			emake -C "${TBD}"
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	DBUS_VERBOSE=1 virtx emake -j1 -C "${TBD}" check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/dbus.initd-r1 dbus
-
-	if use X; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d
-		doexe "${FILESDIR}"/80-dbus
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	readme.gentoo_create_doc
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EPREFIX}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		local plist="org.freedesktop.dbus-session.plist"
-		elog
-		elog
-		elog "For MacOS/Darwin we now ship launchd support for dbus."
-		elog "This enables autolaunch of dbus at session login and makes"
-		elog "dbus usable under MacOS/Darwin."
-		elog
-		elog "The launchd plist file ${plist} has been"
-		elog "installed in ${EPREFIX}/Library/LaunchAgents."
-		elog "For it to be used, you will have to do all of the following:"
-		elog " + cd ~/Library/LaunchAgents"
-		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
-		elog " + logout and log back in"
-		elog
-		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
-		elog "specified and refused to start otherwise, then export the"
-		elog "the following to your environment:"
-		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
-	fi
-
-	if use user-session; then
-		ewarn "You have enabled user-session. Please note this can cause"
-		ewarn "bogus behaviors in several dbus consumers that are not prepared"
-		ewarn "for this dbus activation method yet."
-		ewarn
-		ewarn "See the following link for background on this change:"
-		ewarn "https://lists.freedesktop.org/archives/systemd-devel/2015-January/027711.html"
-		ewarn
-		ewarn "Known issues are tracked here:"
-		ewarn "https://bugs.gentoo.org/show_bug.cgi?id=576028"
-	fi
-}
diff --git a/sys-apps/dbus/dbus-1.12.12.ebuild b/sys-apps/dbus/dbus-1.12.12.ebuild
index c8f41d7c003a..ff2be5242806 100644
--- a/sys-apps/dbus/dbus-1.12.12.ebuild
+++ b/sys-apps/dbus/dbus-1.12.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,10 @@ CDEPEND="
 		x11-libs/libXt
 		)
 "
+# autoconf-archive-2019.01.06 blocker added for bug #674830
+# Please check on bumps if the blocker is still necessary.
 DEPEND="${CDEPEND}
+	<sys-devel/autoconf-archive-2019.01.06
 	app-text/xmlto
 	app-text/docbook-xml-dtd:4.4
 	dev-libs/expat
@@ -87,7 +90,7 @@ src_prepare() {
 		# fix standards conflict, due to gcc being c99 by default nowadays
 		sed -i \
 			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
-			configure.ac configure || die
+			configure.ac || die
 	fi
 
 	# required for bug 263909, cross-compile so don't remove eautoreconf
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index ab33b8072c5e..6530656ae883 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,4 +1,3 @@
-AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d255571377d7c711bd90cd0ed710016929d7b9a68934d852fc9c9410b73e144259a2cc2264b2751ca444403b9ae37c065 SHA512 ad0cff0aea2ac560b3c0171141b6d1975d2ffb8684a20697464471355cdb161dea5967b72732b4de5ff9375a2ba2f29aae532967abe5311820de817afaf354ba
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 EBUILD diffutils-3.6-r1.ebuild 1238 BLAKE2B 346154ef13cb04dc0007980ba09be2414b8cae8b03d8a3bbb14c7b1313caa2fcd48e4f313cc3671485f3c78045c9d5e023e32a36d6caafeff97c0c879c6fd769 SHA512 ea936a476f43c18e1149bfbb7eb025d8d99b8de1487ade5a81473b1bf4f9b4f9903254bcd1d2fea173e9400def7d712d3ee2c9eb9c3dd06ed58e46738f159092
diff --git a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
deleted file mode 100644
index ae820fc372ce..000000000000
--- a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/intprops.h?id=175b4e22f99e00996b72f822f5ae54dca8243d19
-
---- diffutils-3.5/lib/intprops.h
-+++ diffutils-3.5/lib/intprops.h
-@@ -230,11 +230,11 @@
-    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-    that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-    __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-    __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-    __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 0327dba91261..1d8092b26402 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,5 @@
-DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
-EBUILD ed-1.13.ebuild 910 BLAKE2B bddb91d370a5cc478d584f002cbfedc1a87ab36a341994e7a9f3a554d3d6c6439de89b50d0489dfba4637c4aba52ce55d0797470581d9c6dff07d0cedc13e2c8 SHA512 0871616d130d1ccade2ca980e01f096fc3191bfad6a506bdfcc9a4506b039852ce4f4b86c564fb8efad726f7b77930830d8358ebf607d53541e149e9474456bc
-EBUILD ed-1.14.2.ebuild 923 BLAKE2B 41c6316b1d3b1c9712b273c1747488eff8895d8f886f0724d04714fcd730d67e7495a3931c74eee04e9cec0ed4374b59dc9c9451ff11c103d77fa916abd7cb32 SHA512 2235580f4da91e1b283bf5d9d013911bb09a14a02d92c89c93a689b1c24b598799e48dc5782456ae8c0d7ca6df2ae40d8bca109c7176fc01a25f9cd9a8483ad5
+EBUILD ed-1.14.2.ebuild 919 BLAKE2B 6296135daabd5e22d5bcfe9c485ee55d14d3cfa832c8a1570c1931fe511ea6ce9f43ff5abac83f08724b723eb0201891c4c8382f2931b919e46c05708d957e2e SHA512 6578fc87f934c94b3c38beac8cdf382597c7e9f8be91298882a49db3a4fed0b215c16cb43f1e9e09535673bacc8c9a09096d26b355308e8f332655e19e780e1d
 EBUILD ed-1.15.ebuild 940 BLAKE2B 37341d4509e86c36756185ad5a699f1288bd1362e9407a992164ceba3eb503ad0e2440ca3077c81d6ad8e6f59b0d2612a8652d2122b7cb4f8a93808ab2815abb SHA512 2e87bda21820a963209df0391dcb77d43f7ecc455b3250c36101b2bd6aa3d331a4cae5337a9354ac08b418936d9193b2942d01a8b160703f8e91a90c5733654d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.13.ebuild b/sys-apps/ed/ed-1.13.ebuild
deleted file mode 100644
index feaa1b77c26c..000000000000
--- a/sys-apps/ed/ed-1.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="Your basic line editor"
-HOMEPAGE="https://www.gnu.org/software/ed/"
-#SRC_URI="mirror://gnu/ed/${P}.tar.lz"
-# Using gzip instead -- the filesize diff is small and lzip uncommon #545344
-SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-src_configure() {
-	# Upstream configure script is moronic.
-	econf \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		--bindir="${EPREFIX}/bin"
-}
diff --git a/sys-apps/ed/ed-1.14.2.ebuild b/sys-apps/ed/ed-1.14.2.ebuild
index a0e545705c99..df31a0a9c4df 100644
--- a/sys-apps/ed/ed-1.14.2.ebuild
+++ b/sys-apps/ed/ed-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 30047aee1a03..de0db59c8977 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,12 +1,6 @@
-AUX findutils-4.4.2-gnulib-date-x32.patch 1210 BLAKE2B 21c799083621d06e0505b8dba2a166d9136b4dd8b7be8053850d6051008300c601c28301f4932e17188ab24dbfff7c580a92954aab50adcc6ea7ac3b6d525266 SHA512 51bd15305d12a93f2a83faa359d1a2501fd96dea2c8dbed25cafa60c5d7f17b7a86d2d7dd0095dc0a6e0c1e9eaf2775bc6e1ceaadbdf5e2ffbaab6a4a4b9ff60
-AUX findutils-4.4.2-selinux.diff 15603 BLAKE2B 9fac4cb7a522cdce1c13ed4a7b60bba5d1778b0ec4b07e8e8b77461eece3373d516b4711749e531f951b5d95f9bf0594b569dbc54778b7ba305fa3add120608d SHA512 5fb4346b56cab0a470358e75c4c4a57f6709f7a987b1e6887242b9a4f241590adcaba7061d71752a5d2f8ac3598ecc1dffdb92b2bc072f5f31152088b88ed7f9
 AUX findutils-4.6.0-glibc228.patch 14434 BLAKE2B b125febb478b1abd7db298b6faaab139f6efb0ccd975d7f0abb1270eddc9e8cef20461d8f2aecb15adb74af54cfa6672c3b6b3eb13d8e7a2f502028c0060880c SHA512 ee02f9664e7f59dbd8a57e307f09ffbc8a383cef6ab4ddf0a1e79baa860ef5740120aaebeff7fdded1adc8b1d16b79bd4aec04d05653fa4f5f73619271ae7cab
 AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
-DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc465c884417531d56bda6dcf35746ec9c25f940ec660d83431787b88a3cb6931382326fdc3ab82575f236e9543163 SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1
-DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
-EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
-EBUILD findutils-4.5.18.ebuild 1554 BLAKE2B c2fb2c7c3c49673adde0b9dfb136a05fa980cf47e0d5b8ff677883b580fe10e759ab87f808f249d5ea385645913f8a8cbc0e1f18cc8885e3aa57e9dd4e2d7bf9 SHA512 87e20215836682aaa186507908548737c25befa31d600dc144f5e1be93a580e63b467bbd24a483a2ba393324cdc91f399584a225d427e616417b056f952a875c
 EBUILD findutils-4.6.0-r1.ebuild 1954 BLAKE2B a7e0dcd9564f3a2f4c5bd744acd131105898ee3f18e667c427bd2a411da9773fbd198f3ca8eeb14dba735546ddb962fcebc058a1077bb192d3274e0678a81a58 SHA512 319fccfcb878b2db2b9d5845ecaa0e447253c9e5df2ecdadb2d57d089a9b71be7e7497e9872e4d44e232110e0d7ee534ef4dc60414553d14a71cc2395bac5a61
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch b/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
deleted file mode 100644
index 9ff86f6b84a6..000000000000
--- a/sys-apps/findutils/files/findutils-4.4.2-gnulib-date-x32.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-newer gnulib has rewritten these checks in a way that works for the x32,
-and for the targets we care about, these checks won't return false.  so
-just drop them to make our life simpler.
-
-https://sites.google.com/site/x32abi/x32-patches
-
---- findutils-4.4.2/gnulib/lib/getdate.c.x32	2009-05-10 14:23:57.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/getdate.c	2011-12-05 11:41:18.130675712 -0800
-@@ -114,7 +114,6 @@
-    wraps around, but there's no portable way to check for that at
-    compile-time.  */
- verify (TYPE_IS_INTEGER (time_t));
--verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
- 
- /* An integer value, and the number of digits in its textual
-    representation.  */
---- findutils-4.4.2/gnulib/lib/mktime.c.x32	2009-05-10 14:25:13.000000000 -0700
-+++ findutils-4.4.2/gnulib/lib/mktime.c	2011-12-05 11:49:38.368589386 -0800
-@@ -166,7 +166,5 @@ ydhms_diff (long int year1, long int yda
- {
-   verify (C99_integer_division, -1 / 2 == 0);
--  verify (long_int_year_and_yday_are_wide_enough,
--	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
- 
-   /* Compute intervening leap days correctly even if year is negative.
-      Take care to avoid integer overflow here.  */
diff --git a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff b/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
deleted file mode 100644
index 66c9c412a0af..000000000000
--- a/sys-apps/findutils/files/findutils-4.4.2-selinux.diff
+++ /dev/null
@@ -1,464 +0,0 @@
-diff -purN findutils-4.4.2.orig/find/Makefile.am findutils-4.4.2/find/Makefile.am
---- findutils-4.4.2.orig/find/Makefile.am	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.am	2010-04-25 03:58:33.762402367 +0000
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- 
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c
-@@ -26,7 +27,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = . testsuite
- 
-diff -purN findutils-4.4.2.orig/find/Makefile.in findutils-4.4.2/find/Makefile.in
---- findutils-4.4.2.orig/find/Makefile.in	2009-05-16 15:28:13.000000000 +0000
-+++ findutils-4.4.2/find/Makefile.in	2010-04-25 03:58:33.762402367 +0000
-@@ -275,7 +275,7 @@ CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFAULT_ARG_SIZE = @DEFAULT_ARG_SIZE@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- DIRENT_H = @DIRENT_H@
- ECHO_C = @ECHO_C@
-@@ -607,7 +607,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ @FINDLIBS@ -lselinux
- man_MANS = find.1
- SUBDIRS = . testsuite
- all: all-recursive
-diff -purN findutils-4.4.2.orig/find/defs.h findutils-4.4.2/find/defs.h
---- findutils-4.4.2.orig/find/defs.h	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/defs.h	2010-04-25 03:58:33.762402367 +0000
-@@ -91,6 +91,9 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
- 
- struct predicate;
- struct options;
-@@ -315,6 +318,9 @@ struct predicate
-     struct samefile_file_id samefileid; /* samefile */
-     mode_t type;		/* type */
-     struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
-+#ifdef WITH_SELINUX
-+    security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
-   } args;
- 
-   /* The next predicate in the user input sequence,
-@@ -459,7 +465,9 @@ PREDICATEFUNCTION pred_used;
- PREDICATEFUNCTION pred_user;
- PREDICATEFUNCTION pred_writable;
- PREDICATEFUNCTION pred_xtype;
--
-+#ifdef WITH_SELINUX
-+PREDICATEFUNCTION pred_scontext;
-+#endif /* WITH_SELINUX */
- 
- 
- int launch PARAMS((const struct buildcmd_control *ctl,
-@@ -605,10 +613,13 @@ struct options
-    */
-   unsigned short optimisation_level;
- 
--
-   /* How should we quote filenames in error messages and so forth?
-    */
-   enum quoting_style err_quoting_style;
-+
-+#ifdef WITH_SELINUX
-+  int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
- 
-diff -purN findutils-4.4.2.orig/find/find.1 findutils-4.4.2/find/find.1
---- findutils-4.4.2.orig/find/find.1	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.1	2010-04-25 03:58:33.762402367 +0000
-@@ -934,6 +934,10 @@ checks the type of the file that 
- .B \-type
- does not check.
- 
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
-+
- .SS ACTIONS
- .IP "\-delete\fR"
- Delete files; true if removal succeeded.  If the removal failed, an
-@@ -1354,6 +1358,8 @@ File's type (like in 
- U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.4.2.orig/find/find.c findutils-4.4.2/find/find.c
---- findutils-4.4.2.orig/find/find.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/find.c	2010-04-25 03:58:33.764899827 +0000
-@@ -1270,7 +1270,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
--  int subdirs_left;		/* Number of unexamined subdirs in PATHNAME. */
-+  int subdirs_left=0;		/* Number of unexamined subdirs in PATHNAME. */
-   boolean subdirs_unreliable;	/* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
-   unsigned int idx;		/* Which entry are we on? */
-   struct stat stat_buf;
-diff -purN findutils-4.4.2.orig/find/parser.c findutils-4.4.2/find/parser.c
---- findutils-4.4.2.orig/find/parser.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/parser.c	2010-04-25 03:58:33.764899827 +0000
-@@ -53,6 +53,13 @@
- #include <unistd.h>
- #include <sys/stat.h>
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -155,6 +162,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype         PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext      PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
- 
- boolean parse_print             PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- 
-@@ -340,6 +350,8 @@ static struct parser_table const parse_t
-   {ARG_TEST, "-help",                 parse_help,    NULL},       /* GNU */
-   {ARG_TEST, "version",               parse_version, NULL},	  /* GNU */
-   {ARG_TEST, "-version",              parse_version, NULL},	  /* GNU */
-+  {ARG_TEST, "context",               parse_scontext, pred_scontext},	/* SELinux */
-+  {ARG_TEST, "-context",              parse_scontext, pred_scontext},	/* SELinux */
-   {0, 0, 0, 0}
- };
- 
-@@ -451,10 +463,16 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_ALWAYS_DEREF:  /* -L */
- 	  options.xstat = optionl_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  break;
- 
- 	case SYMLINK_NEVER_DEREF:	/* -P (default) */
- 	  options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  /* Can't turn no_leaf_check off because the user might have specified
- 	   * -noleaf anyway
- 	   */
-@@ -463,6 +481,9 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_DEREF_ARGSONLY: /* -H */
- 	  options.xstat = optionh_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- 	}
-     }
-   options.symlink_handling = opt;
-@@ -670,6 +691,94 @@ collect_arg_stat_info(char **argv, int *
- 
-    The predicate structure is updated with the new information. */
- 
-+#ifdef WITH_SELINUX
-+
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+  /* Our original getfilecon() call failed.  Perhaps we can't follow a
-+   * symbolic link.  If that might be the problem, lgetfilecon() the link. 
-+   * Otherwise, admit defeat. 
-+   */
-+  switch (errno)
-+    {
-+    case ENOENT:
-+    case ENOTDIR:
-+#ifdef DEBUG_STAT
-+      fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+      return lgetfilecon(name, p);
-+
-+    case EACCES:
-+    case EIO:
-+    case ELOOP:
-+    case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+    case EOVERFLOW:	    /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+    default:
-+      return prev_rv;	       
-+    }
-+}
-+
-+
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ * 
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links.  If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int 
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+  if (0 == state.curdepth) 
-+    {
-+      /* This file is from the command line; deference the link (if it
-+       * is a link).  
-+       */
-+      int rv = getfilecon(name, p);
-+      if (0 == rv)
-+	return 0;		/* success */
-+      else
-+	return fallback_getfilecon(name, p, rv);
-+    }
-+  else
-+    {
-+      /* Not a file on the command line; do not derefernce the link.
-+       */
-+      return lgetfilecon(name, p);
-+    }
-+}
-+
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect.  That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int 
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+  int rv = getfilecon(name, p);
-+  if (0 == rv)
-+    return 0;			/* normal case. */
-+  else
-+    return fallback_getfilecon(name, p, rv);
-+}
-+
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default).  That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int 
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+  return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- 
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -1128,6 +1237,10 @@ tests (N can be +N or -N or N): -amin N 
-       -readable -writable -executable\n\
-       -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
-       -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+  puts (_("\
-+      -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
-   puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-       -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2552,6 +2665,29 @@ parse_version (const struct parser_table
-   exit (0);
- }
- 
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+  struct predicate *our_pred;
-+
-+  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+    return( false );
-+
-+  our_pred = insert_primary(entry);
-+  our_pred->need_stat = false;
-+#ifdef DEBUG
-+  our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+  our_pred->args.scontext = argv[*arg_ptr];;
-+
-+  (*arg_ptr)++;
-+  return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2803,7 +2939,11 @@ insert_fprintf (struct format_val *vec,
- 	  if (*scan2 == '.')
- 	    for (scan2++; ISDIGIT (*scan2); scan2++)
- 	      /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- 	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- 	    {
- 	      segmentp = make_segment (segmentp, format, scan2 - format,
- 				       KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.4.2.orig/find/pred.c findutils-4.4.2/find/pred.c
---- findutils-4.4.2.orig/find/pred.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/pred.c	2010-04-25 03:58:33.764899827 +0000
-@@ -48,6 +48,14 @@
- #include "error.h"
- #include "verify.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif  /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -230,6 +238,9 @@ struct pred_assoc pred_table[] =
-   {pred_user, "user    "},
-   {pred_writable, "writable "},
-   {pred_xtype, "xtype   "},
-+#ifdef WITH_SELINUX
-+  {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
-   {0, "none    "}
- };
- #endif
-@@ -1054,6 +1065,26 @@ do_fprintf(struct format_val *dest,
- 			     mode_to_filetype(stat_buf->st_mode & S_IFMT));
- 	  }
- 	  break;
-+#ifdef WITH_SELINUX
-+      case 'Z':               /* SELinux security context */
-+        {
-+          security_context_t scontext;
-+          int rv;
-+          rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+          if ( rv < 0 ) {
-+            fprintf(stderr, "getfileconf(%s): %s",
-+                           pathname, strerror(errno));
-+            fflush(stderr);
-+          }
-+          else {
-+	      segment->text[segment->text_len] = 's';
-+	      checked_fprintf (dest, segment->text, scontext);
-+	      freecon(scontext);
-+          }
-+        }
-+        break ;
-+#endif /* WITH_SELINUX */
- 	}
-       /* end of KIND_FORMAT case */
-       break;
-@@ -1844,6 +1875,31 @@ pred_xtype (const char *pathname, struct
-    */
-   return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+  
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
-+{
-+  int rv;
-+  security_context_t scontext;
-+
-+  rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+  if ( rv < 0 ) {
-+    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+    (void) fflush(stderr);
-+    return ( false );
-+  }
-+
-+  rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+  freecon(scontext);
-+  return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- 
- /*  1) fork to get a child; parent remembers the child pid
-     2) child execs the command requested
-diff -purN findutils-4.4.2.orig/find/tree.c findutils-4.4.2/find/tree.c
---- findutils-4.4.2.orig/find/tree.c	2009-05-16 15:17:01.000000000 +0000
-+++ findutils-4.4.2/find/tree.c	2010-04-25 03:58:33.764899827 +0000
-@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar
-   const struct parser_table *entry_close, *entry_print, *entry_open;
-   int i, oldi;
- 
-+#ifdef WITH_SELINUX
-+  int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
-   predicates = NULL;
-   
-   /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar
- 	}
- 
-       predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+      if (! is_selinux_enabled_flag) {
-+	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+	  error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+	}
-+      }
-+#endif
-+
-       parse_entry = find_parser (predicate_name);
-       if (parse_entry == NULL)
- 	{
-@@ -1434,6 +1448,9 @@ get_new_pred (const struct parser_table 
-   last_pred->need_stat = true;
-   last_pred->need_type = true;
-   last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+  last_pred->args.scontext = NULL;
-+#endif
-   last_pred->pred_next = NULL;
-   last_pred->pred_left = NULL;
-   last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/findutils-4.4.2-r2.ebuild b/sys-apps/findutils/findutils-4.4.2-r2.ebuild
deleted file mode 100644
index 3208b910b590..000000000000
--- a/sys-apps/findutils/findutils-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.4.2-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
-	mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gnulib-date-x32.patch
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	program_prefix=$(usex userland_GNU '' g)
-	econf \
-		--program-prefix=${program_prefix} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		--libexecdir='$(libdir)'/find
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# We don't need this, so punt it.
-	rm "${ED}"/usr/bin/${program_prefix}oldfind || die
-}
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
deleted file mode 100644
index 355715d5cb12..000000000000
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic toolchain-funcs python-any-r1
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="https://www.gnu.org/software/findutils/"
-SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls selinux static test"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	program_prefix=$(usex userland_GNU '' g)
-	econf \
-		--with-packager="Gentoo" \
-		--with-packager-version="${PVR}" \
-		--with-packager-bug-reports="https://bugs.gentoo.org/" \
-		--program-prefix=${program_prefix} \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_with selinux) \
-		--libexecdir='$(libdir)'/find
-}
-
-src_compile() {
-	# We don't build locate, but the docs want a file in there.
-	emake -C locate dblocation.texi
-	default
-}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index d07a6cd23720..ec73de054698 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,6 +1,6 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
 DIST fwupd-1.2.2.tar.gz 1768003 BLAKE2B 83d91761b7dc71296def8a88eb356df687906278ad6e351dffce246a1473de4a141e84e959dd4a785a36a846fc6884d4c83f512e8ea96d7f1b8f9c5dd438d784 SHA512 34221c905a75f4b6d9ee66bc08a2ceb0d65debb71771b8e0eeed26593dff4f29a4080b7c3164535e862f91f370bb519ae2761dc1f62c6b6de3c6c51ef5f0af65
 DIST fwupd-1.2.3.tar.gz 1768734 BLAKE2B 898f0cf3d86295840ad3f5a3736d9b0aedb61f678ca10d93bbbd9240513ae09a2d8941e3d6844024a20652eec487c7237dea5e6813d8d7c969d2998a970d23c1 SHA512 fc4fbb3778f9ed82eec4f05905d611f34344fccd78d199348b9f8ca83fedc48d1503fc77eb0b85026d77f5f83de5f609d97d0a0c008f3280b0a97e942000ba59
-EBUILD fwupd-1.2.2-r1.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
-EBUILD fwupd-1.2.3.ebuild 3282 BLAKE2B 257fa81a5b3f120ea7a40ce880755314fa22310ce5cbf21f2853ed4e59b262bf27db36a82e1f404734b439f30b44420d53d4271a507b9a2f619199f03dde108e SHA512 5455f670eae891b98e3b6175e966dbbe92d3574e86d3a5cea511d8830a46d06a44bc1ae07557513be2d0c4fdc30878e240974fb98d30bc1855260cd51f87df2f
+EBUILD fwupd-1.2.2-r1.ebuild 3285 BLAKE2B f5a51006836ec97c2d816816493916d17bd40161a720d50a5872f130b80c92439c72104707dacde5068f5b1b16013a87746f6acb83f8511ed9dbe177c8a3a8a1 SHA512 9261a3062fae6e621c650f1b20ff6a3fe60b9b7d72526c3a8cdd2931a4b722c2f41f0775b045af9615267ddd930356b50cdb91748fad0f86a6ec1ecd6c15c1d5
+EBUILD fwupd-1.2.3.ebuild 3285 BLAKE2B f5a51006836ec97c2d816816493916d17bd40161a720d50a5872f130b80c92439c72104707dacde5068f5b1b16013a87746f6acb83f8511ed9dbe177c8a3a8a1 SHA512 9261a3062fae6e621c650f1b20ff6a3fe60b9b7d72526c3a8cdd2931a4b722c2f41f0775b045af9615267ddd930356b50cdb91748fad0f86a6ec1ecd6c15c1d5
 MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
index 72cc697499b1..58920bdfbf6d 100644
--- a/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.2-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliabl
 HOMEPAGE="https://fwupd.org"
 SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="LGPL-2.1+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-apps/fwupd/fwupd-1.2.3.ebuild b/sys-apps/fwupd/fwupd-1.2.3.ebuild
index 72cc697499b1..58920bdfbf6d 100644
--- a/sys-apps/fwupd/fwupd-1.2.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliabl
 HOMEPAGE="https://fwupd.org"
 SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+"
+LICENSE="LGPL-2.1+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7157214b3d2e..1312923518c9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,10 +1,7 @@
 AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
 AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577
-AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4283aa1576ec31d3d31a13898c7d923365c1f5068c5a76e52b33bfe2b9a190c273e35fb2125788bbd56ea03b4c01965c029660464b SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6
 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28
-AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3
 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
-AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5
 AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
deleted file mode 100644
index 919249b83929..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf & libmnl based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile
---- iproute2-4.14.1.orig/bridge/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/bridge/Makefile	2018-01-07 14:24:23.350726423 -0800
-@@ -1,6 +1,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include
---- iproute2-4.14.1.orig/config.include	1969-12-31 16:00:00.000000000 -0800
-+++ iproute2-4.14.1/config.include	2018-01-07 14:25:34.406126921 -0800
-@@ -0,0 +1,22 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure
---- iproute2-4.14.1.orig/configure	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/configure	2018-01-07 14:25:49.242419367 -0800
-@@ -223,7 +223,7 @@
-     then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -268,8 +268,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -283,8 +283,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -297,8 +297,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -425,7 +425,3 @@
- echo -n "docs:"
- check_docs
- echo
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile
---- iproute2-4.14.1.orig/devlink/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/devlink/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_MNL),y)
- 
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile
---- iproute2-4.14.1.orig/genl/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/genl/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -1,6 +1,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile
---- iproute2-4.14.1.orig/ip/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/ip/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -14,6 +14,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile
---- iproute2-4.14.1.orig/lib/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/lib/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile
---- iproute2-4.14.1.orig/misc/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/misc/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -4,6 +4,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile
---- iproute2-4.14.1.orig/netem/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/netem/Makefile	2018-01-07 14:24:23.351726442 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile
---- iproute2-4.14.1.orig/rdma/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/rdma/Makefile	2018-01-07 14:24:23.352726462 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_MNL),y)
- 
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile
---- iproute2-4.14.1.orig/tc/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/tc/Makefile	2018-01-07 14:24:23.352726462 -0800
-@@ -3,6 +3,7 @@
-        emp_ematch.yacc.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
-diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile
---- iproute2-4.14.1.orig/tipc/Makefile	2017-11-13 10:09:57.000000000 -0800
-+++ iproute2-4.14.1/tipc/Makefile	2018-01-07 14:24:23.352726462 -0800
-@@ -1,4 +1,5 @@
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_MNL),y)
- 
diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
deleted file mode 100644
index e5efc9068cee..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://marc.info/?l=linux-netdev&m=151554000532498&w=2
-
-From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Tue, 9 Jan 2018 18:16:53 -0500
-Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell
-
-These files are already mostly written in POSIX shell, so convert their
-shebangs to /bin/sh and tweak the few bashisms in here.
-
-URL: https://crbug.com/756559
-Reported-by: Pat Erley <perley@chromium.org>
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- ip/ifcfg | 12 ++++++------
- ip/rtpr  |  2 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/ip/ifcfg b/ip/ifcfg
-index 851b9215ab63..5b34decd4480 100644
---- a/ip/ifcfg
-+++ b/ip/ifcfg
-@@ -1,3 +1,3 @@
--#! /bin/bash
-+#! /bin/sh
- 
- CheckForwarding () {
-@@ -7,7 +7,7 @@ CheckForwarding () {
-   fwd=0
-   if [ -d $sbase ]; then
-     for dir in $sbase/*/forwarding; do
--      fwd=$[$fwd + `cat $dir`]
-+      fwd=$(( fwd + $(cat "$dir") ))
-     done
-   else
-     fwd=2
-@@ -128,12 +128,12 @@ fi
- arping -q -A -c 1 -I $dev $ipaddr
- noarp=$?
- ( sleep 2 ;
--  arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null &
-+  arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null &
- 
--ip route add unreachable 224.0.0.0/24 >& /dev/null
--ip route add unreachable 255.255.255.255 >& /dev/null
-+ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1
-+ip route add unreachable 255.255.255.255 >/dev/null 2>&1
- if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
--  ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
-+  ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1
- fi
- 
- if [ $fwd -eq 0 ]; then
-diff --git a/ip/rtpr b/ip/rtpr
-index 192a476f817e..7e48674bcf53 100644
---- a/ip/rtpr
-+++ b/ip/rtpr
-@@ -1,3 +1,3 @@
--#! /bin/bash
-+#! /bin/sh
- 
- exec tr "[\\\\]" "[
--- 
-2.15.1
-
diff --git a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
deleted file mode 100644
index b29e1aa3e118..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.2.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.2.0/ip/ipmonitor.c
-+++ iproute2-4.2.0/ip/ipmonitor.c
-@@ -115,7 +115,6 @@
- 	}
- 	if (n->nlmsg_type == RTM_NEWPREFIX) {
- 		print_headers(fp, "[PREFIX]", ctrl);
--		print_prefix(who, n, arg);
- 		return 0;
- 	}
- 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
---- iproute2-4.2.0/ip/iptunnel.c
-+++ iproute2-4.2.0/ip/iptunnel.c
-@@ -637,13 +637,6 @@
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
---- iproute2-4.2.0/ip/Makefile
-+++ iproute2-4.2.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
-     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o link_vti6.o \
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 316b2546896e..685bfe2ec3f3 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -2,6 +2,6 @@ AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
 EBUILD net-tools-1.60_p20161110235919.ebuild 2547 BLAKE2B 15987228f0674bc75b090c8cc4ad659af1e7cc391ed730ca646d56819e0947228335afeb1f9e8658f0af39c35392d64c4089053d80da9360bdee764c197c881c SHA512 2942abff1478a4ec2de75dc41811beb09435828ac36b441da0ef693976f73031f3016e0992251ec5b0c2ad7a94ba1db53ff6293d6ab36b537475343e0b5718e4
-EBUILD net-tools-1.60_p20180626073013.ebuild 2470 BLAKE2B b85bdeb520b34fc6a5ec1dcef8d5164df39b575c12db4e3216e56d7660016856d1d4a205e0e474cf48295465394b1529f0bf330d89c4a6cc34db839fffdbbd2c SHA512 d90d37a704d73493c5f7fd72b526f7d753deea12ee0a83338749bed8dbfc507cc9d73d9537b4f62fb2107eabf165f83c669f25f4f55b14669eca1d7ecb7a5a6d
+EBUILD net-tools-1.60_p20180626073013.ebuild 2469 BLAKE2B e286d123587bfef9fb17fb5031102438c2f4c9fc45f557af8091cef45aead76b8c7e010c91aea6718fa4dfa5e3de676fdb28299c6540de0f7d5a49415fcd8c85 SHA512 194c6c2bda5facf9d41262d27d00087da6ec4466e8858df9c7c2a8c581651fe19a47c27e5e533546e0df5144158f6cb21dac25fe4dcf1fe9d9dc117f2a12879e
 EBUILD net-tools-9999.ebuild 2485 BLAKE2B 6f71c07ffe73b97c8bdca06e34d6fec1924f73e96f2e291f97372982eff2e7c031bb2b9051aa5efb1aeab5fe3ee0d84de786a137f86d067556031cb92a196864 SHA512 88d307884896a579fff1456365900411acff779ad5e034c79a8ad14e969128689d5e2b0bd4d9bbeea499d17a6aeab0c35272465b3e1230b27d9cdfa416b1020a
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index 990832ec4e73..9cc19d297130 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 4b38db765371..dc9abed5d220 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,7 +5,7 @@ DIST openrc-0.38.3.tar.gz 238031 BLAKE2B 87d1546e21d581feda4064cd64bf43f762203be
 DIST openrc-0.40.2.tar.gz 245006 BLAKE2B 9e0aab4d42121296cb9bcc47e9222e0e99df80ab686636a8060c6271d30ff7c0d999f851d0e24dfab9e7a6532b56a6a1974cfa4514e88e6b82ec5fbbc192d76c SHA512 746e238f792113397486b9abb6e41c8179e51fe823c82c8e8942d71329a806b9c398628f835e2626ed0e8735c05b0dcd1b82bf9b5111f420105eeae6b0b0e3f2
 DIST openrc-0.40.3.tar.gz 244510 BLAKE2B ed40506693c642358d46fc5fce9b3fbe6e2b699b3e3ed5bbf47ed349e5f7a5c7c1df07a7621622681af33fd68b197d48bfe4aa32e68a8231380de9a01055ced8 SHA512 65dbc5900a22c37af4aab545c52bb7679b4534755bdff0b0e8cba442a3c5fefa0b987caea74cd572dbb791e060116ecc298fd787b9d7efc8eab009b8b44ca3e4
 EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68ed18f499ee305f9e5908703f5b36228932e2b7384301021af330ac2ae5455f5b07cbcd6d5da475c042386b31fd9e SHA512 99ddc25723791ca82cd80c55790da6738b796d9fdd61c804821e3e26e4c8be5d9eeac56a9c689977008ce01f56b49319f0b5f65a5d7a08b318c9f38040553928
-EBUILD openrc-0.38.3-r1.ebuild 9774 BLAKE2B c4b2016a46b278dc7339a19b233d8b449aed6130a4d0f006964d3fc1b37f3ee6aba7b55f716bf38e2cc5fdf37e89929aedc5508708b80f878d2b1c7a9d8fd4da SHA512 f8f2e22af63449fc0220c51fefbe84d43c311e13874158740a09af2aa26c0656f90589e565e98fdf7496e7f68fa089312c76ec8fec14678a614a282a84a89010
+EBUILD openrc-0.38.3-r1.ebuild 9773 BLAKE2B 6b3d3d72351f0eef3d1adaf0aa43460be7f5c3c09a26451bb7c9fb9a42c384de211f91ae36e86335dff4845de3f0da831a00aa7a2fbb69f2a7740a94129ba4cc SHA512 d094cee5ecc89fb13ee4077145d284b05d1ded359a57cdaf2d526b205dbe6aec0da8ebd511f7a013e195740f5ae901a45976ac94a52be29903aea8062ebcf716
 EBUILD openrc-0.38.3.ebuild 9835 BLAKE2B 6af429b27930becc7b9b10f73c1641d4a7c7e305aad5d1c5ddfc3c585ce1ab7792bee80b260d46d550289cf2f4758235ae138d73dbf8310a6f71d31cc5b6ef96 SHA512 b3061e6608834a13c30668ab354e4438eb66cc5679fdd6354b7fb037f1820807112ad3d912656cba7273f14160b595a0feedf15bfb16b63bfb7f742bec38668f
 EBUILD openrc-0.40.2.ebuild 9961 BLAKE2B 8d4939143cd8b69ad26101bf1435e2f9113fead51240357e1a7878c50f7aa671f447b419da416dcad1cd501e7504cdec0e117349ca4f7b46b8a1be400791e8ab SHA512 9d665e6a921d4c899e225419a8dbd36aed4d8cea32bc51d6dbff30eec24677ff441351fc0bb98c47c947b396bcd0eaa245b64b47ce82606070d5a829753a8a68
 EBUILD openrc-0.40.3.ebuild 9835 BLAKE2B ee2c443b679b36e0c84fb093a08312972b06c032388087013321a09666dc4c02626ad69105d752323b03e88814639ea8a5a28081eddc6f1da738c7d0855176f1 SHA512 00029676e14e23895f460fecc01b7582ef22498b1b8ba2c3154146d17ec8478015b4a58889ae6de392c1bd1c96e1eb632526ff97e2ea9ece3d6a7e48d0340136
diff --git a/sys-apps/openrc/openrc-0.38.3-r1.ebuild b/sys-apps/openrc/openrc-0.38.3-r1.ebuild
index 0b72e11f38cf..0aac6fcda8c0 100644
--- a/sys-apps/openrc/openrc-0.38.3-r1.ebuild
+++ b/sys-apps/openrc/openrc-0.38.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index d861777c69fa..be3c988d605b 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
 EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5
-EBUILD pkgcore-9999.ebuild 1498 BLAKE2B 339396606f12de41e0f85965c9ecc73cef2b723b63888dd972e109feabaee5307b35eef503efc9a4de63c6d2d8aab4fb91fb526dff4577b6af1ebbdaa5b3e53a SHA512 402a372ad4cfe4d9eb7d06c074fe200dbd61bb138e1749212d49d02848ee475e0fb1c6711a238a0c5647457c4bb4611110b4d94ef5909f6ab274533d4e93bbc3
+EBUILD pkgcore-9999.ebuild 1478 BLAKE2B 5bbe0c52cb2757b25e450feaa04070d94d52f781ef37ede7f4aa9d3236d5cfb24bdf745387363ae93cf21519a72a720f14b94c3eba80900ddf7e5172bd56bcd5 SHA512 89e502da94fac886d9dcc7065d0ab7565a044f7abd9d6aa212d9a65dbb1673ab654a1c5431999d82ece98ad90bce07dfb85398ff42bc62f53b07fef3e914db4c
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 34a210caba47..0bc10eacfb55 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -53,5 +53,5 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	python_foreach_impl pplugincache
+	pplugincache
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fce686022ece..edfeef1cfa73 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,15 +5,15 @@ DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b05
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
 DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
-DIST portage-2.3.54.tar.bz2 1015477 BLAKE2B e9adfe59d09b4c7f7509364ada1bfb22d3e6d466d24ae47f6ec9eb9edf2147dad091815b323970b7a6cbf6c42c51a111252bb047862f6863b437d3b6e400ac0b SHA512 8e12e904915232321669789d21f88e9750488d0cd49ec31de6378d3d372a1a463325351a0c4fed2c80cfecf0f43112e9a03e90b84dcc1dba9bb6813c37e22c72
-DIST portage-2.3.55.tar.bz2 1015755 BLAKE2B c6144d732a6eca9006512b8b647287b2dc72b453c67a9d46f0489736d5dbfe644f5527c29d6d0d3d2af077a181e6645624a310dd39ddc8bdb3629ef1b68b2cbe SHA512 6937f9ca266291fef82ecd9ca25e78dd7bf25dfa65392013f905d59d850d6ea3c3cc00e991db0058ffb5ce27d7de3ece4dc01143cf19143cacf04404341df6a4
+DIST portage-2.3.56.tar.bz2 1016476 BLAKE2B a7627bfd3536157efe7d20db78bef37ab025573b4519a07e08c04b3e9f9b42596a9bfa545241f78ba0e3b46333e8deebe20b75ea86fee89c70670b85dc8addc3 SHA512 98704382bce9816d458b33d3b3179c08a5c4b709b8c4ba7757b2ebccbd1d136d11c004806b30cf0cf9daf914062df94654bec255e239713995c7228d1c275938
+DIST portage-2.3.57.tar.bz2 1019074 BLAKE2B c7ced224a8ab5720b101ba791709668216f6fb164814236ce5cef3c5af489889b71bfc5396521411b377f798c2529f7178a84ab322efe3df44066e0ccc30eb20 SHA512 14e67dfe4a339f0374a7e31be840f94476eaeab2572dc0b4d1b07bc50cee4681e99f8a4c873b358feed584d056d7eb29832b6ed22b4c7d72066f83d3a4b23123
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
 EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
 EBUILD portage-2.3.51-r1.ebuild 8934 BLAKE2B 4929d861ef8569848abb8eb79f3326cb23d8ff66eef7895fc1e0cbeb69f0310f97b0b3094610f1d97919c09ecca077273671b5879b3bbbce807ccc7b52b643d4 SHA512 cb55dbc52d5b7af35083e60c83a7085458686ff03f03d8d1f5d03e42c4437bf8c14de026cd11ede70389d0c039320c08fcf901175b40413e09c01a0cd46c43f9
-EBUILD portage-2.3.54-r1.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
-EBUILD portage-2.3.55.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
+EBUILD portage-2.3.56.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
+EBUILD portage-2.3.57.ebuild 8827 BLAKE2B 98d44f9f76e9333457381ae0f689ec2c82a945f1728897e28757b46e8214c6c53b36aa0c85595d2fecbbe6f21c0f4125dc002eb45d96b5165d5e3dfc94e29dbe SHA512 da04eb7f58674cddb68497246379d782de970d625e33ec6150621c765b33ab292c78f87fb608e2e21fc1204094f85217caa74f38ade4a9f4814dc819304696ca
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8686 BLAKE2B 828f8099e038313c4bbf4a17361f1ef42d71c288f8973f59ae18adad176473ff32e869749d48793a5e6e0ae7e139b8560ad06b508718a73d68081520e57ee3ca SHA512 17a3682b8e897219bb29b6ecbc39d2ce53bf7c949ad0ae6faf36f948730bbc25818f59e23622802f09b078f61bb85814dd3ec1c588fef99bd87d057bab129fc9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.54-r1.ebuild b/sys-apps/portage/portage-2.3.56.ebuild
index 4bf3a6b2dedf..4bf3a6b2dedf 100644
--- a/sys-apps/portage/portage-2.3.54-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.56.ebuild
diff --git a/sys-apps/portage/portage-2.3.55.ebuild b/sys-apps/portage/portage-2.3.57.ebuild
index 4bf3a6b2dedf..4bf3a6b2dedf 100644
--- a/sys-apps/portage/portage-2.3.55.ebuild
+++ b/sys-apps/portage/portage-2.3.57.ebuild
diff --git a/sys-apps/s390-tools/Manifest b/sys-apps/s390-tools/Manifest
index 31db12e0161e..86e31c8b5610 100644
--- a/sys-apps/s390-tools/Manifest
+++ b/sys-apps/s390-tools/Manifest
@@ -1,7 +1,3 @@
-DIST s390-tools-1.36.1.tar.bz2 827505 BLAKE2B 5774062699331c6d5958fef44f6cbb048e05aecc190c2519a29dc9c43b0d0d000d8be8183a447eb81b7affbf236edc21105bfe6a689e23b2f519feea0700b9f0 SHA512 83b3456bce8af0d5e1f6a1b96335809a21b676b2371ca101e5f588a18e0de65b8e15a9a973a7dcc2cad800341ecf5997e8230a68b9670751cdf1d6f8d59be22c
-DIST s390-tools-2.2.0.tar.gz 1047199 BLAKE2B d23cfb277d341b4fe73ca92eba0a7bf49420d3303737d871979a93814d1c0cb53884a6fae78453fe69d4a8a8e35923fe9bf2433a412578f8d7696c9defd8570a SHA512 f029b92f18f95b49e189a4f5ad78c02ee629e630a93a8bbfe6966030fe8aaf069e86582d77213d68b447300b73317e4dbcb228df5ff0795a2785f6735087ceab
 DIST s390-tools-2.4.0.tar.gz 1084322 BLAKE2B 1e603433937a5ebe664bd7e4fbd5da7fafbc556f9fa809a07badda2bccf5819d69a2a3c5f62a0698693cd308dae30663bb2f2e1f1bc4b2598b9bf6085d29bd03 SHA512 de4d89f505567fe313df3c9110242d9476d0e20ff9b6f31ecbaa99c8a4e2b4bc959ab29ec6faf8b47c4e669f2eaa736f29a9e9908c95ced2e33db25b1c620c84
-EBUILD s390-tools-1.36.1-r1.ebuild 1385 BLAKE2B 118abdf8d51d926bdc9916a0cf6e4de68e3cdae10ac6652aa569c879bb3a9812d6df6d5f262a1fadabf2ff71a1c22fd2880460a72c823451cfbe6e9ac8120a70 SHA512 2e68aff8976ec3d0e060e01eb403e2473377734fd2ca0733e859ef0eb58ad9633585aac90cf3a78239dfebe4c0f3e0580c3d4452a43a708c1dabce6803f90079
-EBUILD s390-tools-2.2.0.ebuild 1237 BLAKE2B 3539949f21345952571e92df3c4466fb015b6f49aa833ca838a1854ef31c8aa3a07da33163fdbe94c2319991ce4d6fa0b41ddd5271df5ee895ac2d18dfe6e214 SHA512 26e55d3bb79595359e1c86a697f478e48c70f686a7f570f62de47e0f04aa026c829c4f7a01f326d7e932828c8da8f40ec21907e650b6bb274e08a27d60a9fcd2
-EBUILD s390-tools-2.4.0.ebuild 1238 BLAKE2B 00808526cc323eab063ddb459b15a249d6547afbd99749868d00651c3ce02a5c9fca989c5348c062656486ebd8dcef476ed187d36569c834ab15a78daef48fd8 SHA512 505e06e0021ced5049f99bc7e39112387f24dff3928d4d70ecf22bab0b0fbeb3a495b7beff1b7110de204e99ed5b1509988f0eb29eb3a1c1c6c5640086180caf
+EBUILD s390-tools-2.4.0-r1.ebuild 1234 BLAKE2B b62d37902e487a35ea6298d65246887e5106bc237fa806db58590e85a549f4c6c62d1ff6ba9c80bc24617af631e2247ea88571418f50dc74c683325e9e543ac8 SHA512 11cc46fe301b2931ecb034839ba2802e7748c14e680b19c09ad300d810a60ab94a4fc577d45d3aee372f8e42a99a817fa34d95d6421b5e638620df9502780434
 MISC metadata.xml 726 BLAKE2B 3d8b378dc8713cacadd8c7a16657bf7b49056284f1cea9a71151492fa8fdbb34ab00673b71c142057b19c520477ff17ea17417941d8939427f71bbb4f003c091 SHA512 9fe97ad8e4d179da9351268abad46e38f0c7d19dd93f35b8b86669c7a636b186b575b8cab72634492f176d174292892be8b3ac29f7a279c401e3f4350e43e385
diff --git a/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild b/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
deleted file mode 100644
index 61fc38e5cef5..000000000000
--- a/sys-apps/s390-tools/s390-tools-1.36.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses pfm snmp zlib"
-
-RDEPEND="fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses:0= )
-	pfm? ( app-misc/pfm )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )
-	>=sys-apps/util-linux-2.30"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
-
-src_configure() {
-	export MAKEOPTS+=" V=1"
-	export HAVE_DRACUT=0
-	export HAVE_FUSE=$(usex fuse 1 0)
-	export HAVE_NCURSES=$(usex ncurses 1 0)
-	export HAVE_SNMP=$(usex snmp 1 0)
-	export HAVE_PFM=$(usex pfm 1 0)
-	export HAVE_ZLIB=$(usex zlib 1 0)
-	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
-}
-
-src_compile() {
-	emake \
-		AR="${AR}" \
-		HOSTCC="${BUILD_CC}" \
-		CC="${CC}" LINK="${CC}" \
-		CXX="${CXX}" LINKXX="${CXX}" \
-		LD="${LD}" \
-		NM="${NM}" \
-		OBJCOPY="${OBJCOPY}"
-}
-
-src_install() {
-	default
-	udev_dorules etc/udev/rules.d/*.rules
-
-	# The chmem tool has moved to util-linux.
-	rm "${ED}"/usr/sbin/{ch,ls}mem "${ED}"/usr/share/man/man8/{ch,ls}mem.8* || die
-}
diff --git a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild b/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
deleted file mode 100644
index a2e08bb6e2aa..000000000000
--- a/sys-apps/s390-tools/s390-tools-2.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="User space utilities for the zSeries (s390) Linux kernel and device drivers"
-HOMEPAGE="https://www.ibm.com/developerworks/linux/linux390/s390-tools.html"
-SRC_URI="https://github.com/ibm-s390-tools/s390-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* s390"
-IUSE="fuse ncurses pfm snmp zlib"
-
-RDEPEND="fuse? ( sys-fs/fuse:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	pfm? ( app-misc/pfm )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-util/indent
-	app-admin/genromfs"
-
-src_configure() {
-	export MAKEOPTS+=" V=1"
-	export HAVE_DRACUT=0
-	export HAVE_FUSE=$(usex fuse 1 0)
-	export HAVE_NCURSES=$(usex ncurses 1 0)
-	export HAVE_SNMP=$(usex snmp 1 0)
-	export HAVE_PFM=$(usex pfm 1 0)
-	export HAVE_ZLIB=$(usex zlib 1 0)
-	tc-export AR BUILD_CC CC CXX LD NM OBJCOPY
-}
-
-src_compile() {
-	emake \
-		AR="${AR}" \
-		HOSTCC="${BUILD_CC}" \
-		CC="${CC}" LINK="${CC}" \
-		CXX="${CXX}" LINKXX="${CXX}" \
-		LD="${LD}" \
-		NM="${NM}" \
-		OBJCOPY="${OBJCOPY}"
-}
-
-src_install() {
-	default
-	udev_dorules etc/udev/rules.d/*.rules
-}
diff --git a/sys-apps/s390-tools/s390-tools-2.4.0.ebuild b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
index 72f09e63dfbe..e970ee55b2d7 100644
--- a/sys-apps/s390-tools/s390-tools-2.4.0.ebuild
+++ b/sys-apps/s390-tools/s390-tools-2.4.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 inherit toolchain-funcs udev
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="-* ~s390"
 IUSE="fuse ncurses pfm snmp zlib"
 
-RDEPEND="fuse? ( sys-fs/fuse:= )
+RDEPEND="fuse? ( sys-fs/fuse:0= )
 	ncurses? ( sys-libs/ncurses:0= )
 	pfm? ( app-misc/pfm )
 	snmp? ( net-analyzer/net-snmp )
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 08eab0698461..f3efe68f7062 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -3,5 +3,5 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
-EBUILD shadow-4.6.ebuild 5361 BLAKE2B e054cb117ded301b86a8f8abbe288f877b4f5bee029011c7608e4ac6f8a086c3c3ae37f528212b1fdab285f076a5d9e1b89abd803e12175ed44bfd46407e172a SHA512 0a6b20756c171fc2cd83d250e2573dffd6b03cb216fb45463a6a9505d769873616b24e67d5460d41f344d861131ab444892e3bed9c643379cf5055416c8017f8
+EBUILD shadow-4.6.ebuild 5349 BLAKE2B de19b3b93257baae9b0f41658b93d0ddd510524ba0f4117435cbad7c12571dc24d4c04747f15e03d9d7fb06cad9166d09d25cbde200dd9caacfe508c6ea2f00b SHA512 a0d849fca5c244ea5e0cc7ea66bea156cf51d5c831712406202877ccd524b44b0227d6d243dcd2ae7e7aefb5877307e689636bb799a86074119d787042ec2cbd
 MISC metadata.xml 565 BLAKE2B bdd91116c16f590eabb6f18f05a4f72b55651383431c78fb07c27b23e7152b25816895e2ae3e2afd1ecd6e2b9fa9dd0005d198f2ab7ee2061583b586e4c44b01 SHA512 be29faf2eb981bdb0d643ca691d48b10ee702c3a32ca7fca1d00365aa1c4beb5b1b4bec8104be4352fed32f3fabc3108061b8eb8f0054e612c268b5c6f4b1469
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index 6c3e7bef5d76..c39fccd0c9fb 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit libtool pam multilib
+inherit libtool pam
 
 DESCRIPTION="Utilities to deal with user accounts"
 HOMEPAGE="https://github.com/shadow-maint/shadow http://pkg-shadow.alioth.debian.org/"
diff --git a/sys-apps/stroke/Manifest b/sys-apps/stroke/Manifest
index a37438fa3feb..e88fba1c7a9e 100644
--- a/sys-apps/stroke/Manifest
+++ b/sys-apps/stroke/Manifest
@@ -1,3 +1,4 @@
+AUX stroke-0.1.3-missing-header.patch 292 BLAKE2B f079bbc651d5c0b7fc4cd4dd4c2e7b2824de66b0e8380dc2acd0ee55d1414fb7dc175dff1d00e0b70e1472adc6408c16369d9bd03d46af187a2c2cd5da187624 SHA512 2a77155004aa6f860e4aab7b3784444af2604522944fad07b073a97b1bc701d09a00dd514e8c6fa2f4333cebc5f25474123abfa47a9b5056541427aed475abdd
 DIST stroke-0.1.3.tar.gz 180438 BLAKE2B f7b36905707a1a940ea01858562e7b01df5385b67bd7e7c627b9ea7e762d02659c455a25adc43f9a560250243f136101a56b77f9b2dccbb077f8d9238681e178 SHA512 b500f9c158a66f5947a28bf3dbb7caddd20427b4c9bdc2849002995f830019d54a3f0e070e973a0a6475f755ffc14a2995c7c8736c355cf4ae06b22beb07897e
-EBUILD stroke-0.1.3-r1.ebuild 379 BLAKE2B 64e346db33058f9ecc5ebbd005933bdd23c8e22229a911d6c7a2984766f4ba206751678e95f5e58535129914e2db58a7695ebe10cce4e5daa85a3b4753853614 SHA512 46604277ed1e5cec1f53c6b374cf583e309c7a592e2ef5be638fa1f6d4760fdad9964fdb4fe26c0d11cf4e550e22006b89a4e324c0e945e72e952f6cccd56d34
+EBUILD stroke-0.1.3-r1.ebuild 389 BLAKE2B 703fae54c70a7396c20167b60987008741ae7c67af4bee364d04f6176874bccf6cf6ca8e81077fe24f96227df901c00a28576cbf5b34d3f531c50e213c9ab08c SHA512 0b6ce28ce6084bbc3b0b4b524bb03cca723aeb103ff2b1ff24cbaef5d6d6d4bd402f7d33d808f5500c58f65ffdda8c0dce5096f0b145d4dc6ca76576415564b2
 MISC metadata.xml 243 BLAKE2B 9f0cdad2b7238b34694d22b7029261ecd2a7db18998433b847a25fcb954f31b4d14e0eecc537a3888a0417f14a685eac785cd87729089c83240778b193e68b2a SHA512 496837352e3c05b4b998ce2551e373340708790aef7a7fcb6cb48a69c7df8b1b6cb172009f3b9fc1740ee83afd01b9a4dca94ba38df3f96a9f578ad9fbe7bbc6
diff --git a/sys-apps/stroke/files/stroke-0.1.3-missing-header.patch b/sys-apps/stroke/files/stroke-0.1.3-missing-header.patch
new file mode 100644
index 000000000000..920c9260a977
--- /dev/null
+++ b/sys-apps/stroke/files/stroke-0.1.3-missing-header.patch
@@ -0,0 +1,11 @@
+--- stroke-0.1.3/src/libgeneral/src/signals.c  2009-05-27 13:36:11.000000000 +0000
++++ stroke-0.1.3/src/libgeneral/src/signals.c  2019-01-01 00:00:00.000000000 +0000
+@@ -26,7 +26,7 @@
+ #endif
+ 
+ #include <stdlib.h>
+-
++#include <signal.h>
+ #include <libgeneral/signals.h>
+ 
+ int _set_jmp_val;
diff --git a/sys-apps/stroke/stroke-0.1.3-r1.ebuild b/sys-apps/stroke/stroke-0.1.3-r1.ebuild
index 0014e6548605..5dff589e0b30 100644
--- a/sys-apps/stroke/stroke-0.1.3-r1.ebuild
+++ b/sys-apps/stroke/stroke-0.1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A powerful tool to change file timestamps (including ctimes)"
 HOMEPAGE="http://stroke.sourceforge.net/"
@@ -12,4 +12,4 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 233f6a4664de..315007014721 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,7 +12,7 @@ DIST systemd-240-patches-1.tar.gz 15364 BLAKE2B e5cf4c2b8666a5c03e658f46674422d2
 DIST systemd-240-patches-2.tar.gz 28099 BLAKE2B 2e497ed729e2482ef3cc0d010504314f2982a9af19341d6f4efa06b24b3c01f9f69996d43e5b484c641777d00a8a0ba4508bcf6a0296a63d4fc57440f2d3708c SHA512 1be0432d918a4866056ffc65de6e8b412784e5018490c0349a98bba801536d2689c5b2ce41ddd5adbb945aac71bfd0168f94c1daf0788661cd83b159a8c975b8
 DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a52ab946fc45ff7fd1bcc85978ff654720113641534e40c0f9a1ad1c9628255778616770762950426789f659c3 SHA512 da7467781b16f65d868931ae88fd07554db61542aec7f11dbec9f7279b529f900301edfea2d3813ddb64eeb3fdcfb7be86e540c65212dd7cfdcdebbc80de2ff5
 EBUILD systemd-239-r2.ebuild 13285 BLAKE2B 441348e52b56c2124c16377fbe11b639c80b4469e87a0b59d9ef02ee19594eb3652d7868e27a1ab94e76c0f5a66305642bc4e579eb1777ebfa731f6049400280 SHA512 1bd64fd100439fdf1e7beb5dfb55c24aa03cffa7cacf453f65e0f8c450ec5c911e7cc8115d82b6d0df48f7b8cff570563c261f097fde559d703fc24c09fbe9a4
-EBUILD systemd-239-r3.ebuild 13291 BLAKE2B ff420b4143a3de3ab1a9303a4a473fbab76df0a55fbc96378b3662f7cbbdca692707e98784435e14dba1926ee7849375f300457c98bbd3c9ea339e93e780d4be SHA512 cde56777a71bf3fc9cb36928d006986fed98a4d0f31d6c8c81f52441db7e60c863d66b9d0ced6a1fbc8b2a4d7c13cfc0f7f22d6c51fb4830febd2f8095a331f1
+EBUILD systemd-239-r3.ebuild 13287 BLAKE2B 31540bc53168e5eac9e4972b4569bc3979ec34745e78830842bcf217d04ee4b94c8c69b9dd738138a76154b800900b7c1383ebf51eaf872f5fabfc47c74507b7 SHA512 6e5c10348b3f7f4fd1c3640578c50f4334cd3df8624625a9a060644066ad5d0379798d521402644e1c65cbf9d18f14a6a78a4c7a334f6966b12e4d282a736012
 EBUILD systemd-240-r2.ebuild 13371 BLAKE2B abf95e472a48e5ea797d71fb8ee881476b5ae90a93fea800c05fa0b870668bdc833f2efd1fc910c3822ad85d5c6a29fbb8073e63518d5212c616977976321193 SHA512 5a1fccc2bfcce635bc4a9c726720366e9616cf0e4c685dcff77da598938b13e399118620d21ba590d4803b5956ae271bc9c397daff2340283483728247f21dd6
 EBUILD systemd-240-r3.ebuild 13371 BLAKE2B 1a331b96eb22fc07804cfabb39f47c5ec359ddc512f4c178338e3db8782f1ff808875a5790e04ee6f543a4bbe8db3ab64464535a2367ce8167be3e95e0fc5a14 SHA512 115410f96590b90726fdb52dcaac7b5200300c81bcce486e73b01a2b0d0d73885d6928196d39eb3f06d60049508ee9a6ec727b36daba39d9f9c04de0504806a4
 EBUILD systemd-9999.ebuild 13310 BLAKE2B c295b6142d4174d8869fa2f0297beceb266fe0a1185f81455e57ed13dc88c49725c06a534f28e83f2e796c40083bd65d42fd7545e952d168da26aa817f3b89c2 SHA512 56d61973e251ef23e83cf769f2716f0511d9627624267a91ab702af1e1610759f1f7aa286ed86f41b328a15857ac99b764739a65e6d4afe807fe580c09d7cf7c
diff --git a/sys-apps/systemd/systemd-239-r3.ebuild b/sys-apps/systemd/systemd-239-r3.ebuild
index 4f86846776a1..cdfcff70074d 100644
--- a/sys-apps/systemd/systemd-239-r3.ebuild
+++ b/sys-apps/systemd/systemd-239-r3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index dc7cdb1f4e70..2be3aa1a1cee 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -14,7 +14,7 @@ DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0
 DIST sysvinit-2.92.tar.xz 117560 BLAKE2B 300c9b7dffb5a07ece9b12682bf49816143215953527b69fe80c4f7f9b487de6c812213c9a851c5636de3989889b3179ace9a17b35c985729655a7c877b67170 SHA512 1395943540bc52d999de64c426c7f807d7688166591a8104e6c8cec2f45f13e0e3dd3d182b91194402c38172f412424a6c7d8c09662b3b5169ba6f928b5592a9
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 EBUILD sysvinit-2.88-r9.ebuild 3470 BLAKE2B 6963eb9b677c53c0b7fe67c6dd3d9cf4b0ee89f8670abc6e9d8481b2d0dab41c7428b6293f00f039d286eac0c223ebe4d250bfda27fb82beca8812b188de232d SHA512 3beb173dc4b830874f20e16f9d079abba86c2813f81719d091c174aed9591a803fb92d5fa2d20884f8aebb755b6735fa6183613271a576cd93f51c17a072b0f5
-EBUILD sysvinit-2.91-r1.ebuild 3343 BLAKE2B b2ed164568c2cf6ca4665296563f868eef4241788d93f185d77579ce8eff9add86b731bbe0ca44993c3df40bf31b47ca7993cd5e4f5ff965459cb1bcf80ab7c4 SHA512 4f2b2fd267c82a7d4c48c9eb2587af4cf746b7fea00d6b32fbd789fa8ddd1bdd696a68e1a36c1f224ce174b378938dcc3b17a419f58a2eee280f3eeef6ef7975
+EBUILD sysvinit-2.91-r1.ebuild 3342 BLAKE2B 3ee7748062e79ed15102859c4c72beb8f839569d0f2c6afd6b25421df2972721546cd609e9315072d46113ec208922b3a460d9c5c2271f69e534f9837b111ece SHA512 a4b031a288292461adb5f066cd0ca4b4b9d860b427c8459df33f6512604bdc8a04090eff0bb6358869678c39754eb77874d16731e9893493a7619ea277c5a4d0
 EBUILD sysvinit-2.92.ebuild 3464 BLAKE2B 6fd231bcbcf3fa9be8337e68af8ae5da6f8993ad3122a5cd07646ee3dc1eb55281025be67384db811f9fe20406539be7e77140464c8d67d9fc4aaf989b4d4d44 SHA512 22d3979f202a9b4e0d3a30242da0c12ffdfa53d6803d1cac880b86797a80c2f28066f0f483bac16dbf21f5bbad32468ef8dd503ea9d96ec66992ac42c8af0fe3
 EBUILD sysvinit-2.93.ebuild 3588 BLAKE2B 84f3bfbc114740022d746d30a2ec142a1cfe79174ad34088fce5dff6d0e6f9384cb3f601976d5e7aa2e8ef271f181ff8f263cbb3e28055aadc469ae4f2d0e315 SHA512 6cb6b476d57b291070dd337fc26fd142d3a7623b7ce96911cdbca141a898fc8de7f490182aff9a1a6acdb7904f5806b1b11ec09c10d18bafce82aca0c7c5f4ea
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
index 61dc9a5a4ccd..0c70180b3840 100644
--- a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d8766a4260da..e84e8098e2ab 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,14 +1,13 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1
-AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b7d3e7c4a3e63adecfe341e60fc65cf784a2df021cc7b567b0283902f22e1653a54644f508c4ae16d8056c21c3b279649af04a SHA512 9c065bc91e22f38eb8ad8156db8e66671749d2544cb8452da787f0d9e07f34107e9db49beb0d80962020e0b5c134fd8b090d7484d1dbf87eac933e65c81989dc
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
-EBUILD util-linux-2.33-r1.ebuild 8371 BLAKE2B f2c5a6efd1930bd4e0290e84e6390751a6c427f2bfe963fc1b41ae98a54c6f303f136e730f533804ce7b9deda77a3dd01ef25d054b7f78c5b86fb2629a6fc263 SHA512 a2602b02471ae9cbad0e545e4df17d4911e0a8a89314d405be7a6d376f2c58f3dbac5373e5558657f3979f5c302e23569f2878d8fb2113f44b151214c5d38529
+EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B ece7c99d71b080bc7caff76f9c292c42fb600e4bda85e508aa138848a0553b1655f215b48a7dcd59b047aee2e696267c94d0b388413b5b7607262bc9e6bb4a07 SHA512 2ffb2c73200e40a2c6fbd3ad0581d07d8c72b37351f49351a1afccb6a515a82fcb605e67f425acdb4517a5658035d044fee6a5fd7906690094d21bb5c6e55491
 EBUILD util-linux-2.33.1.ebuild 8240 BLAKE2B 5809b713cac06b5b13c9269851327dfef2122789f26059e2ee6980c7cfb9153a2647107264d804a7959fc0b5b10bdab5711e97027a821bf2c7939103d734ac4b SHA512 d17d2959f137216ee08b55e8aab293b4c97be8cd228732b0fb8b70ed0fe9fe11b72594e5f5c9232a22889c950cabe36a562605921426ac96905c9918fe67bfa5
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
deleted file mode 100644
index 7b8867ba0347..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
-From: Frank Schaefer <kelledin@gmail.com>
-Date: Tue, 10 Jul 2018 20:21:02 -0500
-Subject: [PATCH] * break up large strings for PySys_WriteStdout()
-
----
- libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 43 insertions(+), 13 deletions(-)
-
-diff --git a/libmount/python/fs.c b/libmount/python/fs.c
-index d6490d248..634a914ef 100644
---- a/libmount/python/fs.c
-+++ b/libmount/python/fs.c
-@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
- 	return PyObjectResultInt(mnt_fs_get_devno(self->fs));
- }
- 
-+static void _dump_debug_string(const char *lead, const char *s, char quote)
-+{
-+	/* PySys_WriteStdout() will automatically truncate any '%s' token
-+	 * longer than a certain length (documented as 1000 bytes, but we
-+	 * give ourselves some margin here just in case).  The only way I
-+	 * know to get around this is to print such strings in bite-sized
-+	 * chunks.
-+	 */
-+	static const unsigned int _PY_MAX_LEN = 900;
-+	static const char *_PY_MAX_LEN_FMT = "%.900s";
-+	unsigned int len;
-+
-+	if (lead != NULL)
-+		PySys_WriteStdout("%s", lead);
-+
-+	if (quote != 0)
-+		PySys_WriteStdout("%c", quote);
-+
-+	for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) 
-+		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+	if (len > 0)
-+		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+	if (quote != 0)
-+		PySys_WriteStdout("%c\n", quote);
-+	else
-+		PySys_WriteStdout("\n");
-+}
-+
- #define Fs_print_debug_HELP "print_debug()\n\n"
- static PyObject *Fs_print_debug(FsObject *self)
- {
- 	PySys_WriteStdout("------ fs: %p\n", self->fs);
--	PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
--	PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
--	PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
-+	_dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
-+	_dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
-+	_dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
- 
- 	if (mnt_fs_get_options(self->fs))
--		PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
-+		_dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
- 	if (mnt_fs_get_vfs_options(self->fs))
--		PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
-+		_dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
- 	if (mnt_fs_get_fs_options(self->fs))
--		PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
-+		_dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
- 	if (mnt_fs_get_user_options(self->fs))
--		PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
-+		_dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
- 	if (mnt_fs_get_optional_fields(self->fs))
--		PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
-+		_dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
- 	if (mnt_fs_get_attributes(self->fs))
--		PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
-+		_dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
- 
- 	if (mnt_fs_get_root(self->fs))
--		PySys_WriteStdout("root:   %s\n", mnt_fs_get_root(self->fs));
-+		_dump_debug_string("root:   ", mnt_fs_get_root(self->fs), 0);
- 
- 	if (mnt_fs_get_swaptype(self->fs))
--		PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
-+		_dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
- 	if (mnt_fs_get_size(self->fs))
- 		PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
- 	if (mnt_fs_get_usedsize(self->fs))
-@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- 		PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
- 
- 	if (mnt_fs_get_bindsrc(self->fs))
--		PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
-+		_dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
- 	if (mnt_fs_get_freq(self->fs))
- 		PySys_WriteStdout("freq:   %d\n", mnt_fs_get_freq(self->fs));
- 	if (mnt_fs_get_passno(self->fs))
-@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- 	if (mnt_fs_get_tid(self->fs))
- 		PySys_WriteStdout("tid:    %d\n", mnt_fs_get_tid(self->fs));
- 	if (mnt_fs_get_comment(self->fs))
--		PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
-+		_dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
- 	return UL_IncRef(self);
- }
- /*
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
index 930f1b8dc20f..ffb43ba02da1 100644
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index b840e407e0d3..2a2e9f2497c4 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,21 +1,9 @@
-DIST yarn-v1.1.0.tar.gz 874168 BLAKE2B 2c2e00237e4c1264ba3167f5fbeb40ef64d9ca42b05bd4e005673437c9c2ef084e93db00811840aa6cac6fbdec912cff654b09a81bbd6ccfb954d1e14128cd79 SHA512 7ce740ac47d8ba42c47d0262979fcd1d22daede2a298e1743341c52584bee7d4beca8758c118deccaefd9cb0bc2780a37e110ae3633af56ac6916ae0389eadf6
 DIST yarn-v1.10.1.tar.gz 1107068 BLAKE2B ce9870d5f149b53d056682190a4bd3bcd2a8d2c30fb06f053626f55db506100f9db212103c3f498b44a53f94dfa0b5c4ce37453d72e05533476ff6a2d99a4099 SHA512 107d07d5fc9f171904e14a46e1bf9509a558e08e3cf08d84c903661a31862a6bec4886f41b76fed4871f1983c8da0a9ad5dbb8de0e190378c7f1f5e5abaa15c6
 DIST yarn-v1.12.3.tar.gz 1166553 BLAKE2B 8e0c56c46522eeccaa558dd1fccdca40e83d03dc0ec04a58541b318b73bb64b9559c6f210a2745cc07a87234ef7857a1cc8a57d1f22277a8b6a90026f8c563d3 SHA512 f1fe6b58d0ef9210260b19a7f02d0bb0d58cc536159385462a2ab4b0807a1c66636994c7b06207f3b4949950d411dd96939e1ba8aa1495b55681014242146457
-DIST yarn-v1.2.1.tar.gz 885691 BLAKE2B ba7a291e4b071cd285e890fbd8af2a1adf78bc7a65ddaf7adcebee2b8bc15d4b98293eeae79be5ad664daa6a56d553ade1fd5e50aaafc7ed2f980ebfe4feac58 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477
-DIST yarn-v1.3.2.tar.gz 886500 BLAKE2B 224503241b646bd6befe6571022e1081c4e9cce2371ce0c111704a6f0ceb7c4b4f0267c9c37d05feec60311cc7804706fb47d130ca64e6182590e88d8476b386 SHA512 d488ae56b60884bb42e5e2ac8a0359c6947e234ed8b5bba12a93f24abb4419b4a6fef708c35df8caa9e68edca3fe570d1dcda9295d29438e45a32ef5d029aedf
-DIST yarn-v1.5.1.tar.gz 936225 BLAKE2B b35631ba0fef692797c83431fb673c0286dbd29a5a3e5819111bcc189a136d7059afd7e1901a249204e1a14ff4c7a7321207d7fe1c057d4e585184424f9c26dc SHA512 b58b712ee395d4cfec5271e02e8cf77489438815aeebea1c6844866eb6161be9ae078f62f726e44eeb704d0195b94339d1e89991ce56de8690d613d4bab5f548
-DIST yarn-v1.6.0.tar.gz 941806 BLAKE2B c3f225dae625e6404cf2bc363e695adeb43c3738a4a501c88415bee20810085dbf63abbaa7ef64200cfbdfc8a1a21e463af2c035c37e21dae49d5bff18d2d5fe SHA512 073adcb75dff799ac68a5e0adbdc8f8343d3ada3e356dd0e5dad4254b21e0337bc76201163d037eb01e7c5365f15085ef38df171d77ee36cd58557a175e3f713
-DIST yarn-v1.7.0.tar.gz 944751 BLAKE2B 468ee9fbc94e5ae74137f9232929e78213ee435a30b6c22a9bc4378fbf28ce1f4f1358d745f2f298767e98d9cded64d8c61a2f8e4705999bd194aaa21b3505e7 SHA512 1de75fbb48c49ef9c39eab434b3f27b669a8e74f9305e5f03fe3ca30cf6ca00b4b94f8445621474089681bb74f4813c0595633a45c16c4469bab08187ce94495
-DIST yarn-v1.8.0.tar.gz 953127 BLAKE2B b290c4e6a5800afd8706954dab424f7cf0c784c0dade705f10a06803dfe64b83206f534dbb41e3e804593a17d722ddc3253377465413be571bb2b29639f99ea6 SHA512 12919a27d0845644992a60c87a919ef2776e5959c43d1c31767021475b8cbb591f5f6ff2b214eaddc11d520f91d758bee439abe077717a7348eb387813dbefb6
+DIST yarn-v1.13.0.tar.gz 1169613 BLAKE2B 5fc730c0b456d67702ef5305223cfd933c4c8f1d13364ff383294f8ae2b7b3f400476ff32b9aa0b27c497116660ea295691831e4e9bf50cb699d03d2dcd99e6e SHA512 5277f0d9e79fbfc8a6b7864c3e1bc554fe38582cf7f21b83c641ecf98aabc78c014caef94ebd26877578ae1fb6370e6242ad2b70cfd569fa2d099a3da936f90c
 DIST yarn-v1.9.4.tar.gz 937393 BLAKE2B 188e270b2a8b5b357b85101eda2552d675e3f41d30bc7b45266f34831cbcfc00feefe452c420f3aaefad7423c2af342d5fdb859ec6420faf689b680b5acda00f SHA512 1e3a908cf47a2fe46d7ce8db549b91cd0b3372c7c43c6b0029f1060b044a0a65e5bc3323f4ed6baf20bbbcb49ba358a6bb8f2691a591e4d3e8a01bc31372cb5b
-EBUILD yarn-1.1.0.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
 EBUILD yarn-1.10.1.ebuild 853 BLAKE2B e42d2ade1f7b02d9e5a312eea6a0f81cb21fe98a174e42f3fa62e5a414e5d7dee57b7b55aed0a32171407fc20ae06f141fd47c3d061abb4861c563a19aec293f SHA512 4159c1e9702a91c10792ef92f8c444d35176f67977914c5fb100df15c28555a14bc81d9e77e879bc7b78afa7ffdf80185b9a878198ef8c7b9428cdb661320860
 EBUILD yarn-1.12.3.ebuild 853 BLAKE2B e42d2ade1f7b02d9e5a312eea6a0f81cb21fe98a174e42f3fa62e5a414e5d7dee57b7b55aed0a32171407fc20ae06f141fd47c3d061abb4861c563a19aec293f SHA512 4159c1e9702a91c10792ef92f8c444d35176f67977914c5fb100df15c28555a14bc81d9e77e879bc7b78afa7ffdf80185b9a878198ef8c7b9428cdb661320860
-EBUILD yarn-1.2.1.ebuild 841 BLAKE2B 0affb4007c2324aede03eae842a00443f056d323fe2b4ea8ef65139ddbe8a43bc192a27364f081346f64fd01bdadb70e4f7eccd3e7b9350122496fef6bec8dc5 SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5
-EBUILD yarn-1.3.2.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
-EBUILD yarn-1.5.1.ebuild 841 BLAKE2B 08bf76001e5e2aa1e7cb0efa3d022bd562b79a058c83363d7a27abeca51aef0141a199676d2a561d58cc01035c51822a55913538d0c44d24f81d3c6312d85ed8 SHA512 4e53d8287c9c49563c2d36e7fc5dd0657c2926f32bc7aa1b8caba62e8278fe0ed029e59afb3147d554344b7997ffc79e3f230ae3adaa419cad265595f3250062
-EBUILD yarn-1.6.0.ebuild 848 BLAKE2B b0532cde76950dee68e42c3b861ad021657134752b6682245f3920e3577cff8ccd9d8846c7a8fe73cccb3a49a730b962e428ef75eace21c8acbd887a135f8231 SHA512 f18e0e8701e6375c3af0f91569fde1e054a68d9d8c8545ea22c83dfd24f0b0d229eaa6465aec7f5281db596a92e8da2bb58f237ca312cdca84e6934c87d3f613
-EBUILD yarn-1.7.0.ebuild 856 BLAKE2B 4a60e7c73867461b27dbcf392f1b534d2f8bdadbe60fc7f217539cb9728a42e286a53f66d53b1bcc1fe1d83c52589e076f1e6cf4250280ae2058bbb29de6a970 SHA512 28c90ff73bf2f532099ef9311c4b6df63bb78315d316cf8898aae3f558903fb54042df34c10aa9469be0ea9be00f9f7cfcc683bfeb1902a8577655d80a85f271
-EBUILD yarn-1.8.0.ebuild 856 BLAKE2B 4a60e7c73867461b27dbcf392f1b534d2f8bdadbe60fc7f217539cb9728a42e286a53f66d53b1bcc1fe1d83c52589e076f1e6cf4250280ae2058bbb29de6a970 SHA512 28c90ff73bf2f532099ef9311c4b6df63bb78315d316cf8898aae3f558903fb54042df34c10aa9469be0ea9be00f9f7cfcc683bfeb1902a8577655d80a85f271
+EBUILD yarn-1.13.0.ebuild 853 BLAKE2B d4667103ca0c07dafa5392cdb6a6ebc89db12829e59c738aca7801f51b62d91ad0011b9d855946a75787f5ff490f8affb6ab79fcd993aa00d15f85fa607d3045 SHA512 e8b24ea9f2af7a5907245d7c559bcf0139fc418b85c5a74d7fbdeed77ef86277f0848ead7e7faa039d3533f94425e937f2a3a9ebf180849ad3521e85d9cb47bd
 EBUILD yarn-1.9.4.ebuild 856 BLAKE2B 4a60e7c73867461b27dbcf392f1b534d2f8bdadbe60fc7f217539cb9728a42e286a53f66d53b1bcc1fe1d83c52589e076f1e6cf4250280ae2058bbb29de6a970 SHA512 28c90ff73bf2f532099ef9311c4b6df63bb78315d316cf8898aae3f558903fb54042df34c10aa9469be0ea9be00f9f7cfcc683bfeb1902a8577655d80a85f271
 MISC metadata.xml 440 BLAKE2B 526fb5eb5ad9a9ed7062fac74a6c5cbd0bfc82b8f69da9cf687b16c0c6d0cc03728abf1508c6c48960c26198fa88ca8fe64f924c080010b5158ff8f9cb06e850 SHA512 3c6dfd749421e6620930993f60bdac847c8e3baa65d4389861de3b8d63641cdc54402274e4b663a718adf8889d2e8bb9b036b427184e1f4d71e290fa74a273cd
diff --git a/sys-apps/yarn/yarn-1.1.0.ebuild b/sys-apps/yarn/yarn-1.1.0.ebuild
deleted file mode 100644
index f028ad115d08..000000000000
--- a/sys-apps/yarn/yarn-1.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.7.0.ebuild b/sys-apps/yarn/yarn-1.13.0.ebuild
index b4b5ee7ead80..067e0a48abf4 100644
--- a/sys-apps/yarn/yarn-1.7.0.ebuild
+++ b/sys-apps/yarn/yarn-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-apps/yarn/yarn-1.2.1.ebuild b/sys-apps/yarn/yarn-1.2.1.ebuild
deleted file mode 100644
index f028ad115d08..000000000000
--- a/sys-apps/yarn/yarn-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.3.2.ebuild b/sys-apps/yarn/yarn-1.3.2.ebuild
deleted file mode 100644
index bb76e804940f..000000000000
--- a/sys-apps/yarn/yarn-1.3.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.5.1.ebuild b/sys-apps/yarn/yarn-1.5.1.ebuild
deleted file mode 100644
index bb76e804940f..000000000000
--- a/sys-apps/yarn/yarn-1.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.6.0.ebuild b/sys-apps/yarn/yarn-1.6.0.ebuild
deleted file mode 100644
index b3b3e1e95196..000000000000
--- a/sys-apps/yarn/yarn-1.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}
diff --git a/sys-apps/yarn/yarn-1.8.0.ebuild b/sys-apps/yarn/yarn-1.8.0.ebuild
deleted file mode 100644
index b4b5ee7ead80..000000000000
--- a/sys-apps/yarn/yarn-1.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < ${path} || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0 || die)
-}