gentoo resync : 04.08.2018

72 files changed, 971 insertions, 1513 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 50e758fcbdbd..a2a47023071f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 242670b29092..7a56452715b7 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,5 +1,3 @@
-DIST apply-default-acl-0.0.6.tar.gz 112220 BLAKE2B b0cc21ba3cb9c8112e9b8b02a9cb2eaad81e7ebee2bd0505e1925ce73d97f328b4ce0519d5f8c44b841407f73af1ce32d5ca8a629d244acde969a3ed10c8e75e SHA512 6034de13db1867372b8529e29e8b1a3d002619d4522a5eab346a7940946a1c74adc3eec952bc72bf62c736ae89d5631748153a87feb45353af27ec46c71176f3
 DIST apply-default-acl-0.4.1.tar.xz 245936 BLAKE2B 40ddc2a3393a7812f753d88baf1750627a09443ca90c6ad3e7207deff26e22c6ed01a0798abef1991f4b7642550cf855ee9e91432778b4ebee0ecfd868a58216 SHA512 b95999b5775f3ccdd9662fcd8dbbc021bc6372a8f50e4c370919f80d27159e3d07cbaeebf3da717c0314880f210a3cc056767715d55cca71cd3fb950f42ba9c0
-EBUILD apply-default-acl-0.0.6.ebuild 523 BLAKE2B 8ff9d888cd4934d731874a6fedf8881e74dfb5a2e3d3462fc3050a0acd7011cd5a771a3fbf525ab041d2642a5d938bc34474855d4b4d50a681c2bea0251f4a12 SHA512 be23e98716900ddbc133417b4e033d9963b1410a4b9206a0df963fc623ee1c452adb0621b851521755aa167e2846454195eaf7fad39c56fca43828f26ddaf80a
-EBUILD apply-default-acl-0.4.1.ebuild 525 BLAKE2B ae50dc57320ddfbf68b507abb6be75a899a24ff6f34fe0f4f2247a4f37e33c77738e7a0d9473d203715e268f8e80effa78002b7d1515b9017d3e7bb6f2f491a8 SHA512 bb5eebe5d361de4de5e12118163dca38e256990e50b27fde43287efddf221d463369caa47d24516b5c66967cfd66b61d380a9b5e53ab51bd63b2148e66c56519
+EBUILD apply-default-acl-0.4.1.ebuild 523 BLAKE2B b3ada3557f0b28633b72c25ca81cbf7ca8bd7681991c4da9a2d67b4bde936682405d90c7596027aec5cbcf33a5f36da86938ceda3c3871219a620a55aec059e9 SHA512 75d5c42f2920df64450570b77a0f5bffbf697049c7cb26bd7729d9fac11e6f1d65b80d75efc3cde91d2f9a7f2620538b9245462382fd977e07e18dadf8098eb4
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.0.6.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.0.6.ebuild
deleted file mode 100644
index f721fca72c1a..000000000000
--- a/sys-apps/apply-default-acl/apply-default-acl-0.0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Apply default POSIX ACLs to files and directories"
-HOMEPAGE="http://michael.orlitzky.com/code/apply-default-acl.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-apps/acl"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/README )
-
-# tests need to be executed on filesystem with ACL support
-# skipping them for now
-RESTRICT="test"
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild
index dac225d9c5f4..f8b1bf0de60c 100644
--- a/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild
+++ b/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-apps/acl"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index e8d711b32c9c..69a588476f34 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1,5 @@
 DIST baobab-3.24.0.tar.xz 970636 BLAKE2B bac7397a0b157723f8341b09b7e00fdaef2a50803ff901be6c307aa733b72478f7b3f62850e3e8445b79d1ad17668c617655aa7268402a487ee6e10267d0a7a2 SHA512 7a16cdc7b4e77e8bad23bccc171b4e552b2eb33a43822579cdf4b1d5ac76526955c0efeadf355fcda3a72b1fd6f8dbf2a6088406b5a21b8ecc4d06ff525baa17
+DIST baobab-3.26.1.tar.xz 973020 BLAKE2B 37ddfbbc72482bf31367210d0f814a6e163c415730d5fd86f3b48c5591c4f7c15cf1e7c3fbe7ddb20a465be5e4a4bf87705bef0175da98a5fffc37588871f1a3 SHA512 be16249de5ba22ef40b7addaae9823ac9d853422d33b3c345aaca1e07e3497793ec00bddfadc0da882b3c187419210026a4a6e66d23ce7c5cac455d39cfd9375
 EBUILD baobab-3.24.0.ebuild 826 BLAKE2B 2710c2b9102a30500cdf8e27dbc22be0145c293f615be673ff41a634f82f61bc76e9ae17fba1aab1c8a4acb918e2d03471563ffc5fb4468683d312d3a6cd2e23 SHA512 c617bd4aa3327aebd0c9576b6921b38dc309bed6cd7dfa339a8293c261109bbafb5092f9db6da6c1ba575eb1dbceb32be0f2a982c0b4f47a0abf1e67d062f7b9
