gentoo resync : 05.04.2018

34 files changed, 1044 insertions, 326 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 314a7656e9ad..02016d2d9ec5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 274b15278322..0f0d6358b95e 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -2,7 +2,9 @@ AUX agedu-r9671-fix-automagic.patch 1847 BLAKE2B a449fee6a973a27af67ac5e48547d39
 DIST agedu-20170831.fc6b2b5.tar.gz 175900 BLAKE2B f7ace0209afe6c40a54d4f576fd7c2fb7a1fb5433de00c1ae29c8457b32304a3b8686ee38efc3bd64860561bb5ea730f5cfee70d20b56addea1b312ba650a9da SHA512 6e9255776b668de33209486d6fcdcf68e1d4785bd84e2d5392ac71d13e54c7b156d9959e681fefc9b965b43727fbab13ef0b1e1e7587fd56d8dea29568dd0e75
 DIST agedu-20171202.8a8299e.tar.gz 175917 BLAKE2B 9789a901ce2aabd5aff31423d704165f5d2e5a21c6b8d316eb3c97365a51559df1d7c4dc071f329fadb12b4ca748ea4c9d3a697e5b0bd93c7a0b23c5b08af3b8 SHA512 be0f37d0ec94241462095e1503bc94ea3ba1bc1bc8a9b5a8d853cbb96ea09cf267a121fb8c8479c7b5670947b1e5d61d0f93b0ff10337fad9c7ee000765da380
 DIST agedu-20180302.9421c00.tar.gz 176129 BLAKE2B caa30fbb09c7e6f06b0a1832e6206b9400d0ded63866275ecdd3918133f1464db167e046edb5d516a4128a2dcfd9a07692835a88da0b640b4a52500e199e7aca SHA512 ebcb7413fba41341dda00fe8138c37890d5ca3a577060de479c1d1f5ed134ae40228562d24ae58aa496d4a25f59eace28670bfbd7cf033c935776f9592f0148a
+DIST agedu-20180329.af641e6.tar.gz 178860 BLAKE2B a3b17bb708edb530ad56644314969b069577b6663cb3f6ccdc72345ac666c18f80b1eae14c5146be46c9f9692d820104111ccca586e3d5a564bb34a4938aff6a SHA512 66fcaf1f4ee6a66fa68cce88f5a5edbfbc919978513370821de4e01f0fdb499beb7642333b459adb705934dcba2f4a14a8c28edc1045a8fd1b42a4a317061707
 EBUILD agedu-20170831.ebuild 820 BLAKE2B 95cd6fd4dd51d46e1a171c2e1dff3dbe03b4db8a830692277a6189709977044a88b67a6d8011a88107f98c60eb496aeefedf59bdcee721cef6c22cd42a8f5e61 SHA512 0ee867b3ff0802f28d9ca7b919a087c94dbc1ea826b5be998fd6aea959e17b172543230cbd1e8f5b1fa2d3327d86465637c72a76902f6e89295bc2e2fe964fbd
 EBUILD agedu-20171202.ebuild 820 BLAKE2B 13bd8b1d737b2ea3d2b709cf1aee362bc8d6afbc2890a3e9edc3312507b71848a5fbfc62309f4638b7c59f0f37c2d21d2f104f5fb0965a05dedce2b8428ff212 SHA512 774a707927913e22c78a742ef78952d959e9639f9ea09ba717cb5caa7dc2bfb0c25d9dfb01110c8b3575292a881941cdd29de0e7249990b37e875a8e460f2b84
 EBUILD agedu-20180302.ebuild 820 BLAKE2B f5040038168c4e9dadbdcc036551cd1372307e3526b1619c7a3c6d27ad0fc6db0e4c98deab5dc0be661a6a968bc650817f87f0e41c91bccc333c6a57d0d4e8cf SHA512 5796596884e90be15e9c636601110056905b73c6f244500b4b9a84bec76fab65a09d35136eb57cfeab7a82cb8ba2da2fe501f0e6b7789251b6f40403efe9ac34
+EBUILD agedu-20180329.ebuild 820 BLAKE2B 4520dcc0d9dea33c80ccaf66e425c8f11f51672bafd29727d1144ed27ea79e1336de6e3fd450b700e46ac850fa5da503cbd4f04777d24f3999e05e82f5cca3a9 SHA512 f83dfb089017e07e1ad6e10bd38dd78f0f3021d3943f7f51407bb173ad4049ec0b24c304edf46b93323430e44b6e31b762a218f6a78e6826bf257130ee9c82de
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20180329.ebuild b/sys-apps/agedu/agedu-20180329.ebuild
new file mode 100644
index 000000000000..72f7d0242506
--- /dev/null
+++ b/sys-apps/agedu/agedu-20180329.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils
+
+# agedu-20151213.59b0ed3.ebuild is not a legitimate name
+# so we'll drop versionator and just set MY_P manually.
+MY_P="${PN}"-20180329.af641e6
+
+DESCRIPTION="A utility for tracking down wasted disk space"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6"
+
+DEPEND="doc? ( app-doc/halibut )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-r9671-fix-automagic.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-ipv4 \
+		$(use_enable doc halibut) \
+		$(use_enable ipv6)
+}
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index bfc7e8c0c547..9aa4d92071dc 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
 EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-2.0.ebuild 1209 BLAKE2B 78d6ae6756b2bcf40686b6d70473a8efca937a53c6018fa2959a756560e8c29994f81b74d58e0b9503ac2122830ea582d7a43c1ce0fbd3f3a22f5c877b9fef5b SHA512 1c579246ba2cc9ef81f7bb9e530a3305f6881a835131cbb1e58641b1d5d2e799b022b68d09b0059ec2824ed11d8fd4922ea225122e4200763a780938161a9fe3
