gentoo resync : 16.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-16 21:23:20 +0100
commit: fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree: 10baa743a5340b42ad538dd19d48669ccac209b1 /sys-apps
parent: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
44 files changed, 1532 insertions, 1555 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7499c193bd00..20a2c949a407 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 6b39700a4bd9..b80f14324a89 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
 DIST bleachbit-2.2.tar.gz 1100913 BLAKE2B a16e63a2533f9d9c385d384e2fd65dbb32a8f064e769f99e8a8cab9c4069cc7b21e6896c5fa8d02d8204e8c93da8a5f66605601eb44ecc354d41f1a6d9fe2d0a SHA512 c7661cc64358a6420768c3ee1a6ec97d2fd4f0bf67b393be045ef79cef8b3f8cc273a51a5dd7c79d89b8a14cd1357f7714fc860addc9ae74af48bd8d427b3a5a
-EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
 EBUILD bleachbit-2.2.ebuild 1192 BLAKE2B 0bfa92eccb8cd0a08b482870ebfc68bbe09c576d2cb6d2001ca57ed458ef7a3b8e6f9fea3cfd1db07a530363042d3db40bf96e96ad03fd08fc39ed18f6ac9116 SHA512 ce6a55df1b36909d55ef369b4ad61b5097cd3a86702dc9c5606b78386ddbdd90a8048a3d0aedf82955fc025907bc7698949fcf10b00e47ea65a40ea597b327e0
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-2.0.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
deleted file mode 100644
index 480ea80045ac..000000000000
--- a/sys-apps/bleachbit/bleachbit-2.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk"
-
-RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-python_prepare_all() {
-	# choose correct Python implementation, bug #465254
-	sed -i 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
-
-pkg_postinst() {
-	elog "Bleachbit has optional notification support. To enable, please install:"
-	elog ""
-	elog "  dev-python/notify-python"
-}
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a1b1476de338..63c01cd6fc47 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,8 +16,10 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 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.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
+DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
 EBUILD busybox-1.29.0.ebuild 9287 BLAKE2B 681bdbc60c569cce49fd2bd0b01d68200b46c8a95a11fcb60f8686777e6d743a18c55bc5e87e0b466f101a45393ff57558a76a115909f133f1c9874d757a9736 SHA512 fe0adba8450c6073721d0540fb4103e617d33136fe40465e2576143c8781018bcf07f002b20bcb498302d87299016a125be4bcff5231b956a5d073f93dd8966c
 EBUILD busybox-1.29.3.ebuild 9429 BLAKE2B 2834009dcabca4e276462f7d0e8ddce1ef1d830e26218e7608b2506b108b88b5e5bf4ec74da93c6ac3ab97893d432bdc306ce9df809ce0d0c57c7a496f9d4bda SHA512 18c3eaac9e243af3a7ca82018ea6976136b1635b57f6d698a1d8b6303c6f68e8800638b95614abb7f73b30ae3b60214872c2395049f586ea5b9ead18e9c5bf79
 EBUILD busybox-1.30.1.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
+EBUILD busybox-1.31.0.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.0.ebuild b/sys-apps/busybox/busybox-1.31.0.ebuild
new file mode 100644
index 000000000000..c15fa90610c7
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.31.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# 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/dbus/Manifest b/sys-apps/dbus/Manifest
index 26e0ff906b08..71602a46e269 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,7 +5,9 @@ AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
 DIST dbus-1.12.14.tar.gz 2091526 BLAKE2B 45876c4a2880bf9136d4b247b5a533d7306b1d724bb8204b4fb3e5f6a4d34864a25ae947f8276239678f36010f5e69ffe3acecb5ffeeeab0307722b3b0659238 SHA512 b5707a9b429683995a44ba1c61acd402f8c3f2bd867fffc46506583c67dac864c262ce3e7310f653cf3a78fa1a9cae7326a62d244a2b515f613bad274d1826c6
+DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
 EBUILD dbus-1.12.12-r1.ebuild 7772 BLAKE2B 81a77839677b283f6de47d63b3050938ea3929bfe92653ae627c07d0afd648c640064f6c9310b99f697b8984a4f9a06be499db3d7ce303fb74055aaa22f429c7 SHA512 d11da21d55d69a77ef83e3b310a0fa7c0875a376f0de80127e93cdde8dfb0bc35aaa37f9fe95bcaa23c81aebd96d0a0f3feca6d69346ade4c8775c775f5fa240
 EBUILD dbus-1.12.12-r2.ebuild 8000 BLAKE2B 8f25876dba09f3d609f32b6dd23d77ac342070acbaf7a86e7f504980bc7f2e24dec38c848bac9ca699f5b5ddbdb82464803196396a2f4d3be8ae90dc1a878c92 SHA512 f55a77c706bcf660ef5eae51e2b4f1f5c4c8f466ea76c5959b6a11b459b6d56d089463f5845cd0876b7781fb0f38fec1b5d2c69066901a1288a4a8400111f6ef
 EBUILD dbus-1.12.14.ebuild 7861 BLAKE2B 9ad8b5cc984da5738d9ff3e4d2d19c38c3ee9eba8fa55e1cfb7b457cd7d61ed4b4228130ca3c375fa71f816e8cea61e906ff18453fdfc4c351ec3a8421be47fa SHA512 bfc468fba9b80a1168ad4e97ef506139c29e6e75dab9fecc6aee1bb6bf19c61776c3bf6fdd6bcde437514989b1cfa2054105c49a9cd5c0c2fac92a776e0802cf
+EBUILD dbus-1.12.16.ebuild 7861 BLAKE2B 9ad8b5cc984da5738d9ff3e4d2d19c38c3ee9eba8fa55e1cfb7b457cd7d61ed4b4228130ca3c375fa71f816e8cea61e906ff18453fdfc4c351ec3a8421be47fa SHA512 bfc468fba9b80a1168ad4e97ef506139c29e6e75dab9fecc6aee1bb6bf19c61776c3bf6fdd6bcde437514989b1cfa2054105c49a9cd5c0c2fac92a776e0802cf
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
new file mode 100644
index 000000000000..1219009c8285
--- /dev/null
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit autotools flag-o-matic linux-info 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.4
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+COMMON_DEPEND="
+	>=dev-libs/expat-2.1.0
+	elogind? ( sys-auth/elogind )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( sys-apps/systemd:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/expat
+	test? (
+		${PYTHON_DEPS}
+		>=dev-libs/glib-2.40:2
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	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"
+	"${FILESDIR}/${PN}-daemon-optional.patch" # bug #653136
+)
+
+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
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# fix standards conflict, due to gcc being c99 by default nowadays
+		sed -i \
+			-e 's/_XOPEN_SOURCE=500/_XOPEN_SOURCE=600/' \
+			configure.ac || die
+	fi
+
+	# required for bug 263909, cross-compile so don't remove eautoreconf
+	eautoreconf
+}
+
+src_configure() {
+	local rundir=$(usex kernel_linux /run /var/run)
+	sed -e "s;@rundir@;${EPREFIX}${rundir};g" "${FILESDIR}"/dbus.initd.in \
+		> "${T}"/dbus.initd || die
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local docconf myconf testconf
+
+	# 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}${rundir}"/dbus.pid
+		--with-system-socket="${EPREFIX}${rundir}"/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-daemon
+			--disable-selinux
+			--disable-libaudit
+			--disable-elogind
+			--disable-systemd
+			--without-x
+		)
+	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
+		testconf=(
+			$(use_enable test asserts)
+			$(use_enable test checks)
+			$(use_enable test embedded-tests)
+			$(use_enable test stats)
+			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
+		)
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf "${myconf[@]}" "${testconf[@]}"
+	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 "${T}"/dbus.initd 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 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/exa/Manifest b/sys-apps/exa/Manifest
index c923a6172f2f..a4a0c946b447 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -60,6 +60,5 @@ DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST zoneinfo_compiled-0.4.5.crate 7260 BLAKE2B fe461bb585de1a606e8fe800b4df763a988be643a1499e6d4ec182cdd43ea0721ebbea30ed70da4b79fedb2376d2328c4a2bfff993a13046427f85465ad73225 SHA512 1b4248c68d12e2edab047e6067876e5d662b9dc5cf9bab33188082cee0b7aff6162d6288dcad4b08da85baeccbb0f8df81e426448aeda7027544518e3e7850dc
-EBUILD exa-0.8.0-r1.ebuild 1865 BLAKE2B e71a68b4dce9bdbb327f7a29ef46386d31192a8b98a3c8b8c715942d8cf38498d3e5f3f095a50b833bf685b2624ff4fdd8e62cab0a345290454f72afb42b22d0 SHA512 0109b05b0b8a5b732adff479d6ae530351d7980c6525c39bcf3538183b30b1a3ab49da2f2d8b0905ff96f517e2d9cf9545399143c756a05374d83b2785e39883
-EBUILD exa-0.8.0.ebuild 1665 BLAKE2B 604b8c8024ac748888eb0947115bda6d6b2be513f36c6439ff8f8411009a0d44636135c4b8c6badb68a911c5b0043c76be5c3c272ff010def6b1c7b9d7739b4f SHA512 404230a766830808e7196dab9dbb51b2cf743175606afa03cd9824c8510d3044a8461edc97f8468cc473ce8f2c78906524a3b418312a4951593db0ba60263bf7
+EBUILD exa-0.8.0-r1.ebuild 1864 BLAKE2B 2b6dcc1c91530a53b955b886c61698d5eee82382a5c253e1060bf25c526eb06f486844b495a3d984b33e06f2b8b004b2994829af1c746a1c43cd6d1a98299347 SHA512 6b9355716b1778fb9d0f437ed8b06049c98e0b796225f705d1a221488e806005fc2e7f76895adc5d6d3aebcde0c859a2c44c107e66dd87ea9621bf81370cb263
 MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/exa-0.8.0-r1.ebuild b/sys-apps/exa/exa-0.8.0-r1.ebuild
index db54b293100c..164e0c033659 100644
--- a/sys-apps/exa/exa-0.8.0-r1.ebuild
+++ b/sys-apps/exa/exa-0.8.0-r1.ebuild
@@ -76,7 +76,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+git"
 
 DEPEND="
diff --git a/sys-apps/exa/exa-0.8.0.ebuild b/sys-apps/exa/exa-0.8.0.ebuild
deleted file mode 100644
index 93570a71548a..000000000000
--- a/sys-apps/exa/exa-0.8.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.5.3
-ansi_term-0.8.0
-bitflags-0.7.0
-bitflags-0.9.1
-byteorder-0.4.2
-cmake-0.1.25
-conv-0.3.3
-custom_derive-0.1.7
-datetime-0.4.5
-env_logger-0.3.5
-exa-0.8.0
-gcc-0.3.53
-getopts-0.2.14
-git2-0.6.8
-glob-0.2.11
-idna-0.1.4
-iso8601-0.1.1
-kernel32-sys-0.2.2
-lazy_static-0.2.8
-libc-0.2.30
-libgit2-sys-0.6.14
-libz-sys-1.0.16
-locale-0.2.2
-log-0.3.8
-magenta-0.1.1
-magenta-sys-0.1.1
-matches-0.1.6
-memchr-0.1.11
-natord-1.0.9
-nom-1.2.4
-num-0.1.40
-num-bigint-0.1.40
-num-complex-0.1.40
-num-integer-0.1.35
-num-iter-0.1.34
-num-rational-0.1.39
-num-traits-0.1.40
-num_cpus-1.6.2
-number_prefix-0.2.7
-pad-0.1.4
-percent-encoding-1.0.0
-pkg-config-0.3.9
-rand-0.3.16
-redox_syscall-0.1.31
-regex-0.1.80
-regex-syntax-0.3.9
-rustc-serialize-0.3.24
-scoped_threadpool-0.1.7
-term_grid-0.1.6
-term_size-0.3.0
-thread-id-2.0.0
-thread_local-0.2.7
-unicode-bidi-0.3.4
-unicode-normalization-0.1.5
-unicode-width-0.1.4
-url-1.5.1
-users-0.5.3
-utf8-ranges-0.1.3
-vcpkg-0.2.2
-winapi-0.2.8
-winapi-build-0.1.1
-zoneinfo_compiled-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A modern replacement for 'ls' written in Rust"
-HOMEPAGE="https://the.exa.website/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RESTRICT="mirror"
-DEPEND=">=virtual/rust-1.17"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cargo_src_install
-	newbashcomp contrib/completions.bash exa
-	insinto /usr/share/zsh/site-functions
-	newins contrib/completions.zsh _exa
-	insinto /usr/share/fish/vendor_completions.d
-	newins contrib/completions.fish exa.fish
-	doman contrib/man/*
-}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 4ed888b0b37f..04efeb69d834 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,12 +1,10 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
-DIST hwloc-1.11.11.tar.bz2 4114437 BLAKE2B 57666c4a0a49898f55eba991a52954bb9dbc84202cd3e4d7db832a55efc09bb7477593bfa903cadc9e58ac5ba298cbdce3469926f16b8ed65dfa15e2ebb38d5d SHA512 cac1283c603ebe58e6e2c35d3122f349f3251da6b4f4671bdc8a335b2dd7cc2131107fe239dcc25915b07e193784dbf1b86561433acaeef4e4c3ea103f7d54c5
+DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
-DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
-DIST hwloc-2.0.2.tar.bz2 6032384 BLAKE2B 868c57b434f7722202ec07747dcc62b320ed265ff8334347d824151eb0d37ff626a90f8b66828f82e9ea9e17b95f41f4ffe509f00e7aa9c822bb5080fb4edbd8 SHA512 b3bbf56bea99e3c381f72989aa18bc2329f15d7d12d9386ea7049fc875be4b5f89f2476a3c6cbaea562d1c91f147a3a2c80a50e93b824c7ef6323eed1d6126ef
+DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900ce134485c59a0b41a01120950c1c083915a2cd1752c3da2811914d8c007d7d726a1b9c8ee37d7ead9a27e92a70 SHA512 e3d6fdbb65ccfe9a19bbadac45e19c2d485b303995ef790cacbf441e30009c808dc6e2981822e246ea5db662a03eb6382ec21b63bd7d63948a6778f4da4e47be
-EBUILD hwloc-1.11.11.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
+EBUILD hwloc-1.11.13.ebuild 2182 BLAKE2B 6597d78e44eb15ea1a24cda4633109f6c10e6198c56f298a53dbb5dd237968c372b1fea0fb84769547d3d0422039835fad231f0618e0fc629775c1f9027530bf SHA512 8b6f4536484e2712c67d079961ef353446801ed59ea04819a0bcfba2841d0bfb0c76afcceadc6b328283fc3b2db92f548f98807611e36b11211270fac540ef53
 EBUILD hwloc-1.11.2-r1.ebuild 2169 BLAKE2B 938851b64cc610349a7a204953fbad5914d238afc5f170ef48b56b7905184747c2b5d84261478a3921946743a35e2a9da0d723cc09b97f785b4acb4c32899cfd SHA512 7b5931e6e1d4670a7f8aa6a93b367351da99bce3dfcea04c88865e47a617e93928c24eefec5a6a92d85950e3081cb08d61a4aa1e0842f2d11eea670d27d487a3
-EBUILD hwloc-1.11.7.ebuild 2180 BLAKE2B eccaadf693dbe56efb83112b561af209370bcef87618bd89e96ff05a90c74b08bbebd3fc481d67b45a5aefe1cb0e220233a4e4169bcd6f5cb03730c52df944fc SHA512 7c2209cc58dd22e76cfcde886b2d8bec3bf0732f3f48c8cc47b19adc1626f9034246681e4ca9e11d0c9f97445da581792ea8a31ebacd1c21faae54a248d6e107
-EBUILD hwloc-2.0.2-r1.ebuild 2052 BLAKE2B c0535eec4938ba73803929bad5f973d3f7fe00ee3baf1162e803ea664679d7147b9a91b1f39cd83421fcbbb86bc9e06fcb8f1b38c5814e4158e724bfef86bcf0 SHA512 3a3c1b95ca08bc51875461baa84f742688b1f2f8418976b5f2cc3cdb942d1dde95608072031e642fc91028f3cc06d7582a89af2e0e750fc7e8d2f45bb0e2cd1f
+EBUILD hwloc-2.0.4.ebuild 2053 BLAKE2B 64d882e86ce13b75342678aba12510047875bda3432cd2da5682d2565c046ccf15e25d43f0433d9dd67352273fbbc37cdf0022f5fafc6e89ae53ac29c6786357 SHA512 ad144a98b81cc886152eb13c46890290f2d7351bc0973ecf79099a6735a8ec78910f35307fb66ca661b86a5fe77d0921150b63175b001de57207e2986768e5e6
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.11.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 971dfae0ef6d..f3a4a7fc25a8 100644
--- a/sys-apps/hwloc/hwloc-1.11.11.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.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
diff --git a/sys-apps/hwloc/hwloc-1.11.7.ebuild b/sys-apps/hwloc/hwloc-1.11.7.ebuild
deleted file mode 100644
index d0ae44270893..000000000000
--- a/sys-apps/hwloc/hwloc-1.11.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic versionator multilib-minimal
-
-MY_PV=v$(get_version_component_range 1-2)
-
-DESCRIPTION="displays the hardware topology in convenient formats"
-HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
-SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
-	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
-	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
-	pci? (
-		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-	)
-	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
-DOCS=( AUTHORS NEWS README VERSION )
-
-src_prepare() {
-	default
-	eautoreconf
-
-	if use cuda ; then
-		append-cflags -I"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/opt/cuda/include
-	fi
-}
-
-multilib_src_configure() {
-	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
-
-	if use cuda ; then
-		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		$(use_enable static-libs static) \
-		$(use_enable cairo) \
-		$(use_enable cuda) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable gl) \
-		$(use_enable pci) \
-		$(use_enable plugins) \
-		$(use_enable numa libnuma) \
-		$(use_enable xml libxml2) \
-		$(use_with X x)
-}
diff --git a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild
index 57d0a74d2dde..42cab5ea370b 100644
--- a/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
 SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
-SLOT="0/5"
+SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +pci plugins svg static-libs xml X"
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index bdf3c9182145..122b92732c41 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,6 +4,7 @@ AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e1671
 AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
 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
+AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
 DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
@@ -15,6 +16,6 @@ EBUILD iproute2-4.17.0-r1.ebuild 4265 BLAKE2B 4901efc39bb2dfa1b6bb100dd0166b7e40
 EBUILD iproute2-4.19.0-r1.ebuild 4278 BLAKE2B dd66602187e934c6624dca792e055ff00f335fd052f2d2846c8369db4a3fd4cdc7a7cab77a50d11305831dc70217297f059a1ca456a8626d612813f8812ac262 SHA512 e39cb5832b545fc6ebc58bad755f000e7e5969aff4eacc123ada7602c44282bb136462482bd56b89aad24d6c00de81d555d97a62eb4d8d00e1358c82b6bb3978
 EBUILD iproute2-4.20.0.ebuild 4314 BLAKE2B 628a1567d00b724e2596865f54b6aa01fb1731b37b0c3d25220a3fe55d58271734a78a03f70196d991010a0fb0c8b25105fee34123b53301f495376d7f2d8d27 SHA512 31e49b08b2db47d7ac675140d761abe469c4b679ae2c3a9dee54a16f4c1400ee09fc24d0380374e81e0db0f1778cfcbd4807be4bc9a39f7998aa7e312f2a4de0
 EBUILD iproute2-5.0.0.ebuild 4352 BLAKE2B e3dea0581dc026282b8222751c178051e9b58dbe70887d3b709608b19941294afc6c720d25cffa763b8293cf31924029f6fea99013745c14998e6d5d9431f715 SHA512 7d967eb53cc0a05fc7a341a0c62150c39fbe7cdf7780ddd10441365f0c7ede15c508242aa6c5da451758b71f8d64c9afc9250f667675e32c09f369e61ba9d75c
-EBUILD iproute2-5.1.0.ebuild 4272 BLAKE2B 80001911770e432d9a603ba4626e544e9ae5b417ffa52a7033e178b0fb7d836e5c52f46220889e236f0dace23e5dffb1716e2e193ad3e02428584413ba75bb3f SHA512 9b44b8f9dd6ef6a8d2ee6db92ba359e2895710ce1a8491a2f7ac099504eb5f44e1f7cd4a813e39948632c48a713d83230fbdc3321ef0b7b3a52c7219e0668df9
+EBUILD iproute2-5.1.0.ebuild 4317 BLAKE2B bb2e521f2186d87fd740d9ebdc5a1ca107eea739c00b606de308fa60ff183163aec782a3fdc1a3666642b43d36f8ec4836a7133fb4a4907cb3c8aed2f8f79193 SHA512 3109ff8309215f1801eeb49bb73b079f28d2ef73634188123a7e06169cc13154f0eeefcb88f8abcc3c56e3ed7482f362eab71fad4bfe1eb5e255244f83d55a1b
 EBUILD iproute2-9999.ebuild 4272 BLAKE2B 80001911770e432d9a603ba4626e544e9ae5b417ffa52a7033e178b0fb7d836e5c52f46220889e236f0dace23e5dffb1716e2e193ad3e02428584413ba75bb3f SHA512 9b44b8f9dd6ef6a8d2ee6db92ba359e2895710ce1a8491a2f7ac099504eb5f44e1f7cd4a813e39948632c48a713d83230fbdc3321ef0b7b3a52c7219e0668df9
 MISC metadata.xml 581 BLAKE2B b63c391d8d9ba608c12ea74f0cdf0d4d762d18e5b62ab1e2489f34140def1691bc295d8d252ab984b313b6fb037cd4d5a74d992db7ca670557bd8458501f8c04 SHA512 607dd3006049664a4c780a65b187fb938cbf7c5e79b445eb4a69c3115af8fe6718ea227a68cfcf4b42fd92c3e760579a92b49a58415d01ccb0715fdf9c052a97
diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
new file mode 100644
index 000000000000..e704f65c113f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
@@ -0,0 +1,32 @@
+From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Tue, 11 Jun 2019 01:48:01 -0500
+Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever,
+ but removing it breaks glibc's userspace header, which includes kernel.h
+ instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical
+ mistake. on musl, including any header that uses kernel.h directly or
+ indirectly plus sys/sysinfo.h will produce a compile error due to
+ redefinition of struct sysinfo. so for now, only include it on glibc in order
+ not to break their headers.
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ include/uapi/linux/kernel.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
+index d99ffa1..f917115 100644
+--- a/include/uapi/linux/kernel.h
++++ b/include/uapi/linux/kernel.h
+@@ -2,7 +2,9 @@
+ #ifndef _LINUX_KERNEL_H
+ #define _LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+-- 
+2.22.0
diff --git a/sys-apps/iproute2/iproute2-5.1.0.ebuild b/sys-apps/iproute2/iproute2-5.1.0.ebuild
index 5db7d040eeee..f2771e5b49e4 100644
--- a/sys-apps/iproute2/iproute2-5.1.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.1.0.ebuild
@@ -47,6 +47,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 4792b6da957c..2af1c9a8ef81 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,8 @@
+AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399075164320ff608ca6ba5f1bca16d206ca975d8f5f9977ec80fcfed5b81146f9649d61e8e88f5f8589368ab1e SHA512 b5d26fda11398d4877821cbe8bd36967bec095d6e6c2489ec8aa4ef968795f0e238a74e2a9c4db8435fc176dc046920a365771a387a25cb1d0ea763210a92483
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 EBUILD kmod-25.ebuild 4913 BLAKE2B f17beda49f104502c22d5f1e83b36b0869829460be48a3d30edec854891b836c185afa85cd46d36279fea0cb01415038e0a2682037638a3723d86b6b51bc4b5c SHA512 ff8089459817c08226c91243aa8582e4a275b813b5569f6dcd2c591bade7db8832c38cb21736e50f8440eeb3b734197c3971b63e3e0899a6baf8f8dcf7f074ff
-EBUILD kmod-26.ebuild 5009 BLAKE2B 545bdf26a17842acedfe60417b159cbd6087da5eb694f35d3ead332609575f15595e6ae36077169fe9af9015981d1352494661e57c063484b73382be9a66fc92 SHA512 138a6c74662bd99b6785573970c7791c9e6ef838fd9a3e09eec7c6c2b9582fe1fce69061ba90d49a304e3ac32585f36142ae3dfcbb637297cdcdcb4279de4186
+EBUILD kmod-26-r1.ebuild 5134 BLAKE2B e663244e433893ba30b1776258257d30a26beb87607553cf48688f3989b0675d186bbc8ee6c639ca139396db42311021f6818b177c15f61b6a62bc9660f68b12 SHA512 f025735f5ce30d16d2560660a2d781091940cfb517fd7f6100aaf470055b9f4185bdf282e98b065e35180b68adcca7f98fb0c035d9ac25607735a1e239a9b17c
 EBUILD kmod-9999.ebuild 5002 BLAKE2B f5d77bb0b1bc1b55886a7e31b52bd922e616b080d1ee710d889e6465685a8b47c74500d2852dba03d8068abe5def621628c63ed5e7c096b28f449f7ce0755729 SHA512 2df4cf048aa392368c00f338d5fd46382cc7b362717d6fec5e2efb6f6c38f9783201aecfbf54db02f2e3275cb8dfa6e53aeb8a59f7acedbebedddd0e45ca0172
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/files/kmod-26-libressl.patch b/sys-apps/kmod/files/kmod-26-libressl.patch
new file mode 100644
index 000000000000..cb36ab401c21
--- /dev/null
+++ b/sys-apps/kmod/files/kmod-26-libressl.patch
@@ -0,0 +1,143 @@
+From 628677e066198d8658d7edd5511a5bb27cd229f5 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Sun, 19 May 2019 03:42:01 +0300
+Subject: [PATCH] libkmod-signature: use PKCS#7 instead of CMS
+
+Linux uses either PKCS #7 or CMS for signing modules (see
+scripts/sign-file.c). CMS is not supported by LibreSSL or older OpenSSL,
+so PKCS #7 is used on systems with these libcrypto providers.
+
+CMS and PKCS #7 formats are very similar. CMS is newer but is as much as
+possible backward compatible with PKCS #7 [1]. PKCS #7 is supported in
+the latest OpenSSL as well as CMS. The fields used for signing kernel
+modules are supported both in PKCS #7 and CMS.
+
+For now modinfo uses CMS with no alternative requiring OpenSSL 1.1.0 or
+newer.
+
+Use PKCS #7 for parsing module signature information, so that modinfo
+could be used both with OpenSSL and LibreSSL.
+
+[1] https://tools.ietf.org/html/rfc5652#section-1.1
+
+Changes v1->v2:
+- Don't use ifdefs for keeping redundant CMS code, just use PKCS #7 both
+with OpenSSL and LibreSSL.
+
+Upstream-Status: Accepted
+[https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=628677e066198d8658d7edd5511a5bb27cd229f5]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ libkmod/libkmod-signature.c | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
+index 48d0145..4e8748c 100644
+--- a/libkmod/libkmod-signature.c
++++ b/libkmod/libkmod-signature.c
+@@ -20,7 +20,7 @@
+ #include <endian.h>
+ #include <inttypes.h>
+ #ifdef ENABLE_OPENSSL
+-#include <openssl/cms.h>
++#include <openssl/pkcs7.h>
+ #include <openssl/ssl.h>
+ #endif
+ #include <stdio.h>
+@@ -122,7 +122,7 @@ static bool fill_default(const char *mem, off_t size,
+ #ifdef ENABLE_OPENSSL
+ 
+ struct pkcs7_private {
+-	CMS_ContentInfo *cms;
++	PKCS7 *pkcs7;
+ 	unsigned char *key_id;
+ 	BIGNUM *sno;
+ };
+@@ -132,7 +132,7 @@ static void pkcs7_free(void *s)
+ 	struct kmod_signature_info *si = s;
+ 	struct pkcs7_private *pvt = si->private;
+ 
+-	CMS_ContentInfo_free(pvt->cms);
++	PKCS7_free(pvt->pkcs7);
+ 	BN_free(pvt->sno);
+ 	free(pvt->key_id);
+ 	free(pvt);
+@@ -197,11 +197,10 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 		       struct kmod_signature_info *sig_info)
+ {
+ 	const char *pkcs7_raw;
+-	CMS_ContentInfo *cms;
+-	STACK_OF(CMS_SignerInfo) *sis;
+-	CMS_SignerInfo *si;
+-	int rc;
+-	ASN1_OCTET_STRING *key_id;
++	PKCS7 *pkcs7;
++	STACK_OF(PKCS7_SIGNER_INFO) *sis;
++	PKCS7_SIGNER_INFO *si;
++	PKCS7_ISSUER_AND_SERIAL *is;
+ 	X509_NAME *issuer;
+ 	ASN1_INTEGER *sno;
+ 	ASN1_OCTET_STRING *sig;
+@@ -220,31 +219,33 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 
+ 	in = BIO_new_mem_buf(pkcs7_raw, sig_len);
+ 
+-	cms = d2i_CMS_bio(in, NULL);
+-	if (cms == NULL) {
++	pkcs7 = d2i_PKCS7_bio(in, NULL);
++	if (pkcs7 == NULL) {
+ 		BIO_free(in);
+ 		return false;
+ 	}
+ 
+ 	BIO_free(in);
+ 
+-	sis = CMS_get0_SignerInfos(cms);
++	sis = PKCS7_get_signer_info(pkcs7);
+ 	if (sis == NULL)
+ 		goto err;
+ 
+-	si = sk_CMS_SignerInfo_value(sis, 0);
++	si = sk_PKCS7_SIGNER_INFO_value(sis, 0);
+ 	if (si == NULL)
+ 		goto err;
+ 
+-	rc = CMS_SignerInfo_get0_signer_id(si, &key_id, &issuer, &sno);
+-	if (rc == 0)
++	is = si->issuer_and_serial;
++	if (is == NULL)
+ 		goto err;
++	issuer = is->issuer;
++	sno = is->serial;
+ 
+-	sig = CMS_SignerInfo_get0_signature(si);
++	sig = si->enc_digest;
+ 	if (sig == NULL)
+ 		goto err;
+ 
+-	CMS_SignerInfo_get0_algs(si, NULL, NULL, &dig_alg, &sig_alg);
++	PKCS7_SIGNER_INFO_get0_algs(si, NULL, &dig_alg, &sig_alg);
+ 
+ 	sig_info->sig = (const char *)ASN1_STRING_get0_data(sig);
+ 	sig_info->sig_len = ASN1_STRING_length(sig);
+@@ -277,7 +278,7 @@ static bool fill_pkcs7(const char *mem, off_t size,
+ 	if (pvt == NULL)
+ 		goto err3;
+ 
+-	pvt->cms = cms;
++	pvt->pkcs7 = pkcs7;
+ 	pvt->key_id = key_id_str;
+ 	pvt->sno = sno_bn;
+ 	sig_info->private = pvt;
+@@ -290,7 +291,7 @@ err3:
+ err2:
+ 	BN_free(sno_bn);
+ err:
+-	CMS_ContentInfo_free(cms);
++	PKCS7_free(pkcs7);
+ 	return false;
+ }
+ 
+-- 
+2.21.0
+
diff --git a/sys-apps/kmod/kmod-26.ebuild b/sys-apps/kmod/kmod-26-r1.ebuild
index c65b8e722432..a10a6cdda8d6 100644
--- a/sys-apps/kmod/kmod-26.ebuild
+++ b/sys-apps/kmod/kmod-26-r1.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc lzma python ssl static-libs +tools zlib"
+IUSE="debug doc libressl lzma python ssl static-libs +tools zlib"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -36,7 +36,10 @@ RDEPEND="!sys-apps/module-init-tools
 	!<sys-apps/systemd-216-r3
 	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
 	python? ( ${PYTHON_DEPS} )
-	ssl? ( >=dev-libs/openssl-1.1.0:0= )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
@@ -55,6 +58,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS="NEWS README TODO"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libressl.patch" # bug 677960
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index a6f6e588dc91..37c7cadfef12 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,12 +1,11 @@
-AUX less-549-mouse_fix.patch 1241 BLAKE2B 88558651e98023f840853e3b5195fe767242e7a17eabb999135b1cd1f7907586130dee4dd5b10b83866a17a91d9a3459c6b68f2496768c2230f5128034181479 SHA512 9d7c3694f26b89567f229d287773b452165df4686a7c008ce31ebc458d61d4b1e350fb3ddc1ffa72bd99a293ea8310d16a8c2477ea2e94b6a758fe22a73a2351
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd823a8f5a00a110df3492d299b04a66b003528549991c0b87e1ee80835a0383667991b6a8bba50 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b
 DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
-DIST less-549.tar.gz 346978 BLAKE2B 840ff54567d241cd4cfb90e91d3e004da09a3dfe4b8595aebdf69e0fb9c534e9da3bfe4953d51fcab67c86fbaa1e7bd9f318bd18856bf051895995715df7e827 SHA512 f0f86db00ee7a0ed638dfe2183e5cd6a9728d6e4cb9f054a746716abf6fe297f33b6f1d44bd4eac8ad360da564c4ea50cd6f41d297f857c78414961d28f4155c
 DIST less-550.tar.gz 347026 BLAKE2B b033cb09d1bb9624c56db14084c73e5154e36cebd3f757dd2cb1b012b8797e7647d152bb67ce4ea9c2d188b1252fd7ddfd8a113656af5ec9a1e688145d4d9265 SHA512 a3d2769d90589a8e6afbfc9ac10cd1b544e0b0bbe28884e5ad980a71c541a37545c11d3450984b346b516fe082dfc0cf89d246c5a2d6002a7a2b4a4296a15494
+DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
 EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a
 EBUILD less-531.ebuild 1408 BLAKE2B 70268fa7b95805f7c8d5837537e378a881b383c104d5c264b2113554a926659319e1457c470eb6ce1d2215fb2409e2d296643086ff7ca5666c4aa54b996050dd SHA512 7c4b7197acf8d0bc99fb4b3ed5fae4d1a85517d9e70b051fe093597eea640346f03107d0e383bd1e4f23359d2eddf5d6081099b68c103a8146dcd20611ed119c
-EBUILD less-549-r1.ebuild 1477 BLAKE2B c53128815519df2590e196dcbb1c56ed40992c39317363b9c722ed422818e7d6a21c8a92c4591c2e9eeedc3ca85a0a9c148cd8fd4c2e28c285781036e77c0be7 SHA512 8bbc80a38e1505146aaf33d68e1f608bb5544349de14383341e47de9d590fbeb495ed88346537426754ec710ecfab288d93f0a7f66a14a597e301579d8efeb65
 EBUILD less-550.ebuild 1427 BLAKE2B 40d127ef749db3b799aa85bb972ba961b3f9babab2e8b5594d5077ea8fdc27b8db2cf52cef72ef20663476e29852f348fcfaecd78db78277a82903e201e624c4 SHA512 bbe7f12c63e47795412ac1442c776f66ea0ffd8e166d9dbb6a39286f413dcdaa4d7f6fb4e56d0b8745a8effc1be5472995afdc9b965528ad40b5850aca322fd4
+EBUILD less-551.ebuild 1427 BLAKE2B 21b55339b3f11b82561b2d48391dfaa92ee29461d27f0bfc50e17072d4921c061ceec882e924ed1ec59edb8f6dfaaa5fc8c1b2396b677843dd579feede51e17e SHA512 3241ed0b18265fc037e8809266e92a918badd15b413f80bff3c1ff8f9bc98d5020846d658c8e0fc34ce25e61c020febe0b0322f3ac07530c0f979b799cc7aede
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/files/less-549-mouse_fix.patch b/sys-apps/less/files/less-549-mouse_fix.patch
deleted file mode 100644
index 495073a32a49..000000000000
--- a/sys-apps/less/files/less-549-mouse_fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d5015d29f79e70fb70489616c0f2d0ff32e52898 Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Sat, 16 Feb 2019 07:20:42 -0800
-Subject: [PATCH] Don't emit mouse controls if --mouse is not set.
-
----
- screen.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/screen.c b/screen.c
-index 9a32685..b58fe26 100644
---- a/screen.c
-+++ b/screen.c
-@@ -1549,6 +1549,8 @@ win32_deinit_term(VOID_PARAM)
- 	public void
- init_mouse(VOID_PARAM)
- {
-+	if (!mousecap)
-+		return;
- #if !MSDOS_COMPILER
- 	tputs(sc_s_mousecap, sc_height, putchr);
- #else
-@@ -1565,6 +1567,8 @@ init_mouse(VOID_PARAM)
- 	public void
- deinit_mouse(VOID_PARAM)
- {
-+	if (!mousecap)
-+		return;
- #if !MSDOS_COMPILER
- 	tputs(sc_e_mousecap, sc_height, putchr);
- #else
-@@ -1587,8 +1591,7 @@ init(VOID_PARAM)
- 			tputs(sc_init, sc_height, putchr);
- 		if (!no_keypad)
- 			tputs(sc_s_keypad, sc_height, putchr);
--		if (mousecap)
--			init_mouse();
-+		init_mouse();
- 	}
- 	if (top_scroll) 
- 	{
-@@ -1626,8 +1629,7 @@ deinit(VOID_PARAM)
- #if !MSDOS_COMPILER
- 	if (!(quit_if_one_screen && one_screen))
- 	{
--		if (mousecap)
--			deinit_mouse();
-+		deinit_mouse();
- 		if (!no_keypad)
- 			tputs(sc_e_keypad, sc_height, putchr);
- 		if (!no_init)
diff --git a/sys-apps/less/less-549-r1.ebuild b/sys-apps/less/less-551.ebuild
index 8eff7a5d6ea5..7af03b494807 100644
--- a/sys-apps/less/less-549-r1.ebuild
+++ b/sys-apps/less/less-551.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 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 ~riscv ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
@@ -17,10 +17,6 @@ DEPEND=">=app-misc/editor-wrapper-3
 	pcre? ( dev-libs/libpcre2 )"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-mouse_fix.patch #678102
-)
-
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index aec553fe8daa..e5e4ff134f97 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -2,11 +2,14 @@ AUX fancontrol.confd 669 BLAKE2B cc297a5122d54f6104d840548480c6648fb31388a9c78a5
 AUX fancontrol.initd 603 BLAKE2B d5409d4141996adb8e5e9520075d42f79fcdcc017850c0d3d21cbf5736ea1d7da07921b035cbbb5a2c4a8490ddad3a108073fe154f170507249f3fc8f5e5b920 SHA512 3dad0939d679bfb2732bdbd8ff851298ed86e5fd83719eb5181f8cc3e7d84f7986a79a3438a8c3b6a6e3c8be1a3a9839769292d77e352c0167d4b16dd1f0d086
 AUX fancontrol.service-r1 146 BLAKE2B 666a45c2e55dcf31470167ba9bb78e6205b3fcb47f66ae7b185d6651dba33f8a7699f800ecddaed070a8827d24893cc1971203b691f37515ea74125e889e8965 SHA512 eb1e22045a4adbcba398b77061d33b145614edf960c31aeb3c9a987553d6a0d8de332d4887e52ca2c6d6147d6e1a2b5e8bae41dca5f1c9d4fc2dc522c18459f8
 AUX lm_sensors-3.4.0-sensors-detect-gentoo.patch 12441 BLAKE2B f35efdf0f27b8aa64d5d0f8f088921225b9f991eb999d40f452afba4161ea7a38521346356f00c3136e6fb0d27d6508dd46fef385fb9e317157eb33bce8bdb8d SHA512 740c2fefa3c914fbb977e86b5b57cdbbcd06fc2d348ee42b5c678f164f15fb7a171979e5da5a1779c932ba39a535e37d0f7b7506c43966463115e0042dc9dc81
+AUX lm_sensors-3.5.0-sensors-detect-gentoo.patch 12593 BLAKE2B 21383c2d0a7dc2063f81ca7af15ee02dc94a3344f23da80433ab19fc7a5528cc516408ecadc46d0fd1f55799a305c0e509211476314ca0cdf05e3b8942059050 SHA512 0f1556cef3d1c19f4dd822afdf609390f82dbfda7e66070ca5b89b145c29669e05141f150b3b0d58c277c79c57f98659284953788db6334c27e17e3f39e23cdd
 AUX lm_sensors.confd 102 BLAKE2B 5d0771a2cac4869caee2d6ae3ac2cc2f60e64720ad587d4a89fa6dca7506325554b06d92cce42fc51b9af9c8715834d6d481f342cd6be57061c5234dfabd26d3 SHA512 a31220f4bf337de7b17158e00c64e662527abe11c5cc9f8401216f757dcde1c220527ad73f375c0de051030119daeba4cef6c5155f077447a9391e273cd65f50
 AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb96453432808360d1ff0ffd92dfcb306364ffa579afdb6b02dda930c7288e5c1b32274893e8541777a62abe8c37 SHA512 5a3f3eb6ae2a97f0a3841a2544579733f6df4a89c3667e1920203a6b0d18f54eb0aa12b1fd0c0bbdc4f6a1535df8444ebeb9d6212cc8be8dc1cf25e204d009a0
 AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm_sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
+DIST lm_sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 EBUILD lm_sensors-3.5.0.ebuild 6448 BLAKE2B ae7e54bae38d9374a65df2f2aeaf4dad562e91357a351789e985674101253cd6f150b4366c4491cf5dececf1ee561ddd2057ff6a915b9a22b3feb345addd7050 SHA512 a7fb2556fa53fb57ee9e34b60fe9375ad67b326b5f1fd23ff31a2f6c0b98f0c51a184bf7817fbf3d5b28b4cc67c1bf2caf5421a1052efb64df0d9c286d2ec07c
+EBUILD lm_sensors-3.5.0_p20190505.ebuild 6444 BLAKE2B 99e792e84bd2120bcc6e0f632b55c8a2dbc76dd9939e0af95237178aba79f268f3a65c32c793286040785f4f0b8f893a5b981afc61c5ccc29f9b09a06b4b238d SHA512 1ccbc2cfd2a6f2e524579e5438f03d70100863e244ef25c92e956232e7c2d1abc21de6d4e47a2056305c3f8b732d080de4ef790cee0480b99d021ae6c376cd1c
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch b/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch
new file mode 100644
index 000000000000..3fcd19c05c4f
--- /dev/null
+++ b/sys-apps/lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch
@@ -0,0 +1,347 @@
+From eed538e59a63eaacae67d7bfdd95a19e18dad1a5 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Tue, 9 Aug 2016 01:19:16 +0200
+Subject: [PATCH 1/3] sensors-detect: Add sd_boot detection
+
+We need to know in write_config function wether the system is using systemd
+or not.
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ prog/detect/sensors-detect | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index 5c771485..ea1c0d53 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -2976,7 +2976,7 @@ sub isa_read_i5d6
+ # AUTODETECTION #
+ #################
+ 
+-use vars qw($dev_i2c $sysfs_root $systemd_systemctl $systemd_system_dir);
++use vars qw($dev_i2c $sysfs_root $systemd_is_booted $systemd_systemctl $systemd_system_dir);
+ 
+ sub initialize_conf
+ {
+@@ -3050,6 +3050,10 @@ sub initialize_conf
+ 	} elsif (-d "/lib/systemd/system") {
+ 		$systemd_system_dir = "/lib/systemd/system";
+ 	}
++
++	# Check whether the system was booted using systemd.
++	# See: man sd_booted
++	$systemd_is_booted = -d '/run/systemd/system';
+ }
+ 
+ # [0] -> VERSION
+-- 
+2.21.0
+
+
+From bad0d73c98c9167ec4ade01c6b75159643d237f1 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Tue, 9 Aug 2016 01:25:52 +0200
+Subject: [PATCH 2/3] sensors-detect: write_config function adjusted for Gentoo
+ environment
+
+Bug: https://bugs.gentoo.org/480018
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ prog/detect/sensors-detect | 133 +++++++++++++++++--------------------
+ 1 file changed, 62 insertions(+), 71 deletions(-)
+
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index ea1c0d53..1e8ac00d 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -7338,6 +7338,9 @@ sub write_config
+ {
+ 	my ($configfile, $bus_modules, $hwmon_modules) = @_;
+ 
++	my $have_conffiles_created = 0;
++
++	# /etc/modprobe.d handling
+ 	if (defined $configfile) {
+ 		my $have_modprobe_d = -d '/etc/modprobe.d';
+ 		printf "Do you want to \%s /etc/modprobe.d/lm_sensors.conf? (\%s): ",
+@@ -7346,96 +7349,84 @@ sub write_config
+ 		$_ = read_answer();
+ 		if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
+ 			unless ($have_modprobe_d) {
+-				mkdir('/etc/modprobe.d', 0777)
++				mkdir('/etc/modprobe.d', 0755)
+ 					or die "Sorry, can't create /etc/modprobe.d ($!)";
+ 			}
+-			open(local *MODPROBE_D, ">/etc/modprobe.d/lm_sensors.conf")
++			open(local *MODPROBE_D, ">", $have_modprobe_d . '/lm_sensors.conf')
+ 				or die "Sorry, can't create /etc/modprobe.d/lm_sensors.conf ($!)";
+ 			print MODPROBE_D "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ 			print MODPROBE_D $configfile;
+ 			close(MODPROBE_D);
++			$have_conffiles_created++;
+ 		} else {
+ 			print "To make the sensors modules behave correctly, add these lines to\n".
+-			      "/etc/modprobe.conf:\n\n";
++			      "/etc/modprobe.d/lm_sensors.conf:\n\n";
+ 			print "#----cut here----\n".
+ 			      $configfile.
+ 			      "#----cut here----\n\n";
+ 		}
+ 	}
+ 
+-	my $have_sysconfig = -d '/etc/sysconfig';
+-	printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
+-	       (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
+-	       ($have_sysconfig ? 'YES/no' : 'yes/NO');
+-	$_ = read_answer();
+-	if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
+-		unless ($have_sysconfig) {
+-			mkdir('/etc/sysconfig', 0777)
+-				or die "Sorry, can't create /etc/sysconfig ($!)";
+-		}
+-		open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
+-			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
+-		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
+-		print SYSCONFIG <<'EOT';
+-# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
+-# be loaded/unloaded.
+-#
+-# The format of this file is a shell script that simply defines variables:
+-# HWMON_MODULES for hardware monitoring driver modules, and optionally
+-# BUS_MODULES for any required bus driver module (for example for I2C or SPI).
+-
+-EOT
+-		print SYSCONFIG "BUS_MODULES=\"", join(" ", @{$bus_modules}), "\"\n"
+-			if @{$bus_modules};
+-		print SYSCONFIG "HWMON_MODULES=\"", join(" ", @{$hwmon_modules}), "\"\n";
+-		close(SYSCONFIG);
+-
+-		if ($systemd_systemctl && $systemd_system_dir) {
+-			if (-f "$systemd_system_dir/lm_sensors.service") {
+-				system($systemd_systemctl, "enable", "lm_sensors.service");
+-				system($systemd_systemctl, "start", "lm_sensors.service");
+-				# All done, don't check for /etc/init.d/lm_sensors
+-			} else {
+-				print "Copy prog/init/lm_sensors.service to $systemd_system_dir\n".
+-				      "and run 'systemctl enable lm_sensors.service'\n".
+-				      "for initialization at boot time.\n";
+-			}
+-			return;
++	# /etc/modules-load.d handling
++	my $modulesload_filedir = '/etc/modules-load.d';
++	my $modulesload_file = $modulesload_filedir . '/lm_sensors.conf';
++	my $modulesload_cfg = "# Generated by sensors-detect on " . scalar localtime() . "\n"
++		. join("\n", (@{$bus_modules}, @{$hwmon_modules})) . "\n";
++
++	my $have_modulesload_file = -f $modulesload_file;
++	printf "Do you want to \%s '$modulesload_file'? (\%s): ",
++		($have_modulesload_file ? 'overwrite' : 'generate'),
++		($have_modulesload_file ? 'yes/NO' : 'YES/no');
++
++	my $input = read_answer();
++	chomp($input);
++	if ($input eq '' && $have_modulesload_file) {
++		$input = 'no';
++	}
++	elsif ($input eq '' && !$have_modulesload_file) {
++		$input = 'yes';
++	}
++
++	if ($input =~ m/^\s*y/i) {
++		unless (-d $modulesload_filedir) {
++			mkdir($modulesload_filedir, 0755)
++				or die "Sorry, can't create '$modulesload_filedir' ($!)";
+ 		}
+ 
+-		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
+-		      "for initialization at boot time.\n"
+-			unless -f "/etc/init.d/lm_sensors";
++		open(my $fh, '>', $modulesload_file)
++			or die "Sorry, can't open '$modulesload_file' for writing! ($!)";
+ 
+-		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
+-			system("/sbin/insserv", "/etc/init.d/lm_sensors");
+-		} elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
+-			system("/sbin/chkconfig", "lm_sensors", "on");
+-			if (-x "/sbin/service") {
+-				system("/sbin/service", "lm_sensors", "start");
+-			}
++		print $fh $modulesload_cfg;
++		close($fh);
++
++		$have_conffiles_created++;
++	}
++	else {
++		print "\nPlease create '$modulesload_file' with the following content\n"
++			. "to allow modules-load service to autoload modules on boot:\n\n";
++		print "#----cut here----\n"
++			. "# Generated by sensors-detect on " . scalar localtime() . "\n"
++			. join("\n", (@{$bus_modules}, @{$hwmon_modules})) . "\n"
++			. "#----cut here----\n\n";
++	}
++
++	if ($have_conffiles_created) {
++		printf "\nNote: You only have created the required configuration to autoload the\n"
++			. "required modules to use your sensors on boot. If you want to start using\n"
++			. "your sensors right now you have to either load them now once manually, to\n"
++			. "reboot this system or to execute the following command(s):\n\n";
++
++		if ($systemd_is_booted) {
++			print "  # systemctl restart systemd-modules-load\n\n"
+ 		} else {
+-			print "You should now start the lm_sensors service to load the required\n".
+-			      "kernel modules.\n\n";
+-		}
+-	} else {
+-		print "To load everything that is needed, add this to one of the system\n".
+-		      "initialization scripts (e.g. /etc/rc.d/rc.local):\n\n";
+-		print "#----cut here----\n";
+-		if (@{$bus_modules}) {
+-			print "# Adapter drivers\n";
+-			print "modprobe $_\n" foreach (@{$bus_modules});
++			print "  # /etc/init.d/modules restart\n\n"
+ 		}
+-		print "# Chip drivers\n";
+-		print "modprobe $_\n" foreach (@{$hwmon_modules});
+-		print((-e '/usr/bin/sensors' ?
+-		       "/usr/bin/sensors -s\n" :
+-		       "/usr/local/bin/sensors -s\n").
+-		      "#----cut here----\n\n");
+-
+-		print "You really should try these commands right now to make sure everything\n".
+-		      "is working properly. Monitoring programs won't work until the needed\n".
+-		      "modules are loaded.\n\n";
++	}
++	else {
++		print "\nNote: Please make sure the following modules are loaded when you\n"
++			. "want to make use of your sensors:\n\n";
++
++		print "  " . join(" ", (@{$bus_modules}, @{$hwmon_modules})) . "\n\n";
+ 	}
+ }
+ 
+-- 
+2.21.0
+
+
+From c1d471a8be4840a38fe82464e0756a243e158a30 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 29 Aug 2016 12:47:50 +0200
+Subject: [PATCH 3/3] sensors-detect: Add Gentoo config file protection
+
+Per default we don't modify live config file. Instead we create
+"._cfg0000_<filename>" files known from emerge when using CONFIG PROTECT.
+
+See CONFIGURATION FILES section of emerge(1) man page for details.
+
+Can be disabled using the "--no-gentoo-config-protect" parameter.
+
+Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+---
+ prog/detect/sensors-detect | 51 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 48 insertions(+), 3 deletions(-)
+
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index 1e8ac00d..e548bfaf 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -7352,7 +7352,7 @@ sub write_config
+ 				mkdir('/etc/modprobe.d', 0755)
+ 					or die "Sorry, can't create /etc/modprobe.d ($!)";
+ 			}
+-			open(local *MODPROBE_D, ">", $have_modprobe_d . '/lm_sensors.conf')
++			open(local *MODPROBE_D, ">", gentoo_get_protected_file($have_modprobe_d . '/lm_sensors.conf'))
+ 				or die "Sorry, can't create /etc/modprobe.d/lm_sensors.conf ($!)";
+ 			print MODPROBE_D "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ 			print MODPROBE_D $configfile;
+@@ -7393,7 +7393,7 @@ sub write_config
+ 				or die "Sorry, can't create '$modulesload_filedir' ($!)";
+ 		}
+ 
+-		open(my $fh, '>', $modulesload_file)
++		open(my $fh, '>', gentoo_get_protected_file($modulesload_file))
+ 			or die "Sorry, can't open '$modulesload_file' for writing! ($!)";
+ 
+ 		print $fh $modulesload_cfg;
+@@ -7411,10 +7411,17 @@ sub write_config
+ 	}
+ 
+ 	if ($have_conffiles_created) {
++		if (!$opt{no_gentoo_config_protect}) {
++			print "\n * IMPORTANT: At least $have_conffiles_created config file(s) in '/etc' need updating.\n"
++				. " * See the CONFIGURATION FILES and CONFIGURATION FILES UPDATE TOOLS\n"
++				. " * sections of the emerge man page to learn how to update config files.\n";
++		}
++
+ 		printf "\nNote: You only have created the required configuration to autoload the\n"
+ 			. "required modules to use your sensors on boot. If you want to start using\n"
+ 			. "your sensors right now you have to either load them now once manually, to\n"
+-			. "reboot this system or to execute the following command(s):\n\n";
++			. "reboot this system or to execute the following command(s)\%s:\n\n",
++			($opt{no_gentoo_config_protect} ? "" : " _AFTER_\nyou have updated your config files");
+ 
+ 		if ($systemd_is_booted) {
+ 			print "  # systemctl restart systemd-modules-load\n\n"
+@@ -7430,6 +7437,32 @@ sub write_config
+ 	}
+ }
+ 
++sub gentoo_get_protected_file
++{
++	my ($file) = @_;
++
++	if ($opt{no_gentoo_config_protect}) {
++		return $file;
++	}
++
++	my $basename = basename($file);
++	my $dirname  = dirname($file);
++
++	my $protected_file;
++	for (my $prot_num = 0; $prot_num <= 9999; $prot_num++) {
++		$protected_file = sprintf('%s/._cfg%s_%s',
++			$dirname,
++			sprintf("%0*d", 4, $prot_num),
++			$basename);
++
++		if (! -f $protected_file) {
++			return $protected_file;
++		}
++	}
++
++	die "Running out of files -- cannot create protected file '$file'"
++}
++
+ sub main
+ {
+ 	my ($input, $superio_features);
+@@ -7440,6 +7473,8 @@ sub main
+ 			$opt{stat} = 1;
+ 		} elsif ($ARGV[0] eq "--auto") {
+ 			$opt{auto} = 1;
++		} elsif ($ARGV[0] eq "--no-gentoo-config-protect") {
++			$opt{no_gentoo_config_protect} = 1;
+ 		} else {
+ 			print STDERR "Error: unknown option $ARGV[0]\n";
+ 			exit 1;
+@@ -7493,6 +7528,16 @@ sub main
+ 		      "unless you know what you're doing.\n\n";
+ 	}
+ 
++	if (!$opt{no_gentoo_config_protect}) {
++		print "Gentoo config file protection is active. Every file this program will\n",
++			"modify must be merged before the change will become active using\n",
++			"default Gentoo tools such as dispatch-conf, cfg-update, and etc-update.\n\n";
++	}
++	else {
++		print "Gentoo config file protection is _disabled_. This program will modify\n",
++			"your active configuration without backups.\n\n";
++	}
++
+ 	print "Some south bridges, CPUs or memory controllers contain embedded sensors.\n".
+ 	      "Do you want to scan for them? This is totally safe. (YES/no): ";
+ 	$input = read_answer();
+-- 
+2.21.0
+
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild b/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
new file mode 100644
index 000000000000..c63ff098149b
--- /dev/null
+++ b/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs multilib-minimal
+
+DESCRIPTION="Hardware Monitoring user-space utilities"
+HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
+
+MY_PN="${PN/_/-}"
+
+if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
+	COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
+	SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+	SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1- -).tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1"
+
+# SUBSLOT based on SONAME of libsensors.so
+SLOT="0/5.0.0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="contrib sensord static-libs"
+
+COMMON_DEPS="
+	sensord? (
+		net-analyzer/rrdtool
+		virtual/logger
+	)"
+
+RDEPEND="${COMMON_DEPS}
+	dev-lang/perl
+	!<sys-apps/openrc-0.36"
+
+DEPEND="${COMMON_DEPS}
+	sys-devel/bison
+	sys-devel/flex"
+
+CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
+WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
+WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
+WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
+
+PATCHES=( "${FILESDIR}"/${PN}-3.5.0-sensors-detect-gentoo.patch )
+
+DOCS=( CHANGES CONTRIBUTORS INSTALL README )
+DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
+
+src_prepare() {
+	default
+
+	if [[ -n "${COMMIT}" ]]; then
+		local _version="${PV%_*}+git_${COMMIT}"
+
+		sed -i \
+			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
+			version.h || \
+			die "Failed to update version.h"
+
+		sed -i \
+			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
+			-e "/^\$revision =~ s.*/d" \
+			prog/detect/sensors-detect || \
+			die "Failed to set revision in prog/detect/sensors-detect"
+
+		sed -i \
+			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
+			-e "/^REVISION=.*/d" \
+			-e "/^REVDATE=.*/d" \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust prog/pwm/pwmconfig"
+	else
+		sed -i \
+			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+			prog/pwm/pwmconfig || \
+			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
+	fi
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
+		die "Failed to sed in LDFLAGS"
+
+	sed -i \
+		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
+		prog/pwm/fancontrol || \
+		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
+
+	# Don't use EnvironmentFile in systemd unit
+	sed -i \
+		-e '/^EnvironmentFile=/d' \
+		-e '/^Exec.*modprobe.*/d' \
+		prog/init/lm_sensors.service || \
+		die "Failed to remove EnvironmentFile from systemd unit file"
+
+	if ! use static-libs; then
+		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
+			die "Failed to disable static building"
+	fi
+
+	# Don't show outdated user instructions
+	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
+		die "Failed to remove outdated user instructions"
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	default
+
+	if multilib_is_native_abi && use sensord; then
+		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
+		# support. To prevent errors like
+		#
+		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
+		#   cannot find -lrrd
+		#
+		# we only build sensord when we are building for profile's native ABI
+		# (it doesn't affect libsensors.so).
+		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
+			die "Failed to enable building of sensord"
+	fi
+}
+
+multilib_src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D%/}" \
+		PREFIX="/usr" \
+		MANDIR="/usr/share/man" \
+		ETCDIR="/etc" \
+		LIBDIR="/usr/$(get_libdir)" \
+		install
+}
+
+multilib_src_install_all() {
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit prog/init/lm_sensors.service
+
+	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
+	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
+	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
+
+	if use sensord; then
+		newconfd "${FILESDIR}"/sensord.confd sensord
+		newinitd "${FILESDIR}"/sensord.initd sensord
+		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
+	fi
+
+	einstalldocs
+
+	docinto developers
+	dodoc doc/developers/applications
+
+	if use contrib; then
+		insinto /usr/share/${PN}
+		doins -r "${S}"/configs
+	fi
+}
+
+pkg_postinst() {
+	local _new_loader='3.4.0_p20160725'
+	local _v
+	for _v in ${REPLACING_VERSIONS}; do
+		if ! ver_test "${_v}" -gt "${_new_loader}"; then
+			# This is an upgrade which require migration
+
+			elog ""
+			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
+			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
+			elog ""
+			elog "To migrate your configuration you have 2 options:"
+			elog ""
+			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
+			elog ""
+			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
+			elog "     variables from \"/etc/conf.d/lm_modules\" to"
+			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
+			elog ""
+			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
+			elog ""
+			elog "     Important: Don't forget to migrate your module's argument"
+			elog "                (modules_<name>_args variable) if your are not already"
+			elog "                using \"/etc/modprobe.d\" (which is recommended)."
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# New installation
+
+		elog ""
+		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
+		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
+		elog ""
+		elog "You might want to add ${PN} to your default runlevel to make"
+		elog "sure the sensors get initialized on the next startup."
+		elog ""
+		elog "Be warned, the probing of hardware in your system performed by"
+		elog "sensors-detect could freeze your system. Also make sure you read"
+		elog "the documentation before running ${PN} on IBM ThinkPads."
+	fi
+}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 7c5cb23ee659..f0a794d20324 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,12 +1,6 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
-AUX logwatch-7.4.2-openssh-hpn.patch 880 BLAKE2B 68f12d45265810f700315211f3a8ab8df9dddc033c7701c5c4aa29288d737fbc806d3ab81b1562abad22661ebac43c78a3dd8aeebdb90b3d1a9388e03b100af4 SHA512 f80ef051e07254869dad4c7221564d09d2f52c2fceb2fa4c802f67b83f4569ed9405d07d85b21a1fc67f75b552a82fa4b4a9e69578829f51a5e49e50cb79f0b8
-AUX logwatch-7.4.3+-openssh-hpn.patch 885 BLAKE2B 2a381c8b321ae4e545e8620e1ad3adb900f27f76d6c189085ae8b260d25017983f455f540536b9e2146ecbf86e6565555429d7827fcf1d6d920adde98e3636f5 SHA512 5a11509507631c1f8f74830e1ef24fc522fe62dffd5f3778849b82462b8e73c1b5cb0ab6c7ed2f1ea35e9d2c4b5674eee532a650b0d69e71219cf029e41b978a
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a
-DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268
 DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
