gentoo resync : 02.06.2018

32 files changed, 1028 insertions, 1154 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 19b861a7c002..06cc505a7ecb 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 10d1e168b6d0..e3c5b727fd55 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,8 +1,6 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
-DIST baselayout-2.5.tar.bz2 31368 BLAKE2B 73a939bf9a180da151804045ff0e57e4def11e9bca8f55b2b891437712877b718faaf7d6ef006161d92e853c747246b20adc7d26105832c5c3120510325cbc67 SHA512 5705740c0be47a7c76d480c1173fd69a5cfc278351f34ab0c4f54220da81617fc4755c8f61888985611f77881cc89b273775fec593915f344076fc3264ea6934
 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.5-r1.ebuild 8890 BLAKE2B b4f5d135b81f21f5f2e53482fbb45fcf3e297de59d2ae2a547135de22250bd19e09b4cd0b04330864426803f54c176fe181752f90afe27366251439592e58638 SHA512 6b884773a0e854724b1e32f79c4c8c90fe0a7cf1b017efe7b0dbe60e81f2c8445c124eb3125cb41996ad4bd343d71f27e0f210b072f0fb89725a6375b5a3474d
 EBUILD baselayout-2.6.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd
 EBUILD baselayout-9999.ebuild 8890 BLAKE2B 467831c65fb6dc104caaa18fe536f3a9f4c4f0bffa41546e42b96912b7e666926952a9154c14f9d29760f282bfc5e036c546383e5c670df77ae0da7620014f3c SHA512 bece802c71d3beb9b913c322e63682a2534d97363fabd5c805e6735e0708bf2ba215f5701095b6e35c6db29bbc6c844f8f421bc5b87e6a06f2eb9d8186125dcd
 MISC metadata.xml 460 BLAKE2B 5c30cc883f9ea3feeae2148cb58741c98e182ca0fff7c28458b3cc20023321395cbeda951426d12ff469105b43689ecaaa5f9c984396b72065c70b8c99843c38 SHA512 60728fd1a2702e79a717ea3e74247ac1e5c80a586a920597d985c87f0d84b30462ef04a36713a0945147d7f2b6c01052c08722c660b02fe82c4bba0407c582b1