+EBUILD baobab-3.26.1.ebuild 894 BLAKE2B 92cfdcfcc6d1c4915ee67487121494580b7e3e361e13fab742f002119eb1d3a8a7ca8e1ad3d08cf7e9e7f89584dc49e1e0fad24e827e6c52412a1cdaa45c0e52 SHA512 3ad8ae9d818aadd0052601551ae6bc099f7b873adc06a1b7974b58950d7b510555d1a1e7b84abc73a65645c0ceddf4adac4a9810d557f845f5c196e71c6106ec
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.26.1.ebuild b/sys-apps/baobab/baobab-3.26.1.ebuild
new file mode 100644
index 000000000000..2b10870a588e
--- /dev/null
+++ b/sys-apps/baobab/baobab-3.26.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.19.1:3
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	x11-themes/adwaita-icon-theme
+	!<gnome-extra/gnome-utils-3.4
+"
+# ${PN} was part of gnome-utils before 3.4
+# libxml2 required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure   \
+		VALAC=$(type -P true)  \
+		VAPIGEN=$(type -P true)
+}
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index e3c5b727fd55..7e9c6005b238 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,7 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
-EBUILD baselayout-2.4.1-r2.ebuild 8573 BLAKE2B 1ae0257d233a4ee8a6351cd501bd3516b0c3c3a6e306d3b01fd45db29b4a932214dfe4989d23f397733eefd02c72f58bb726bdcfce975a58a0541f7fe71b4671 SHA512 cdd4f344d072851848c6e512bc3c47f1225d49b2077dbd3af45caf1f4e8d6d9d112a315b034a2237f8cf7bcadd5585cd3fc55489a085bb744130c0d37d2d7662
-EBUILD baselayout-2.6.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd
-EBUILD baselayout-9999.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd
+EBUILD baselayout-2.4.1-r2.ebuild 8575 BLAKE2B 2bcd6128ef70f86c75c6400c8f89285a164124bdc4882494dc93acef2be4b5c44db208643b6421e39f8459ae850634d3bd008defb75bee8b2b17b7688cede34b SHA512 f414d8e1ae7e7b9774f28166c930c4ae6d810f034ecf0eb158d5cac8c359085f59142b50fa5a55ad07c91797336aeb0ef49b56e5b83c33b5a891aa496a711c96
+EBUILD baselayout-2.6-r1.ebuild 9572 BLAKE2B 1696bcd9f85b9aa690a470d082d5c83038afda84caafaa998f598b33b516757451353619fb5f8dc9d90552657a2c8d66d8e305934413e970372e3d459eb0a57b SHA512 b105725dd38edaea5d38bf8bc4ab42ee68686ba9214711881725303666f90a453fca41472611e170f7d953a78b9bfc4ee91c56c36c98484358bd7f0da1ea9236
+EBUILD baselayout-2.6.ebuild 8892 BLAKE2B 438db17b2d57e6c4f785cf7c86ed33a4d95b3e31740fd2c52b5a558570e446f4da246f402b33c7abdc3fbd14822bdf7bf317cc3a1438ba90b79aa50f29c4525f SHA512 4869fb45d97c0469ab51c6f4ec0e6dfeb98dab1eed481c49c0400c93092f27257e9777c0d0243713b9bb8f693e9b726853f82c4edaa38890ac3741d07ea05f73
+EBUILD baselayout-9999.ebuild 8892 BLAKE2B 438db17b2d57e6c4f785cf7c86ed33a4d95b3e31740fd2c52b5a558570e446f4da246f402b33c7abdc3fbd14822bdf7bf317cc3a1438ba90b79aa50f29c4525f SHA512 4869fb45d97c0469ab51c6f4ec0e6dfeb98dab1eed481c49c0400c93092f27257e9777c0d0243713b9bb8f693e9b726853f82c4edaa38890ac3741d07ea05f73
 MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d5f5254ba606..a3a7fc30d9af 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -23,7 +23,8 @@ multilib_layout() {
 	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
-	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
 
 	# figure out which paths should be symlinks and which should be directories
 	local dirs syms exp d
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
new file mode 100644
index 000000000000..daa903ef83a0
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib versionator prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://www.gentoo.org/"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+		for prefix in ${prefix_lst[@]}; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die " Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
+}
+
+pkg_preinst() {
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${EROOT}etc/${x}" ] && continue
+		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"run
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 2.4 ${x}; then
+			ewarn "After updating ${EROOT}etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ! version_is_at_least 2.6 ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}{,usr"
+		fi
+	done
+
+	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
+		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-2.6.ebuild b/sys-apps/baselayout/baselayout-2.6.ebuild
index c32ab3e4495f..0428b0afbb90 100644
--- a/sys-apps/baselayout/baselayout-2.6.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6.ebuild
@@ -30,7 +30,8 @@ multilib_layout() {
 	libdirs=$(get_all_libdirs)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
-	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
 
 	# figure out which paths should be symlinks and which should be directories
 	local dirs syms exp d
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index c32ab3e4495f..0428b0afbb90 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -30,7 +30,8 @@ multilib_layout() {
 	libdirs=$(get_all_libdirs)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
-	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
 
 	# figure out which paths should be symlinks and which should be directories
 	local dirs syms exp d
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 0d8693aaeefa..1a1695a7f684 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,3 +1,3 @@
 DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
-EBUILD bolt-0.4.ebuild 790 BLAKE2B fff0dd5bf06bf2d27a466bd20beb5bfe17c10f800174b22b2f4f58ee793efdb9bee1dd783ab54152807ad684001ebc4a4e59ed433157c3275950e1e89d6f6055 SHA512 51f2c1ea1c13aab602649e49211a73750756efa46d3a41036463c5cb7a48b4775e18e1453a0b7bdd1c4c3f9fcca80480dc36d291730d10c244539adca4fba70b
+EBUILD bolt-0.4.ebuild 811 BLAKE2B e28db1546f449f68019161dd5b85ad5a48355df464c9faf29d4197570538d030d9af840c46fcdc8c56291d4be83942fe3bc9f61486ab9571b4ea61164748489f SHA512 8951b1d10ddd4c7102c1047630d9b3cacd5563d1c1d494e306abcde839b85ea31c762e1d16b0caa5e103e66a3faf1b251526c0ef6ee4d340318e44873b19155e
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.4.ebuild b/sys-apps/bolt/bolt-0.4.ebuild
index 43fd351f9483..5c53b7e1a03d 100644
--- a/sys-apps/bolt/bolt-0.4.ebuild
+++ b/sys-apps/bolt/bolt-0.4.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	>=dev-libs/glib-2.50.0:2
 	virtual/libudev
 	virtual/udev
+	sys-apps/systemd:0=
 	sys-auth/polkit[introspection]
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 60bedf29d53b..5edf55f33e3e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,9 @@
 AUX file-5.33-CVE-2018-10360.patch 538 BLAKE2B 78c6006285e3ba254cc2dcb1196fe95217d1ccda46b3f652cbc99c9750b74a47ddbed33f01ef01e7f8c58205dd4c1f9669cb982e08679dd0b45214915883fb75 SHA512 7f6fd05fe29081039c57d22f5122364bf6ccfe869745f1306ceff13e876cb88e03263d2f11558ccbffebe227bcb9c2c6872d1fdb9b2823d16b001f6598f25c6f
+AUX file-5.33-berkdb_bogus_magic.patch 1133 BLAKE2B b00b3b1271d47bdcc75858d593500b9d81cff748e27eec9f7d6c6c3003a5382b6664c0bd64b0444aa386d4f70c3cf05b776c1ae27bad14534d65f0b6eccd8d09 SHA512 2815dfa9a5cd498e100456555fbde5a4cede5b680e17713a4cc09dc4a7cc6613124736070407e6abeeb637a2f79b7484061086ee6554eef96415bc2281a8943c
 AUX file-5.33-gl_VISIBILITY-macro.patch 3209 BLAKE2B 50fa53df86ce25bbc1f64525a23adbd7f117d6f97e97dacc56031f564dfd2c4742a86128738acc0495869500c986273f815c5f49c24c79e8e0659fc26f3e38fc SHA512 e3d0be41d4889db8b77a7c8a56c0f7996071277e5288af18010c5736555b1a4f31ac1767969e8b3f1cbe8d4bc800e8c1faa27aa82ac58069faa2d314c6737ad1
 DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
-EBUILD file-5.33-r3.ebuild 3259 BLAKE2B 5efff0eaca07d57e1c077e9941d95cc95899a4a649f696ab4999b4524ba1f2127332682d4607c6e00346f102b58987ef8084dc3fa9be48c78c85d8ca1e7649b9 SHA512 9b2930225b8687fc5a8ad32b0400d51f2caad3ce857e107d95b06250466f0915e7dda6a236f0ea3be0723e785482d191d82b82b9bf2b640992e417160f30fa9b
-EBUILD file-9999.ebuild 3143 BLAKE2B 4c9bb3c75d7422f3d681612e79877930277f96a3996b2424cb2f70416f4dff17f9f97a30cae8897983b317a0538d99a8392fb72d59a0fb0d56847ee3cde9592a SHA512 8d90ff5243e257617e93c791d59267381356bcf3a761ef9d8bb2ac0a52471bb4f4dd4c95449bb8e4a04820d880ba6b4e44c07b0df54e330522100573e9cea1b1
+DIST file-5.34.tar.gz 840219 BLAKE2B 20f34684e583d1cb42967f1106d979a42f55fd78097e26929ab4e6cd470b0d3a12c9f1fad89c982ed42869455ba0f3381c812ed00c31112e5ad17edcd50783e0 SHA512 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8
+EBUILD file-5.33-r4.ebuild 3325 BLAKE2B 4d3d5d900cde2eff2fa7c79ab577ce8fa6eb7e3379b0e8d4ca6978f7c551be6d046d2ff9f8f50ad9309f2facdd67ed4140a45e13ba5958bb4ee3968f18d2fe06 SHA512 8b69bec29f3b7dd8c1102bf52683c4195a26d2feaba4437767755084aa7768d5c2331c2ff8b3b2f8c956b8b8d348a421e9572b19f0028682e8fd2c9974257363
+EBUILD file-5.34.ebuild 3173 BLAKE2B 820282d182b13e9971fa9599456fa0ef53696970056600cf9d6b226a8694230bddbd667c7cb841017840df46d718d670dfbdafffb0a1c0695fc404eca28873a3 SHA512 27fee86b699c6caad4aa9e53177ee60ce56f6cb562811c1a62854ca40460eeab7c6f35e7c521af0d87d621bafee0e85429977a0dae188ebaaaa4b452747ae40e
+EBUILD file-9999.ebuild 3259 BLAKE2B 786b89386f6070703ad7cbe15f93cce4ec2073a59c74db596c728e9fda8f6cb23b8023f8b482f33130f01a06742e7581b02e07ac812c944a586c842952161a36 SHA512 b1cb4176878e92d18ba2e63038d1b6ff271265a02a4e13f3c6319b1c81e0abc40cb595f5318d5b3116f949d24d9053d8ad9d39f4941520ea4ce5d5efccc9fc40
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.33-r3.ebuild b/sys-apps/file/file-5.33-r4.ebuild
index e9203f385ff5..1221edeea29a 100644
--- a/sys-apps/file/file-5.33-r3.ebuild
+++ b/sys-apps/file/file-5.33-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-CVE-2018-10360.patch
 	"${FILESDIR}"/${P}-gl_VISIBILITY-macro.patch
+	"${FILESDIR}"/${P}-berkdb_bogus_magic.patch #661922
 )
 
 src_prepare() {
@@ -129,5 +130,5 @@ multilib_src_install_all() {
 		cd python || die
 		distutils-r1_src_install
 	fi
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/sys-apps/file/file-5.34.ebuild b/sys-apps/file/file-5.34.ebuild
new file mode 100644
index 000000000000..848fa28a4820
--- /dev/null
+++ b/sys-apps/file/file-5.34.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit autotools git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-libseccomp
+		--enable-fsect-man5
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		tc-export_build_env BUILD_C{C,XX}
+		ECONF_SOURCE="${S}" \
+		ac_cv_header_zlib_h=no \
+		ac_cv_lib_z_gzopen=no \
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		CC=${BUILD_CC} \
+		CXX=${BUILD_CXX} \
+		econf --disable-shared --disable-libseccomp
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index eb7620e857d8..8bdee5d348af 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/glensc/file.git"
@@ -32,7 +32,7 @@ DEPEND="
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp )"
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 src_prepare() {
 	default
@@ -41,7 +41,8 @@ src_prepare() {
 	elibtoolize
 
 	# don't let python README kill main README #60043
-	mv python/README.md README.python || die
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
 }
 
 multilib_src_configure() {
@@ -62,7 +63,7 @@ src_configure() {
 		mkdir -p "${WORKDIR}"/build || die
 		cd "${WORKDIR}"/build || die
 		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE=${S} \
+		ECONF_SOURCE="${S}" \
 		ac_cv_header_zlib_h=no \
 		ac_cv_lib_z_gzopen=no \
 		CHOST=${CBUILD} \
@@ -122,5 +123,5 @@ multilib_src_install_all() {
 		cd python || die
 		distutils-r1_src_install
 	fi
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch
new file mode 100644
index 000000000000..7627bafc6ef9
--- /dev/null
+++ b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch
@@ -0,0 +1,33 @@
+From 4fb6a59df80d4974f8230bfce36e38e6de7d574f Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Thu, 24 May 2018 18:54:40 +0000
+Subject: [PATCH] fix bogus magic
+
+---
+ magic/Magdir/dbpf | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf
+index 65cab61e..8545720d 100644
+--- a/magic/Magdir/dbpf
++++ b/magic/Magdir/dbpf
+@@ -1,6 +1,6 @@
+ 
+ #------------------------------------------------------------------------------
+-# $File: dbpf,v 1.1 2017/10/13 20:47:14 christos Exp $
++# $File: dbpf,v 1.2 2018/05/24 18:54:40 christos Exp $
+ # dppf:	Maxis Database Packed Files, the stored data file format used by all
+ #	Maxis games after the Sims: http://wiki.niotso.org/DBPF
+ # 	http://www.wiki.sc4devotion.com/index.php?title=DBPF
+@@ -9,9 +9,7 @@
+ >4	ulelong	x	\b, version: %u.
+ >>8	ulelong	x	\b%u
+ >>>36	ulelong	x       \b, files: %u
++>>24	ledate	!0	\b, created: %s
++>>28	ledate	!0	\b, modified: %s
+ !:ext	dbpf/package/dat/sc4
+ !:mime	application/x-maxis-dbpf
+-4	ulelong	1
+->8	ulelong	!1
+->>24	ledate	!0	\b, created: %s
+->>>28	ledate	!0	\b, modified: %s
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 5d30c8473172..930bc56d84f1 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -9,4 +9,4 @@ EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb942
 EBUILD flashrom-0.9.9.ebuild 4249 BLAKE2B 4618423e4a0cafc1d94453839ab846f29ebfc904f41bd888ba6ddb0c884b10176c77f914f87c90013ddf15c3a68a6ea56dd739c5e51e9f49182706d5c55008e3 SHA512 dd62222c8c92c53e21e7b03d7d8d82836a3b3d724ecc55cf878708e2b32f7b7ee16b99a083bd3f3556546396e9c11941df4d7e6e92af69176416b32bb39f90a6
 EBUILD flashrom-1.0.ebuild 4148 BLAKE2B 78cb2ae88f8f8e6afbd959fba5a2b2d64e4d62f4db709d287330e499c6a3af2b8003dd8a48177a9f28b5e6183c449bcd06d81a596a4f42739db21b42f2b3681e SHA512 db947a856e8a4ca801d478f168b0a036fc1d33f718f4e1e136e84d773ea65d7e0c060c5d429ad6872ec110cee39fc7216fc40d07df1c778694e319caa791e436
 EBUILD flashrom-9999.ebuild 4225 BLAKE2B e9c5d6792f40fa0580088c442ca0238c35e69ae1cfa1fbc05a749a8137529cb7fd5d721c2f2c7e21d6de593fd06c517971d0fa6d6adae5dff0d59ad0ee2056d7 SHA512 66cf2081ca1fca2ec0d6746c5f003d869cf2455f228b473004834397e44c6280df725f6a57a481c524886219ec5aadbd52a1a91779e33d05a340f6f70f054367
-MISC metadata.xml 4653 BLAKE2B 25d59aa49991e8919240e6653823cddbe5bec073c6962ed5177bc2aae8dde94ad14c3142644b6a20efcacd8e9d65c4617ea9f15d7d8755fb70a9a3486f4c32ff SHA512 5ac8a5dbfee4783698820a053125608843ec6151df756c3d2db2ad559b17803dcc98641e29fdb60d02bd243d9a2ab4d452364b8175dfd001aa8e2400629041e6
+MISC metadata.xml 4543 BLAKE2B b348f4688599a551a1f1ff90d24a680d005fa230e5d03fab0aa231e7e8296911e6925887b4fde737b94913c2eaf3ee70e0915505ccf66a4c810df15c106e4577 SHA512 bce243c97485d24ef101f23f1e0e77bf3f1ed54459289f9a744f9f6a15ed9dc5077c076c00f3864ab05806ea9498719f443583bee566dd7b8ac0f29772894476
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index d2729fb7eb66..033a0dbcc0b1 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-		<name>Christian Ruppert</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>peter@stuge.se</email>
 		<name>Peter Stuge</name>
 	</maintainer>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 3693fdafbb1e..23d31f48ac2d 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,6 +2,6 @@ DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26c
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 EBUILD gptfdisk-1.0.1.ebuild 1198 BLAKE2B 35a6dff3f8c26d31be4a1bbfd6b274847fb0ae854ed70c8f6ba02202b90437d7c5f195629bf5bb9865cb0e9601670470a7f9e4a313afc737a43f4f128c7fe776 SHA512 fff00afa1c3689f41c0908d5198b07ca14e34c785e6bd907d593343dac00cb9079880b18769f8856c09f3972619ef0b48a0a0bb49cd3e07ccfff189c5b31cac2
-EBUILD gptfdisk-1.0.3.ebuild 1258 BLAKE2B d74cb1dca5639cdb666c87bbd9f3f0f181ea17b284711e51c2f6d60c330805ab9cdd0eb100dae09aba9ec7cfdec4b5a54b1e3110b90d2f5e54dc19c32eef7d7e SHA512 506b6fd6f73434e9451be85482267ba28c4f62deef0ff998bc8c21bbdc667a6308e760608a487a9904298abee6b2523e85f8fed618e027bfd55391c422ef7fad
+EBUILD gptfdisk-1.0.3.ebuild 1257 BLAKE2B 9c9818910c216019eaa9797f4293c550828aacff5a250406324920b4919be27c2f4d0a0a53274457af21bec70ac7fdb088bc168aaec979f7af3057706be6a3a5 SHA512 83e08ccb6d2c0aa23bde6d4ea63818774e4c935e99af7345e2ff208b305587b8c681b3227c8455c54956b8a2978892821a181662f5711890248eb62e8ac1c4fe
 EBUILD gptfdisk-1.0.4.ebuild 1259 BLAKE2B f2a4d0d41b9a128cb27d006a89031ca7a3b8ef27e142e32af77502c05572214edc1251f8793520e1cba22e13ece8dae7161daeba0543c16c3e56a5550c6e4838 SHA512 613080951e4db937ca66a117a89040a740d301b04a74a1d9db6b7cda73bee0e4e534a2dfcd42ebaf05f6e783283ed786942251a20b58ea5a97af3bd8c65faaa0
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 04c9952c4c98..0b200379b91d 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/hwinfo/Manifest b/sys-apps/hwinfo/Manifest
index c6644671b8c2..008a3c7e8980 100644
--- a/sys-apps/hwinfo/Manifest
+++ b/sys-apps/hwinfo/Manifest
@@ -1,5 +1,5 @@
 DIST hwinfo-21.23-1.2.src.rpm 844672 BLAKE2B 33cfd68c06081d76b33243474b9a72cc5994c749ff57b7fc4f36c88627707068fb86d4825bae66e4e08f730dc8849264f5f31f8717f28400b3d54302ac12b1eb SHA512 d25c955fa5620268a34a857916e0bdbbdb92f8e092735ac453e7bacc6476e00047c9ccef3a5275e5d50cc354bf9e3cffef57af519dc885d0afd3d161ab426629
 DIST hwinfo-21.4-1.1.src.rpm 781525 BLAKE2B 83c6d0b3d15a7b4354223eef8b976643ec6520842007ce6fb06534360a8994d4aac0975eba059275910f59391e7069b0166b69301006ea78ca4b74c6aefbde7c SHA512 bccac7749751924e1e1a8005e6fd783da7114926b6d9b9a1247b3b26dd680848eb2b85b368c312d08b444c8d7b75036d249daf33afc5b7efbbcc09bfbad4b340
-EBUILD hwinfo-21.23.ebuild 1290 BLAKE2B f5b4729004b3ccc2f85231163b442cefacb85f3a93a43bae0a9bd500a47771d751e85063e5612636b680e147d7b8fff351e54a235b2b17747cf387ebcd19bb6a SHA512 0fcd72e8886fe2ac537ad01675f2af870b346a157ccc2f6c3e3d8a0b09f92ec5bc9f0855ded7b486df0a8a432326c19af546407582bfd00221da54b59b19f9bc
-EBUILD hwinfo-21.4.ebuild 1571 BLAKE2B c989391f8206869ec965946aedbe0a4213e82a2d6469b55e3f120eed5a17f05184b08b6cd01b6eaf0273566fa73847d7587c8713394139687bb9884c3c7c565c SHA512 ee1a7965081c515162ca40076269b18c18e0633c32db69ecb83b1b719bb348c40112a8df0fd058973bf1d7005131893e0b20015ecfbfecb4b7dfd64db763a501
+EBUILD hwinfo-21.23.ebuild 1295 BLAKE2B 550a5eae06fbd3a1cb28ae87f7854985a744c8fe8c4bd09608a1bc1ed72493aca72a7afef60ff5b17226cf31f5ed884a8a9fdc72a0de4dd1b402262d84dcfb3c SHA512 f6cd1940a5b9ede5aaf06780434c87c218b77b27ac77c37419e8641efa6e55c27ddc849e1bceccd4c5a8bc6b4a337e3248128964bb5fecbcd8230fe697d32758
+EBUILD hwinfo-21.4.ebuild 1576 BLAKE2B ad2c9469499e1ee1565c9f34d07a19a3df5914177c30cc201cf6933e896ac827b99c9f37fd52f0edfcc59e3ea8b3d88548892adebddaae01f89773a42c007ae7 SHA512 76bc658891201db983815fa5b33295bc78b4d9056ac72da715e51b36ac8c03c3d6d456ae5309a6cdb1e3516ba3abcb85669fb4eb8d31b6eadfcaec829781afdb
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/sys-apps/hwinfo/hwinfo-21.23.ebuild b/sys-apps/hwinfo/hwinfo-21.23.ebuild
index 0306e9299fe1..a39e2d901698 100644
--- a/sys-apps/hwinfo/hwinfo-21.23.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.2.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/hwinfo/hwinfo-21.4.ebuild b/sys-apps/hwinfo/hwinfo-21.4.ebuild
index 1030cd638604..348ba397ad0d 100644
--- a/sys-apps/hwinfo/hwinfo-21.4.ebuild
+++ b/sys-apps/hwinfo/hwinfo-21.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-1.1.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index d3b97d8fab6b..b3b62fa50570 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,7 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-1.11.7.tar.bz2 4187754 BLAKE2B 9d55c35ee328eddbdb9364f4330d157eeefb53fd01b3d0cba23423515302ab0f43aac6c6aaec3a96277411883e3806888aa1c55d2312e102d00302305279f044 SHA512 f3afd123f917d07fe987b8a16dba9f1aa9a9112fc4bdc806417c942b5fbd3b7f31067550048258814b4ba08d4ac7bd45c1fd477457d817bf9453735e0b82f04e
-EBUILD hwloc-1.11.10.ebuild 2240 BLAKE2B c935e5c7f67b37f0075cc402ac838d098e81e37172c463d04b843051f1581e3d53ba896f9c4d09bf33bc99f7aa004b60e993a18216b8c07ed65e87b4a46f1ede SHA512 96c45d99501f348b99867edb06cb55e397c0b00a6dd7dd0b542d140655088fd35aaa7c9135b5e506d95614f30453b5aa16cc5e0bd5fb6c0baa19660eab9aeb4e
+EBUILD hwloc-1.11.10.ebuild 2239 BLAKE2B 33eb03ed6ce9de352f53602c6e687e409b63cec0a4141c2e7e416be4f98dde7d867e7a8158d09168a563bb39c19578b44397c1a8f3a08662d4e375ca80456d48 SHA512 006165b38fa9c332b4cd24aef0876555ba5e4cfd5d4dcae22a82beb0fd5f253197dc87e691291eb2e9b3e7e681c7d504d4df4e44ccd8e537b7008aefb2f34563
 EBUILD hwloc-1.11.2-r1.ebuild 2207 BLAKE2B 56a2d0b7383b173cc389a22b3a3ee68a867db2339bad083720bb6c1a8f5e8879e414a87039164b019140f959d742519d5d5cc9126a8712e4ddb9af2dffedd964 SHA512 ec68dd2534e19ef77a0bd4fd87b357d8dc05bddc6a361ee320fe7b9145ed0a6988d219ec8c56c6ea66036db61e1cbd2ade9f34e4470b997684f95309287fce6d
 EBUILD hwloc-1.11.7.ebuild 2218 BLAKE2B e085ef7ca3e0d275b5e59b4e14206450bc4c820addef6931547247037862072d988e70f37f900a9a6bf66d478c48b97500ae1d5cbba1b405e5321e7841c217ab SHA512 984bb91ccc20ee9afeee0cc474141a7c967deb8e4cc02235a095161721e16aeec43901fb9fcd1eff0b3dd05e5f3a46691711a64a838d90423ecded36e900baf5
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
index ac35fa5698e0..83dab218d512 100644
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -13,7 +13,7 @@ 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+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 +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index da24e2087fd2..912d463ed5c0 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,10 +2,10 @@ AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.0.tar.gz 1697374 BLAKE2B 42cbe5a252fff7427f9a6eed48f110a16ecccc1e251f033ef8184b9efa7d9d184af4e83483e234fa97c1cfd964bce1c5fae756e34b5713328ed58be4d66e0fef SHA512 2089110e5c829f7bb2d97d634a543a93612503fb918d5696a17e376bf12aff160272634634652085d7f374ea39102c2bc8fc06d61ccbd50c6a76152073ea0a8c
 DIST ipmiutil-3.1.1.tar.gz 1697588 BLAKE2B 89d5f6a4b92494d5b5845a856011bf75eb6925506d7956b72efd3a258b29726f3b426185588cbf45a721c804e5e2f8203b1ba5ca132e8e907435cc2cbe5e563a SHA512 c2a7e05f85d668d6d02c990c1078d6f05c30f7ca26b5fdb4bbfe09952dcc4e9cc5eb67657ca07770fa8b0d333bc4d4a96ba845b45efe942c28342be013cf60bd
+DIST ipmiutil-3.1.2.tar.gz 1698885 BLAKE2B aa6ad98b38c2d2c4a618717842afc88496f88c291a2731fe95072005a4a85f6dcb3a312924c3353e7b902d90a6bfbedc73bef0ce3d7c31d2326db14e4777ee0b SHA512 83dfddb30e8ddb8ac323473873e0920d2f81c059790556a472fb33c4dd140f5045b74f6f63e3300817b2f5c4af3d5ce35f3bacb96dc65c91ad0133bf088ba565
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
-EBUILD ipmiutil-3.1.0.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 EBUILD ipmiutil-3.1.1.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
+EBUILD ipmiutil-3.1.2.ebuild 1459 BLAKE2B 05a9ea153c3da53dab123c1088441e08c246e634aaddbd41b44a13a72917bf70766a1de04a485fab592c7c9e3db87e1e6a0286525d9540f6b183b9dae0869442 SHA512 61dcd5b01576d7eb1fbb8f324c41bfe51788e1e4f58414dbc225145c4a9cd3764b78abf62e127a60be12cdd322cf774f620a3eb413e26406abf3ac2540e387fd
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.0.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.2.ebuild
index ac6d2f9004f7..4a05a288313a 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.0.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.2.ebuild
@@ -57,4 +57,6 @@ src_install() {
 	if ! use static-libs ; then
 		find "${ED}" -name '*.a' -delete || die
 	fi
+
+	keepdir /var/lib/ipmiutil
 }
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index f9632086088a..89c507333487 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -8,6 +8,5 @@ AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2840 BLAKE2B a2c5e97bf4a87b1e8d5a4b7546004dc32c172c5bd0771721a5469aab7f2f198c3dec04eb9d48ae32d5f941a96881c9753ab374b278838afbef7b751934b36e55 SHA512 e3bb4180cbf4b6331c0f48ca2a9c3f636d1a4d28f731678a8db8eb92c7f0b377dec220894135bd8fa90f4a641ee99f80f4f09e4bc39220e39972aa1e8c09f078
-EBUILD keyutils-1.5.9-r1.ebuild 2163 BLAKE2B d425809fc5197a5c160e500f12fbb729410db5d6ea2f5703e7a76260e2735a158a0bbb95aaf6fde4fa37ac151314d3c3611744a805d5a593384f5917a25941ef SHA512 ad3387908cf7590c54f43ae6d7d25f408d338818df786bdc3911475cce93680aa4d1c27b2b078529b7362dc4503e145f2010cc03a6f84f970739c59e14efda2d
 EBUILD keyutils-1.5.9-r4.ebuild 2984 BLAKE2B f93ee7c4a4fc0cd4f623d13f2007355294e0a9dc6b6f86ee8afce908569db146e166a2e90565891ed396137d5f8dcff762287674e3f36167b7d377177f36d591 SHA512 0175ceb620c7ffe593145ac41303a200584bb8212fb1df3767ed23a1a99c6027afe457da33a1fbb4f18b6bd19dd0f22808fe39cadd921a687a7464602a55019d
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
deleted file mode 100644
index 5dd6f75e4ce1..000000000000
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal
-
-DESCRIPTION="Linux Key Management Utilities"
-HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
-
-pkg_setup() {
-	CONFIG_CHECK="~KEYS"
-	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
-	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
-	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
-
-	# The lsb check is useless, so avoid spurious command not found messages.
-	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
-	# All the test files are bash, but try to execute via `sh`.
-	sed -i -r \
-		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
-		tests/{Makefile*,*.sh} || die
-	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
-	# Some tests call the kernel which calls userspace, but that will
-	# run the install keyutils rather than the locally compiled one,
-	# so disable round trip tests.
-	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
-
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CC
-	tc-export AR
-	sed -i \
-		-e '1iRPATH=' \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		Makefile || die
-
-	emake
-}
-
-multilib_src_test() {
-	# Execute the locally compiled code rather than the
-	# older versions already installed in the system.
-	LD_LIBRARY_PATH=${BUILD_DIR} \
-	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
-}
-
-multilib_src_install() {
-	default
-	gen_usr_ldscript -a keyutils
-}
-
-multilib_src_install_all() {
-	dodoc README
-}
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index b2178f5aa61e..6ed615693745 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -9,6 +9,6 @@ AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c2
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
 DIST lm_sensors-3.4.0_p20170901.tar.gz 208487 BLAKE2B b6d2eb6efee25891fbd655738ba25e91d8ec5d97f07e24ee217ab1a59c51a8ab59e042a90ed6fa1de4459992adc740252588419c0f74ce02f9ad7c1f4f9750da SHA512 5c4a750efdff2ef086a5ed1b6a8a03278872ca077255eae91d0696af229f37b09216e2f53d1d6e4602596fd8b978e0b9c27327357621486c5d7b1d39ecd16fea
 DIST lm_sensors-3.4.0_p20180318.tar.gz 260899 BLAKE2B a859c20ef148f80cc9d5ead61547feb5c26a77447aeedf9273334fc1e5b4075c74d8f786102e33e8fc771968dd605829923f8d3da8293fef168c74b8c55bf32a SHA512 923ee985d8e0b8fdc43b2e4418873ccbeb8433adbf2efe71fcaba1df0c6971d502866abe8ea015d199380e06e3cfd35d945451e5e9f7e64cede35fff37621aee
-EBUILD lm_sensors-3.4.0_p20170901.ebuild 6318 BLAKE2B 29a5176941ea4ab05a7cd6db72d760a5b4a8ab18f6f6e1352ecdaa5dc2843119f0e43887eed62d09507a4bd17586462a20488a8ddc13a065b5dda8cb49c07cb7 SHA512 8c7c8a0ff38f474c0b7123dc093f899f80550b0990b62908e787f80d52697f4024d5185b719608a3e56b4b41fffed0df9b943b5ed55837116605344f829200ba
-EBUILD lm_sensors-3.4.0_p20180318.ebuild 6326 BLAKE2B aba7273721d0f623e048c8d1406b93082fdb64ca3ee1b7388bf42187742fc73c1e6d91185b913328cf858fde0cbf6a086767647f427af512e326c503ff261f76 SHA512 de48193fde018450cc9a33d771f8207a7662f699a1377b09956ee7a34569e80ba2b29182d3f75b5b3834f7a2fa4a28419ce801ae9ddd9dace7a33a91212f7ffd
+EBUILD lm_sensors-3.4.0_p20170901.ebuild 6330 BLAKE2B 8b17a747524ae07e3105d570109a18cbd690725c834234bfc82ed926bac576b97e1d5fbb2c7fd58fcace61dc95807391961ebe15beb1bf6cafd462f86fa32f1c SHA512 afe2db6d3699a1ae079a4994746fe214269c89b09ab641788b73b0c7ecd780713210ed31251edd1eb4141b7679b7124c0f6ee22a33a150aef8dff13e482ab03d
+EBUILD lm_sensors-3.4.0_p20180318.ebuild 6338 BLAKE2B 99b2847e9f3de45368b3dc1d9de7006c340a4b336f6ea82eb2220c7a45342f680bd3bc9d005338868b96b9bf65816da0ae29f3945029ac6b9fd806ebe957163b SHA512 526fb55c056d3782c9461a2bb1eb8af5b3816225fc923563e66ca23c1435736ec2ce74cd88865cd7411cef9e47ac641e7815cd3c5b2d404d093dcb6a988fa36e
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
index 80eebd78ae58..3999a62a36b1 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20170901.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit linux-info systemd toolchain-funcs multilib-minimal
+inherit linux-info systemd toolchain-funcs multilib-minimal versionator
 
 DESCRIPTION="Hardware Monitoring user-space utilities"
 HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors"
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
index c765228b5b41..a6c69f572bca 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180318.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit linux-info systemd toolchain-funcs multilib-minimal
+inherit linux-info systemd toolchain-funcs multilib-minimal versionator
 
 DESCRIPTION="Hardware Monitoring user-space utilities"
 HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/groeck/lm-sensors"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 014bfc65501b..d42dd92d143c 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,9 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc
 DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
+DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66
 EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
-EBUILD man-db-2.8.2.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-2.8.3.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
+EBUILD man-db-2.8.4.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.2.ebuild b/sys-apps/man-db/man-db-2.8.4.ebuild
index 627b8941479e..627b8941479e 100644
--- a/sys-apps/man-db/man-db-2.8.2.ebuild
+++ b/sys-apps/man-db/man-db-2.8.4.ebuild
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index fbf8eaa5f373..f1d25b41e26f 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239aa774bec04233c95929981531d1fabb24ebfdc5c92ab401f51cf6bbf2432b6e8486a833d06a96a51e1893f39f6f641 SHA512 48b3bd2e52c16829f70d62ad8b1f32313956fcb7085cd906965f1d7b12f61952c60123ef335fbd4a1dd86aebc9751b9bf44f71c61f4bb6ac9bcb30d514ac36a9
 DIST osinfo-db-20180612.tar.xz 71356 BLAKE2B 3dcf9d843d32eb4e5be7cda47e8c8d123939b381d41f0596d8fd5794c64130b1fed39b367a1f6b58c34e91b5a38811af54066311ece209cbcaf268d1f032e55c SHA512 02c92bca33ae35abe28fb575c73ab96fedf5652e7822a10a213f084390b3d863e3ea83469d8a2bbf6ed69328803d48f2f35a1e45f938ca698a63e08b82c05e9d
+DIST osinfo-db-20180720.tar.xz 73976 BLAKE2B 23f92ba745f0e21ae839ab1bdfec7128dd33d60871f90cfc37c74b1720cfa74c04c63b609283cb5f1b10e5211f7be931478c4dcc6ed683f40100a371311b2e77 SHA512 9c62c1427ca71931984f9edb80d2784a40596d9000b91b70d66ad4a9956a50a57ec1b38de9a56e2d4889cbdec9cceda68e6a9ede49d6fea0bb0f35326350d6b3
 EBUILD osinfo-db-20180531.ebuild 671 BLAKE2B c2911f510895eb36e53bb93ecbc8914cbbfdec31c836f6828688ac022aa3f0dcba8fd22effde1238736bb2b5029404e232933eac6bcd41ce1b9c1ac28a0c5a7a SHA512 1ededfeaa0e2271d861deab2b9ed94eae3c6fa323af8b50b850a8ccd3d2f9128f6701252ccedf80c385a0f4d1dbfa979859fbd4b74d92a8b786c92de8da4a453
 EBUILD osinfo-db-20180612.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179
+EBUILD osinfo-db-20180720.ebuild 674 BLAKE2B 1e05c5e43f9bd1b9caa05505d8f2e14eaca4605fcf00e857baf4810a5038dbed48ab7c9de19732f22c649d85d9a9588aefecddbeef9e7c1499523d39ab7330b3 SHA512 fb407f5ae28e4309b92836504ed11c819e4b9a12509527b4030300a8826a9c54d7491544d771c84a5e93b1a844b3c3accae6e1159cecc5e385ea0ec29a918179
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180720.ebuild b/sys-apps/osinfo-db/osinfo-db-20180720.ebuild
new file mode 100644
index 000000000000..05bfe3807574
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20180720.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index d369d78dc063..9852461ba50e 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,12 +1,6 @@
-DIST portage-mgorny-2.3.26.1.tar.gz 1237698 BLAKE2B 73dcce2f57930bd074f6de5103a31ba3730537196438302ea7b25b21ee32d6ab8b3292b42825eac2e912639be1dd0a1b15c049c5cb22f54525c476b96f4817f4 SHA512 38c5ca6a1fee7125942fca10921f3c2ae201c6c06b4f69ee7b0b90b44486aca7b8e4f5817efad99c1ef5ad3f558cd9da144d2c3c26242a1a05bca9e17921b173
-DIST portage-mgorny-2.3.31.1.tar.gz 1245744 BLAKE2B f9085fd7b66c2e018736cd1b5740d03cd61ab50d18113d651289521c3cb7786bd7963b24fe9a8d55e9dd107a01bc77c5ca2e8f343e4728a844fc17fd608a3680 SHA512 d2f6188f78c94341c97ca71915bd1428b49d26ea2d22f34b71029128dbd9ec0c9673b2835af730f17d81aba96927bcf05e46ef82ba1e94c3ae7249b6ac8ee235
-DIST portage-mgorny-2.3.33.1.tar.gz 1246760 BLAKE2B 5502b60a889d224008d9cdd3befce80bc831ab15bf1a9dd43599e6da307d108939fe21ba272f19b785e2e927c582bef55dd2baa2186f0dcb882a5ea9b37accc4 SHA512 1fcc239abbb4288dc8863e3d5aea84fe59dcb1ecd989616cfabc477dc8516722d174021e96105ded26952d7e900c83dd32da27c35fd1e429af6431ee32dfa877
-DIST portage-mgorny-2.3.36.1.tar.gz 1247357 BLAKE2B e3adcb48a2261d55956e9d5da291936aa581f485a88b815097f93bec4b0300f98677064207a60b2d98c10c1c6082e6f58221f7bea87b689a920c0c50a81bd583 SHA512 16284e06531cdad65f8ea3efd8f4fb9e4f3ff5c127c7d24f5a3fc3d0ba1a3cebe18e32b89ed85759f6b3df3841eaf618390c5b401a7e621a02cfce1da71c4ea4
 DIST portage-mgorny-2.3.43.2.tar.gz 1254672 BLAKE2B 2fc3b7d1fa617b0032525fcef475c53d8a59b2c5b34a6685b7c34d88d41930bd24bd4203966922537ef243f30e4377060ba7f94e89c1bb3c9941cbc3297a690b SHA512 b23386616dac61295460c823bb24959e3adb926d97d1d6e188df8958089bfec20cd87b2f6090e74bba249c0006496571d3807b20edf1947655659e777423a691
-EBUILD portage-mgorny-2.3.26.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
-EBUILD portage-mgorny-2.3.31.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
-EBUILD portage-mgorny-2.3.33.1.ebuild 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
-EBUILD portage-mgorny-2.3.36.1.ebuild 7166 BLAKE2B 2f4017f7e9233f8519f006a87223c8cf5b7acde2777cd0b2ebccdb7cba9265cf65680539b1956822668875d37b4dad84ed78c618fcfb5f52aaeffd6d6dc08fe4 SHA512 829a39a01c001aa6384ea4adf4c6a0f07a4cbd68546c552b220c5aab678123b7fd39107f4cd9b5c6a118834db916756d2e93cdd02bd1cc7dc652594ac0da090e
+DIST portage-mgorny-2.3.43.3.tar.gz 1254313 BLAKE2B afb5101537bfff9b05622f4357757215bbe9641f2ca058baa59316b72ad3280ca7905f75e10b3270627c0b703434691bbfbbd88c6e375ba3f405d69d983b1944 SHA512 4fe3d1a8809a91fb52a9ccccac7d66cd25e8b6ff23b0ab2b4fae5f26a2036296a1c4eba78fee819003a8a8c44a5c6fcb0f04b9eded220d124bf08019a4f2fb02
 EBUILD portage-mgorny-2.3.43.2.ebuild 7168 BLAKE2B 02710ff96aae53795a5be8a4c6bfb077f6260bf40c7316d4502457d1d9b2f7d2faf516d0fb8a9cb2c76d74b4c9c86542d6a21f0bb2bf8e5c2416e92ba60533ce SHA512 d1c2fd6ef66b900f0ff6988d156c99d55f8415558bb2eef9dfdbc18eeb0d705ccc04beee6846357350bf959a229f6b4193241f8ed9641ea08d199507760f7ec0
+EBUILD portage-mgorny-2.3.43.3.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-9999.ebuild 7080 BLAKE2B 703c046e27a79356ed4a0c88690e83677ef0493ea63e4a19be21778513ce9a3f8f14ff03e8116aedbfe9c8baed2f31fbe613d88586eae647386b2625527a6c2c SHA512 d7fa51354786bb879c6f2954b633a07d863126becaeede41e11f8f3d1c52ad80f8ffde671ccd4ffafc5552b2074e5cd6c30270f525f828244d5a7b339147b445
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.26.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.26.1.ebuild
deleted file mode 100644
index d6c166badf4d..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.26.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild
deleted file mode 100644
index d6c166badf4d..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.31.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.33.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.33.1.ebuild
deleted file mode 100644
index d6c166badf4d..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.33.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
index ccc6052e2056..36bbee3032b0 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} pypy )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1
@@ -105,7 +105,7 @@ python_prepare_all() {
 	if ! use ipc ; then
 		einfo "Disabling ipc..."
 		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py ||
+			-i lib/_emerge/AbstractEbuildProcess.py ||
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
@@ -123,7 +123,7 @@ python_prepare_all() {
 			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py ||
+			-i lib/portage/const.py ||
 			die "Failed to patch portage.const.EPREFIX"
 
 		einfo "Prefixing shebangs ..."
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a8968f7ef2f9..5f2fb2eb44c8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,17 +6,15 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9
 DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
-DIST portage-2.3.41.tar.bz2 996250 BLAKE2B f76c9198b5a4f00a5d67c85613b182dcb30c8ff568cd74b798c230945294532ecac65a682e97b64da28dd297b6d985445b7f3999b84d5152e4241f22e8813330 SHA512 113113a982e346c31e65c326326913458229c05d443f531c1d1897a679dda143d80223cab8bfbe831f4d92b6db9d09fc451ae3c7753e4d73b33736cc4f34c5e9
-DIST portage-2.3.42.tar.bz2 998518 BLAKE2B 8943dcaf80b9bd566dcc9297e655a225cfafb0d316b17a82aeb25ea05f9cfeeda1ff6a78eb500f85057e98f936ae923200112f3dca920325182e793b4bde74be SHA512 406776e7e026ed5f91c8f16b823a0f18d59deb864ac9e5f86447eba9785b33a91ffc737d9aec19ea764b3f1c32b15dad9c5bb7d35cbf0225c6ed9daa8a471d5f
 DIST portage-2.3.43.tar.bz2 998958 BLAKE2B 28874db4dc989e550aa4a54a91b8ad303f17b2444d6e23a539672c4742ec62c4228f6070f0d36a31b90d1d32998bc4825de706e5a6635bb7051e5b592f8e3eac SHA512 b8f3ab4f700cc72364b38153451a32a371d0b222feacfb206017be7182596cbc83b7e036025d07399e8b32cf3e3889dbc6ba8d26a64fbfc4253f1506da3c8252
+DIST portage-2.3.44.tar.bz2 1008301 BLAKE2B de370ce9f455e6f778dece3be78703f23852caa9185d79b54e6fc35939923f2a28c91aa372a4ae601872b7933970b536e935ea1f8cb8604bf1547dced3d70c33 SHA512 e491998958439dc27fed6e6f9a3b87867c881cae6ec1fe9515db3277fb2f6f866b6ea6298bae5bf6553591ebe75719a5f379ae92e4aede440ac620ce4af9160d
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
 EBUILD portage-2.3.40-r1.ebuild 9948 BLAKE2B 148e93c0bda6febdcabe74eea89aabae4d9be7ad68fa284824b78d1b32bab8404b89904a791ba487c0152270d0578a2dd35a07160483703eeb5ccab330f5a54d SHA512 4c184513337bc67deaf118986b5be94e81bf8dba02ade64a767c796525c51e66754674e4e323c0d89c0002b83cf99b5ad56f290fe764ecf1b19a6af84b79dddf
-EBUILD portage-2.3.41.ebuild 9322 BLAKE2B 702e4104d52fa5f2e159cdccf9f8ff2103b5db4b6b4ebd984a77029642da9626914eeb353122dffc1852e3e3cb68ce4041c7df0cb402737067b05c1d930273b4 SHA512 0153700fac90fe752ab925c8bcc4d2ab362a5730a1724a36d8166ba4468fecc888eefad83dd20328ead52375ff23e9c598985e11a6fe42fe6553be0d986953be
-EBUILD portage-2.3.42-r1.ebuild 9476 BLAKE2B 54b2a7eec574774671a17403d39541ff5b39ee0ea57e089bd72629e92def9a252aa99e873cdb0ce81b6f5c677528a5b87518aac3339305e4aa94b1e737812889 SHA512 088e2b4b816f531d0596dbfe5c3ae7e1e7c4b254e3dc113f6592f5918fad928fe9c9bdd6ec82f8742fb06cde48870e5d12e07fc58ccd51f429345c6dbbfd988e
-EBUILD portage-2.3.43.ebuild 9532 BLAKE2B b237d95349051d7b8bc40e9a7f59dccc53779b43ae9ee9cbcef45040d56a0bba3abddc9ebc5efa8613bc8a5baec49a63397b99bdbb5793df6e1af2091b2252ca SHA512 2943dd8dd029b55b26d1e2895073a0cc9e44f5a16c6e00921adc1616446175136e50c5aa56889e21a1ecbc7261bb8157c6375090274674779a78b36654a7a916
+EBUILD portage-2.3.43-r1.ebuild 9880 BLAKE2B a38b18fbf692f1bfed43c9f85566eb1262f804ff5ed6e0aa95329aa5faa73f14dd18e95dc456ccbb4253df53e0f8c440a2ff0a3714e5a980db066a6e409144eb SHA512 75f3e6d49b41eaa6cbf7a041590994ef79f41535d20af1fc43edd691b3319a221e594c5f1d14bd8bfba640ed863f8ba5235c0d5a0c4e63fd71cb9f3950d6767e
+EBUILD portage-2.3.44.ebuild 9362 BLAKE2B b6707ff66a01b3dc659e2ce1da922fdb7e5e054a8084ff20292cada826704f20a90d0bd8230a275c61c1023c67d0ee9378ede97ac14ecd572b32c4dd85f1b807 SHA512 7a5e773ac818d97a0f44d0b56b7118b413c79cf7f9affeed5d040a154cd39e5155fcfc8b7c118714b7ef1ac0e3218da672f3e7a0b00606b3b3f6462d968770ab
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8839 BLAKE2B 1dea8a4b171b64e0dae5818179acfc089a4c3335fce9182a4200652d15fe5f6ff2d044f54b01f6580896da46515278ddd0a107be6b7d5391bf0bb35f6f12f8cf SHA512 d08279a4a54c83baa26447fbb19a6158217e0e6054cd4e74814461d84be8a6b9eca30bf7e523f2b365cdc51cdc858f58390a28954a9b190b6f8c770d1be940db
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.42-r1.ebuild b/sys-apps/portage/portage-2.3.42-r1.ebuild
deleted file mode 100644
index cc042b0b156e..000000000000
--- a/sys-apps/portage/portage-2.3.42-r1.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
-			app-crypt/openpgp-keys-gentoo-release
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Apply 36dca004be44 so that sync-allow-hardlinks can
-	# be set in the DEFAULT section.
-	sed -e 's:^sync-allow-hardlinks:#\0:' -i cnf/repos.conf || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
-	einfo ""
-	einfo "This release of portage NO LONGER contains the repoman code base."
-	einfo "Repoman has its own ebuild and release package."
-	einfo "For repoman functionality please emerge app-portage/repoman"
-	einfo "Please report any bugs you may encounter."
-	einfo ""
-}
diff --git a/sys-apps/portage/portage-2.3.43.ebuild b/sys-apps/portage/portage-2.3.43-r1.ebuild
index 4afb116e9521..54096df31b3b 100644
--- a/sys-apps/portage/portage-2.3.43.ebuild
+++ b/sys-apps/portage/portage-2.3.43-r1.ebuild
@@ -99,6 +99,14 @@ python_prepare_all() {
 	sed -e 's|\(def call_.*,*args\)):$|\1, **kwargs):|' \
 		-i pym/portage/util/_eventloop/EventLoop.py || die
 
+	# Apply dc1ba7729c42 and de9801740fcb for bug 661906.
+	sed -e 's|^\(					return \)(1, False)|\1False|' \
+		-i pym/portage/sync/modules/git/git.py || die
+
+	# Apply e356d53ceb10 for bug 661834.
+	sed -e 's|subprocess.call(rsynccommand)|portage.process.spawn(rsynccommand, **self.spawn_kwargs)|' \
+		-i pym/portage/sync/modules/rsync/rsync.py || die
+
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
diff --git a/sys-apps/portage/portage-2.3.41.ebuild b/sys-apps/portage/portage-2.3.44.ebuild
index 08db0a649a22..4cf0b294edb7 100644
--- a/sys-apps/portage/portage-2.3.41.ebuild
+++ b/sys-apps/portage/portage-2.3.44.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6
+	python3_4 python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -61,7 +61,8 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
 			python2_7 pypy)
 	) )
-	!<app-admin/logrotate-3.8.0"
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -97,7 +98,7 @@ python_prepare_all() {
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
+			-i lib/_emerge/create_depgraph_params.py || \
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
@@ -113,7 +114,7 @@ python_prepare_all() {
 	if ! use ipc ; then
 		einfo "Disabling ipc..."
 		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
@@ -136,7 +137,7 @@ python_prepare_all() {
 			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
 			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
+			-i lib/portage/const.py || \
 			die "Failed to patch portage.const.EPREFIX"
 
 		einfo "Prefixing shebangs ..."
diff --git a/sys-apps/proot/Manifest b/sys-apps/proot/Manifest
index 2e2ae20236a2..d7192faf9bb2 100644
--- a/sys-apps/proot/Manifest
+++ b/sys-apps/proot/Manifest
@@ -1,15 +1,6 @@
-AUX proot-2.3.1-lib-paths-fix.patch 700 BLAKE2B eace0a2dbd277197961992ff0e94ebd8aa466808f0714d74ffabca632d62aadc27a2786b48e5840ea55696f66313e2a04df927947fc5b077393cffe32f25628c SHA512 90c5b6fa8d9e98de79d2c1344508a82be22ccc334cfcf8b6d60a2004a445a1c683fa538dd57958ba6491e26a1997fcfa8daa44f3a8001424470c85ece56c34a9
-AUX proot-3.2.1-makefile.patch 327 BLAKE2B 202b3180885595c18264e26dc78e71ca0ea33b07eb309688831f82629c739ea14508ac6bf6b7e79a7da765630aa667089e277760920510a07bcc369fa0cb67ed SHA512 8c1614b5c47ffddbbf59f1a47d60d7fa43c03a31612a1b8c699c8ea9c0a4f319ab326bb713e0c0dc6bcb8d7b38282a181e89f7429c7aaccc7340da0769235a57
-AUX proot-3.2.2-build-care.patch 630 BLAKE2B 90f6e8d0cfa544cec4207a7fa1f9cb3024bb19da7d0d551976144094cd8873a6e542514a9984cdf506b3b6bc0132251c4db7284aaa37da726995a235fd60c74e SHA512 394d647a9b5054ca31b7c18a0993adb9d811123cc54fb9f9ea5560016562260966e61f73f3290697af1dc141482dd75d3bb4cbb7c84995af58e246f8977169b6
-AUX proot-4.0.1-argv.patch 3833 BLAKE2B 911d3299e62223a90bbb930c5a0b7b518d815120d97adb0b343f4942eda17c3b75c774378fbf7a4ecedd0ece6f28cb7e86981b71372fd1ef8920adde6de36923 SHA512 d0be9f636ecfd75fef3987d2ebb4c693aa134371e2fee6d975373ac89b0da79ad017301c388b4893667101db405f98d54a8de2cc851413356b1616337d274a14
-DIST proot-3.2.2.tar.gz 171047 BLAKE2B a99f7e27e57bc63508cd31b39d15cade0ffadc6b92a4f9acdf92d41afcbc9e294962d8f7b0114eade568f15b0262065ae20b3308f5b5d03a973c896ecffecaea SHA512 baf8df06a463978f0faf36f9d81935d6583b99b7e8c54b8ac330478ed92bb3a5d5cd624e028247c50bb9bc6fbe1300c5736a38c0aff250b23614aa52f922dfdd
-DIST proot-4.0.1.tar.gz 218732 BLAKE2B 2df499190bf4ffc2c60a9b4dcff21b21aa23647e958c49731679d0a8ca4ac33f8ffb2c52729179efd4dd6d0df78c92861e17061145527f0bc1aba574350a45c4 SHA512 df6ea412856268af65ed5fd3ede8ae099c70e9b08d7875e3e2d8e44e9d4288de93e3844aa361db0b7b579b68b5e7a983989ec0742a6d31d7bef889f739db2158
-DIST proot-4.0.3.tar.gz 222716 BLAKE2B 40a0f99926db386f4018612035812246b67e2070ebd343183dfc6f1e5a53f1c3718352e1042e9727d9e617c0591b6fdcb90745d8d359d607dec95e015ac2704e SHA512 1c74219d44ea79a4573c6dd21a5b62df8e93522886cadb1175044b782f40a711193af348763663d24ab634fbe13b67264f0bff061a980947810e38850d0133f8
-DIST proot-5.0.0.tar.gz 250005 BLAKE2B 89b4f9cb5507b87ae52e82502846fa66a0083618672599068620f7f21ea750524f56f9159e81e1e96bee2ac476b1c49aeb58429178b70c01f26f34065f443fdf SHA512 0617142d5bfe40329c12f5cbe3c850d01b82f10a8b44d63acb64e7e880af652fb60d05610fb91ce317353986eb30f031d82114661e5d58a38696d242ccd366ee
+AUX proot-2.3.1-lib-paths-fix.patch 704 BLAKE2B 2ec5d90122914299dd892001a2b100b7b263dc83f9a43533ee5d7ee7575f9a33e6703265da58d04b68c2f84d511e0206b43dbb4d5e8d9366c6bb52fbaa3ded88 SHA512 be372a1f7865a22f76f6eddcd348806a4c5351d4a9ffc4657ad41826ceadcb6f6cc3987d8e81ccaa022df01567066c9d5b450f315bb29cd01a266f8ae9141306
+AUX proot-5.1.0-loader.patch 8308 BLAKE2B 097a5a3dbf46160a940acf194004443529b720fd8d323bb39057263cb294905e729f0d441a80bc52427e1108a9c1c4fe7dea7e84d39064258d98a3e832522ae0 SHA512 6c3018a4b44149260f2d9f9b8f892f972c0f85482fdc6b7d2858ab6ad16fdc68a9ea619dbcb80c1cb7b4a6d0af2b90329b4560f44baaf3fae29f3c624966ef12
+AUX proot-5.1.0-makefile.patch 779 BLAKE2B a70e16c8f61501253adcd4cb40f69e315548d4394828af537c646fd46878ec75a5f3d24270458a1dfcb9bc70c2468efbcc6e629f848172a678fea27e9f4a5e2c SHA512 3ee5566e2209e0c3cc12ba9dbbbbc93d0080e66039aacbdc3c30974acf5380d4f855bee81a49976ea9c0a67f904456104a2d18777e5c0c10f530debae6e42df7
 DIST proot-5.1.0.tar.gz 253251 BLAKE2B 8dc147d6c6ee303baf0c86f2fa4a8c17a58e76d9da9432635fc70ee06a65aa748ad617735012a1a18a520775fbe38c2264dcccefb681e8e829a5e7e1ddb05cca SHA512 26be26d405a8bcbe94377c3e9c18a571e4b61e3074f0716b0db3517d147d9d4a07c80f7312171cf9580ac7748e72e688efaf1b8e4a0ca3bfc31c802aa351346f
-EBUILD proot-3.2.2-r1.ebuild 1675 BLAKE2B d219c5565aaa7ce20f3ec6d3dc674d302b484120411f03224a895f1a07304aa457e264f28109e3c209630c0dabb5522e0aa6db5d2418f3aeff896dd735f3b38d SHA512 0b15670f67c14e86cd3af2238412d8a3d2c86a252d3228666497633096344eed528da23e6701ae06fb1f9190e0a3fc8f2f8493535b11369eea203a54cdc5bd5a
-EBUILD proot-4.0.1.ebuild 1616 BLAKE2B bc34c263697ee1eefb81576421d29ae3344494e896c576d6b8a7df8392101a5304fc32ea91fc1c5fd5a46153d81aac74d5794efcc19e005f22006689558d109c SHA512 8a6b2da2143283965926b722a661fdf820da7f868a347667c0d7e8ffd00e0dee2d9085861358accceb0e4461eb52f114b6e944ba8ab2adea937a43eb33eaed17
-EBUILD proot-4.0.3.ebuild 1563 BLAKE2B 5b1a8c584360ddcd0219d97527c40c886bda2be3bbe4bc250ca97989996a59d04dee5f54a82090865dbee6e9ce171d3b2787cec7d07efb2b0aff61146a13dc58 SHA512 a8f5aba5498c1bdb6f2d74574a5a53408b6be26164137be29bfd20760767b374470f8c7f28d1c9393d0737548a689df11881c9ed09cb0b97e4eae7fbd37fa1bc
-EBUILD proot-5.0.0.ebuild 1563 BLAKE2B 5b1a8c584360ddcd0219d97527c40c886bda2be3bbe4bc250ca97989996a59d04dee5f54a82090865dbee6e9ce171d3b2787cec7d07efb2b0aff61146a13dc58 SHA512 a8f5aba5498c1bdb6f2d74574a5a53408b6be26164137be29bfd20760767b374470f8c7f28d1c9393d0737548a689df11881c9ed09cb0b97e4eae7fbd37fa1bc
-EBUILD proot-5.1.0.ebuild 1563 BLAKE2B 5b1a8c584360ddcd0219d97527c40c886bda2be3bbe4bc250ca97989996a59d04dee5f54a82090865dbee6e9ce171d3b2787cec7d07efb2b0aff61146a13dc58 SHA512 a8f5aba5498c1bdb6f2d74574a5a53408b6be26164137be29bfd20760767b374470f8c7f28d1c9393d0737548a689df11881c9ed09cb0b97e4eae7fbd37fa1bc
+EBUILD proot-5.1.0-r1.ebuild 1744 BLAKE2B 4494e0f0c9eafc9f36e75f9e48f30126d65476b0067472325cd5168d5920b7bb6d552274b96dd314f7c05b0efc1e8932b8adb0d037acead4bf80b75122d927ae SHA512 fe10a94938cb13d4140b6a7633794d756f04ebb84f04494d53f44443727e9530c596bd91ed2b9660a31063cbf2cc5b150820b689516b9497ce261d4ab8405a13
 MISC metadata.xml 969 BLAKE2B 23deaf1895522b9bddab5b184c088b74b0ca883ccd1a28bd925418203c4cd5c1ddf3dba7f395828ce198ea4e3bbcedd14539ad1268e6bf10cc52624f5d334635 SHA512 447fb399976f554931c6983af60c33567518fa21e40ef4b1732c9e7615dcf9796ab8bc1356b84eef947455f8e25111bdee0dfc5025d686fe978aa6f6e7343145
diff --git a/sys-apps/proot/files/proot-2.3.1-lib-paths-fix.patch b/sys-apps/proot/files/proot-2.3.1-lib-paths-fix.patch
index 43c0d03d978a..647f19183a9d 100644
--- a/sys-apps/proot/files/proot-2.3.1-lib-paths-fix.patch
+++ b/sys-apps/proot/files/proot-2.3.1-lib-paths-fix.patch
@@ -1,5 +1,5 @@
---- src/execve/ldso.c	2013-01-23 16:22:37.870287856 +0400
-+++ src/execve/ldso.c	2013-01-23 16:31:40.219283675 +0400
+--- a/src/execve/ldso.c	2013-01-23 16:22:37.870287856 +0400
++++ b/src/execve/ldso.c	2013-01-23 16:31:40.219283675 +0400
 @@ -285,16 +285,10 @@
  	/* 6. /lib, /usr/lib + /usr/local/lib  */
  	if (IS_CLASS32(elf_header))
diff --git a/sys-apps/proot/files/proot-3.2.1-makefile.patch b/sys-apps/proot/files/proot-3.2.1-makefile.patch
deleted file mode 100644
index 854c48ef0817..000000000000
--- a/sys-apps/proot/files/proot-3.2.1-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GNUmakefile.orig	2013-12-06 10:47:18.554784621 +0400
-+++ src/GNUmakefile	2013-12-06 10:47:43.129785804 +0400
-@@ -9,7 +9,7 @@
- CC       = gcc
- LD       = $(CC)
- CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
--CFLAGS   += -Wall -Wextra -O2
-+CFLAGS   += -Wall -Wextra
- LDFLAGS  += -ltalloc
- 
- OBJECTS = \
diff --git a/sys-apps/proot/files/proot-3.2.2-build-care.patch b/sys-apps/proot/files/proot-3.2.2-build-care.patch
deleted file mode 100644
index c52a39cf787b..000000000000
--- a/sys-apps/proot/files/proot-3.2.2-build-care.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Skip check for building care, patch by Patrick Lauer <patrick AT gentoo.org>
-
---- src/GNUmakefile   2014-02-25 16:42:04.336863622 +0800
-+++ src/GNUmakefile.new       2014-02-25 16:42:26.063050467 +0800
-@@ -54,15 +54,6 @@
- all: proot
- 
- ######################################################################
--# Sanity checks
--
--ifneq (,$(findstring care,$(MAKECMDGOALS)))
--ifneq ($(CARE_BUILD_ENV),ok)
--$(error care is supposed to be built with: http://build.reproducible.io)
--endif
--endif
--
--######################################################################
- # Beautified output
- 
- quiet_GEN = @echo "  GEN       $@"; $(GEN)
diff --git a/sys-apps/proot/files/proot-4.0.1-argv.patch b/sys-apps/proot/files/proot-4.0.1-argv.patch
deleted file mode 100644
index df580563458c..000000000000
--- a/sys-apps/proot/files/proot-4.0.1-argv.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-commit 520fa3601c36dd0a3c84e310bd2a1189259000bd
-Author: Cédric VINCENT <cedric.vincent@st.com>
-Date:   Thu Aug 7 14:29:37 2014 +0200
-
-    Don't dereference argv[0] when launching a script through a symlink.
-    
-    Reported-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
-    Ref: https://bugs.gentoo.org/show_bug.cgi?id=517496
-    
-    Also, don't complain about non-regular or non-executable files that
-    are not explicitely candidates.
-
-diff --git a/src/path/path.c b/src/path/path.c
-index 4225876..ecdef70 100644
---- a/src/path/path.c
-+++ b/src/path/path.c
-@@ -219,17 +219,21 @@ int which(Tracee *tracee, const char *paths, char host_path[PATH_MAX], char *con
- 	/* Is the command available without any $PATH look-up?  */
- 	status = realpath2(tracee, host_path, command, true);
- 	if (status == 0 && stat(host_path, &statr) == 0) {
--		if (!S_ISREG(statr.st_mode)) {
-+		if (is_explicit && !S_ISREG(statr.st_mode)) {
- 			notice(tracee, ERROR, USER, "'%s' is not a regular file", command);
- 			return -EACCES;
- 		}
- 
--		if ((statr.st_mode & S_IXUSR) == 0) {
-+		if (is_explicit && (statr.st_mode & S_IXUSR) == 0) {
- 			notice(tracee, ERROR, USER, "'%s' is not executable", command);
- 			return -EACCES;
- 		}
- 
- 		found = true;
-+
-+		/* Don't dereference the final component to preserve
-+		 * argv0 in case it is a symlink to script.  */
-+		(void) realpath2(tracee, host_path, command, false);
- 	}
- 	else
- 		found = false;
-@@ -274,8 +278,12 @@ int which(Tracee *tracee, const char *paths, char host_path[PATH_MAX], char *con
- 		if (status == 0
- 		    && stat(host_path, &statr) == 0
- 		    && S_ISREG(statr.st_mode)
--		    && (statr.st_mode & S_IXUSR) != 0)
--				return 0;
-+		    && (statr.st_mode & S_IXUSR) != 0) {
-+			/* Don't dereference the final component to preserve
-+			 * argv0 in case it is a symlink to script.  */
-+			(void) realpath2(tracee, host_path, path, false);
-+			return 0;
-+		}
- 	} while (*(cursor - 1) != '\0');
- 
- not_found:
-diff --git a/src/tracee/event.c b/src/tracee/event.c
-index 70668d6..5905c43 100644
---- a/src/tracee/event.c
-+++ b/src/tracee/event.c
-@@ -92,7 +92,7 @@ int launch_process(Tracee *tracee)
- 		 * guest rootfs.  Note: Valgrind can't handle execve(2) on
- 		 * "foreign" binaries (ENOEXEC) but can handle execvp(3) on such
- 		 * binaries.  */
--		execvp(tracee->exe, tracee->cmdline);
-+		execv(tracee->exe, tracee->cmdline);
- 		return -errno;
- 
- 	default: /* parent */
-diff --git a/tests/test-713b6910.sh b/tests/test-713b6910.sh
-new file mode 100644
-index 0000000..82e01fd
---- /dev/null
-+++ b/tests/test-713b6910.sh
-@@ -0,0 +1,51 @@
-+if [ -z `which mcookie` ] || [ -z `which rm` ] || [ -z `which cat` ] || [ -z `which chmod` ] || [ -z `which ln` ] || [ -z `which grep` ] || [ -z `which mkdir` ] || [ ! -x  ${ROOTFS}/bin/readlink ]; then
-+    exit 125;
-+fi
-+
-+######################################################################
-+
-+TMP1=/tmp/$(mcookie)
-+TMP2=/tmp/$(mcookie)
-+TMP3=/tmp/$(mcookie)
-+TMP4=/tmp/$(mcookie)
-+
-+rm -fr ${TMP1} ${TMP2} ${TMP3} ${TMP4}
-+
-+######################################################################
-+
-+cat > ${TMP1} <<'EOF'
-+#!/bin/sh
-+echo $0
-+EOF
-+
-+chmod +x ${TMP1}
-+ln -s ${TMP1} ${TMP2}
-+
-+${PROOT} ${TMP2} | grep -v ${TMP1}
-+${PROOT} ${TMP2} | grep ${TMP2}
-+
-+######################################################################
-+
-+mkdir -p ${TMP3}
-+cd ${TMP3}
-+
-+ln -s $(which true) false
-+! ${PROOT} false
-+
-+echo "#!$(which false)" > true
-+chmod a-x true
-+${PROOT} true
-+
-+######################################################################
-+
-+ln -s ${ROOTFS}/bin/readlink ${TMP4}
-+
-+TEST1=$(${PROOT} ${ROOTFS}/bin/readlink /proc/self/exe)
-+TEST2=$(${PROOT} ${TMP4} /proc/self/exe)
-+
-+test "${TEST1}" = "${TEST2}"
-+
-+######################################################################
-+
-+cd /
-+rm -fr ${TMP1} ${TMP2} ${TMP3} ${TMP4}
diff --git a/sys-apps/proot/files/proot-5.1.0-loader.patch b/sys-apps/proot/files/proot-5.1.0-loader.patch
new file mode 100644
index 000000000000..e74cfaa7807b
--- /dev/null
+++ b/sys-apps/proot/files/proot-5.1.0-loader.patch
@@ -0,0 +1,272 @@
+commit 77d5ba4e5bb35f91d026a3240ad0a91a2d4b662a
+Author: Cédric VINCENT <cedric.vincent@st.com>
+Date:   Fri Feb 20 14:28:55 2015 +0100
+
+    Set tracee's stack executable when the loaded program requires this.
+    
+    This is required for UMEQ and for some older versions of PRoot.  For
+    example:
+    
+        $ proot -q umeq-arm64-dce01957 -R ~/gentoo-arm64-20140718
+    
+    Before:
+    
+        proot info: vpid 1 terminated with signal 11
+    
+    Now, it is OK.
+
+diff --git a/src/compat.h b/src/compat.h
+index 2b603f1..5009490 100644
+--- a/src/compat.h
++++ b/src/compat.h
+@@ -243,5 +243,17 @@
+ #    ifndef MAP_ANONYMOUS
+ #        define MAP_ANONYMOUS			0x20
+ #    endif
++#    ifndef PROT_READ
++#        define PROT_READ		0x1
++#    endif
++#    ifndef PROT_WRITE
++#        define PROT_WRITE		0x2
++#    endif
++#    ifndef PROT_EXEC
++#        define PROT_EXEC		0x4
++#    endif
++#    ifndef PROT_GROWSDOWN
++#        define PROT_GROWSDOWN		0x01000000
++#    endif
+ 
+ #endif /* COMPAT_H */
+diff --git a/src/execve/elf.h b/src/execve/elf.h
+index 3ced10c..a5b367b 100644
+--- a/src/execve/elf.h
++++ b/src/execve/elf.h
+@@ -108,7 +108,8 @@ typedef union {
+ typedef enum {
+ 	PT_LOAD    = 1,
+ 	PT_DYNAMIC = 2,
+-	PT_INTERP  = 3
++	PT_INTERP  = 3,
++	PT_GNU_STACK = 0x6474e551,
+ } SegmentType;
+ 
+ typedef struct {
+diff --git a/src/execve/enter.c b/src/execve/enter.c
+index cb84ec6..f0f3e7f 100644
+--- a/src/execve/enter.c
++++ b/src/execve/enter.c
+@@ -252,6 +252,11 @@ static int add_load_info(const ElfHeader *elf_header,
+ 			return status;
+ 		break;
+ 
++	case PT_GNU_STACK:
++		data->load_info->needs_executable_stack |=
++			((PROGRAM_FIELD(*elf_header, *program_header, flags) & PF_X) != 0);
++		break;
++
+ 	default:
+ 		break;
+ 	}
+diff --git a/src/execve/execve.h b/src/execve/execve.h
+index 11eca10..98b8d03 100644
+--- a/src/execve/execve.h
++++ b/src/execve/execve.h
+@@ -49,6 +49,7 @@ typedef struct load_info {
+ 	char *raw_path;
+ 	Mapping *mappings;
+ 	ElfHeader elf_header;
++	bool needs_executable_stack;
+ 
+ 	struct load_info *interp;
+ } LoadInfo;
+diff --git a/src/execve/exit.c b/src/execve/exit.c
+index e6eff44..36cc51f 100644
+--- a/src/execve/exit.c
++++ b/src/execve/exit.c
+@@ -174,6 +174,9 @@ static void *transcript_mappings(void *cursor, const Mapping *mappings)
+ static int transfer_load_script(Tracee *tracee)
+ {
+ 	const word_t stack_pointer = peek_reg(tracee, CURRENT, STACK_POINTER);
++	static word_t page_size = 0;
++	static word_t page_mask = 0;
++
+ 	word_t entry_point;
+ 
+ 	size_t script_size;
+@@ -190,10 +193,22 @@ static int transfer_load_script(Tracee *tracee)
+ 	void *buffer;
+ 	size_t buffer_size;
+ 
++	bool needs_executable_stack;
+ 	LoadStatement *statement;
+ 	void *cursor;
+ 	int status;
+ 
++	if (page_size == 0) {
++		page_size = sysconf(_SC_PAGE_SIZE);
++		if ((int) page_size <= 0)
++			page_size = 0x1000;
++		page_mask = ~(page_size - 1);
++	}
++
++	needs_executable_stack = (tracee->load_info->needs_executable_stack
++				|| (   tracee->load_info->interp != NULL
++				    && tracee->load_info->interp->needs_executable_stack));
++
+ 	/* Strings addresses are required to generate the load script,
+ 	 * for "open" actions.  Since I want to generate it in one
+ 	 * pass, these strings will be put right below the current
+@@ -208,7 +223,7 @@ static int transfer_load_script(Tracee *tracee)
+ 			: strlen(tracee->load_info->raw_path) + 1);
+ 
+ 	/* A padding will be appended at the end of the load script
+-	 * (a.k.a "strings area") to ensure this latter is aligned on
++	 * (a.k.a "strings area") to ensure this latter is aligned to
+ 	 * a word boundary, for sake of performance.  */
+ 	padding_size = (stack_pointer - string1_size - string2_size - string3_size)
+ 			% sizeof_word(tracee);
+@@ -229,6 +244,7 @@ static int transfer_load_script(Tracee *tracee)
+ 			: LOAD_STATEMENT_SIZE(*statement, open)
+ 			+ (LOAD_STATEMENT_SIZE(*statement, mmap)
+ 				* talloc_array_length(tracee->load_info->interp->mappings)))
++		+ (needs_executable_stack ? LOAD_STATEMENT_SIZE(*statement, make_stack_exec) : 0)
+ 		+ LOAD_STATEMENT_SIZE(*statement, start);
+ 
+ 	/* Allocate enough room for both the load script and the
+@@ -266,6 +282,16 @@ static int transfer_load_script(Tracee *tracee)
+ 	else
+ 		entry_point = ELF_FIELD(tracee->load_info->elf_header, entry);
+ 
++	if (needs_executable_stack) {
++		/* Load script statement: stack_exec.  */
++		statement = cursor;
++
++		statement->action = LOAD_ACTION_MAKE_STACK_EXEC;
++		statement->make_stack_exec.start = stack_pointer & page_mask;
++
++		cursor += LOAD_STATEMENT_SIZE(*statement, make_stack_exec);
++	}
++
+ 	/* Load script statement: start.  */
+ 	statement = cursor;
+ 
+@@ -352,7 +378,7 @@ static int transfer_load_script(Tracee *tracee)
+ 	 *   | mmap file  |
+ 	 *   +------------+
+ 	 *   |   open     |
+-	 *   +------------+ <- stack pointer, sysarg1 (word aligned)
++	 *   +------------+ <- stack pointer, userarg1 (word aligned)
+ 	 */
+ 
+ 	/* Remember we are in the sysexit stage, so be sure the
+diff --git a/src/loader/assembly-arm.h b/src/loader/assembly-arm.h
+index ee5bb85..59a7fe0 100644
+--- a/src/loader/assembly-arm.h
++++ b/src/loader/assembly-arm.h
+@@ -89,4 +89,5 @@
+ #define EXECVE	11
+ #define EXIT	1
+ #define PRCTL	172
++#define MPROTECT 125
+ 
+diff --git a/src/loader/assembly-x86.h b/src/loader/assembly-x86.h
+index c83b3ef..4045144 100644
+--- a/src/loader/assembly-x86.h
++++ b/src/loader/assembly-x86.h
+@@ -65,3 +65,4 @@ extern word_t syscall_1(word_t number, word_t arg1);
+ #define EXECVE	11
+ #define EXIT	1
+ #define PRCTL	172
++#define MPROTECT 125
+diff --git a/src/loader/assembly-x86_64.h b/src/loader/assembly-x86_64.h
+index c581208..6f431be 100644
+--- a/src/loader/assembly-x86_64.h
++++ b/src/loader/assembly-x86_64.h
+@@ -93,3 +93,4 @@
+ #define EXECVE	59
+ #define EXIT	60
+ #define PRCTL	157
++#define MPROTECT 10
+diff --git a/src/loader/loader.c b/src/loader/loader.c
+index 5b31b02..9c2037b 100644
+--- a/src/loader/loader.c
++++ b/src/loader/loader.c
+@@ -171,6 +171,14 @@ void _start(void *cursor)
+ 			cursor += LOAD_STATEMENT_SIZE(*stmt, mmap);
+ 			break;
+ 
++		case LOAD_ACTION_MAKE_STACK_EXEC:
++			SYSCALL(MPROTECT, 3,
++				stmt->make_stack_exec.start, 1,
++				PROT_READ | PROT_WRITE | PROT_EXEC | PROT_GROWSDOWN);
++
++			cursor += LOAD_STATEMENT_SIZE(*stmt, make_stack_exec);
++			break;
++
+ 		case LOAD_ACTION_START_TRACED:
+ 			traced = true;
+ 			/* Fall through.  */
+diff --git a/src/loader/script.h b/src/loader/script.h
+index bb48af5..6ae7621 100644
+--- a/src/loader/script.h
++++ b/src/loader/script.h
+@@ -42,6 +42,10 @@ struct load_statement {
+ 			word_t clear_length;
+ 		} mmap;
+ 
++		struct {
++			word_t start;
++		} make_stack_exec;
++
+ 		struct {
+ 			word_t stack_pointer;
+ 			word_t entry_point;
+@@ -67,7 +71,8 @@ typedef struct load_statement LoadStatement;
+ #define LOAD_ACTION_OPEN		1
+ #define LOAD_ACTION_MMAP_FILE		2
+ #define LOAD_ACTION_MMAP_ANON		3
+-#define LOAD_ACTION_START_TRACED	4
+-#define LOAD_ACTION_START		5
++#define LOAD_ACTION_MAKE_STACK_EXEC	4
++#define LOAD_ACTION_START_TRACED	5
++#define LOAD_ACTION_START		6
+ 
+ #endif /* SCRIPT */
+
+commit d649854ddb66779950954aac99d960379c631a71
+Author: Nicolas Cornu <ncornu@aldebaran.com>
+Date:   Wed Jul 29 14:52:57 2015 +0200
+
+    Fix use of size
+
+diff --git a/src/execve/enter.c b/src/execve/enter.c
+index 8f22d9c..4c163a1 100644
+--- a/src/execve/enter.c
++++ b/src/execve/enter.c
+@@ -454,10 +454,10 @@ static int expand_runner(Tracee* tracee, char host_path[PATH_MAX], char user_pat
+ }
+ 
+ extern unsigned char _binary_loader_exe_start;
+-extern unsigned char _binary_loader_exe_size;
++extern unsigned char _binary_loader_exe_end;
+ 
+ extern unsigned char WEAK _binary_loader_m32_exe_start;
+-extern unsigned char WEAK _binary_loader_m32_exe_size;
++extern unsigned char WEAK _binary_loader_m32_exe_end;
+ 
+ /**
+  * Extract the built-in loader.  This function returns NULL if an
+@@ -483,11 +483,11 @@ static char *extract_loader(const Tracee *tracee, bool wants_32bit_version)
+ 
+ 	if (wants_32bit_version) {
+ 		start = (void *) &_binary_loader_m32_exe_start;
+-		size  = (size_t) &_binary_loader_m32_exe_size;
++		size  = (size_t)(&_binary_loader_m32_exe_end-&_binary_loader_m32_exe_start);
+ 	}
+ 	else {
+ 		start = (void *) &_binary_loader_exe_start;
+-		size  = (size_t) &_binary_loader_exe_size;
++		size  = (size_t) (&_binary_loader_exe_end-&_binary_loader_exe_start);
+ 	}
+ 
+ 	status2 = write(fd, start, size);
diff --git a/sys-apps/proot/files/proot-5.1.0-makefile.patch b/sys-apps/proot/files/proot-5.1.0-makefile.patch
new file mode 100644
index 000000000000..414cb29010cb
--- /dev/null
+++ b/sys-apps/proot/files/proot-5.1.0-makefile.patch
@@ -0,0 +1,22 @@
+--- a/src/GNUmakefile	2018-08-01 16:30:00.957743804 +0300
++++ b/src/GNUmakefile	2018-08-01 16:30:34.876741798 +0300
+@@ -15,8 +15,8 @@
+ OBJDUMP  = $(CROSS_COMPILE)objdump
+ 
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -I. -I$(VPATH)
+-CFLAGS   += -Wall -Wextra -O2
+-LDFLAGS  += -ltalloc
++CFLAGS   += -Wall -Wextra
++LDFLAGS  += -ltalloc -Wl,-z,noexecstack
+ 
+ CARE_LDFLAGS = -larchive
+ 
+@@ -182,7 +182,7 @@
+ $(eval $(call define_from_arch.h,$1,LOADER_ADDRESS))
+ 
+ LOADER_CFLAGS$1  += -fPIC -ffreestanding $(LOADER_ARCH_CFLAGS$1)
+-LOADER_LDFLAGS$1 += -static -nostdlib -Wl$(BUILD_ID_NONE),-Ttext=$(LOADER_ADDRESS$1)
++LOADER_LDFLAGS$1 += -static -nostdlib -Wl$(BUILD_ID_NONE),-Ttext=$(LOADER_ADDRESS$1),-z,noexecstack
+ 
+ loader/loader$1.o: loader/loader.c
+ 	@mkdir -p $$(dir $$@)
diff --git a/sys-apps/proot/proot-3.2.2-r1.ebuild b/sys-apps/proot/proot-3.2.2-r1.ebuild
deleted file mode 100644
index ef14402f0834..000000000000
--- a/sys-apps/proot/proot-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils pax-utils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
-		"${FILESDIR}/${P}-build-care.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(usex care "care" "" "" "")
-}
-
-src_install() {
-	if use care; then
-		# Workaround for bug #493416
-		pax-mark -Emp src/care
-		dobin src/care
-	fi
-	# Workaround for bug #493416
-	pax-mark -Emp src/proot
-
-	dobin src/proot
-	doman doc/proot.1
-	dodoc doc/*.txt doc/articles/*
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}
diff --git a/sys-apps/proot/proot-4.0.1.ebuild b/sys-apps/proot/proot-4.0.1.ebuild
deleted file mode 100644
index 33b2ca7192b2..000000000000
--- a/sys-apps/proot/proot-4.0.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch" \
-		"${FILESDIR}/${PN}-3.2.2-build-care.patch" \
-		"${FILESDIR}/${PN}-4.0.1-argv.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	use care && dobin src/care
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}
diff --git a/sys-apps/proot/proot-5.0.0.ebuild b/sys-apps/proot/proot-5.0.0.ebuild
deleted file mode 100644
index 6e07802ddcba..000000000000
--- a/sys-apps/proot/proot-5.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	if use care; then
-		dobin src/care
-		dodoc doc/care/*.txt
-	fi
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}
diff --git a/sys-apps/proot/proot-4.0.3.ebuild b/sys-apps/proot/proot-5.1.0-r1.ebuild
index 6e07802ddcba..d8436f733386 100644
--- a/sys-apps/proot/proot-4.0.3.ebuild
+++ b/sys-apps/proot/proot-5.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 MY_PN="PRoot"
 
 inherit eutils toolchain-funcs
@@ -26,11 +26,11 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.0-makefile.patch"
+	"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
+	"${FILESDIR}/${PN}-5.1.0-loader.patch"
+)
 
 src_compile() {
 	# build the proot and care targets
@@ -57,6 +57,11 @@ src_test() {
 }
 
 pkg_postinst() {
+	elog "If you have segfaults on recent (>4.8) kernels"
+	elog "try to disable seccomp support like so:"
+	elog "'export PROOT_NO_SECCOMP=1'"
+	elog "prior to running proot"
+
 	if use care; then
 		elog "You have enabled 'care' USE flag, that builds and installs"
 		elog "dynamically linked care binary."
diff --git a/sys-apps/proot/proot-5.1.0.ebuild b/sys-apps/proot/proot-5.1.0.ebuild
deleted file mode 100644
index 6e07802ddcba..000000000000
--- a/sys-apps/proot/proot-5.1.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN="PRoot"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User-space implementation of chroot, mount --bind, and binfmt_misc"
-HOMEPAGE="https://proot-me.github.io/"
-SRC_URI="https://github.com/proot-me/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="care test"
-
-RDEPEND="care? ( app-arch/libarchive:0= )
-	 sys-libs/talloc"
-DEPEND="${RDEPEND}
-	care? ( dev-libs/uthash )
-	test? ( dev-util/valgrind )"
-
-# Breaks sandbox
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	epatch  "${FILESDIR}/${PN}-3.2.1-makefile.patch" \
-		"${FILESDIR}/${PN}-2.3.1-lib-paths-fix.patch"
-	epatch_user
-}
-
-src_compile() {
-	# build the proot and care targets
-	emake -C src V=1 \
-		CC="$(tc-getCC)" \
-		CHECK_VERSION="true" \
-		CAREBUILDENV="ok" \
-		proot $(use care && echo "care")
-}
-
-src_install() {
-	if use care; then
-		dobin src/care
-		dodoc doc/care/*.txt
-	fi
-	dobin src/proot
-	newman doc/proot/man.1 proot.1
-	dodoc doc/proot/*.txt
-	dodoc -r doc/articles
-}
-
-src_test() {
-	emake -C tests -j1 CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if use care; then
-		elog "You have enabled 'care' USE flag, that builds and installs"
-		elog "dynamically linked care binary."
-		elog "Upstream does NOT support such way of building CARE,"
-		elog "it provides only prebuilt binaries."
-		elog "CARE also has known problems on hardened systems"
-		elog "Please do NOT file bugs about them to https://bugs.gentoo.org"
-	fi
-}
diff --git a/sys-apps/restartd/Manifest b/sys-apps/restartd/Manifest
index cd36633154a2..4c865f051a62 100644
--- a/sys-apps/restartd/Manifest
+++ b/sys-apps/restartd/Manifest
@@ -1,3 +1,3 @@
 DIST restartd_0.2.2.tar.gz 13777 BLAKE2B ccefeb3b6b8e7a288d52793a708a1158804530c3ac8351c9b40b33ce2ff725511c8ce19558f3100dc5f01a4d9f6b17252362d97979c2a7d54dbe71392593b070 SHA512 731d33e6ade389708801e6cb024c355062745d049ab389fc78fcc1918720c93601dc8fb3a56a8bbb626bffc0a240b16e33ff5a8614d27b2701eb6ca68018cc93
-EBUILD restartd-0.2.2.ebuild 710 BLAKE2B 81e18fcae2c3ab3b5d8d393a66227d1aededcb25e6634661ac3e7395483eb3266334382861b7a887eee9ccecd21d146c8b7dddf740516971c0a714c90f10db88 SHA512 01a3a9ae08d8fed30de029457650ca63ef240174444a9c2633ea8c017f63948090e87c27861ee78017c55d578765b51b977468bd6b43fbe110c6cd3d4c8a6740
+EBUILD restartd-0.2.2-r1.ebuild 683 BLAKE2B 64c92becfc4b55cb598786ed94d1c2cb7798f2a63a1251b7ed942a550a5d64586614b1172af9dadd6143dbd1b793b4a5353b4cf682d6a74e6ffe87c9865c382b SHA512 f76698fa08444badbc49f9a08c5d70fbf6349bdf714ee46d8805eca66c7ca6bc1b848956e5ea0a2b696ab83cfd787aa08c08902cf2151eae955346cb509b270a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/restartd/restartd-0.2.2.ebuild b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
index 1de6a97b5fd2..dadb97c5f33b 100644
--- a/sys-apps/restartd/restartd-0.2.2.ebuild
+++ b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PV=${PV/_alpha/.a-}
 DESCRIPTION="A daemon for checking your running and not running processes"
-HOMEPAGE="http://packages.debian.org/unstable/utils/restartd"
+HOMEPAGE="https://packages.debian.org/unstable/utils/restartd"
 SRC_URI="mirror://debian/pool/main/r/restartd/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 src_prepare() {
+	default
 	sed -i Makefile -e 's|-o restartd|$(LDFLAGS) &|g' || die "sed Makefile"
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) C_ARGS="${CFLAGS}" || die
+	emake CC=$(tc-getCC) C_ARGS="${CFLAGS}"
 }
 
 src_install() {
 	dodir /etc /usr/sbin /usr/share/man/man8 /usr/share/man/fr/man8/
-	emake DESTDIR="${D}" install || die
+	default
 }
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 477bf540e990..7660de7b3917 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.12.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
-EBUILD sandbox-2.13.ebuild 1917 BLAKE2B 0f2a6c7e166da0a1a35522a7a88b974f23a1475a0138674db31d1dfdc554b0e72ec9685df5b133ffedcf8291e913b83474c853aa1a13fa54e58e66b5b530b01d SHA512 6396509c7e538eed4094c7294b979653d654e6855f22086ca9cbd7826321a698ed95d0ce9ec608a610470158b6f55c648a5c09798843a01b5080201350fc550c
+EBUILD sandbox-2.13.ebuild 1915 BLAKE2B c3ff81ed2f60d90782e2309b4627ffc4d60012f65b719edd0e682ca420511a65cbb309c9af77313a8e205c80142deff0a1aa461c43803fb4807ae1109d49d157 SHA512 73296f3050de852ede31fbde96cca0ea5a2cef5b841b2056fa7d4a9479e35c30d99e26c9003f736ef22f5cc0641c050c8fd7d66f83f0830f329cbd328bbcf94f
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index bc024e36568c..a8cac65b8374 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sensei-raw-ctl/Manifest b/sys-apps/sensei-raw-ctl/Manifest
new file mode 100644
index 000000000000..1b7b5cce4c47
--- /dev/null
+++ b/sys-apps/sensei-raw-ctl/Manifest
@@ -0,0 +1,3 @@
+DIST sensei-raw-ctl-0.0_pre20180729.tar.gz 16103 BLAKE2B b3e1348768663bbac7e7668ad8874c2831127b11a7ee57a9952a33ce96c404d34f50ab08bedc29f8a2c2599f4b179bd98717cece836c782b0c03f91e99c6c00d SHA512 e613ed13ad7321dd005067f989f5c487f2f6edf7e795be903f6d32b9ed8ae5874dfd928d678ef6bf38f792bdc54740f200533008f2959208d8ac9a73f3b8994b
+EBUILD sensei-raw-ctl-0.0_pre20180729.ebuild 625 BLAKE2B 871238811f8564b2b252acf7a400dc900c10db1095ce216aac076b96cd36f32832b9d91a68b0e7b4f8ea22177db08b42005fc36abaaed59084c9a31e4b19f233 SHA512 c7ef57cb5a491e4c37c4e09f9ee2f85bfe16cf2d6d0736041ecb913172ba95c6cc2c7ca90058fbe78af1a548bd9ffa281d82b461f5aa527c15a63db5d39585da
+MISC metadata.xml 414 BLAKE2B cf91ea602380b435218ea1e9d4dc27160ae3c5eb4d12b63e4a8a681431dd0a402f8f7a7f0983d7a6c2ca531685c53af200dfffd0e82d50e5e24856cbfb62d976 SHA512 1958a1cb7c60e4212277e199ed4bdb3bfa4ffd469bddcc7e62e9d13f48d03fb7cc8a0bbab7626b012de414d6c682b5187e71286ab147239276cfca5e338948e1
diff --git a/sys-apps/sensei-raw-ctl/metadata.xml b/sys-apps/sensei-raw-ctl/metadata.xml
new file mode 100644
index 000000000000..078205ca8900
--- /dev/null
+++ b/sys-apps/sensei-raw-ctl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <bugs-to>https://git.janouch.name/p/sensei-raw-ctl/issues</bugs-to>
+    <changelog>https://git.janouch.name/p/sensei-raw-ctl/commits/branch/master</changelog>
+  </upstream>
+  <maintainer type="person">
+    <email>thev00d00@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild b/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
new file mode 100644
index 000000000000..1afb62454342
--- /dev/null
+++ b/sys-apps/sensei-raw-ctl/sensei-raw-ctl-0.0_pre20180729.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT="175d72ee849afe6e3547739132103cb26acf9173"
+
+inherit cmake-utils
+
+DESCRIPTION="SteelSeries Sensei Raw configuration tool"
+HOMEPAGE="https://git.janouch.name/p/sensei-raw-ctl"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+DEPEND="
+	virtual/libusb:1
+	gtk? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_GUI=$(usex gtk)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2b407b682b92..66826042ffe7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,5 +18,5 @@ EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7
 EBUILD systemd-238-r7.ebuild 13147 BLAKE2B 0fd72c09cb7d7648d5a48722a13443924de26f6810b05aa196cf4f757bcfed60d7e4750b10a7e87104441ecd737fe3bd897d89b9b58b9a7acb926f5df2c887e3 SHA512 8917208a24c8a8866854812c1e3157cd8976f7875b8304e0fa08d75b25f850fb2185947f4f7ff0a040e389f7635288b30edaed1849b542a51535909c9bd10a11
 EBUILD systemd-239-r1.ebuild 13235 BLAKE2B 2bf23f3b9c55789cfad9a12419f7c18cdd922fa85db7e40a087fc13f2af52b1f33e978b408c7a24db2774d68aa718e97688fb42ca58676687ca6d9a3fe9482dc SHA512 a0c183d6514d6dad30dca20bc49d4dfbd99080f5f74b6c988d460caeb7767895f5f348aad6e8fd27e16f9a814bbdbc31e1fe7ab419603131e526a4a5a1eb6db3
 EBUILD systemd-239.ebuild 13174 BLAKE2B c704d7a943b0ee21ffb56aa3b738aba283f5ee94d64f0a25982053cbcc593025271c7db75082ad797d36ea26eed578efc5a816c5a1d19be41a521ec2a0852928 SHA512 209b339a8b5e398c7f9abfc92e854f33205f168e3b14e97524fa6e7d96f1a41f0ecbf572e46fb2f42e91ea802c52117daa8d6f4002f8b5ba4f4e2af19864b833
-EBUILD systemd-9999.ebuild 13174 BLAKE2B c704d7a943b0ee21ffb56aa3b738aba283f5ee94d64f0a25982053cbcc593025271c7db75082ad797d36ea26eed578efc5a816c5a1d19be41a521ec2a0852928 SHA512 209b339a8b5e398c7f9abfc92e854f33205f168e3b14e97524fa6e7d96f1a41f0ecbf572e46fb2f42e91ea802c52117daa8d6f4002f8b5ba4f4e2af19864b833
+EBUILD systemd-9999.ebuild 13193 BLAKE2B 47f6b232fad63001b5ef81efdfeb7640e2fae9e5ae9da4f3141c5080d6a3357c6b1e3d10a887ae453dd2f709bc05963cae0407b91a0f83a6453ec68f71e88ffa SHA512 d6dbcd019db7000202103895f51e1e15625145b44e87d45896947be2e97b72059abb0678e6b148d3e50d00a4135822703bbe93a8e9caba2503ca9ab77e529368
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 08a0c54c349b..8743de4cdf55 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
 
@@ -88,6 +88,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils:0
 	dev-util/gperf
+	>=dev-util/meson-0.46
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
 	>=sys-kernel/linux-headers-${MINKV}
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 2a6e3c7c5da8..faab88e64bd1 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -2,7 +2,7 @@ DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b47194
 DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
-EBUILD ucspi-ssl-0.94-r1.ebuild 1222 BLAKE2B 918248c0d42f6501bc36e78162c146d76016385b4c9ad3d4ebc76c3706e7bdfb738c25cf50a1b790d023282ee35ec3a7dc8df6508d8186d1154f8ab0b274e726 SHA512 91cdf4b6a63cc3f1dbd29e394218b74e4f6ebf319cb6f14807f59b3a813f077f3f9aa1cfeeed3ba8c882c72686d59555a0bcd5e508ac2d04f7bd9778bb0b1657
+EBUILD ucspi-ssl-0.94-r1.ebuild 1221 BLAKE2B d0798dc6c435019cc27206a54299920e83c2d7e390aa2556df6f88b6d406d7a4423b354408459a2c038e978326322c5f40ff3229ff9d3b5b3544b52614ed99f6 SHA512 cd383191e6db16f47a5988a6a0dd10f8134d671dd0e2073c2036f5c446d5a188508e43879937674e7b1bf076c5956fd79cf40813096f169d3e94470bc935a003
 EBUILD ucspi-ssl-0.97.ebuild 1291 BLAKE2B d5cce688c75b6fcc1045c46a76a226538d820806fdd7f44388d97ddb19c3b938ee5215c09379e51ad7dc797688ea2f14584e01094e6f2426f9f98838da87d6a8 SHA512 d24336736ccba8f460c3fa5b96acfd9a62c991f0d06529b4f8b86552fd5b7ba57765fcc28e848a0a9400f622cc964e41c8f74a52c4e23def67a1c135f7aa9db1
 EBUILD ucspi-ssl-0.98b.ebuild 1261 BLAKE2B de1dcb3605573056f89e7a92d96a34d255ead15cee2197a466563ddbc64b90e33d372007acfe70337b3ad4a1c22ee86f3260ee8e3160613c3a052ac94456d98f SHA512 9ea688005132662c54f243b7f4f5f9264c4f73b3c179de7fc65cd69b5b77f12b4c963fc76300ab463b4c11d8ec66dd06c7d67842c6e66a0eb39a88426150b14d
 EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B 2409ff62c3a8680d485ce74bc1da0f207e00768b3b12c9c5977a7f048e4dab769e8be881db12a8d1f2defa8ca43d8068045610fd3e75cd0c8d824d2578956bb7 SHA512 d23fbfb1527c201cf0e3b5efab516ae85c16f21b17500331e1b60140f3ec3bc179e60acf01d61cf7cd9bd56bd7f95f6d8e01acd5343f0da8554e8f4a5401071d
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index e04657a7bf63..208e9bc702d7 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 3f0e1ea66a5b..6e6737015ed5 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2109 BLAKE2B 0a8059efe88e7f3ae8328675642af6594e2515b69df01b2a7295721efa42b6507b455dc04c8e061ba7bc1f0fde016de18884088e3507fedb7f6f4a825ffd9ba2 SHA512 da755a746ccf903099a6c890b4ecc84cd8735e5b8a8996f0347fb1fba17a21e60e406aa680cd2c13919130c7a6328018837f378974e4a30113b36898bea80dbd
+EBUILD ucspi-tcp-0.88-r18.ebuild 2107 BLAKE2B e86c5f30c508a5d37065ed53474842b69879d905f8180fc58f1e9c7aa137ea1eaade710ac1d5ed634d09909d7618d0c296e053561015f75d1625b18adafc60e4 SHA512 b5bef98cb34c5176e015e1e7e19b496fc9ea7033be3c7bdb37e2559502edee638cb2cb70342ce35063d66872dbde9b1e6a26944baffdd4ae4c52bb6d20638251
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 4f421968ef5d..4264e46075ca 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"