-EBUILD logwatch-7.4.3.ebuild 2054 BLAKE2B e7ae5b810b3bc55e481fa4dbd35c923f3c8737b14aa2c52e166c86dc55165a1977a21b33d2e8c518f21f24ac16f206263e5ccc0ce4655bbdd17fd1d03faff755 SHA512 975fe721a5bee017d9da2efb98914749ae4f6a1a52e0563dedab92cf6c5b029fbb2b0ce880849f3ea143796cc06dd7001101ffe0fede0d07ffa6597dddd5fd69
-EBUILD logwatch-7.4.3_p20171025.ebuild 2836 BLAKE2B 8a7aad2786d4c7509e60106ccc5e00949416753103d986921f7964321972cf3cf6500e1a76e0570b5c71f63290774b718fe34b89aa3e69650c59e570a2f4f624 SHA512 0979e2451fbadb4a60f6c7b418dc31e00fb1d825f818ed13320225e8f026fa8cbf4ac90285dc16c78f4964ba568c53826b91fedc33f0923d7b42bd33e456ce45
-EBUILD logwatch-7.5.1.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
+EBUILD logwatch-7.5.1.ebuild 2421 BLAKE2B 331cca62555720132abb6370e61a646f948a9cab8c7b8ca586c8e1e31d99d8aa33e9a0b8b47d096f0c9018cfac18e9983b15f582d4fb0eaa9b41d1aacf94d00b SHA512 d16c0c55e425e81652701f9e276bbcef001fd58c91c48269fa1f6db5788ec188c51f2d661e5706aa3a4e5bea27dd5a7e6b986e611008ff3ffd681a6c61e96bc1
 EBUILD logwatch-9999.ebuild 2430 BLAKE2B f0273cf44e1c7abe6059bcc3ce949263a4cadf57e1e84c46b7255be4d64626b1520b45e85762c3b0bd56f5750165762bbb1a15ce1b28a6967c375736be0b3dec SHA512 312d6634eaced0149f9d6a70cc62241f2273dc4476db468e1d71a19dbde7f8ebcd5e542a41c0fce78313b902d1a5858193e5e624016461bf9d5c6e14d5bf8a21
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch
deleted file mode 100644
index 80e6ee06b767..000000000000
--- a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add an 'ignore' line for the HPN patch that we enable on our openssh by default.
-
-https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
-
---- logwatch-7.4.2/scripts/services/sshd
-+++ logwatch-7.4.2/scripts/services/sshd
-@@ -297,7 +297,8 @@
-        ($ThisLine =~ /Starting session: (forced-command|subsystem|shell|command)/ ) or
-        ($ThisLine =~ /Found matching \w+ key:/ ) or
-        ($ThisLine =~ /User child is on pid \d/ ) or
--       ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/)
-+       ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
-+       ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
-    ) {
-       # Ignore these
-    } elsif ( my ($Method,$User,$Host,$Port,$Key) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+) port (\d+) ssh[12](?:: (\w+))?/) ) {
diff --git a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
deleted file mode 100644
index 426253df85d0..000000000000
--- a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add an 'ignore' line for the HPN patch that we enable on our openssh by default.
-
-https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824
-
---- a/scripts/services/sshd
-+++ b/scripts/services/sshd
-@@ -315,7 +315,8 @@ while (defined(my $ThisLine = <STDIN>)) {
-        ($ThisLine =~ /Found matching \w+ key:/ ) or
-        ($ThisLine =~ /User child is on pid \d/ ) or
-        ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or
--       ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ )
-+       ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ ) or
-+       ($ThisLine =~ /^SSH: Server;L[Tt]ype: /)
-    ) {
-       # Ignore these
-    } elsif ( my ($Method,$User,$Host,$Port,$Key,$FingerP) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+)(?:%\w+)? port (\d+) ssh[12](?:: (\w+) (.+))?/) ) {
diff --git a/sys-apps/logwatch/logwatch-7.4.3.ebuild b/sys-apps/logwatch/logwatch-7.4.3.ebuild
deleted file mode 100644
index 1f058e2a889e..000000000000
--- a/sys-apps/logwatch/logwatch-7.4.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/Date-Manip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.4.2-openssh-hpn.patch
-}
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	keepdir /etc/logwatch
-
-	newsbin scripts/logwatch.pl logwatch.pl
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc README HOWTO-Customize-LogWatch
-
-	# Do last due to insopts modification.
-	insinto /usr/share/logwatch/scripts/logfiles
-	insopts -m755
-	doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-}
diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
deleted file mode 100644
index 391f0f2e9534..000000000000
--- a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit tmpfiles
-
-MY_COMMIT="d36589f22a322a5ec4d77618b408803f4d193c2e"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.4.3+-openssh-hpn.patch )
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-${MY_COMMIT}.zip -> ${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/Date-Manip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-S="${WORKDIR}/${PN}-git-${MY_COMMIT}"
-
-src_prepare() {
-	default
-
-	sed \
-		-e "s:my \$Version = '7.4.3';:my \$Version = '${PV}';:" \
-		-e "s:my \$VDate = '04/27/16';:my \$VDate = '10/25/17';:" \
-		-i scripts/logwatch.pl || die
-}
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	keepdir /etc/logwatch
-
-	# logwatch.pl requires cache dir (bug #607668)
-	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
-
-	newsbin scripts/logwatch.pl logwatch.pl
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc README HOWTO-Customize-LogWatch
-
-	# Do last due to insopts modification.
-	insinto /usr/share/logwatch/scripts/logfiles
-	insopts -m755
-	doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
-	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-
-	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-apps/logwatch/logwatch-7.5.1.ebuild b/sys-apps/logwatch/logwatch-7.5.1.ebuild
index eefc16389fc7..17318fa5e511 100644
--- a/sys-apps/logwatch/logwatch-7.5.1.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 28a1301190d2..4c275507e368 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,5 @@
-AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58
-AUX 242-gcc-9.patch 1676 BLAKE2B ed0151821dd695faaecaf3b7eeb5b6765d335b2e355c835d03c64c93c1920981ffad15b50ad1d2ef356b416173c6a53a0e4adbb6f40bbd6688655e622472358d SHA512 a1502ff4dd6b66952791676781bc8a2d8db4bd41123345e42d1eb2f99cca4f53d70a35e96306df4a8aec2f3b50be177a12bd67c88133373b54e7985121a7a435
+AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
 AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
 AUX CVE-2019-6454.patch 6017 BLAKE2B 8feefe11f44e4136c5fcf87160197bfbc0557d5097bc12275411887005bed1fe56a532d114e2e49527a7f35016a6b5fc04cb1086b33445402ace21eb880c02e9 SHA512 ff84ae9a043f17fd78c7fc499fe532c4d3b46dbe34f24c8289c209a026c1eda20de3ba46b67c8a5b14e9889e6362a4fb2097d550e6bcdb5182455fc569e23224
@@ -8,17 +7,12 @@ AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patc
 AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
-AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
-DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
-DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-EBUILD systemd-239-r4.ebuild 13317 BLAKE2B d62f39c9d3ed7ae40c5d04ab463dc1e14140bf9a7b55292906420c088549ace6e491aa1fc598cc274c4518824e419a3d8067d5ea491a7736fc075393d3f68b88 SHA512 3fefb4eb2a28e511cfaba5f076fbbb63358b9adeaed5dce8afa289da7b8295fe793dd2f32a5dd58b84a4fabecf4a138bda6f7d4ed0719acc47a3bffaff2ad446
 EBUILD systemd-241-r1.ebuild 13807 BLAKE2B bed17c8e35d3936f67fa538a314c716d7fbeb0b3e7057024f5cf5c0080b27f9f8e3739e47b419125e78b2f7f67d555b82e4155e7eecb0bd8b7ada58480f24428 SHA512 6cd80e98c0104cd7807fc0ddbe5e59a7558743cf98caaa40a84786caa5919603e683c3ca11f8ad215e3290ddd4fdc67988ef90fd4b9ff5ec12eb80adbe116729
-EBUILD systemd-242-r1.ebuild 13756 BLAKE2B a8dd25392b38e683e2b46c1b50efc3dfd46235ae4aa64432c891525bd17044645cf6917c73461b9ff534f5f803e9214c47892f0e89ec0e6b08babdbac288ebf5 SHA512 7fe988fb7df8f11a681376894e8d343ceb141f86ec85136388585b5318d1bfa490682eff5e24b64477dd78cbe562c1324875c048e4c946eab151e891bd0dac0b
 EBUILD systemd-242-r2.ebuild 13803 BLAKE2B be33f36f5610fae2f89795647c472ead227f58afee1bb72aea661174d64c3e1141e07e72d5ac544695151f80efec83871cdc7871fed801c613f830c165ca5852 SHA512 2e944d46414ffe887587d3f5087c56b04fdd607cb8c88a5d0e0075d65c0d82298e802e7f43493fd2ca1fe77417d9333a2cd156ab86b66726cb50067ef43991b8
 EBUILD systemd-9999.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
 MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
diff --git a/sys-apps/systemd/files/239-debug-extra.patch b/sys-apps/systemd/files/239-debug-extra.patch
deleted file mode 100644
index 19db590257cf..000000000000
--- a/sys-apps/systemd/files/239-debug-extra.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 19 Aug 2018 19:11:30 +0200
-Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
-
-Meson added -Doptimization and -Ddebug options, which obviously causes
-a conflict with our -Ddebug options. Let's rename it.
-
-Fixes #9883.
----
- meson.build       | 2 +-
- meson_options.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f79ac4b12e7..2209c935ad6 100644
---- a/meson.build
-+++ b/meson.build
-@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty'))
- 
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
--foreach name : get_option('debug')
-+foreach name : get_option('debug-extra')
-         if name == 'hashmap'
-                 enable_debug_hashmap = true
-         elif name == 'mmap-cache'
-diff --git a/meson_options.txt b/meson_options.txt
-index e3140c8c110..7b1f61bf464 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
-        description : 'path to debug shell binary')
- option('debug-tty', type : 'string', value : '/dev/tty9',
-        description : 'specify the tty device for debug shell')
--option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [],
-        description : 'enable extra debugging')
- option('memory-accounting-default', type : 'boolean',
-        description : 'enable MemoryAccounting= by default')
diff --git a/sys-apps/systemd/files/242-gcc-9.patch b/sys-apps/systemd/files/242-gcc-9.patch
index e12d65718238..e9f690a65be5 100644
--- a/sys-apps/systemd/files/242-gcc-9.patch
+++ b/sys-apps/systemd/files/242-gcc-9.patch
@@ -33,3 +33,131 @@ index 533193ac932..6fc82940033 100644
          else
                  log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
  