+EBUILD bleachbit-2.0.ebuild 1208 BLAKE2B 1359b21e86449a987681f2058c972f5b392122944346b18c901b82fa8b51c34032fdeddb6cb38390bfc3a38606e0e93373c12ca71fac58f524cdb0767cc3c59c SHA512 7ade695a7630cfb39a7d9d652f617c8236fce594fe9cbc8e96faffb9ba34babaa8ae7175dc901f3f122827a3b8ba7a5a14816831bbb0e69f2f8b64e9d303dd3b
 MISC metadata.xml 571 BLAKE2B dfb5414d647ae661fa1aaab2e5a301ce80a5306f1c658ce2448368fa2dc4b0f3f49d0084de0b5f0bf9e0f00f1abe4c6a441f68d5abe0a610ac13a4392a0343f5 SHA512 59eaf4a789189b5f02fbf945a26cddc46c3ca22ce0aeb5b0311768bf8af21bb80081bc31f859add067a32a6a7840343af43d0680913c0422161efb0784b09a8f
diff --git a/sys-apps/bleachbit/bleachbit-2.0.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
index 3cf1d36382e9..a3c40b185337 100644
--- a/sys-apps/bleachbit/bleachbit-2.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 1e092ab015dd..e44c0328f19f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -17,7 +17,9 @@ AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303
 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
 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 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 EBUILD busybox-9999.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.3.ebuild b/sys-apps/busybox/busybox-1.28.3.ebuild
new file mode 100644
index 000000000000..68000bffa174
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.28.3.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="5"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
+#	epatch "${FILESDIR}"/${P}-*.patch
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index e4bac3253ad8..c4c61431701a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.4.tar.gz 1555679 BLAKE2B 75282437169cbb5a0da8d4c296ddd4fe62e32f4bd4d4b6d386b57708869a1dfc591a991c4c17dba5dac80f84e7238181b0beed654da453f72cc8e92f9513d3df SHA512 20f24253c4ee5c90d6d262ebe5c515bea78c6cc3720e78bdcff04c1b02500a79de583886ce0ae6c48d24b9c3d9638c4c5896d57d2efc0b77346317ba53924d2a
 DIST fwupd-1.0.5.tar.gz 1564037 BLAKE2B 1b97cf35e2531fc11b901f061dc30ac0c6b745f32f0b2f756e428509121ac3269d8d51c273566290cba2b840c890ce1274a268d46c35bd6486a932454c2d2cfa SHA512 dbbd0ae574c493de5d89f58e0050e44fd3cd1353807131d7e821ae02cffd4da594855df0ed35e9ceb72bdfc9c4b670e022d184c24897bf2ed370ce545c578621
-EBUILD fwupd-1.0.4.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
+DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
 EBUILD fwupd-1.0.5.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
-MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
+EBUILD fwupd-1.0.6.ebuild 2487 BLAKE2B b752c547e695bfec356468b7fb5089ca75f75e3ea3c782acc50200024a0adc46d51ab1906d00e1a812fe10c9855ea48093e6005c5f94bee73997ff2804c5fb46 SHA512 6cf5280743a7123c18f0be9c58021d08d36a09f39251386ba1f34232b40471cbed9830b38dda676806098b280d8ed48c1d7328c7dcb048d2df0994903b66174e
+MISC metadata.xml 834 BLAKE2B c71e6a3c51d232413bc726375abfc6716b82a8228644c0032aae613936b47f0aa44d61c7c4d34b00b78b70dab6a1e8a0e8cb9d19ba0555cdee231310fb60230f SHA512 ac8f92d0d9dee26834fb46635451a7b053866d01614ea53f00d37281d34165d462aeb867cc770006b2abbcefa0051eeb3fa2cc9751c0017c72d31fedf6587a90
diff --git a/sys-apps/fwupd/fwupd-1.0.4.ebuild b/sys-apps/fwupd/fwupd-1.0.6.ebuild
index c5747fe2cd8f..bf7962018270 100644
--- a/sys-apps/fwupd/fwupd-1.0.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
 
-inherit meson python-single-r1 xdg-utils
+inherit meson python-single-r1 vala xdg-utils
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -15,24 +15,24 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
-	app-crypt/gpgme
+	app-arch/libarchive:=
 	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/appstream-glib-0.6.13:=[introspection]
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/libgpg-error
-	dev-libs/libgudev
+	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4
+	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
@@ -44,6 +44,7 @@ RDEPEND="
 		app-crypt/gpgme
 		dev-libs/libgpg-error
 	)