diff --git a/sys-apps/baselayout/baselayout-2.5-r1.ebuild b/sys-apps/baselayout/baselayout-2.5-r1.ebuild
deleted file mode 100644
index 866701708dc6..000000000000
--- a/sys-apps/baselayout/baselayout-2.5-r1.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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 def_libdir libdir libdirs
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	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"
-
-	# 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.
-	local prefix prefix_lst
-	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.5 ${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/busybox/Manifest b/sys-apps/busybox/Manifest
index 8f889dcb750d..9c8cabfbfc00 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -14,10 +14,10 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
-DIST busybox-1.28.1.tar.bz2 2260551 BLAKE2B 5dbe7d4fe63ff187bb1458368891c570016cd67406b7e1e4f675555d969c8655d258a0f6b3ba0ac26cc65739d65694f9042d00d9920ee610a6f79f62fb9bfb5d SHA512 c2d551eb70210d63d891614f4469ad3ec151dbd10fce96b2355dd1f2ea43a32ed08cc8f1d1ab361fb547199a19902d17a2935b839aeee2e1c3c8a1ed012db732
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
+DIST busybox-1.28.4.tar.bz2 2263342 BLAKE2B f35c81e67136d888a998f41b1418589e4bddaacde25d55eb509822a13ab93d351dcda6b147794a47e3c3c5c4141e9d8cc834ed239e0afba176f08bf3cb55b911 SHA512 92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed
 EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0
-EBUILD busybox-1.28.1.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 EBUILD busybox-1.28.3.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
+EBUILD busybox-1.28.4.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.1.ebuild b/sys-apps/busybox/busybox-1.28.4.ebuild
index 68000bffa174..ea0b4ce81fb0 100644
--- a/sys-apps/busybox/busybox-1.28.1.ebuild
+++ b/sys-apps/busybox/busybox-1.28.4.ebuild
@@ -3,8 +3,9 @@
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+EAPI=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
@@ -62,14 +63,18 @@ busybox_config_enabled() {
 	esac
 }
 
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
 src_prepare() {
+	default
 	unset KBUILD_OUTPUT #88088
 	append-flags -fno-strict-aliasing #310413
 	use ppc64 && append-flags -mminimal-toc #130943
 
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
@@ -280,7 +285,8 @@ src_install() {
 	dodoc *.txt
 	docinto pod
 	dodoc *.pod
-	dohtml *.html
+	docinto html
+	dodoc *.html
 
 	cd ../examples
 	docinto examples
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index cc4aa1f14ad9..5767a505befc 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,6 +3,7 @@ DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5
 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1
 DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2
 DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
-EBUILD coreutils-8.28-r1.ebuild 6516 BLAKE2B cce086ffecc713b04301bbd498bca6cce4bb501d2d80ab93fa9dfd86b3e88c62ea79f652385a789b09f4e02f66a6a500637ff9d393f4c3294c1005f018de04be SHA512 8df28ce72003cd7f890f252b1f62addd0c80b2ed3b6599cde3cde7d25478923fb9848783c8ff5e88c91f75ba3c879e89d0e955acaa8467583cddc00630b57ad9
+EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed
+EBUILD coreutils-8.29-r1.ebuild 6176 BLAKE2B 7401f3562c128eba7dece52d55464e345b782cbbb5d033a5c1321ba3a2485ab48f01e26a3f5eadf0614607949bf0f1aee34c83303f2ad442a2e4b618569323ac SHA512 d6e571fbf22f285d230c128fcc5d583070d7c9d5464ddf8a1198cbd1bdbd79b8394c229d045ce5a5d0ef042d5e26da0d9f60590df7d7ff6ec86b791268c812d1
 EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
-MISC metadata.xml 869 BLAKE2B 397aa866d67eb1d6ff5f604194cf071be0f75606092d78e1cf7f0ced85cf4474d67677307e7e8566ba402c1f94ae2f3e3906ef5006a50e73d6673edb25d517fa SHA512 19e07c93cbe1cfe087eb7fdc8647aa4c264f1e6a193a0ed4e1ceb302bda92565aa76966b6ef2efa15d7535082ef0e6a1454fee20eca4797466f5de5e37ac4957
+MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.28-r1.ebuild b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
index 6629afaa9633..bde20a7a599d 100644
--- a/sys-apps/coreutils/coreutils-8.28-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/coreutils/coreutils-8.29-r1.ebuild b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
new file mode 100644
index 000000000000..36ef844453e9
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.29-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH_VER="1.0"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
+	https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		!userland_BSD? (
+			dev-util/strace
+		)
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
+	)"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if ! use vanilla ; then
+		eapply "${WORKDIR}"/patch/*.patch
+	fi
+
+	eapply_user
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(use caps || echo --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	use userland_BSD && myconf+=( -program-prefix=g --program-transform-name=s/stat/nustat/ )
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox $FEATURES ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers
+	mkwrap() {
+		local w ww
+		for w in "$@" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if [[ ${USERLAND} == "GNU" ]] ; then
+		cd "${ED%/}"/usr/bin || die
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use hostname; then
+			mv hostname ../../bin/ || die
+		fi
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
+		if use split-usr ; then
+			# move critical binaries into /bin (common scripts)
+			local com="basename chroot cut dir dirname du env expr head mkfifo
+			           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+			mv ${com} ../../bin/ || die "could not move common bins"
+			# create a symlink for uname in /usr/bin/ since autotools require it
+			local x
+			for x in ${com} uname ; do
+				dosym ../../bin/${x} /usr/bin/${x}
+			done
+		fi
+	else
+		# For now, drop the man pages, collides with the ones of the system.
+		rm -rf "${ED%/}"/usr/share/man
+	fi
+
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+
+	# Help out users using experimental filesystems
+	if grep -qs btrfs "${EROOT%/}"/etc/fstab /proc/mounts ; then
+		case $(uname -r) in
+		2.6.[12][0-9]|2.6.3[0-7]*)
+			ewarn "You are running a system with a buggy btrfs driver."
+			ewarn "Please upgrade your kernel to avoid silent corruption."
+			ewarn "See: https://bugs.gentoo.org/353907"
+			;;
+		esac
+	fi
+}
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index 9241968a4690..4e46af051b39 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="hostname">Build the hostname program</flag>
 	<flag name="kill">Build the kill program</flag>
 	<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+	<flag name="split-usr">Enable this if /bin and /usr/bin are separate directories</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
diff --git a/sys-apps/gcp/Manifest b/sys-apps/gcp/Manifest
index 0fd57b097f9f..ed8dac6b7d94 100644
--- a/sys-apps/gcp/Manifest
+++ b/sys-apps/gcp/Manifest
@@ -1,3 +1,3 @@
 DIST gcp-0.1.3.tar.bz2 30946 BLAKE2B 404adeb65396829afd1e51308e3e629b19dc8b27e142b349ee90282142b9fc151acad60010bf75031d9dc9ce805d5c561a6244994c1b69d1e7f87b76402984f3 SHA512 856561d7d1514b7e90ed4e976b4572b6a82113edb9c3127168053d8993f67ea4efa1d3d5543c318dd961ee9d42679232444e1f397b1c7ba22bfba6b5d7acfc76
-EBUILD gcp-0.1.3.ebuild 679 BLAKE2B bd15d0323d8a67495921a09077c20cf55047031081751d48407da3830ac45c356ae35db51c49204e1af3621f5cbba67aa955fe130cfed3e9be1e2884b04958af SHA512 bc640e728c5c8ff5be4d4791934978675e826864f6f557deab1e338f9c15db58eb9698259ee6111a0eb0b6e7a251206e56f3823403528fb7610ae4641960d54d
+EBUILD gcp-0.1.3.ebuild 680 BLAKE2B 7a58b0317199111ccf51160c28752d2ba1d1a36f83d90bb210f03800cea22670f5e66c47acaace553a4d8046661b9649d299332a145af7c7f4e94448d73ea802 SHA512 e9e1ea9c802943f702dbb9f69916f28f52abb99804b320457be0a03db45289523e6e9141f044b53750c0f6fb0fca33386880624c60f51d152c6901a25a437b99
 MISC metadata.xml 219 BLAKE2B 96b35aca9e98ee4763a251a4dd9d63b7377c7183023f2ccda74cc76c7117fa885f518bebfad739d2e80f32dfdf4882e08012a94360666dd9cff26642e2df4513 SHA512 39ee913ff21c2aaa9f767872e2b49cb3cb982afab04d7b5045eda61368d63c2e3e1d637df59f7fb4ec4f95776e754615a260b37580cc9f18017a7c080955db77
diff --git a/sys-apps/gcp/gcp-0.1.3.ebuild b/sys-apps/gcp/gcp-0.1.3.ebuild
index 6c8ec4f32909..bc2f7a8a3168 100644
--- a/sys-apps/gcp/gcp-0.1.3.ebuild
+++ b/sys-apps/gcp/gcp-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="File copying utility with progress and I/O indicator"
-HOMEPAGE="http://wiki.goffi.org/wiki/Gcp/en"
+HOMEPAGE="https://wiki.goffi.org/wiki/Gcp/en"
 SRC_URI="ftp://ftp.goffi.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ac36cc70453f..62502eb9e431 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,7 +3,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
+DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
 EBUILD openrc-0.35.5.ebuild 10049 BLAKE2B 20a347eb789266d9462c49509ba62b26963a982a4f586a91ff073cafdf4b0dbacaab9bcbe47a36a86b33228c34adc9117a42a9e4f4f2aa0226993e0b50da05b1 SHA512 8a54f2c6c96766d03d69a0460635fb29f064edda9a96baa27b9057f2e7406f87f397001169148fb874df0555826589c4aa23d5f78d58df1861872ce8762548e9
+EBUILD openrc-0.36.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
 EBUILD openrc-9999.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.36.ebuild b/sys-apps/openrc/openrc-0.36.ebuild
new file mode 100644
index 000000000000..18aa6cade207
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.36.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index e3a63d9c762c..24b714bd5974 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -5,6 +5,6 @@ DIST portage-mgorny-2.3.36.1.tar.gz 1247357 BLAKE2B e3adcb48a2261d55956e9d5da291
 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 7148 BLAKE2B 6560b50e0e55106e2415c3ebe7ace10d0b62ab4f8183d90566bf172b9d819ec2e816e6bfc241e7208bd4a24444a6e8b337f9b7a328ec6d05a246e6168af2f789 SHA512 9745458840e04187caa20076f939d83a325e0bdbb58e36eda4572b1ec1d989fa343389a8dda730f90c12ca3e308a0a5bacb1d3d5d443625293abe48eaea5cb8b
-EBUILD portage-mgorny-9999.ebuild 7060 BLAKE2B 283fe989708567de926d6a7d227193a6f8761caec6a485cd80d95c60f2efb018b9b6df48362cdfebeefbaaedddcd9df9066bc3a42d4c913a4b2f5c4f505b9382 SHA512 a2a77e0a75ea9169e28f7c886a41b11368196e6f27980c33406804b40deea275ce58d1564de4c6dcd3c5e44caabd640d3c576fb415ac12bcc2fb34ec2f934e76
+EBUILD portage-mgorny-2.3.36.1.ebuild 7166 BLAKE2B 2f4017f7e9233f8519f006a87223c8cf5b7acde2777cd0b2ebccdb7cba9265cf65680539b1956822668875d37b4dad84ed78c618fcfb5f52aaeffd6d6dc08fe4 SHA512 829a39a01c001aa6384ea4adf4c6a0f07a4cbd68546c552b220c5aab678123b7fd39107f4cd9b5c6a118834db916756d2e93cdd02bd1cc7dc652594ac0da090e
+EBUILD portage-mgorny-9999.ebuild 7078 BLAKE2B c330bd538df85690f7bbf8fc93dc647a2d63d0d86074bf3b5eb9243d652784bff55294afbb6f0ed0f6335a84a9380cb98c12a5ab2ce4a17027914fd63726a157 SHA512 b61d46f8ee8c7a9161bb25ecc8f73d67706b6616edb5e54d8ea10773b71456add98d0153ba8d6b74eb353a60492a699d79eac42e89733339a3ee363438dce236
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
index d6c166badf4d..ccc6052e2056 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.36.1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		app-crypt/openpgp-keys-gentoo-release
 		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10
+		>=app-portage/gemato-10[${PYTHON_USEDEP}]
 		app-shells/bash:0[readline]
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
 			python{2_7,3_4,3_5} pypy)
diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index d3195fa60f36..03be7d1ced9e 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 		>=app-admin/eselect-1.2
 		app-crypt/openpgp-keys-gentoo-release
 		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10
+		>=app-portage/gemato-10[${PYTHON_USEDEP}]
 		app-shells/bash:0[readline]
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
 			python{2_7,3_4,3_5} pypy)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 35002ce3ca24..d90439aea715 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,18 +3,12 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
-DIST portage-2.3.31.tar.bz2 986684 BLAKE2B dc2a6e7da211da98320b872b26af46138791e2600d261fbff21823576804ea04dc77bc69c5f64d94a9bc3d0ec9cba0630b9093c12c426ae0561471092c837080 SHA512 7cca6aa6e8e6ce7ee3902686b437ea09c398630f46926d568a35f94b95be3c6ecc53a4ab6ee99d52c04755d5144900cc3aa84be24a49533518f8c50a9301ffb8
-DIST portage-2.3.36.tar.bz2 992242 BLAKE2B 44b414495ab156214bfd27d10894a6b1ae020f503639f41d408670b440b5e389bd56c801138907992982db8964aaa2664e9f7f0aa99647d4eab1aa81167157ba SHA512 765bb60fce2b6b84c5fde7b19c5abeeed0ba8036ea311c7f57dfcb2ed11395cafe7bdd07a2b46adce95792f4bf9f5401643e88780c90e792a8a4e4d1f2886167
-DIST portage-2.3.38.tar.bz2 993841 BLAKE2B a473d905a3caae4fc9e45486c4cbf75b10de396b40b4f84aef9012da12dab78ad14f8645bbb71adf058159dca6dacba7314d44664826c8402904d0e0e4c55e52 SHA512 e9fbfdcb5c3f4f8c001d0cd16e62c0cc7c23b92f9abca1b26f4c9e95b547e78cf126a9a7807b70beb9014514c1d32bd277bea9d0b91a7c912785b4178f77dede
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
 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.31.ebuild 9300 BLAKE2B fcb1625349a2072fcaed11c2f604b26cd37134049d86a17659d7af04c23362a462ebdfdcae19df7dabbe16dd793462e2effe035a0d5602ce239ef13c28db6a9f SHA512 b0f0c9beefb02202cf32e9e36d864bbe487e4845c8edf59cc3fef05c8af28d97f576f0483e28215b4920f952d7acd2afe5becb825e9a4cc881440b72aa3eeba8
-EBUILD portage-2.3.36.ebuild 9300 BLAKE2B fcb1625349a2072fcaed11c2f604b26cd37134049d86a17659d7af04c23362a462ebdfdcae19df7dabbe16dd793462e2effe035a0d5602ce239ef13c28db6a9f SHA512 b0f0c9beefb02202cf32e9e36d864bbe487e4845c8edf59cc3fef05c8af28d97f576f0483e28215b4920f952d7acd2afe5becb825e9a4cc881440b72aa3eeba8
-EBUILD portage-2.3.38.ebuild 9316 BLAKE2B 70505ab1d0858271c22a9a7dc26571d597a4422eb7f1e01a9fb56e3336453bb6d2773506cb8448bfb45881e8bbccce1fe127b30b7b8fc127ff070f51639e04c5 SHA512 5438f516f78827a307c81d344ba53f95c2c165e81df8baa82a0821ade944f9558665cd8e9d00a0163ca80227e8d89c15b70764ec656c0f9c6bbfb835a9b33796
-EBUILD portage-2.3.40.ebuild 9447 BLAKE2B 9f44bd1d717d06d734156b0f2f1070bf160aa0d11041bb29a11ddab8aaa1abdf50b09b085e65b2a149c2a20df724588f9199bae0c602d9604931e5898a12a9d0 SHA512 c38de71d8e1447315211057c17fb0a8c2630629a6beb46016fa3f02ef06157c556e7aac7c040cf3de3711cf2433eb21bc8705451c6cc0f242738ded2fcb3708c
+EBUILD portage-2.3.40.ebuild 9595 BLAKE2B d0ac87f07bc85b82d91dfcc5ded9fb77d76fe1133b7e07a74420d5a6351c77e382760352f3ded2ff27d6cde0f2b401dfdce2cc84fd8b8994dc084cf23710defc SHA512 0008a37f2a4c5d35a3a59de1135f620bf27684ce8cd02fb429438e00bb089d5b4f0bdf5b033991649c19b3a39cf89c532cda0404f3c6a6e130f6944a018419bc
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.31.ebuild b/sys-apps/portage/portage-2.3.31.ebuild
deleted file mode 100644
index accf849fff4d..000000000000
--- a/sys-apps/portage/portage-2.3.31.ebuild
+++ /dev/null
@@ -1,284 +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 ~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/gentoo-keys
-			>=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
-
-	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.36.ebuild b/sys-apps/portage/portage-2.3.36.ebuild
deleted file mode 100644
index accf849fff4d..000000000000
--- a/sys-apps/portage/portage-2.3.36.ebuild
+++ /dev/null
@@ -1,284 +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 ~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/gentoo-keys
-			>=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
-
-	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.38.ebuild b/sys-apps/portage/portage-2.3.38.ebuild
deleted file mode 100644
index 453c559a2ac2..000000000000
--- a/sys-apps/portage/portage-2.3.38.ebuild
+++ /dev/null
@@ -1,284 +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 ~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
-
-	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.40.ebuild b/sys-apps/portage/portage-2.3.40.ebuild
index 48b0a930fe71..2fef032b5260 100644
--- a/sys-apps/portage/portage-2.3.40.ebuild
+++ b/sys-apps/portage/portage-2.3.40.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -94,6 +94,10 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# apply d07a47ff3c06
+	sed -i 's:("--dynamic-deps", "y") != "n"$:\0 and "--nodeps" not in myopts:' \
+		pym/_emerge/create_depgraph_params.py || die
+
 	# apply 4fb5ef2ce2cb
 	sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
 		pym/portage/util/_eventloop/EventLoop.py || die
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index bbdf08b294cf..ecd7825391c2 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,3 +1,5 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
+DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
+EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
new file mode 100644
index 000000000000..f1878d4e465b
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.4.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.4.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4
+	>=sys-apps/s6-2.7.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.2
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 19939f0c7e6d..5bc803dfd6cd 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -1,5 +1,7 @@
 DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a76184783e16dbf066891a84a3f6177aec40a4cc78c276126c4588d7d57e4c5a2fa609b1b0276a12a595b99bc7440497 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
+DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
+EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
 MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
diff --git a/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild b/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild
new file mode 100644
index 000000000000..ab1ba2e9f5a2
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.4.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.4[static-libs]
+		>=dev-libs/skalibs-2.6.4.0[static-libs]
+		>=sys-apps/s6-2.7.1.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.4[static=]
+		>=dev-libs/skalibs-2.6.4.0
+		>=sys-apps/s6-2.7.1.0[static=]
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4:=[!static?]
+	>=sys-apps/s6-2.7.1.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0:=
+	)
+"
+
+DOCS="examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
+
+pkg_postinst() {
+	ewarn "Databases from ${PN}-0.3.0.0 or earlier must be manually upgraded!"
+	ewarn "See the upgrade notes at ${EPREFIX}/usr/share/doc/${P}/html/upgrade.html"
+	ewarn "and the documentation for the s6-rc-format-upgrade utility."
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 516701269591..e04d907cbe2c 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -1,7 +1,9 @@
 DIST s6-2.1.3.0.tar.gz 181237 BLAKE2B 8cf3b4d4da81aacc17fb663a0648bae1a17085c796014d9c49b4c8c5915cdb9694f067fc1f23afc0738377535d4db493f3b1d187c62ebb48c531e975e398db6f SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca
 DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f700bb6a5642fd37bab1ed78b18c16bf5713ade1c2ae456fb653b38aeb793e671138b1038f988ed78c6fad748 SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
+DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
+EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
 MISC metadata.xml 413 BLAKE2B ad4e5f70c72eb8fcbc679c329e16d9eadcec41aeb07b391098676a9c52739b4e3a27fe86e742d1322a50261e62060f7a93eafd6534ccc7514f2402295e2b01b5 SHA512 000e085535127bf6a340451b6cbd51549dd2f1f9cba1bcf76dde590f628f780fc756f344844982f1d3a6ef69299b6db4fb71ddd92f72650e38f7a24aa541257c
diff --git a/sys-apps/s6/s6-2.7.1.1.ebuild b/sys-apps/s6/s6-2.7.1.1.ebuild
new file mode 100644
index 000000000000..df566e620d64
--- /dev/null
+++ b/sys-apps/s6/s6-2.7.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.4[static-libs]
+		>=dev-libs/skalibs-2.6.4.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.4[static=]
+		>=dev-libs/skalibs-2.6.4.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.4:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.4.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index dca3c94d6e61..85078a0d5fdc 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -2,6 +2,7 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartd.systemd 258 BLAKE2B 9aadec117adeacff070f127ff34df520d5deebe152d0a72e34f36a34b267f854c52640644b285c57de460c7b91f5fb54a5e1c704706540fd5813ed1954f74e7d SHA512 73c49bca755adf0ff1c6ccd221de0fd2bb7804250968fbcb3799e19c66dacc85a6c7a3e0d1eecea683f57d6a3ff01fbd4b4fc47b0eab5747006f0edc21876a7c
 AUX smartmontools-6.6-fix-build-on-musl.patch 416 BLAKE2B 3c7eec408c3ea346ebad3df77e8b2beb89e2565c61d7b85c69404d354b662ee0679389b10cfb110728d99b8df8434a590865a4bb2b46c1ce108ca635dd2a6ebc SHA512 cf2ec3c0366c5ec79cccbe181b4dfed74f051d2236e851f81125e57f7893221a3e311c46556a8854c7c50ee6378d34c917089a90fcb6c3e07cc0c0716085540d
+AUX smartmontools-6.6-set-broadcast-nsid.patch 4217 BLAKE2B 27225c052a13c22d031450f9ed700e5f5295738644a91802c86e1d9f6938fd17b150eff028ec4aa79fdd3cf927697dbe1d0d55f57ce48df850ce335e2497c24b SHA512 8abaa33749f70049f3c28ac09f915ccd37081cc7ca8ee63325eecd78d038842c2cce300f277279614b5b1d6d336c343f7512b21c51d73953f4b3921976642a3e
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-6.4.tar.gz 822539 BLAKE2B be76ec24cf24b2388a77758a1df5b5b9b19bd455dda26df6c13184051a51feeb0baf164265fcfe15b1d2ac41767d546109dea53cd7ac290d02f6e03b44da454f SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc
 DIST smartmontools-6.5.tar.gz 855642 BLAKE2B 25f78de8fd58497cf052e75aef746c15af8d56d2694007c1d6e2f8e31cae3b517babfc52ef73d3ae4bc5104a49e4bac16a48f23f3b3145228997bef0aad823dd SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3
@@ -9,6 +10,7 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd
 EBUILD smartmontools-6.4-r1.ebuild 2534 BLAKE2B 3395b22b8bdd26c78404016cbb5f48a91b9858ffbff70ae3ca486fc3d32ca9603cbd752111693691a91b5c04982f07987391745514af782bf31d4644d8314223 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c
 EBUILD smartmontools-6.4.ebuild 1639 BLAKE2B 103e33da5b3605be940863b879ab2a4859036c3ce1206052b08cd9f0f88acca4d3f56513049a24ac57dcbd2e3c2413fdfcf4dc973fc19645c735feb2063ba122 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448
 EBUILD smartmontools-6.5-r1.ebuild 4043 BLAKE2B cb6764d3186c03fc1df0878d00b7ced1d1e5036e8e3e7afeeb552e3d257cb51c3173edc07b738d111b41eb73f83f67967a9bd9ed071ab11478e12fdf5a0ea20c SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5
+EBUILD smartmontools-6.6-r1.ebuild 4198 BLAKE2B efdd8dd91c44c87f2b7424f6200ab64095ccc82c8c36d239bbe88a93e1fa89a653a9d6aa5b7db1fb43e7f152b5333ca175e98e6f394729328c640f4a229a6f79 SHA512 e23a2d29430c2984dc944d3f3613c45dcbd6d6892e5eca3ca97d2fae649163bda5dfcfc2931df86b0d329779ffa26f8b45f11dc1776a0e66b0d270e688d9b218
 EBUILD smartmontools-6.6.ebuild 4141 BLAKE2B 44a371caee16745f0e5ae8aca8cd92e673579df9d9a693a81ed2ae0f91a9e2138558cf23f4dbbc6beee6f9910ed4e16368ec9ac68f6b8ca9772a40dc58f21481 SHA512 499b051c4e78c0dd053c8a377814f86b8d01c8176bf973ea03b3032037e573759e08ab1de68ae5a989a18fe688456f306769196c838b4f6b3809121a53aa9f65
 EBUILD smartmontools-9999.ebuild 4094 BLAKE2B 2af97f4da8bb0b0f5a1c6f9bc275724d69b4687e3ab7890f021d9e2fa25fccab24769dde1a08d61464f8977b6cd8c912b906307feb119e9f94eb83ce204cf0c7 SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a
 MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54
diff --git a/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch b/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch
new file mode 100644
index 000000000000..e65504d43c65
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartmontools-6.6-set-broadcast-nsid.patch
@@ -0,0 +1,104 @@
+fix from upstream
+
+https://www.smartmontools.org/changeset?new=4671@/&old=4670@/
+
+Index: trunk/smartmontools-6.6/ChangeLog
+===================================================================
+ 2017-12-27  Douglas Gilbert  <dgilbert@interlog.com>
+ 
++	nvmecmds.cpp: according to NVMe 1.3a spec, the SMART/
++	health information log page is global and should take
++	the global nsid (all ff_s). It also says the Error
++	info lpage is "global. Broke WD Black PCIe (NVMe)
++	SSD but worked on Intel SSDs. Fix; could break others.
++
++2017-12-27  Douglas Gilbert  <dgilbert@interlog.com>
++
+ 	os_freebsd.cpp: on error was setting set_nvme_err() to 1,
+ 	not the actual NVMe status value; fix.
+ 
+Index: trunk/smartmontools-6.6/nvmecmds.cpp
+===================================================================
+diff --git smartmontools-6.6/nvmecmds.cpp smartmontools-6.6/nvmecmds.cpp
+--- smartmontools-6.6/nvmecmds.cpp	(revision 4670)
++++ smartmontools-6.6/nvmecmds.cpp	(revision 4671)
+@@ -196,7 +196,8 @@
+ }
+ 
+ // Read NVMe log page with identifier LID.
+-bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data, unsigned size)
++bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data,
++	       		unsigned size, bool broadcast_nsid)
+ {
+   if (!(4 <= size && size <= 0x4000 && (size % 4) == 0))
+     throw std::logic_error("nvme_read_log_page(): invalid size");
+@@ -204,7 +205,7 @@
+   memset(data, 0, size);
+   nvme_cmd_in in;
+   in.set_data_in(nvme_admin_get_log_page, data, size);
+-  in.nsid = device->get_nsid();
++  in.nsid = broadcast_nsid ? 0xffffffff : device->get_nsid();
+   in.cdw10 = lid | (((size / 4) - 1) << 16);
+ 
+   return nvme_pass_through(device, in);
+@@ -213,7 +214,7 @@
+ // Read NVMe Error Information Log.
+ bool nvme_read_error_log(nvme_device * device, nvme_error_log_page * error_log, unsigned num_entries)
+ {
+-  if (!nvme_read_log_page(device, 0x01, error_log, num_entries * sizeof(*error_log)))
++  if (!nvme_read_log_page(device, 0x01, error_log, num_entries * sizeof(*error_log), true))
+     return false;
+ 
+   if (isbigendian()) {
+@@ -234,7 +235,7 @@
+ // Read NVMe SMART/Health Information log.
+ bool nvme_read_smart_log(nvme_device * device, nvme_smart_log & smart_log)
+ {
+-  if (!nvme_read_log_page(device, 0x02, &smart_log, sizeof(smart_log)))
++  if (!nvme_read_log_page(device, 0x02, &smart_log, sizeof(smart_log), true))
+     return false;
+ 
+   if (isbigendian()) {
+Index: trunk/smartmontools-6.6/nvmecmds.h
+===================================================================
+diff --git smartmontools-6.6/nvmecmds.h smartmontools-6.6/nvmecmds.h
+--- smartmontools-6.6/nvmecmds.h	(revision 4670)
++++ smartmontools-6.6/nvmecmds.h	(revision 4671)
+@@ -248,7 +248,8 @@
+ bool nvme_read_id_ns(nvme_device * device, unsigned nsid, smartmontools::nvme_id_ns & id_ns);
+ 
+ // Read NVMe log page with identifier LID.
+-bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data, unsigned size);
++bool nvme_read_log_page(nvme_device * device, unsigned char lid, void * data,
++	       		unsigned size, bool broadcast_nsid);
+ 
+ // Read NVMe Error Information Log.
+ bool nvme_read_error_log(nvme_device * device, smartmontools::nvme_error_log_page * error_log,
+Index: trunk/smartmontools-6.6/nvmeprint.cpp
+===================================================================
+diff --git smartmontools-6.6/nvmeprint.cpp smartmontools-6.6/nvmeprint.cpp
+--- smartmontools-6.6/nvmeprint.cpp	(revision 4670)
++++ smartmontools-6.6/nvmeprint.cpp	(revision 4671)
+@@ -473,9 +473,21 @@
+   if (options.log_page_size) {
+     // Align size to dword boundary
+     unsigned size = ((options.log_page_size + 4-1) / 4) * 4;
++    bool broadcast_nsid;
+     raw_buffer log_buf(size);
+ 
+-    if (!nvme_read_log_page(device, options.log_page, log_buf.data(), size)) {
++    switch (options.log_page) {
++    case 1:
++    case 2:
++    case 3:
++      broadcast_nsid = true;
++      break;
++    default:
++      broadcast_nsid = false;
++      break;
++    }
++    if (!nvme_read_log_page(device, options.log_page, log_buf.data(),
++			    size, broadcast_nsid)) {
+       pout("Read NVMe Log 0x%02x failed: %s\n\n", options.log_page, device->get_errmsg());
+       return retval | FAILSMART;
+     }
diff --git a/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
new file mode 100644
index 000000000000..06a1bd943dbe
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-6.6-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools flag-o-matic systemd
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools"
+	ESVN_PROJECT="smartmontools"
+	inherit subversion
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+fi
+
+DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
+HOMEPAGE="https://www.smartmontools.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps +daemon selinux static update_drivedb"
+
+DEPEND="
+	caps? (
+		static? ( sys-libs/libcap-ng[static-libs] )
+		!static? ( sys-libs/libcap-ng )
+	)
+	kernel_FreeBSD? (
+		sys-freebsd/freebsd-lib[usb]
+	)
+	selinux? (
+		sys-libs/libselinux
+	)"
+RDEPEND="${DEPEND}
+	daemon? ( virtual/mailx )
+	selinux? ( sec-policy/selinux-smartmon )
+	update_drivedb? (
+		app-crypt/gnupg
+		|| (
+			net-misc/curl
+			net-misc/wget
+			www-client/lynx
+			dev-vcs/subversion
+		)
+	)
+"
+
+REQUIRED_USE="( caps? ( daemon ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-on-musl.patch
+	"${FILESDIR}"/${P}-set-broadcast-nsid.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# The build installs /etc/init.d/smartd, but we clobber it
+	# in our src_install, so no need to manually delete it.
+	myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
+		--with-initscriptdir="${EPREFIX}/etc/init.d"
+		$(use_with caps libcap-ng)
+		$(use_with selinux)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_with update_drivedb gnupg)
+		$(use_with update_drivedb update-smart-drivedb)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local db_path="/var/db/${PN}"
+
+	if use daemon; then
+		default
+
+		newinitd "${FILESDIR}"/smartd-r1.rc smartd
+		newconfd "${FILESDIR}"/smartd.confd smartd
+		systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service
+	else
+		dosbin smartctl
+		doman smartctl.8
+
+		local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO )
+		einstalldocs
+	fi
+
+	if use update_drivedb ; then
+		if ! use daemon; then
+			dosbin "${S}"/update-smart-drivedb
+		fi
+
+		exeinto /etc/cron.monthly
+		doexe "${FILESDIR}/${PN}-update-drivedb"
+	fi
+
+	if use daemon || use update_drivedb; then
+		keepdir "${db_path}"
+
+		# Install a copy of the initial drivedb.h to /usr/share/${PN}
+		# so that we can access that file later in pkg_postinst
+		# even when dealing with binary packages (bug #575292)
+		insinto /usr/share/${PN}
+		doins "${S}"/drivedb.h
+	fi
+
+	# Make sure we never install drivedb.h into the db location
+	# of the acutal image so we don't record hashes because user
+	# can modify that file
+	rm -f "${ED%/}${db_path}/drivedb.h" || die
+
+	# Bug #622072
+	find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
+}
+
+pkg_postinst() {
+	if use daemon || use update_drivedb; then
+		local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h"
+		local db_path="${EPREFIX%/}/var/db/${PN}"
+
+		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
+			# No initial database found
+			cp "${initial_db_file}" "${db_path}" || die
+			einfo "Default drive database which was shipped with this release of ${PN}"
+			einfo "has been installed to '${db_path}'."
+		else
+			ewarn "WARNING: There's already a drive database in '${db_path}'!"
+			ewarn "Because we cannot determine if this database is untouched"
+			ewarn "or was modified by the user you have to manually update the"
+			ewarn "drive database:"
+			ewarn ""
+			ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this"
+			ewarn "   release which can be found in '${initial_db_file}', i.e."
+			ewarn ""
+			ewarn "     cp \"${initial_db_file}\" \"${db_path}\""
+			ewarn ""
+			ewarn "b) Run the following command as root:"
+			ewarn ""
+			ewarn "     /usr/sbin/update-smart-drivedb"
+
+			if ! use update_drivedb ; then
+				ewarn ""
+				ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}"
+				ewarn "with USE='update_drivedb'."
+			fi
+		fi
+	fi
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index cb52886445d4..0d66ac73330b 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -3,6 +3,6 @@ DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f4533
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 EBUILD usbutils-008-r1.ebuild 1244 BLAKE2B 65d0f771202bf1e39d243c6f46d3f45d818033b7bd40ba198e834038416498a68e329c7182ec0ba756479ee6bd54aac11556e4513b44baa98c0dcee320b1801a SHA512 5384707b65c9801744ec1838e94396ee421ea007ec25c5afc1503134c2d7bf0231fdd1d9dce8b6af9892177b1dbe16b30303c810bb4e1d82b2082c2f32fe5964
-EBUILD usbutils-009.ebuild 1150 BLAKE2B 6d32e478cf57e97d44f352c785c5f2d2690de91b99566024d455a63cd8e36d762fc63516b2fddcbfdfc05044c7627550224a631a253e02535089bab34bd7351b SHA512 5c8a91a7d257b5dd8a9fc04fe52a4138756ea203d53b7912710cad0ccb8ce81a031e6306ed11d55daef0a7257641f54b6ad33e6a59662d9db7fa3420f16d5765
+EBUILD usbutils-009.ebuild 1149 BLAKE2B 55c6a3f8101cb3eac2665c43181d1e040a2ac15bfe747fb723d3a4821cf5abb53992ce3fdafec597d5b815fe8d32d91a398b5db86daba407481c653a0127e6f4 SHA512 ee459781bf41a8280ca7a4eda7768ab634fe4ba0f76dcdad7a41ddfbb049389ff0efda701ef78e5547b72786fd3980173caf7898280011dfa169326b542c1422
 EBUILD usbutils-010.ebuild 1204 BLAKE2B 5ba8ce207ceeec0297ec554ec40c288f77eb6973926648294535fa2c63997fb8f5d9b4efb64700c891399f2421e814ee44819f791f232b6596b45b38b8e82679 SHA512 671d130588c07e24c793b4cc8d929c390baeec46001b2344e2c09cd862fa1bad9445a22292be54a98d762047cf782a0cc60f4de43fec650d9763f6b4143fcb2a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 6f8799ca0b5c..477f9c5cdc05 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"