+From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2019 10:31:01 -0400
+Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
+
+Fixes: https://github.com/systemd/systemd/issues/12534
+---
+ src/shared/machine-image.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6b9d8fb97a6..6a6d952b424 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -201,11 +201,13 @@ static int image_make(
+                 Image **ret) {
+ 
+         _cleanup_free_ char *pretty_buffer = NULL;
++        _cleanup_free_ char *cwd = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+ 
+         assert(dfd >= 0 || dfd == AT_FDCWD);
++        assert(path || dfd == AT_FDCWD);
+         assert(filename);
+ 
+         /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
+@@ -221,6 +223,9 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
++        if (!path)
++                safe_getcwd(&cwd);
++
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+                 (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
+@@ -359,7 +364,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -373,13 +378,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }
+From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 24 May 2019 10:54:09 +0200
+Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
+ first argument is specified
+
+A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
+---
+ src/shared/machine-image.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6a6d952b424..55e5f08f91e 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -200,8 +200,7 @@ static int image_make(
+                 const struct stat *st,
+                 Image **ret) {
+ 
+-        _cleanup_free_ char *pretty_buffer = NULL;
+-        _cleanup_free_ char *cwd = NULL;
++        _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+@@ -223,8 +222,12 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
+-        if (!path)
+-                safe_getcwd(&cwd);
++        if (!path) {
++                if (dfd == AT_FDCWD)
++                        (void) safe_getcwd(&parent);
++                else
++                        (void) fd_get_path(dfd, &parent);
++        }
+ 
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+@@ -364,7 +367,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -378,13 +381,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }
diff --git a/sys-apps/systemd/files/gentoo-generator-path.patch b/sys-apps/systemd/files/gentoo-generator-path.patch
deleted file mode 100644
index 6912b481f20b..000000000000
--- a/sys-apps/systemd/files/gentoo-generator-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 17 Jul 2017 11:21:25 -0400
-Subject: [PATCH 1/3] path-lookup: look for generators in
- {,/usr}/lib/systemd/system-generators
-
-Bug: https://bugs.gentoo.org/625402
----
- src/shared/path-lookup.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
-index e2b3f8b74..1ee0e1cdb 100644
---- a/src/shared/path-lookup.c
-+++ b/src/shared/path-lookup.c
-@@ -821,6 +821,8 @@ char **generator_binary_paths(UnitFileScope scope) {
-                 return strv_new("/run/systemd/system-generators",
-                                 "/etc/systemd/system-generators",
-                                 "/usr/local/lib/systemd/system-generators",
-+                                "/usr/lib/systemd/system-generators",
-+                                "/lib/systemd/system-generators",
-                                 SYSTEM_GENERATOR_PATH,
-                                 NULL);
- 
--- 
-2.14.0
-
diff --git a/sys-apps/systemd/systemd-239-r4.ebuild b/sys-apps/systemd/systemd-239-r4.ebuild
deleted file mode 100644
index 2eae2f567674..000000000000
--- a/sys-apps/systemd/systemd-239-r4.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-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"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	>=sys-kernel/linux-headers-${MINKV}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/239-debug-extra.patch
-		"${FILESDIR}"/CVE-2019-6454.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED%/}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED%/}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
-	local locale_conf="${EROOT%/}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup render
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT%/}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-242-r1.ebuild b/sys-apps/systemd/systemd-242-r1.ebuild
deleted file mode 100644
index a26267273852..000000000000
--- a/sys-apps/systemd/systemd-242-r1.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? (
-		gnutls? ( >=net-libs/gnutls-3.5.3:0= )
-		!gnutls? ( >=dev-libs/openssl-1.1.0:0= )
-	)
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		gnutls? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/242-gcc-9.patch
-		"${FILESDIR}"/242-socket-util-flush-accept.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Dgnutls=$(meson_multilib_native_use gnutls)
-		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	if multilib_is_native_abi && use dns-over-tls; then
-		myconf+=(
-			-Ddns-over-tls=true
-			-Dopenssl=$(usex !gnutls true false)
-		)
-	else
-		myconf+=( -Ddns-over-tls=false -Dopenssl=false )
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup render
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 61bf5a554a0b..1b659c309e92 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -7,8 +7,8 @@ AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31
 AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