+	pkcs7? ( net-libs/gnutls:= )
 	systemd? ( >=sys-apps/systemd-231 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
 	uefi? ( >=sys-apps/fwupdate-5 )
@@ -61,19 +62,18 @@ DEPEND="
 	app-arch/gcab
 	app-arch/libarchive
 	virtual/pkgconfig
+	$(vala_depend)
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
 	test? ( net-libs/gnutls[tools] )
 "
 
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
 REQUIRED_USE="dell? ( uefi )"
 
 src_prepare() {
 	default
 	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+	vala_src_prepare
 }
 
 src_configure() {
@@ -83,10 +83,11 @@ src_configure() {
 		-Dgpg="$(usex gpg true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_colorhug="$(usex colorhug true false)"
 		-Dplugin_dell="$(usex dell true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged yet
+		# requires libtbtfwu which is not packaged (yet?)
 		-Dplugin_thunderbolt=false
 		-Dplugin_uefi="$(usex uefi true false)"
 		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index dd10e28c07e5..db5cd052b861 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
+    <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg>.</flag>
     <flag name="uefi">Enable UEFI support</flag>
     <flag name="uefi_labels">Enable UEFI labels support</flag>
   </use>
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 752b3e819bdb..844b109f9336 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,9 +1,9 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
-DIST ipmiutil-3.0.7.tar.gz 1694854 BLAKE2B a46940da8b71439d803342bb640353498a9ae2ac5516930bcb76042aba9981c50bbe7cd2bdd4feb18e1074bb180d578fb213c151a3d10593985c8b9601eee905 SHA512 26a0c805f2c49102eee44052814a6f7af67c74082489e70b058bd4350526a65aad1e1352e33b12e1afeae5e9e96fd2eb361fc6a112d38782dee58f95c3e2a13b
 DIST ipmiutil-3.0.8.tar.gz 1695826 BLAKE2B 1a20ecdab438c461519db6c9065aab28c07ac26303c3ace0339b1aceb53da73d05e975fa0b73f543a2d1e6ae908ec291d167b545430b85c9744b7a1252d8850a SHA512 9997dac5bc48231ec5333c86cff669bb6b321940497d9e7397763482960956dcf066f27ad2fdf33f4e42033ae2479d8f1ed37fb096b06f9075ad43709b94950d
+DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
-EBUILD ipmiutil-3.0.7.ebuild 1336 BLAKE2B 591dc4e0d765c7234b76c0641d5f4f2ac0563bdbbcf461fcee1a4fe9f9239b308fe9f9b5bb0ac5c0730adc75c79b983c5d729ad02608baf31d28d057077d0aaa SHA512 4893b8f52d6e3f4502394f39ce7d622575d73c247315c8752aa6924972e98086e6332bf58c3c2797cbd71b5e1fdc2920ddfe2304401d9d822006343f2cc053be
 EBUILD ipmiutil-3.0.8.ebuild 1336 BLAKE2B a64dab4dff49eaa2f5e0bdf22476e88ce7ee3e780b72e5692247e53bf64b83718b3ac1d407fef7d9bfd93f169dcad4f6074bc5ecbf98ab3d128813be920b6e42 SHA512 63e1c498e25e2dd153d840c3a78f7d9b3d74f4a9ccaee1efd728dde314b7c866875133b89d67f39a5589c97c3b7652ab71647a15a30b463dc1f3a4e5fe86d31c
+EBUILD ipmiutil-3.0.9.ebuild 1431 BLAKE2B 80a5a7d78fdc0862346cc3c208110f5e934d2f4361e38fcf5572e90584ed931e24539891994318cd51895aa002e93cb0357cb2b9a9d3c6a661782df87c1be185 SHA512 7a600b99dcc43ea953c5bb37cbb5b313fd13714378a97d4159248f44ed2076e3ba783f6b326309744bbc4c599c09349fadd97a57f406988d0579950cd5265491
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
index 9f90df500d29..ac6d2f9004f7 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.0.7.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="static-libs"
 
 RDEPEND=">=dev-libs/openssl-1:0="
 DEPEND="${RDEPEND}
@@ -52,4 +53,8 @@ src_install() {
 
 	# Init scripts are only for Fedora
 	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
 }
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index be9031beccbe..99e4f294d2e2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,6 +4,7 @@ AUX iproute2-4.12.0-uclibc-ng-add-ipproto_mh.patch 1178 BLAKE2B e00d87fc26faa843
 AUX iproute2-4.14.1-configure-nomagic.patch 7334 BLAKE2B d1a79a653cdaa5907bc93a4283aa1576ec31d3d31a13898c7d923365c1f5068c5a76e52b33bfe2b9a190c273e35fb2125788bbd56ea03b4c01965c029660464b SHA512 0d09bc0a11ec32483a10db7e42a1620087f75063ce8bc24fed30f490eed2ee01d19bd092fb6cd392735c0c9434b13f70d562a469ed3d8a3b51b7fb25ceaf5af6
 AUX iproute2-4.14.1-fix-tc-actions.patch 6665 BLAKE2B e2ff926f2122973bcbe61e16717b8a1c51b6b76a774b6ce03126b7664fc5beb47e4f38672910e822b19aadd5c369d00553b2e6b6c30c012e03ad37b023cac4f7 SHA512 cdde7bb5a0cb49471472a8412758023529976dcafefc6a759ce758fba1b0420c046ca6faf084df81ac11e7153ac820909b1b9ec41c04f643208b9db456cfda28
 AUX iproute2-4.14.1-posix-shell.patch 1841 BLAKE2B ba1ab797c264dc74180b85f842810af120462df3e15523f132b67968f7be0ae68086d9c01f33cc70fb7680ce2229c76960fe7a232ce6bd1069903976c7143349 SHA512 bb4c3c75c25ec551fe006ae15a0e3bc31c1f49861083894d6d51320be52dbac60634951332135b888faf9363857b53695f3cc418029445a4578b5e9233aec4f3
+AUX iproute2-4.16.0-configure-nomagic.patch 5104 BLAKE2B 49c1cb559afe12eccae26f4547bcbcf8a030ee37d1ef287c178f55f01472e3b5f04d14f25834c99d3df25fae06246086197bd11446f1f50970aecc261b595f08 SHA512 b46d7ec009f924cae2d32c16e0f45c49ddb68af70dfa5d1fc0806c2ede85c744261fd1157d8ac4b1b1455604de456e2f68075b838b42265c3bfa88c021752de1
 AUX iproute2-4.2.0-no-ipv6.patch 1336 BLAKE2B bafb155e6bbd902eb0fff7d8875cc4ef7956de0071273dd373ebd09ef46ba23eb22f4226a044585faa2a00c9e4c2854e57e0e06eb1ac735edea9dce2721cadcc SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5
 AUX iproute2-4.5.0-no-iptables.patch 1022 BLAKE2B 5e073c3e78491ae86b137ecbea2362c25c98011121cd7b59b8791227638918ad34c417f1ecd48459ef1901c7ff015463f15e5f8343d46d4b56e5555311e3c8d8 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e
 DIST iproute2-4.10.0.tar.xz 626944 BLAKE2B 8d37ae67785cd4a3110f989b0ac635c1cbdc8258afeba5894b58dfcee49fdd9a4c86d8c1693ee5c5a933ce54396dbfed054dbf7fb4888c08563c36c13c282a65 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b
@@ -12,6 +13,7 @@ DIST iproute2-4.12.0.tar.xz 662424 BLAKE2B 6c6608d4a157e46932834c09e91d6a786a04c
 DIST iproute2-4.13.0.tar.xz 670340 BLAKE2B 379072c0865e8960b46065454e9bdf3a9cb7af45b32a2fff8e89bef8d60e837419bea60df1343b4bb15db624feb3ce4acbe621b4c44405c43fa729e770bb04a3 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a
 DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc
+DIST iproute2-4.16.0.tar.xz 661336 BLAKE2B 4efb08c88a60b1bbbeef807c0731e610032bfb11d022562c1df052d324eb43cb25b9523f49730d22a3f92eb06bd5037c70d8ed0b58276a0cf0854a0f82800b64 SHA512 a8fbc92665a8d4ca6ee1e894bfb27373cf6b16dac9e2ab3831e418fcc9b895acc7d6fc64efa0b0e37b3affd4ef8eacf4dae5715536138d6a05c65ad49a2becad
 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 DIST iproute2-4.5.0.tar.xz 554500 BLAKE2B b64933bd0bf572796705ce2559b1c6cf7faf2f9ac11e1a94a09a428b0039216df8b2ce72a9783e84825a12baaa08526f724d385c6c7e5f6a0d86c3d1662ab822 SHA512 d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860
 DIST iproute2-4.6.0.tar.xz 570960 BLAKE2B e49dc56615490aa7d7cec20830b2866c3e00b08a25ab92bf94d30cc1d7e60e5f10982aa379502a0e5279748c9504e67603f0b947376b6d2991838516b55ef4c9 SHA512 1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f
@@ -23,8 +25,9 @@ EBUILD iproute2-4.11.0.ebuild 3986 BLAKE2B 0103b40fa4c1104421e3fac2d002cb8422498
 EBUILD iproute2-4.12.0.ebuild 4212 BLAKE2B 8b40329be710f3d8461429dd94a5a4d4d29cff3b2bdec2a69870e4b24db9726f81885dac49e9afe3aecbca99d9039077a5553e87f5558c91cfb08ed903adfaca SHA512 d66105200c18892f642ab4c43fe3d72ab8cbfd7b1c212eb2b6d04b2e16f8389a1b5244abed85fbbefe4da90bf2604c57f6a0e13601b268b04609cf31c73da897
 EBUILD iproute2-4.13.0.ebuild 4213 BLAKE2B 4a238544e35502f785f0916ec5bd255787b01fe5368d169d380778a5d514bd39784968073bcfaf2a2a7abaaf14c0fe85ec46f5374b204b46be887f750c823d62 SHA512 9e3d7ac9347a9e92ece5f6d737b688bd76136600264c888e449e0738c53a58de45a3459b1bd94f150bf2147f5232a8fefe571985bc2227f0d29322f8657d1039
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
-EBUILD iproute2-4.14.1-r4.ebuild 4305 BLAKE2B cee940c2a0e309cf9fd0c8d652410cc3acf32bd4abcee04055bde9cbfd38704734b3ca7b9ff92ac6f1ff7dd7b8036ac99221be3a9752bec7adcd5310534e49f8 SHA512 a8c6bdd2c21731bf54da7964aece0be7dd1e78948602f9f2534e1978fa783ad917f40f43eb62084046da1ce0ebaac6c840e7886cdcc44987e5b8225e06c40386
-EBUILD iproute2-4.15.0.ebuild 4244 BLAKE2B e422c120a073b1df1246b316eb3d0bc22c0fe5925059b70b170ac5a45e2ac27b9bea7fceba09a1243598990db1535c09bc20f61a2aa0f17a0532226faa3a7003 SHA512 e8f7250b9a2ecd6b0c80c850599bc61f5f22d434a2699f29d712abc317970780e88e14c013498969723d5457f68493eab55b0f260ed5cfee06631ad29b5de9cc
+EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752
+EBUILD iproute2-4.15.0.ebuild 4214 BLAKE2B 391db4082541f9f23fef2386194590da5dec77a8dfcaf43b0335d0e6a7ae6417a8515ec206ad8557660c33ff7a31ff6b14dff303d6499a5c3576516a870cd6c4 SHA512 a04301fe1dba7903c6043612e5321bd6b231b7913d67973a80abfa228156c9919c8b959248d4f092776603877fc3661001b529f8ca032a0a996ac93425139d75
+EBUILD iproute2-4.16.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
 EBUILD iproute2-4.4.0.ebuild 3874 BLAKE2B 38518bb4f4610a04231e03a0068b0cd232477202c2efeeab9c42883a155707d74535e7398347316bff6d4c7833ebe6893fcac246fc756780febd6e4b61f0a486 SHA512 d21f5f77a404fc3ecd70728c64af64a24080044a4634cb68078699e628120c1cba2c2b508cd34ad92e9202ccdac01596a6e988635b5c1a1e0113815d893a217a
 EBUILD iproute2-4.5.0.ebuild 3887 BLAKE2B 6788057f29e49ba641f790c571035d2a489a238a2821b3b5fe12c0973fa4c2aeef703826379944defe3b9997b889c071ce51f7ffe0ab5eeff68b644ced49faeb SHA512 a5d957f6660e3d1444a46511f8040f0bc7eb7a489a087e49e90a4e1d356f5346cb39a5dfdc98411d5e3eb1d6aca9e6d88f815ea133d501e5a640e099ef8e9ecc
 EBUILD iproute2-4.6.0.ebuild 3997 BLAKE2B 4f2a0cf508475c2763b08f8cbe865d8dee51fadacffd070625a54e8419784706ca64918462284be1e9a641e4fbcef27e54bed13cdb91927ce7bac63132520ad2 SHA512 7e90c8bc70a9f3cf477389aa881d58f7e16a8d0a73dce93d0e5aa33d977c549715e0ae86583292bfe2797ef7792ed0ddad6b2bfb7a68d940bc4240313c565617
diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
new file mode 100644
index 000000000000..01a1fe2d812f
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
@@ -0,0 +1,191 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libelf & libmnl based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
+
+--- iproute2-4.16.0/bridge/Makefile
++++ iproute2-4.16.0/bridge/Makefile
+@@ -2,6 +2,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+--- iproute2-4.16.0/config.include
++++ iproute2-4.16.0/config.include
+@@ -0,0 +1,22 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+--- iproute2-4.16.0/configure
++++ iproute2-4.16.0/configure
+@@ -212,7 +212,7 @@
+     then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -257,8 +257,8 @@
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -272,8 +272,8 @@
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -286,8 +286,8 @@
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -426,7 +426,3 @@
+ 
+ echo -n "libcap support: "
+ check_cap
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
+--- iproute2-4.16.0/devlink/Makefile
++++ iproute2-4.16.0/devlink/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-4.16.0/genl/Makefile
++++ iproute2-4.16.0/genl/Makefile
+@@ -2,6 +2,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+--- iproute2-4.16.0/ip/Makefile
++++ iproute2-4.16.0/ip/Makefile
+@@ -15,6 +15,7 @@
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+--- iproute2-4.16.0/lib/Makefile
++++ iproute2-4.16.0/lib/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+--- iproute2-4.16.0/misc/Makefile
++++ iproute2-4.16.0/misc/Makefile
+@@ -5,6 +5,7 @@
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+--- iproute2-4.16.0/netem/Makefile
++++ iproute2-4.16.0/netem/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+--- iproute2-4.16.0/rdma/Makefile
++++ iproute2-4.16.0/rdma/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
+--- iproute2-4.16.0/tc/Makefile
++++ iproute2-4.16.0/tc/Makefile
+@@ -4,6 +4,7 @@
+        emp_ematch.yacc.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+--- iproute2-4.16.0/tipc/Makefile
++++ iproute2-4.16.0/tipc/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: GPL-2.0
+ include ../config.mk
++include ../config.include
+ 
+ TARGETS :=
+ 
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
index c9c21b326b4e..834e23c06287 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
@@ -61,7 +61,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 
diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
index 15efa9acf6c9..34856824f571 100644
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
@@ -60,7 +60,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 
diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.16.0.ebuild
new file mode 100644
index 000000000000..7d284f1e5446
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.16.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 5d2d46b7c02c..64bd9a9200b5 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,10 +1,6 @@
 AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
-DIST pcsc-lite-1.8.20.tar.bz2 745049 BLAKE2B 211b463c63b25f1dab629e8c32ccc6f19f28baf7b62029610dc9c2163ba2392f9ffa3d17671ae93c35e0ae3768a82ed5a5f245b8d3ea5f4c46013a07896a00b5 SHA512 63fea660d71605ebced5600a59ab5b6a735c4ba3697faf7658d91b8e281a7fb2a2bca6831c8f8c8c87b87a54f7fd03ae818a4c496dcbac0afce523e3b6c606b8
-DIST pcsc-lite-1.8.21.tar.bz2 750879 BLAKE2B dc12fbef1e91a649c1df77603788f3b8eb9f4d3a38f40d54c8d5ea16135312f48d92c4d5706b667ac0db5491467881a8b557a9c56bb14b168c28d06e6e731642 SHA512 bd3740f4444d2201efaa34a312d2a5f6b5808b0b7ff1d5696dce26df67ef198a63a96670d0acac97a6e693b33079afeeeaa6692746875b0ff72d69a2b0835990
 DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
-EBUILD pcsc-lite-1.8.20.ebuild 3193 BLAKE2B f161086df19a7db4f0a579ce56cef95b57c32b18691dbf3388b38caf9ee3f428060faa2c14a2e5240728c0657c58a64a395f1515d8a4bfd8f1f43a91dda68deb SHA512 172634822b9c74bdfc515135b15d883566692f1ecab16f0c93a0b8eccc254d9c38d87b8b7d3647d0d60085cf39952753a442d1993f08f7e72a8c5d83e30358ca
-EBUILD pcsc-lite-1.8.21.ebuild 3218 BLAKE2B 1b14333382b36968d0c30e95c0e320038824e40a104d0262077e737171bdfae55499709004d4f03a1cb8ba8521d9e1adf43522a0d066a008fccd45631b5e182e SHA512 e971f52ae70d2b66e237ab17e1cc5c8b6d9ec2ab1922a7ceb9b5cc125889eaa9dd4a3592feac0d02d43355d6954546cc8efaa567b3e22de908b044e73ec43476
-EBUILD pcsc-lite-1.8.22.ebuild 3218 BLAKE2B 6c36cc80cd6547cfc641480d4db6fb62fc9ce3c5f9ff3c529fb6ca21eb13226bbf603b96f61202f7a03642000d707d2b3d093ac7fc89339a1faacc2b914d3a47 SHA512 683bb1ee27ab8b38eb14a9266cb01d52df29cfd7b1698c8141fd5515e5e9ed064cb3655aaca0df9546100f60e28d54afee1a79eaae85599430de76e576b941db
+EBUILD pcsc-lite-1.8.22.ebuild 3217 BLAKE2B 72cc7aa8bccaaecfc09b19cd79a623a56d7c4352d827e0405a07978df48eb8a1f28e9792db66fe312701f613520bc3ae414b9ffe520ac208342b6822d2a70035 SHA512 0b7ab64205791b089d2bf0cca6671fbcfd6743fcf7f2276170712692ce9c21eeb5c11d51044c15ae2b21a17909542ca8a0f6e2d9bbca887965399ffab61cde06
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
deleted file mode 100644
index 435f3790d8a0..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.20.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.alioth.debian.org/"
-
-STUPID_NUM="4203"
-MY_P="${PN}-${PV/_/-}"
-SRC_URI="https://alioth.debian.org/download.php/file/${STUPID_NUM}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="python libusb policykit selinux +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) \
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild
deleted file mode 100644
index 582b0f6a87fd..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.21.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-single-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.alioth.debian.org/"
-
-STUPID_NUM="4216"
-MY_P="${PN}-${PV/_/-}"
-SRC_URI="https://alioth.debian.org/download.php/file/${STUPID_NUM}/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="python libusb policykit selinux +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) \
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog ""
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog ""
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog ""
-	if use udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index a86d7bfce15b..14f6de001e56 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 705832300195..69d97bbdd122 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,6 +6,7 @@ DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89
 DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9c5211e9cafd4f1a35de1d77e655d99df0ceb352fd431a8cefd40c733064422d8f41099edf7263aa36ef8cfd2ba8 SHA512 fca250d4afc1819a27b67daff770132ed4e88fb067038992a6b3f8aac63604536366ea628dd30c24f93db19ae55e88da372598ccc489bcf445038dfe860ce0ec
 DIST portage-2.3.26.tar.bz2 970245 BLAKE2B b854bef894327b9e4beabca55d70368d326548d96efdc5b63e47f77971da195d041c8e8412bbb308ef6922be02964727c99f9dcc92a2a4b0a7372e0a1c774ffe SHA512 5acb8a00fdbc72a8c3e79f8b1c2ba17c9b469205edf1e56592db9ccfeb54b4dc83a98548ff0e01c408456a1c962262377967f6d70510c8d1b0e7ab15eab51079
 DIST portage-2.3.27.tar.bz2 970480 BLAKE2B dc46362773544102d9a07e686759d454a37177e9ac6e88d664c1aeb1676b9fb4e12662500f1de63644ad5eaf69d58bf85f38339c18d695cdc42930746dedb731 SHA512 791c87ffe958e883fe16562e69e606dd7ff860c13b2262b3eaa665f78acacdcb547c5e124b69d2c0faa36147fdc7c1d60669dee43b7401ea4f89784a619f81fe
+DIST portage-2.3.28.tar.bz2 975684 BLAKE2B 70f944700bba66e369877ffdb76c829d6521d429c65ded482482058639478c1c6e27366cb509252e59a4c3d2d295211f4efc2cecd84f7790674429a42a399a72 SHA512 208237faeee844bca829adc42b0407c246e09e91d5c5850c27696eb201f1009a87dce0b28cbbca4a27f2c9d58c0c102387a41483c976642acade83679a980777
 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.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
@@ -14,6 +15,7 @@ EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba
 EBUILD portage-2.3.24-r1.ebuild 9270 BLAKE2B 56129755048817a6651fae7f243cbc89a17959c59371fb337542840ec3ca4543c1e5ad35143b0564f01ecc818b7a63748749426be91c002c8406d9f2eb78cc36 SHA512 efab90e8139a141d6d5466a2d9d67181d7dfe923bc0be3bc735b3107369b8a20485ad0ed3faef1c4ff105e5dadd0dd55533bcc251cf833222102fc46ed74b1d6
 EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.27.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
+EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.28.ebuild b/sys-apps/portage/portage-2.3.28.ebuild
new file mode 100644
index 000000000000..376030121e07
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.28.ebuild
@@ -0,0 +1,284 @@
+# 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
+			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/rename/Manifest b/sys-apps/rename/Manifest
index cb6598135c87..4c818651899b 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -3,6 +3,6 @@ AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789e
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
 EBUILD rename-1.3-r1.ebuild 909 BLAKE2B f19745cd4b9de20bd1cb205c85931fba29c41cf8045acb6891769bb2a723bb0a2cd96e0ed96ebe5c77ef31ba6265716ec47b5c567b96c2b77f48c37309b6f45d SHA512 cf894e062fb1d57cd665a688e89dcc9c8d18e67c1eea970137399e9926d43dc61731b48acd930cb9f0f54979fc0ccb52c4a55839bb861dfe83f793bc6529e3a7
-EBUILD rename-1.3-r2.ebuild 906 BLAKE2B ed478e747f691e5d0798ec47f45737eb9c59314f1c51459c9823c783c4c09ba0f7ef3c7d6c6da2d65511f2a5052e02ca2d783d168a973ba0f71ecb098c9c09fd SHA512 1825425420baa2c06613f6a4dd96e5afb239cba53713747f97d4e1374634718707a22b004fc4e755dac642953713562e4b2e78a94c06d94b611fe6d30f5d36b4
+EBUILD rename-1.3-r2.ebuild 905 BLAKE2B 276d71be1ab6b177e5e662c4106bd33a671580394a131b15a42d06fb37aedf1ea910c52e7a6d9a20e87aea79377ba780e58a3be130f89b93e5fbb536344270cf SHA512 e2024c90996ee49fd1aaa88969eaefe66cbd5c886c554e6d6fd2b78f5ae0a2c8e1fe7d178333e08a6c45b9f51c272e9a3cdd960e0dcea6236a147922c39db63f
 EBUILD rename-1.3.ebuild 901 BLAKE2B eae1572c51512e69f94795274c6502b57fa620f9eb91f85ff7eed79180021150e31278b53f4591d42ca6e2c23d0e45757401db8d11c345c6b1223f9921461c99 SHA512 494884b7cd285c34c5ae6139b3c93a3a6e42051a9431be5437a46d06ecc4ab9605f2752e6003f10c9103859edfa2e89d8bdc8266862b485ce890f608f1b6e269
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index e967a98b15ca..d988da6c61ad 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 MY_PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index a3e70f6c664b..181361ea3e37 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -7,5 +7,5 @@ AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2ad
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
 EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
-EBUILD setserial-2.17-r5.ebuild 953 BLAKE2B 3569844ad98c0328f5abc706a1dc0d82d8431edfe722a6fb669f7c62495c0fefa119e358e62cfb44dc2cb284922c3e5fc4d7fbeb884f368714c2b0e5f618c8cc SHA512 b5254d0875bdd96edf5e2d78ce16ba36d0d86a41017308b97ae84878429b8d6b7eb80c2b45661cec9f92c0ef4a16383808bb71bc3527a924000e97339521b92f
+EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 9c7e25be14ed48bd3d042ace168a77b8e4bfe23af77824251d5a98c88a4d8f1e040ec1dce3a7c2c3057f3d41434a834d3b539b1f54323f5d1ddb6ebaa588e75a SHA512 b8cc99e72717f21ce08a955faa8007484c5d274e63b3c1975dcea20cb68b25175babcbc8dfc1fb85188721c0777512074257acb8f48e47b9a2c80d427f854776
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 43a3b2c5102d..a5f8ca032da4 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sydbox/Manifest b/sys-apps/sydbox/Manifest
index 6b4f10eae2f6..5b7519a0291b 100644
--- a/sys-apps/sydbox/Manifest
+++ b/sys-apps/sydbox/Manifest
@@ -1,3 +1,3 @@
 DIST sydbox-1.0.7.tar.bz2 480350 BLAKE2B d0e079148c997d6d452017a374d7795a79a8519cdf2c2f5f6f30c9fe4bd3cc8a579881de7bd1611615f18a8fc0bbd88e519cfbabc8e0e05009705a41ab6822f5 SHA512 b14d0cc6929aa705380dc2710e772054e07ca52c2990a71cac42d1111c90baf22253e168e1fe20eaf94ccde4d1ea1a3c1c26e4b9dd292f20a1028dc78a4e80d5
-EBUILD sydbox-1.0.7.ebuild 638 BLAKE2B 8c7936bbeaec2835aaa57256e158ef910a705c9607ac8a30445c0a69becfa751d7707dfdae75e515eae8b8ee4793e05f37eeafca9eb40703f26a45c84c83ad80 SHA512 60e9eea0b2e7975528a2f5740e76622a14e09f73524a76f809450f54de16f3080c28257b38661a9e7ecdb4da0d64176fb55d8cef528f17eec472db55aa439dfa
+EBUILD sydbox-1.0.7.ebuild 662 BLAKE2B 9bdc3dd77f3018e06889836325df7fc14dd156a91a0b2dabfcd3eb002135dbe439364466318f63f5bbe331d8eacd92a558f7aae50c202e8664cc230cb104f6eb SHA512 4b39dc76375cc8dbca4c7c5a2a60a921fa5fa21df4712462e17dd4ce31939ca6eef50519ee18356bbc49cf8673c0453f11fd0962a3d06c1e23c439f498ed8305
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/sydbox/sydbox-1.0.7.ebuild b/sys-apps/sydbox/sydbox-1.0.7.ebuild
index 660422f3a516..951a50fa3a49 100644
--- a/sys-apps/sydbox/sydbox-1.0.7.ebuild
+++ b/sys-apps/sydbox/sydbox-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="debug seccomp test"
 RDEPEND="sys-libs/pinktrace:=
 	debug? ( sys-libs/libunwind:= )"
 DEPEND="${RDEPEND}
-	test? ( app-portage/unsandbox )"
+	test? ( !<sys-apps/sandbox-2.13 )"
 
 src_configure() {
 	local myconf=(
@@ -27,6 +27,9 @@ src_configure() {
 }
 
 src_test() {
-	# two sandboxes are never a good idea ;-)
-	unsandbox emake check
+	# unload the Gentoo sandbox
+	local -x SANDBOX_ON=0
+	local -x LD_PRELOAD=
+
+	emake check
 }
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fe8770a04c7f..d4778aa44920 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,10 +3,8 @@ AUX 238-0002-core-do-not-free-heap-allocated-strings-8391.patch 1664 BLAKE2B 6a3
 AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688 BLAKE2B 19faeab810419669a6743ebc6a3051b2f5060f6de793a3f7c9c21fce26d395dcad95f6b8aee58fe133d11e2b02e8847d1df4cde30a5dc237f615a8656f823f30 SHA512 075f7d6f20f33f5e0b07ae993853e969e0d54d0a0683302ab1ab7c4047185397f39aaa894cbe4104e75ae65f8944fb5af47e9f8adb1e66c28b152c6d6e863eff
 AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62
 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a
-AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
-AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
@@ -17,5 +15,5 @@ DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b
 EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6
 EBUILD systemd-238-r2.ebuild 13272 BLAKE2B 1f24a5fb90f29640fd52b1c37d67180c733a5fea1a66ae855daaee797b9458bbf42db3fe915b10e0fd90ebfcbfe9cb415fec7d6d4c83cc529e284725b3463cc7 SHA512 537f5053ce876c4b57677768e249be492e1f8b238d96230ddca780ca1ca3785aeda5b61a805703f3efffa7c8e08196fb3022334d2efbb407178440cfae96b451
 EBUILD systemd-238-r3.ebuild 13136 BLAKE2B 6b020f91bd932475f372a372fbc1a20975117dd62ee170252b5056b518a2cfa19a7f8182716c64a63c807de82abaaea2bb8a7aba887fd08f207296eaf497f17c SHA512 866e86d1fb97c0f97a7738374633ba8300e287860554d08702f578a7f516505672f638fdd929757425350a2579670d103ab0ec64f2c3246abde25d1c2e6c468b
-EBUILD systemd-9999.ebuild 13051 BLAKE2B a90c984afbc9222285c81c878d3dfdf14e17a11492837a54aeea0ea2ba2398b98964fe828368d06db02b9333886909fdaf0fb094966f8e1fc65129ef2092ad34 SHA512 972ec90323cf00581e6cd72fd7b4c7b103f1f922359b0990531fb419a855a319de33bdcaf3283ce7e0831199e9fc4ee1fa1fe2b9eb0308b55e1b4f4cf91eec1b
-MISC metadata.xml 1956 BLAKE2B fa955e0f048412ba4b8784a858dde7ec6ba7d0a84897b018f611f6bee0b71db2bcf570873f8e32edada2e126a3cc89d70c3aba00f2f87a2b83508529ecae6618 SHA512 4b4e0a447070c9bf14957b82085ef7c479ddee3d848f8f9a37df791a83344829351e3fbfddc61d35ecf3e9fe0d86e6059d89a3a7d1e50837028b72b2c36a448c
+EBUILD systemd-9999.ebuild 13186 BLAKE2B 8de75e0c231da02f48ac6a886abc6014ede50b1761ad65e6fcdd3ade2f2cb38bef73bfd4b49f1e35f9b651057b18be886e39ce7d9c09ddbcaea52b7456ff84a4 SHA512 7d2d65b6c37479ebf5997540a35b39125fbb2a050021090c588acd1a38a3b1b09822c59887883b2cdffd518c5a3d4f980193fad23ac5baa6beb736317ea2fbda
+MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch
deleted file mode 100644
index 08e5e37514ce..000000000000
--- a/sys-apps/systemd/files/CVE-2017-15908.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 25 Oct 2017 11:19:19 +0200
-Subject: [PATCH] resolved: fix loop on packets with pseudo dns types
-
-Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.
-
-https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351
----
- src/resolve/resolved-dns-packet.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index e2f227bfc..35f4d0689 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
- 
-                 found = true;
- 
--                while (bitmask) {
-+                for (; bitmask; bit++, bitmask >>= 1)
-                         if (bitmap[i] & bitmask) {
-                                 uint16_t n;
- 
-@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
-                                 if (r < 0)
-                                         return r;
-                         }
--
--                        bit++;
--                        bitmask >>= 1;
--                }
-         }
- 
-         if (!found)
--- 
-2.15.0.rc2
-
diff --git a/sys-apps/systemd/files/gentoo-noclean-tmp.patch b/sys-apps/systemd/files/gentoo-noclean-tmp.patch
deleted file mode 100644
index 769aa04ccf6e..000000000000
--- a/sys-apps/systemd/files/gentoo-noclean-tmp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Sep 2015 10:26:18 -0400
-Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp
-
-Bug: https://bugs.gentoo.org/490676
----
- tmpfiles.d/tmp.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
-index 6bbd1aa..a361062 100644
---- a/tmpfiles.d/tmp.conf
-+++ b/tmpfiles.d/tmp.conf
-@@ -8,8 +8,8 @@
- # See tmpfiles.d(5) for details
- 
- # Clear tmp directories separately, to make them easier to override
--q /tmp 1777 root root 10d
--q /var/tmp 1777 root root 30d
-+q /tmp 1777 root root
-+q /var/tmp 1777 root root
- 
- # Exclude namespace mountpoints created with PrivateTmp=yes
- x /tmp/systemd-private-%b-*
--- 
-2.4.10
-
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index d2004bef1076..cdc951205cdc 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="nat">Enable support for network address translation in networkd</flag>
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
+		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
 		<flag name="usrmerge">Enable /usr merge (experimental)</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 560fc8c4f150..a57c2ffe12cf 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -68,6 +68,7 @@ RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? ( !sys-apps/sysvinit )
 	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
 	!build? ( || (
 		sys-apps/util-linux[kill(-)]
 		sys-process/procps[kill(+)]
@@ -298,14 +299,19 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	local rootprefix=$(usex usrmerge /usr '')
+
 	# meson doesn't know about docdir
 	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
 
 	einstalldocs
 	dodoc "${FILESDIR}"/nsswitch.conf
 
+	if ! use resolvconf; then
+		rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
+	fi
+
 	if ! use sysv-utils; then
-		local rootprefix=$(usex usrmerge /usr '')
 		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
 		rmdir "${ED%/}${rootprefix}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die