-DIST sysvinit-2.95-beta.tar.xz 121352 BLAKE2B 769768185ae3f374ff7bac4a9178796526db9232ed6c735d6165b3f28b219a9804a6e0ae5f78e8558616aa3ae022f4963b9922e7c71bf4997772b8fb1f9d98d7 SHA512 0d1d7559a05142e2bd209fca83e1396e9d3ed32ebe5d4f5f1356ac51e597c0201648e8a80946089fa91e8620302cd60894b7ff343747cee373c0c4459e6224ed
+DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
 EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
 EBUILD sysvinit-2.94.ebuild 3817 BLAKE2B dcf4a1ce3f2eb774783e0d3bab5a189e45f43bafefb05c8f6d60f3f09639c691576447c0b6922c974ed8f0f5ab7ecbacba1b427dcb569470163658c64dadaa06 SHA512 7b60c4537ad8f1d4bd70a3c922a8778501b89343ab103f5413322745077ae8c85c16344773746a8e7ae3ef1d185420c26fd30598e33b5641d57563d32f9c7179
-EBUILD sysvinit-2.95_beta.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
+EBUILD sysvinit-2.95.ebuild 3812 BLAKE2B 945467b8f510628c055cfd83b9c5a36198b1aacdf5f05918a34b0478576c941eba6d690ba4523f10e729b5cdcd696643e01c8ceadf4374d49a371e1c5e090079 SHA512 5d0b8a20b6e2380e841cfa529ba867368db64725f776fafe3d4381ded00f3550906e6baa9a58b3eb065155d20f8c3376ab1ec0bac50f27dadc18b9ff9da71352
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild b/sys-apps/sysvinit/sysvinit-2.95.ebuild
index f02f81e06455..f02f81e06455 100644
--- a/sys-apps/sysvinit/sysvinit-2.95_beta.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.95.ebuild
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9cdbc4be8830..25efd97a3613 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -9,7 +9,7 @@ DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c609
 DIST util-linux-2.34-rc2.tar.xz 4990080 BLAKE2B 63c7bc91d04e8cde2f67e2fad5a6a4b6ffe7b392d284c29b01b5a89eea26b42436656f8c4544555545b3718a739674c795c13a41e3a1e1cb2a98e952d02f9283 SHA512 54ae5ab146a2f8185dd1e46b363d3f83fd6791eb95f83522307ea59dcf23be93a9496fd1ca10bb09788ebd429c62db8fcde8747ed793c7826340289efb4e77d0
 EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B c8991a1f9a36cc09ad888b439b1baba241740707112abda423a85fdaf13db09c10be9a29ff2c018166cb14f64f425b6f8ffd6c2680c3fce1e25369f4ee8d3209 SHA512 13e47582fe9ae0bced2ad9c2c47e8d4b062ad4ed1cc65973debb2b6fa54d5aa232936f91fc88b6183cd53c2ec2754f00d7a79e274e7cc41f2dd6a8949004311c
 EBUILD util-linux-2.33.1.ebuild 8638 BLAKE2B 9ed38cd12026e04327b38f33a2c0f5285cbe148f9e604e03fd2ba179cdc10351b12ef3768bd97da7f7ba5e65972c42b04c1cef50a2f7ab6854953a990eba8b10 SHA512 aca35d647f0d3d3e260acc67e95a2e32a6d5b4898c78a187306a9c2d228e4304503eeaaed8fe92a6b2c6f7e0a6110ae087d3f486d37ad1c429d04f30b49b8832
-EBUILD util-linux-2.33.2.ebuild 8646 BLAKE2B 14ff1524097b52badbf1d9387be0227f965726c0de918759bd97af2d60eb1e7f3b8e5c06b04874eeb6031d31b9b5f776b794cc8cca17cfbb296598a985c668e9 SHA512 fe5dc9c0c5e40aafa89ced9058048d2f1df5c17e7eb19cf178c7b416c4f9a72af520f921ea4952ec9f28d24151bc902b89f1d6e83ee6c2edb6c5a84c2edf4645
-EBUILD util-linux-2.34_rc2.ebuild 8244 BLAKE2B e23a21643c084b26a0c5644eaa7ed6ec8075dc52abe8d9bfde40fa6c69e6dce99e92ee1d0a05e0750b53fa48c123ac143447a96fab1480297017e3edfbf342cc SHA512 0a9cd16c055aa50d936b7f5d45198e74619154537ca8af859e14a343923efcfa70948a1dac423aa72ffeca5891f6af516ee480466296fc55f64f34e7b0fbc960
-EBUILD util-linux-9999.ebuild 8238 BLAKE2B 8fd5c1b2fc9bde4b6e9331da10d8f013d3c29a2f74b69ffb63c8f34ddad81d67f638be661bf258d41c31b973a9b00dd01f06ae6dcf2e0f1e4b259e9c22bf2ea8 SHA512 cc6bf3d785dc23b101ab4f147dea9c0ab258fbebf6c4de44f6e4600c46e986a555f2b54264142d7168bbbbe5ce280fcc995c879dbb3afb8b50940128e89008b4
+EBUILD util-linux-2.33.2.ebuild 8573 BLAKE2B a8bc5375d2fae05fd4243f604307e0ab026a881fa95c93884f36082a9b46390c7d859c841bd43dd27e5decab9183c2b71e9b3295efdbea5f33cf4f6459ebfbd9 SHA512 905c909704adee2d975d734ae2b4a9286f86d9582bc6e603d0e0ad9d71e9a31c2d77e9c14685f81969845f58aa300dcdb8988d0409e34ad00101f1f71ff44851
+EBUILD util-linux-2.34_rc2.ebuild 8180 BLAKE2B 9a05060356ea2424f8c62b1e79f887c718820a10323835cc19a994492139d6b1cfe49a622fbf685c7b1e563f7874fb9d6bb22474f3dc7e7831a2b7d44b5ee4eb SHA512 35cb3fc8f619a44b0cc0b67890fe6868e9b403b3478bd154d79a05a853c61548d46474540803257cc6203ce8b2bdefbb48c1df1f344b8ca508f2df2467a1b039
+EBUILD util-linux-9999.ebuild 8174 BLAKE2B 58bbf2b8f49d4ab41376a96e2a92f4dac75f553c8198f20b250ab67652206a7301765d92277fa0a00c6f1055ddc0c03f0446b72c9cb3b551b03dfe33781177e4 SHA512 4d1e0dc4b05b95ef5736e1637f756c5951eb40b2748b1066ce2eefb5eb4a21c7c44a273b3a93213fb00171e4ac1f797b07517b30b3c7ce573d9a1feaf1623a89
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index b4ef5f4bf397..f8deb925a000 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -1,5 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors and others
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +16,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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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/util-linux/util-linux-2.34_rc2.ebuild b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
index 9aefa2207941..55b7c4d9ee9b 100644
--- a/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
@@ -1,5 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors and others
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index af148d37cb23..6940636a7b16 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,5 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors and others
-# Copyright 2018 Sony Interactive Entertainment Inc.
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-16 21:23:20 +0100
commit	fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree	10baa743a5340b42ad538dd19d48669ccac209b1 /sys-apps
parent	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)