gentoo resync : 07.07.2018

36 files changed, 723 insertions, 84 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9451ee6d299e..9fe6ef80e6a6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 96e7050e8cd2..9f08807aebc8 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,8 +16,10 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
 DIST busybox-1.28.4.tar.bz2 2263342 BLAKE2B f35c81e67136d888a998f41b1418589e4bddaacde25d55eb509822a13ab93d351dcda6b147794a47e3c3c5c4141e9d8cc834ed239e0afba176f08bf3cb55b911 SHA512 92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed
+DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
 EBUILD busybox-1.28.0.ebuild 9290 BLAKE2B bb09b1b547fcdefed76ef91c549a4865a807707376f8d100f97585661b4d57a25b628cd62d572b509495be61b787cdc40192ec11152979318a4e78a7a93497f8 SHA512 9b59a7ae3585432c9ac89eedd0fbcfdd9782f429d171eca6c8856a6181f4976a2733b4128e02b9fb3b81cf69582483bb1eecc4184f23679236c437df3a3be8ff
 EBUILD busybox-1.28.3.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-1.28.4.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
+EBUILD busybox-1.29.0.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 EBUILD busybox-9999.ebuild 9307 BLAKE2B 00e319049af8efa963c92a360e5156e0e760af0489973ba555401167dbfdfaa2a5e3ee98af2f794b2816caa0bef464675a4289a9efe93ffdd57cadd8a0aedef6 SHA512 4a5263ad0d1ad16655f15a99cd6da391a168de8ef1066028b37940cea0d7ab045fb6c80c436e7e2f6523aeccbec6536bdec7c2b15103625c1833d9b7d12d39ed
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.29.0.ebuild b/sys-apps/busybox/busybox-1.29.0.ebuild
new file mode 100644
index 000000000000..ea0b4ce81fb0
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.29.0.ebuild
@@ -0,0 +1,329 @@
+# 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=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 5767a505befc..28421517cba8 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -3,7 +3,9 @@ DIST coreutils-8.28-patches-1.1.tar.xz 7336 BLAKE2B 9cd5db3e1d5545da5cb38f919ae5
 DIST coreutils-8.28.tar.xz 5252336 BLAKE2B 30e3c05311834b19a941ddaa6a405cb0033b0e3518211dd0d33e9a1aa91c60f4d597fca9419b467ade2b54e3bf81ba5149cebfc93a02fa1e546c1b0f71ee91c9 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1
 DIST coreutils-8.29-patches-1.0.tar.xz 5772 BLAKE2B 8f05185404d527ad524684231f0b8bef3b65e7752527b6bf55371f474035b8a92cdcaa8349a321784d14c6700a0d49e9d10ee2e3a96b78e8f6423ee8c5b9ec02 SHA512 0f7db6744a6a6bad8d582bb2d32e1a0ad0ab5f48a53b54c371d27494967832ddec2570e45dbf7e66c7091496bcecd66aab21644f603d2c8878a87f51a1a9b1a2
 DIST coreutils-8.29.tar.xz 5286588 BLAKE2B cbb66d9054bdd2db5b9a6010876484b16d178f8f4d935836b1e42830178647fac4e0a75052a6e7e2fbc50e74e4e7ff6f8da43f1137b96d0c2d027c4ebac28a98 SHA512 546bbcd5741beae7a68e7c4ca14d6d634f7c8be87feecdeddd00e226f4865bb89d503437c3a95622ba7bb0cb70addbb5bdf3767fa18d0b7410ab90ee53b29dfd
+DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
+DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 EBUILD coreutils-8.28-r1.ebuild 6513 BLAKE2B 7202dde224d53d23d69d07b6f0db38eb52c17bc9cdfbe32e6e223bcf2e5823b81e819794f4088bfbb7ba7e060750a68d5c33156ebb4da010ffa947b25cca0528 SHA512 79fc8c2d6fc9e1c97317a8470166ee7fbf3e03a58ffcfbde3b7fdc172c571299bdd484f91039d79c3d1a0a2b1dc4113c8ec6d40c884fa52f469c8b68713f53ed
 EBUILD coreutils-8.29-r1.ebuild 6176 BLAKE2B 7401f3562c128eba7dece52d55464e345b782cbbb5d033a5c1321ba3a2485ab48f01e26a3f5eadf0614607949bf0f1aee34c83303f2ad442a2e4b618569323ac SHA512 d6e571fbf22f285d230c128fcc5d583070d7c9d5464ddf8a1198cbd1bdbd79b8394c229d045ce5a5d0ef042d5e26da0d9f60590df7d7ff6ec86b791268c812d1
-EBUILD coreutils-8.29.ebuild 6063 BLAKE2B 3582ae6e941fa7d6dc47729939ebec016d6d682d616069cac70c58dc34ecf13820820191be18c353f0fc4d86bb6af7becd888024fa5cf21c718c005c26bebd90 SHA512 095b2958618e972ae9f6d04f7868acc97996a3fbd8bede850d6f215d392736cfe046ee5afb99919e10f34b1dfbcbdd501ef37880f9d6ab0a697d68e342231196
+EBUILD coreutils-8.30.ebuild 6171 BLAKE2B d695f8f24e64e3c35ac6ef58143c31598b1877a05abeaebafa733962804e7bcd2b6cd301bcd22a8043d80085f75b4098b2d00d56e7f2508f79737d56c8655c84 SHA512 b25eba145100bbf5f4963c93706ca09318a2ac0654fa57a5aaabcc1f3dfbe537527c639c9da7ee7e74f26592fe75d7e123065cea0904f98648e0dfbd24366f4e
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.29.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 92f88849d772..417a9b7195a1 100644
--- a/sys-apps/coreutils/coreutils-8.29.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.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"
@@ -7,17 +7,17 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
-PATCH_VER="1.0"
+PATCH_VER="01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCH_VER}.tar.xz"
+	https://dev.gentoo.org/~polynomial-c/dist/${P}-patches-${PATCH_VER}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux static test userland_BSD vanilla xattr"
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 
 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
 	caps? ( sys-libs/libcap )
@@ -89,7 +89,7 @@ src_configure() {
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
 		--enable-largefile
-		$(use caps || echo --disable-libcap)
+		$(usex caps '' --disable-libcap)
 		$(use_enable nls)
 		$(use_enable acl)
 		$(use_enable multicall single-binary)
@@ -163,18 +163,23 @@ src_install() {
 		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
 		           mkdir mknod mv pwd rm rmdir stty sync true uname"
 		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use hostname; then
+			mv hostname ../../bin/ || die
+		fi
 		if use kill; then
 			mv kill ../../bin/ || die
 		fi
-		# move critical binaries into /bin (common scripts)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
+		if use split-usr ; then
+			# move critical binaries into /bin (common scripts)
+			local com="basename chroot cut dir dirname du env expr head mkfifo
+			           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+			mv ${com} ../../bin/ || die "could not move common bins"
+			# create a symlink for uname in /usr/bin/ since autotools require it
+			local x
+			for x in ${com} uname ; do
+				dosym ../../bin/${x} /usr/bin/${x}
+			done
+		fi
 	else
 		# For now, drop the man pages, collides with the ones of the system.
 		rm -rf "${ED%/}"/usr/share/man
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index fd273698d77e..989475de5efb 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,3 +1,3 @@
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 EBUILD dstat-0.7.3.ebuild 797 BLAKE2B 9846a833e6b416f09446c324141ec27cbfc7111cac5a2e45cb7b5bf15f99ea758b726a0b23d0622800f935735fefff49bc64daef79d567bea952625d4129c828 SHA512 cba3abfed39aac4d2d7fc02feef57f95f768d3c3d23ed0ee3a183a2ba9ca7299e67a3faa588ff429c53849c52610510e9a9c2ccaeb43482960e8b64c8219bdb7
-MISC metadata.xml 832 BLAKE2B 9e08d3bf228c3e0e47534e6518282d5d0bc153921d92de95bb153515544e4adbe4f58d8cbddffa04b3b7175e58d653665fe3799f93c12397f3de3f00b8c31ace SHA512 ef01b0db1825319610196c1e51ba115bd0160b5aaa056ad75a4829e4d068a8e6ffc071ada94e03a81d315d5d9597a502761ee4041848ffc135b980b41486017c
+MISC metadata.xml 750 BLAKE2B d9ff390a9b80fa81887a4f4dea5aa925df36249c298add72c420e277bb7cb69b6cecc4c046dd714d2b0e3a3f7eb3a1d7b103c98c688f329099ee0af68151d60c SHA512 49b359fc5fc453c8d6e1246fb74d2dfbcef34b1a427c95db0aab7b736878c87f08548d7418f4ed8658c1bfb5dd8966bff840c1e4a7c0f081be9856c68e35c612
diff --git a/sys-apps/dstat/metadata.xml b/sys-apps/dstat/metadata.xml
index 88b554a0aae1..4fb9befed7d8 100644
--- a/sys-apps/dstat/metadata.xml
+++ b/sys-apps/dstat/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wschlich@gentoo.org</email>
-		<name>Wolfram Schlich</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Dstat is a versatile replacement for vmstat, iostat and ifstat. Dstat overcomes
 some of the limitations and adds some extra features.
@@ -21,3 +18,4 @@ same interval).
 		<remote-id type="github">dagwieers/dstat</remote-id>
 	</upstream>
 </pkgmetadata>
+
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 54c05b05f480..41227d619ae1 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,5 @@
 DIST fakechroot_2.17.2.orig.tar.gz 463307 BLAKE2B c13e0bb649dc4ecafed1d1f7aa487659631bfae94b2fdc91aee8b23910954e46a74ba6f3d50107a9a282b9e7cb21bf4edb372257adaf157f43c4055738ddce49 SHA512 bcdcf8e77aae46b567acddb80e6817a118c7ef250ba7b6962982e60a6a5e3b8c1eeef950dc33335f31466c3f53ab6b7260bc64a1da9c4b156a44d811ef8cccd0
 DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 EBUILD fakechroot-2.17.2.ebuild 586 BLAKE2B a19038407cd5be5f4facb1dadc4543a6d1bb19b30e1e003d20603eeb154db97caccb1633be9b564ce887ebf8131d686d6182f353e07be82c1d3419f5e00031a6 SHA512 b2fcfa6605167ffc457c273ab13aad743d7a92b51e7444ef9edc4744692b97bb608dc2529c73cc5441d6d458cbbf5ffe7ad843e1396c0b02a21fd142c737e296
-EBUILD fakechroot-2.19.ebuild 600 BLAKE2B 179d2856ab8c47c96d9e631687d93b2b3f9faaff2f909d0bd3e85cc83f461e585e8e706f575079af351a8fac0ca4d37f5c9741ac70408314a8224ec56da44502 SHA512 6aa29b0cd72f33de0a5b602bd953eff30be823a11c28dd1bbf3fe100944407da729a5a0f520dc55546a868a3b7d50f881827dcd116878c3058f37a6df1303b50
+EBUILD fakechroot-2.19.ebuild 599 BLAKE2B 12bc33935ffc710c2a3ff21414902b7c71961489048aeff95d8aa8c53c7d90c8c8beb9c0c41d0331e51593e2f64e1b7b9db5e6dcdd25b9110a5f704cded171a3 SHA512 8e354f5b49a9648fe5f9655745805685a82c776d97217c743c7b6014b810be323d9b4525e044761dc9fe0fd83a6d08e4f88b3fde288b9816a1265bb3b6628a1a
 MISC metadata.xml 345 BLAKE2B 3471b0985dec02f4065149b788a8edb64d5a90741719c02bb4c87dffc27ee6f61f4d231df83e716382f36d2220e7cb7a4797cd3960db955761ee4852c76b80e6 SHA512 940ab52cf3ad5ef13f24f093fcc41e4c39dc9cd484eaf0dc0bb0d29306cbab474044cc72898ddaf49604a63032d7a089e2f308c9ea94e79c6a16c27970aba08c
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 7bbdde0ffba7..8126e0b444bd 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 6a7218851f12..2ed433eaddf5 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -1,7 +1,7 @@
 AUX fakeroot-1.19-no-acl_h.patch 915 BLAKE2B 2392343f314e5cc3fa49def14a245cf2898902d99ff2fbe4bc0a883e70ae1382ed5c4c506533545b9c428958f8e4be54e795601063d48dd8ffe9e80d56ec267a SHA512 d077e8ba2bc4407ba1a57fb5920f2a866bdcb13fa359c2245e479019bbc19a3aab398cc25220079edf7c42c4d09429e57326b606ff5795f83de24c7a31835717
 AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d72497145bcb8e5e1b2acf43608dd03f1a2b9ee688fda8859491d79c898e6f412eded6a5c8a24734640e2479eda95319a265 SHA512 824e71169877702c5d98970d62866d5074d1a728d5bc52460483117610f50f6869f65714608313f20e40b7432ea4c50cf9f47158d8f2f9ef4a3c00220ccbd52c
-DIST fakeroot_1.20.2.orig.tar.bz2 326910 BLAKE2B 813fce6416a375de7dce0581a2a7398f023e5e5d6b981d6dd973e9e29380b5908e0bb9e1e84db3b20638933817ed85a8f7d341b369631881905aab9ca4cf2119 SHA512 1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
-EBUILD fakeroot-1.20.2-r1.ebuild 1008 BLAKE2B 75a46f53e7c9c02acff4f84cc7c1a439e3821df80d23714282e3f1ea9d106424083b705c4d96481874631059c6c4022e9d924ed0b73881f60513a93a9bd8c712 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e
+DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 EBUILD fakeroot-1.22.ebuild 1041 BLAKE2B b64d63b8148a5f39cad405c35d57d04f561be22a1c1215228fd78450140e274c5de1ac260f82e246147f8866c8c49708abc45f9942fe44e3016ebf67aac10862 SHA512 2abe6975c02acf769651759fb2892dd681ba2985ac6391f5e85bca84d699c92979ab50011ca0ce20e8ca690ec20bae6e999cfe1fa375817045ec7a0171ac1550
+EBUILD fakeroot-1.23.ebuild 1050 BLAKE2B bd2880d451c7d4f66c78ab41a0f019831ede057bb80900816a3f4cc76e2b47634a26477f62ce4549da9a4274eb5513d09ff4b7aa1d5288a7c39800edc490a89c SHA512 7a3f007f8073bff4679678320f07baf00f3c73dcec844ac722d960962b9a579fe6f4857495a2af3c57fffa40443f58b5b644a941d82f374d17ca6e7ad733d1e0
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild b/sys-apps/fakeroot/fakeroot-1.23.ebuild
index 79faa7e78dee..91ad0aff45d0 100644
--- a/sys-apps/fakeroot/fakeroot-1.20.2-r1.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.23.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
 HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 
 DEPEND="
@@ -23,7 +23,7 @@ DOCS="AUTHORS BUGS DEBUG README doc/README.saving"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.19-no-acl_h.patch
-	"${FILESDIR}"/${P}-glibc-2.24.patch
+	"${FILESDIR}"/${PN}-1.20.2-glibc-2.24.patch
 )
 
 src_prepare() {
@@ -41,5 +41,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 }
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index af17edb78a3e..5d30c8473172 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -6,7 +6,7 @@ DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b6
 EBUILD flashrom-0.9.6.1.ebuild 2702 BLAKE2B e09bdc5eefbb5ede081353387f4f28d5de54a1298e867053774a883fdbd5a4cdd3df7dcc461a1806911c0ff74f84ee086130d0c1c9e250e01ff39c725635f62e SHA512 5488a0f73d3545182fd1e240add89304044aa511db26cb1799a4f99112c55902a70a1fdf79f12d1bb5713b18d5f1a4bdf1136b5c18d381cffe7430cf5dc80020
 EBUILD flashrom-0.9.7.ebuild 3394 BLAKE2B f95bbed798bb7a86c962c32cf2b09b47474415fb141d72c13d6045b955153d8a50e0f29834f641bc674f7349796167d0a9be9fae7dad2c9758ec79df14f8f816 SHA512 6435c267b8664b7cdfe9a8fedea13ff4e5756e107ed40643b16c404f6c46bff4c6f679cc02154d29157ff45c2fa3930d9fe742c258bf29de502ed8c090f92ea9
 EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb94250047d8cc360402af983f6dd4ad8de5a0c285fccce776c301fd659e5e3dd49d36fa9f550726ea631f7ea7c71a5 SHA512 2fa5038683700dbe446a386f93c37afcb6f089396b4f6e17526de58ca840cb3c908808335988a6d84ebe44868d92d47dfba6bcc7b62a0cfc1ba8568f4258770f
-EBUILD flashrom-0.9.9.ebuild 4247 BLAKE2B 14c4b35866d6f45924b20f625152bad859c853ae651d0704e1ec267f420ca6a29013fc67b6b8cfe6ae42cd86d23d68420e914f4a77c383724055470b387507db SHA512 4a8591b141a7c3964e814e4b47f0cc3f1f4810ef0526b640846668f3a54a7b69354f4ac02e937842042e3e6cefa112e711d6ad22d2742b1711125c451c6968b1
-EBUILD flashrom-1.0.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
-EBUILD flashrom-9999.ebuild 4157 BLAKE2B 96c421bb2fc4d94c8c8159c9274bb5ac4e9effb604ea1224c7f52b6418f07ddb89348468af99042b648af61b8b6044f3e2c173aa506057c75f8d32bc0e5c8b8e SHA512 87020f0701717ddacc8c6db549718a6c9f7adebc23488a0bbfd56952a5cdf3b156fc5e4929f416b0822aafab51952a7f7441dfe7ef9b3e0b4bee7b476ccff681
-MISC metadata.xml 4561 BLAKE2B c2498b2fbaffd1c1afe85cbca55a04e1d79e96c3a460ca4445d9c3386dc4208dfc342a620b8a896c772540ea39b63b1cb701e1863d9db106f51e5f1b61dec600 SHA512 1907479d6aa1930dc7eaab630e828e6746cf11f99f04b45cdaaf153beafd276dea0104ce07ea538ae7bfee36565c0772fad6a7af135a361e20cbdab9cbd28e5c
+EBUILD flashrom-0.9.9.ebuild 4249 BLAKE2B 4618423e4a0cafc1d94453839ab846f29ebfc904f41bd888ba6ddb0c884b10176c77f914f87c90013ddf15c3a68a6ea56dd739c5e51e9f49182706d5c55008e3 SHA512 dd62222c8c92c53e21e7b03d7d8d82836a3b3d724ecc55cf878708e2b32f7b7ee16b99a083bd3f3556546396e9c11941df4d7e6e92af69176416b32bb39f90a6
+EBUILD flashrom-1.0.ebuild 4148 BLAKE2B 78cb2ae88f8f8e6afbd959fba5a2b2d64e4d62f4db709d287330e499c6a3af2b8003dd8a48177a9f28b5e6183c449bcd06d81a596a4f42739db21b42f2b3681e SHA512 db947a856e8a4ca801d478f168b0a036fc1d33f718f4e1e136e84d773ea65d7e0c060c5d429ad6872ec110cee39fc7216fc40d07df1c778694e319caa791e436
+EBUILD flashrom-9999.ebuild 4225 BLAKE2B e9c5d6792f40fa0580088c442ca0238c35e69ae1cfa1fbc05a749a8137529cb7fd5d721c2f2c7e21d6de593fd06c517971d0fa6d6adae5dff0d59ad0ee2056d7 SHA512 66cf2081ca1fca2ec0d6746c5f003d869cf2455f228b473004834397e44c6280df725f6a57a481c524886219ec5aadbd52a1a91779e33d05a340f6f70f054367
+MISC metadata.xml 4653 BLAKE2B 25d59aa49991e8919240e6653823cddbe5bec073c6962ed5177bc2aae8dde94ad14c3142644b6a20efcacd8e9d65c4617ea9f15d7d8755fb70a9a3486f4c32ff SHA512 5ac8a5dbfee4783698820a053125608843ec6151df756c3d2db2ad559b17803dcc98641e29fdb60d02bd243d9a2ab4d452364b8175dfd001aa8e2400629041e6
diff --git a/sys-apps/flashrom/flashrom-0.9.9.ebuild b/sys-apps/flashrom/flashrom-0.9.9.ebuild
index b6fe28e75232..1ccbc53db826 100644
--- a/sys-apps/flashrom/flashrom-0.9.9.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.9.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +drkaiser +dummy
 +ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
 +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
 +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
@@ -30,8 +30,8 @@ IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
index 45893e146faf..0c908ab17779 100644
--- a/sys-apps/flashrom/flashrom-1.0.ebuild
+++ b/sys-apps/flashrom/flashrom-1.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +drkaiser +dummy
 +ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
 +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
 +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
@@ -30,8 +30,8 @@ IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 0c9d952b2f7f..a89653a104b2 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -21,18 +21,19 @@ SLOT="0"
 # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
 # by some other spi programmers.
 IUSE_PROGRAMMERS="
-atahpt +atapromise +atavia +buspirate_spi ch341a_spi dediprog +drkaiser +dummy
-+ft2232_spi +gfxnvidia +internal +it8212 +linux_mtd +linux_spi mstarddc_spi
-+nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek
-+ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog
+atahpt +atapromise +atavia +buspirate_spi +ch341a_spi +dediprog +digilent_spi
++drkaiser +dummy +ft2232_spi +gfxnvidia +internal +it8212 +linux_mtd +linux_spi
+mstarddc_spi +nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi
++nicrealtek +ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog
 +usbblaster_spi"
 IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
 
 LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atapromise? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
-	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
+	digilent_spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
 	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index ddb50695a2b7..d2729fb7eb66 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="buspirate_spi">Enable Bus Pirate SPI programmer</flag>
 		<flag name="ch341a_spi">Enable WCH CH341A SPI programmer</flag>
 		<flag name="dediprog">Dediprog SF100 support</flag>
+		<flag name="digilent_spi">Enable support for Digilent iCEblink40 development board</flag>
 		<flag name="drkaiser">Enable Dr. Kaiser programmer</flag>
 		<flag name="dummy">Enable dummy tracing</flag>
 		<flag name="ft2232_spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest
index d318696b9d83..570a9eef063c 100644
--- a/sys-apps/guix/Manifest
+++ b/sys-apps/guix/Manifest
@@ -2,6 +2,7 @@ AUX guix-0.13.0-default-daemon.patch 2888 BLAKE2B 8f94b392167691338a9645697bfec6
 AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278
 DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf
 DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69
+DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f
 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27
 DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337
 DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c
@@ -9,4 +10,5 @@ DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180
 DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23
 EBUILD guix-0.13.0-r1.ebuild 3585 BLAKE2B d78dc51abf4be7d3b0558fa9b96fd6696c4f35a83b3b2b28638d8a4de2dfedb8536477e077e5e8f3ecb1e27b95dc2e3e60fe61faad4deb88c922513b1ee3ca5a SHA512 500a6e19aabde2fe9259171a46b4214ab278548e8415e96dd4fcedcc332e30c6aaef58a4b3c2d02c2c40fc1f282fcf1c32e0113de1cbc2a3dc95bbb87a8e640c
 EBUILD guix-0.14.0.ebuild 4044 BLAKE2B aa4f6f587fcb3903b39e1cfe2936104c30b409b07b0d5e57842e9aa01818c501a8c17798aa985f0cd5ae786f1504a3b6f0c1430a2a2eb09c79707796bbdd83da SHA512 eaaec42be5fe5c4573aa971c68c7c4b3511c34b10736ce912a3ae810ad9ea45fdf8a7a2ef344e234a12a9003e832e54c59a2dcc9067a44a3b72da1581803e7a9
+EBUILD guix-0.15.0.ebuild 4074 BLAKE2B eba05270a47fe6fe6babc65cef2b9a399acaba228cae8af571fb0207d89fb64af253b697bd704a64c5947c526341db9bc8fbf6b287054d920ed7261bdee1b9d9 SHA512 bfc4f41e69d6cda77c8c68a85469a6de70dd387a34ec790d4b23439e76ce8358c1d73a2273c2f23d8eb074e04522227b3e2502bb6079b3947a6469825c92623d
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-apps/guix/guix-0.15.0.ebuild b/sys-apps/guix/guix-0.15.0.ebuild
new file mode 100644
index 000000000000..45aca6b4d2c0
--- /dev/null
+++ b/sys-apps/guix/guix-0.15.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 autotools readme.gentoo-r1 user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
+	"armhf-linux    20150101 guile-2.0.11.tar.xz"
+	"i686-linux     20131110 guile-2.0.9.tar.xz"
+	"mips64el-linux 20131110 guile-2.0.9.tar.xz"
+	"x86_64-linux   20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+	local system_date_guilep uri
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+		# ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+		echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+	done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+	local system_date_guilep
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+	done
+}
+
+SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz
+	$(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-scheme/guile-2:=[regex,networking,threads]
+	dev-scheme/bytestructures
+	dev-scheme/guile-git
+	dev-scheme/guile-json
+	dev-scheme/guile-sqlite3
+	net-libs/gnutls[guile]
+	sys-libs/zlib
+	app-arch/bzip2
+	dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+	# guix archive --authorize < /usr/share/guix/hydra.gnu.org.pub
+[as root] enable guix-daemon service:
+	[systemd] # systemctl enable guix-daemon
+	[openrc]  # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+	\$ guix package -i hello
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+	guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+	enewgroup guixbuild
+	for i in {1..10}; do
+		# we list 'guixbuild' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+	done
+}
+
+src_prepare() {
+	copy_boot_guile_binaries
+
+	default
+	# build system is very eager to run automake itself: bug #625166
+	eautoreconf
+
+	# guile is trying to avoid recompilation by checking if file
+	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+	# is newer than
+	#     guix/modules.scm
+	# In case it is instead of using 'guix/modules.scm' guile
+	# loads system one (from potentially older version of guix).
+	# To work it around we bump last modification timestamp of
+	# '*.scm' files.
+	find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+	# to be compatible with guix from /gnu/store
+	econf \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	# guile occasionally fails with 'bad address'
+	emake -j1
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	keepdir                /etc/guix
+	# TODO: will need a tweak for prefix
+	keepdir                /gnu/store
+	fowners root:guixbuild /gnu/store
+	fperms 1775            /gnu/store
+
+	keepdir                /var/guix/profiles/per-user
+	fperms 1777            /var/guix/profiles/per-user
+
+	newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/habitat/Manifest b/sys-apps/habitat/Manifest
index 138721597202..4b6431543962 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,4 +1,4 @@
 DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
 DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
 EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
-MISC metadata.xml 328 BLAKE2B a1f7888eef25b795b359fefb3e7d51f2909a80257b1749f1665973bb34ad655885d5a4fb67cd821c5f6420f828902556c27833f48988b62c72b195a7e25cedc5 SHA512 cdafdd1846825f625feef5635f331f12ff4490383c54e760af5dd4ece4fcbe381ae325c8c732474de7124b55dffd32e129a9647e2e2aa5e0dcaff8ccbe4b1e8f
+MISC metadata.xml 250 BLAKE2B a106b4f4027e144e7bccf077c9602554d75cae2a511e63b43c6811db362e367697d1f4c0bd3df91222fe25fd437f3b7e8abcc30938887aa27d7d5af6ba8f5830 SHA512 427ed66d63881efc32787274abdb196c339589c15ffeb5cbde100f3ccd92a2caac9476d28acae4d1ab61b8df714fa1d71d294435784a04ffb2879565cc07796d
diff --git a/sys-apps/habitat/metadata.xml b/sys-apps/habitat/metadata.xml
index 67159d965888..2b27fe032012 100644
--- a/sys-apps/habitat/metadata.xml
+++ b/sys-apps/habitat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">habitat-sh/habitat</remote-id>
 	</upstream>
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 883f957e6f39..6b9e2061aad8 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,3 @@
-AUX nix-1.11.6-per-user.patch 554 BLAKE2B c56fcbc5154a315cdb87827a4f0aaa2991903f149608ef5168e2b26932802a9d466e41ee673ffbaf23d3ccd0292fce6a8a3d5fe91d4c4aa891cd8a750725ac17 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a
 AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6
 AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87
 AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd
diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch b/sys-apps/nix/files/nix-1.11.6-per-user.patch
deleted file mode 100644
index 9cea685c59a4..000000000000
--- a/sys-apps/nix/files/nix-1.11.6-per-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-By default created symlink poins to a directory not accessible by user.
-Make a symlink the same way NixOS does symlinking.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 672d1f0..e3b0978 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
-         echo "creating $NIX_LINK" >&2
--        _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
-+        _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
-         @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index 38a8e484d500..2d1ea6d9a9fa 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -3,7 +3,7 @@ DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d
 DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121
 EBUILD opentmpfiles-0.1.1.ebuild 1021 BLAKE2B 7268fe79b3bb68b30f642e2e438caffc940b287f64084c5d960ec4a9b6e9839d9a7e710fd6fbd8e18ce0b1867c4248519733688a4b646ed1c7a298f1fe3eb698 SHA512 77daf26e2de2f40f1f723a58e73fe1e1dbb76b2cd7299e1e6776491792df82aa003ad83d412909aae123d8d781143c5c7d6e1ca745e7f14fe473a968814df083
 EBUILD opentmpfiles-0.1.2.ebuild 1120 BLAKE2B f9e9dfd90ce72f1a0b7eb603b430b66a08467786562539810cf091d0b320a763742f1d9fcd70d622d03e529640b9a9b1df0e51ffa7a55f8c4059e803272269a5 SHA512 7231a5327564f6471dff75348d85c7d38bb3f8eff50ef55ef38136de21d8139791e6c32e2ef712b37d1faf82f7f08fec47ba41978a6c051cb7fbf3aa4fdfc0de
-EBUILD opentmpfiles-0.1.3-r1.ebuild 1251 BLAKE2B 0f8f5e948ca15eed6dea84f8097107bc5959de8bd07c15f17750b1823b54620a4f331b4dbc0fe9cb0def5e132ad6c4c5cbfbb548fe258654d8cd5d2c51c10892 SHA512 d80ba564c4899105d409671120727817ec69ccd6c73d64d1b6875036a5b9a4f4c6705c49bbeedbe88067cf76b92c5ef9f70028bddb60c167e7d357cf030245e1
+EBUILD opentmpfiles-0.1.3-r1.ebuild 1287 BLAKE2B 48a2d7141584785eade047c80d4ceeee4f86e8dfe0a94cf664e81082eb663c3edbe168cf4d03badcf27aa1ed3061c2beb5fa58ef7314702a47a02ba2aa1595f9 SHA512 8f618457feb924f4cffd1e48ce188863abf22088f835fb1f101dc025a311d97dc48f1aef421c8a554fecbd1784ee98ff69c02730fe5f7393335a5d58a4ca0f9c
 EBUILD opentmpfiles-0.1.3.ebuild 1139 BLAKE2B c74faed4e847c8fb39276bd184bbfd413d544596ffd4ef74205deca3cd5aa66a3341bf72c5bfe30558b343b7092d42be5ae69a3f90e012af448d10f740d15beb SHA512 be34016b152901f48cc91dca89fcd37aa90c0b22b9496d5dee23a0c9ed1c3c6d2354290a753adf871151f2fabc3f9c0a8f8f3f5f86901cf34123353604afaf04
 EBUILD opentmpfiles-9999.ebuild 1251 BLAKE2B 0f8f5e948ca15eed6dea84f8097107bc5959de8bd07c15f17750b1823b54620a4f331b4dbc0fe9cb0def5e132ad6c4c5cbfbb548fe258654d8cd5d2c51c10892 SHA512 d80ba564c4899105d409671120727817ec69ccd6c73d64d1b6875036a5b9a4f4c6705c49bbeedbe88067cf76b92c5ef9f70028bddb60c167e7d357cf030245e1
 MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
index cd2b8eff44b1..a7f5363a4cad 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index a798d603e343..5c94a5c669b2 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -5,5 +5,5 @@ DIST osinfo-db-20180531.tar.xz 70868 BLAKE2B 919a2767d24af91e9aa7b14f3a238b9239a
 EBUILD osinfo-db-20170813.ebuild 671 BLAKE2B 21131786f459a25aab816a1ea30067b7f3ed84d00063d7e2ed330c060f7e8616171e298379ac0bfad2ac54c2e847072b8a481ef85be280f19b9ded9f8f2494a7 SHA512 feecb9a6298484e19e9d78aefa7e75c376b66c0bd676aff22e5ad3fe7a745ea74fc64ddbfb6dde002f6b58a72720e5ddb571ef616c9e1af04411a910aa1b2694
 EBUILD osinfo-db-20180416.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
 EBUILD osinfo-db-20180514.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
-EBUILD osinfo-db-20180531.ebuild 673 BLAKE2B bc1f0a9c4f01f70e62d28c388aba1b3892cd8445c18a0020f0cb5cd5e998221f5009b828790229c73a8f62ee13dee14c9c35ae1464bef1fec04ecd1b8baf3dd4 SHA512 e873662320619e38cb827b3987208a3c74a472cc969c1774e33c0a2a91041bb17c20574513667170091c204805b042a74f7ce94da011fb8ff9dcf17ff59ab377
+EBUILD osinfo-db-20180531.ebuild 672 BLAKE2B f9e1033698f65341d73f12b20368bda941d4445c6a3c72bff034853a8bb38cf6929415efe41ca423996c4f2876de7ad58029737c8787029af821322c2df8f2d2 SHA512 6a0cd6854b1609e3d8c9765fd67ef2f8ef068f01e213214b33a6534b2b7e6e127e78093afe90005bc5aec4d9f98bfab41fabd6a70c9841e894ab83e6e3b09226
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
index 9e69a433ac60..db4a3c50856c 100644
--- a/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20180531.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
index 7d952466d4af..66a8cd6c7211 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,4 +1,4 @@
 AUX pacman-5.0.2-CVE-2016-5434.patch 3938 BLAKE2B 67ef2e348502753df10f7dbc9235401dcc8fe1e304a718592fafb6e84e7e045635890aeffe5ab808808f02392c6a141add8d97370957cef8fce357c8dd17b90b SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30
 DIST pacman-5.0.2.tar.gz 3361701 BLAKE2B 499041cb9914991c12c21383aaf36465189ced456ca8b2908d3c036acc3ef9dde0fba1efd823580c12e6d8dbdcaa5e53a7b1329cac347208d1de21702e8f3efa SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628
 EBUILD pacman-5.0.2-r1.ebuild 2952 BLAKE2B 0cd3a4905b9ca217747786d3e2cb98b01e0371f968799aff33a89885bc07332c9a45f6df41499e515b7c48423ab450ebb7ff4ce909d1561cff2797a6a71cf347 SHA512 451a898cef0974bd1ec2967dfc6d121021cf3176fc3632f4fa4851875d0ea16bb8bebb221cc759f9c9c18b8d9682ca000204da0ad106b83e35ed5c1b6e050695
-MISC metadata.xml 874 BLAKE2B d1dd7019e9ee4277dfe7f4c04e658345fe0ab6cbf45033ce130400459ab4b8c489c9b5c22a5e7970a73744e6b235fd41f671fc883a0aeab7fba2dd255e551772 SHA512 ae1e64b32f52880904150c58367e119313a679e49504e9ad19b3d1fbe59b9f6a008ff7319802197002102f1112a43ab17cb1c78b3babacae12e38c9a04e481c3
+MISC metadata.xml 675 BLAKE2B 4019b589f7cc08897c958654944004864bebf838e50d32fa18b295ecbf99d137431402dffbda17b9578f3b0c005e46ef0295d8edc73f01f840d5822c478595fc SHA512 52987ad9ce090732316a0fde96b26cfe3a21cdf1f4ba7b4dc661d21568d22a8972e8dbd90afd7a183fca64a13051c2723f2732fafc56413dfeb156fa7d7d0886
diff --git a/sys-apps/pacman/metadata.xml b/sys-apps/pacman/metadata.xml
index 2eb4eff00bb6..0a733cd836dd 100644
--- a/sys-apps/pacman/metadata.xml
+++ b/sys-apps/pacman/metadata.xml
@@ -6,14 +6,7 @@
 		<changelog>https://git.archlinux.org/pacman.git/tree/NEWS</changelog>
 		<doc>https://www.archlinux.org/pacman/</doc>
 	</upstream>
-	<maintainer type="person">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<slots>
 		<subslots>Reflect major ABI of libalpm.so.</subslots>
 	</slots>
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index e005a87628e4..8fa5dbb26c8b 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,9 +2,9 @@ AUX conf.d-pciparm 988 BLAKE2B c51b826806c58411939d8987e103cba5775806abcbf12a932
 AUX init.d-pciparm 1758 BLAKE2B a9dd930da942c73d7a150938b2b58543f517542c4c675334cca8f9eb02b83dad456e36ae1bf77ed8fcc0eac52e0dc638f19a41682fa3e1d3623011d09301945b SHA512 c5a527236039edf29f6876d3b07909045dd04e40d863d68014dd96cc021b7b61356470e67541b5b68487d996a299b60b3da46272259f9d0724ea1392e6243646
 AUX pciutils-3.1.9-static-pc.patch 373 BLAKE2B 39e44412bdde832e9812cd719155f7638d01cd49ebb5be638b2bd10627fe77279c4be79684e13c588b5d3b252eba66dc1a95275d60d40bcf12df46cf8bbdc807 SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
-DIST pciutils-3.5.5.tar.gz 437331 BLAKE2B 695aecfe58c2e8cde4da1aa0a1869ad8d62c6a7244e2b8d54f24e8ca59bd6de578770ff3d1ddf73a266653eb3640ffe70ee87adeb1dbabfc870c9a15e9286a51 SHA512 b2c89e1d742c5a23cad662ed6bb1d47d7587b0d823fcbf3abc6d613735961473f7d29c83a4ccb49b64ec4f674026f17e88693eb34b42cb6c128abd1407c778ba
 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
+DIST pciutils-3.6.0.tar.gz 454912 BLAKE2B 1f37307ba21085d5f49dd908781ce34dff98a1e4d818158800a1fbdc1fc689e1b868ee9c762378a8cd28ab17cbaaf1e9255da94c44029bfa2f4a8b5d9fd4b273 SHA512 e59cb5685f1dee2673368c90fdf1f5b7689de9fa45f249ce472258f278288da7a81644c76d1ecb7cc857f8029d3d70c367fe62190caf55328143b51017cc5c6f
 EBUILD pciutils-3.4.1.ebuild 2854 BLAKE2B bfc624cfc8a303673e2c480ffd77d888243bf0df8c84733ba37bf9dd7c13063df458160f9649c3c8c67d3320418595406cafd9596814f399d24646161ff8d9b0 SHA512 cd86bd701d2225009923bbdc4bbc75b32b1992fb0f2b212fc7b0288c1e607f7ac64a3503c85dfdfc1a448f75cac9f904e4b2767d01abc7d5f5f8b048d826896c
-EBUILD pciutils-3.5.5.ebuild 2922 BLAKE2B e89cb60e40b4fd1b1ff51f1dda3825cc43ee25f7016d8bb1044b6a81e25e7c814e61c4df9d7d059eeac3a1b7fa3dc20d89445475caaa0cc09caf5ec25228f23c SHA512 7421156ce321c3cd979712debccf4908ace3dbdd70d0b033c15fecba3f010122b4675d567a302fb4ec594edf2e46535691c24abd23e37bf296fdddc0c9c41d9b
 EBUILD pciutils-3.5.6.ebuild 2900 BLAKE2B ce68aba5b8564d1b3d043a1e71398fbbb5608e48401013a600186d6f1fb76a700b0f91ec6d1e50f28ab1388064203504e8948bbcb93f4163b526f4a7e706b8b4 SHA512 b4e20c6644a5767c960dfa2e232f0e3e148a15f3476825507fd7d4895e883b96de2e346f2d0e474259ac2e8321f8ec6b02e4796e6d7e250ac7e5c05088073065
+EBUILD pciutils-3.6.0.ebuild 2900 BLAKE2B 268e47d2e63abc0cc57b1fcea7ddd86831824e80dffb39772b6dff8a93a0aedc52831f318a230658be28c07e8746cefc745d784083292a99946cd837529e9af5 SHA512 593a8d5ac2d30da48392f2753846412d41b8a7d879e188dbc671b76695e6640607133ea45cc4e9249c96a19e6ab29679821b4eb153292d9f36e3e4c97d6581ff
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.5.ebuild b/sys-apps/pciutils/pciutils-3.6.0.ebuild
index 953cbfc4aa60..4fa617e1c488 100644
--- a/sys-apps/pciutils/pciutils-3.5.5.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib toolchain-funcs multilib-minimal flag-o-matic
+inherit multilib toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
@@ -49,7 +49,7 @@ switch_config() {
 }
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index bcac0406b3fa..b20231f7206f 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,6 +4,7 @@ AUX rng-tools-5-man-fill-watermark.patch 765 BLAKE2B 1e99d4961ba0e132fac5fbc7d57
 AUX rng-tools-5-man-rng-device.patch 398 BLAKE2B 6781f201e9c87143aa56dbb35702e95441cdfc304233be40d9f28c929c18f955d710b32128eede20bee71bab789bc72318cd71af294c2e6bc6d721882c3d030c SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f
 AUX rng-tools-6-fix-noctty.patch 2188 BLAKE2B 73eebe43b950e0ef261208c073f5b6c0fee6b4cabd216373c0973de61604c936200943a4b0574533ec3cacee8701253de55f5d6a730765fcadc9a6e099eed3b6 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116
 AUX rng-tools-6.1-fix-nistbeacon-validation-on-x86.patch 1615 BLAKE2B 63b8e975bcff85d0990d8ffe172b394167083fb95c0a9425425dd0b9aeb84a5c7265cc3181451b299cbbc7b965b957f472e18d7f1c109c38a564819581d863da SHA512 44a23471ba5dec1da76d4ff9ff77caa83a26fdebabcfbf561bc87ab838885a55a6fac7e31b64798e5ed0f67c4a47da03961a150efa7bb5ec4eebfc4889a21784
+AUX rng-tools-6.3-jitterentropy-linking-fix.patch 1057 BLAKE2B f07a9f6621c814237a71956f18b267c009181677fb47b3e0f1ed3b6417e3b33afd620cdb9bd1d5e9746ba195b1d861d86d03c16f7f2839931677c400cfe6281c SHA512 e64f4cf670143d91b4ac0dd4844d120308badfbccbe8764f9c5ed6badee90e9c5b58cc8cce3a3d6e53ac0c8fe906f155c629acc42ae3b414ff2559713844863a
 AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b
 AUX rngd-initd-6 481 BLAKE2B 0642727e7dfb7cafcca269ce2b559880743f85402c5df26f28dd144766c8f5c0661d5a4d563d121550bec31c1ae103a4b6169ec5143ab895a7e1b7cf5bc77f0d SHA512 d15b462aa333bd0d64fa827626fa953d30cadce861dfc070598218104f072ffad26d88531d48bd22b5d627dc4fe8560a2808cc9e2e27310dcd74a6efad8a9baf
 AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6
@@ -12,9 +13,11 @@ AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600
 DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
 DIST rng-tools-6.1.tar.gz 29814 BLAKE2B 4102c03ced36b33f9db6f7e5f77e8f918c4b9286a4c94cfd9ea9645c394f054fb3165255c3beb0f73d897d066831301f69a64e2758296b4418808343c97f3269 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9
 DIST rng-tools-6.2.tar.gz 30421 BLAKE2B 646628095cbc611aee4113198e0874b5f0672cd787f04f1649ff350883edebe6b31753aef3ac2bca1f05eedcf3c1400435c084382bde9f97fe6dcdd71adf18c2 SHA512 ffd8be5b232f092f8bcfdb6281580ce9053ec8bb87ff6bcae76585c38e3e91b9e464a9544a33ecd9814a9f244a89bac973d15c9bd3560d1164559685c720d174
+DIST rng-tools-6.3.tar.gz 31474 BLAKE2B 4d3924b3ca85d31d1999ceb45908cf64e8d2978d2e0aa638d9bbd3054a11a41251f9db54db35583c8fc080fd0667387cd63792c15486048d1f52300217e02fa9 SHA512 c00ac28c059ba689f114480958fe993e2199a1428137b151779a0331b9cc5a667f08770aa7b28d98c801166a509e8bd40d6b92f5c29b6ff73eb50a1cb0f2dd13
 DIST rng-tools-6.tar.gz 26024 BLAKE2B a523328fcce56997e2847940cdc096abd5a539135f857f0a4cd3d782a1659f4d2978870149caac47b839c80788df6a3d891adcd39371d5968149dd29bc46bc62 SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4
 EBUILD rng-tools-5-r2.ebuild 1098 BLAKE2B b9cd42d86a00f766dcf81fb4e3e5f1346c2ffcc3722a97d4508b89a3ee60be4fe6112ef0b624b270c9be12af50fd0b9c838725740f1c89cff9513d2c476797f3 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52
 EBUILD rng-tools-6-r1.ebuild 1109 BLAKE2B f3411983c54dd734685ed56d41cfc2b36b1cd1ca00716b3e8b0de30227cabc59e18d3cf7cfcf8cb18bf3f8398b18a5907d0bf7669828ae7666f0b20f7c191eaf SHA512 dd9cecec2238e7fd8d1ea332e11f10dcd0fc8e4aa545fda6a4f3eae0807b273529ef40b5ebc76426b1feb5d9253ef37f2626d93a8a7e5380290d9944b0143e20
 EBUILD rng-tools-6.1-r2.ebuild 1286 BLAKE2B 651e7ad6ccc1b47abf9829eff864e0a41711402b454bf33c7002bf93f322de14dd0b7b5b57ca9eba4afdb3a0fc501a7d79d2b494cf6e0d14b6a62bcc1f38ce73 SHA512 af5f213c593432a351bd7f07e5d7816151d812c3679fb523c92ce5941e942e6e410e2088eb287c11a5076ddd24dcb183ffaa248b716c2c91d81b876909576c95
 EBUILD rng-tools-6.2.ebuild 1222 BLAKE2B c411ec68551e0a6ee9bc6138d1f34486db0a3dfd8517aa8fdfb5ba37415cffd0d2e3db1cf602d7c663a9981b5e8b02176c8d825c418a206916ce64448533280a SHA512 4920a8dc84902dc8fedb6538839603fd949396473d206e2ea6370de6999ee32a756dba7814fb3f7b7585dd5bc1001d280cc1ce86fe2a9f7d7e05efa65b6e3ffb
-MISC metadata.xml 576 BLAKE2B 3a93712adab793447235d55c03b6d3a652bb728ddbbc1dd118f8143ed194e7597828a830bf0612e17a43e82d4433b9a0240de85116b1ba4626e54ac572264be9 SHA512 306d4b47230443cf82abd2c7e934b8fab73e695305a8981d3c011cbc2bbb193a87ae7a9c265a56c0454f4c0103f136211a4aabc2e35e030107b5ab2ac457c6e3
+EBUILD rng-tools-6.3.ebuild 1509 BLAKE2B 097d8bea4ea6d217e2a4489756545a6e8f768075fe26062062dd7c94f8c354be96d791ff6e9951e97f6c1b34f177368067663819a0f6606e3c56a749354f486e SHA512 e9d9e1cdea25334ac66d4cc8fcd3229694125209c310daa65cc9161f1cddc45e555838462b67e01793958a05b466870a97b62a6611cdf708e0f48a8850b0b353
+MISC metadata.xml 650 BLAKE2B d34f1f678d081e26075a4defa96ae293e2c8d06a6ff7a1091ddfe4c324b4e2c98db4f763664455008fba84d656b75220e5e16be9183fe8a5ddbe5aa250aadb8c SHA512 afe5c54ac87af8f1802160cc0e67198b1b0c8ddcf86dbc70571d5b879d128ddb4343a69da16a9fda789520a3e092735a5ea906d321b12bb329009c49e9813d41
diff --git a/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
new file mode 100644
index 000000000000..f7b87c88715d
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.3-jitterentropy-linking-fix.patch
@@ -0,0 +1,36 @@
+From c9f795da2dbeb0e85025f6264321aef1ba12059e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Fri, 6 Jul 2018 17:20:28 -0400
+Subject: [PATCH] Makefile.am: use the libjitterentropy available on the system
+
+---
+ Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b80e9a0..5d33aaf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,9 +2,7 @@
+ ## Toplevel Makefile.am for rng-tools
+ ##
+ if JITTER
+- JSUBDIR = jitterentropy-library
+- JSUBLIB = ./jitterentropy-library/libjitterentropy.a
+- AM_CPPFLAGS = -I./jitterentropy-library
++ jitterentropy_LIBS = -ljitterentropy
+ endif
+ 
+ SUBDIRS		= contrib tests $(JSUBDIR) 
+@@ -33,7 +31,7 @@ if JITTER
+ rngd_SOURCES	+= rngd_jitter.c
+ endif
+ 
+-rngd_LDADD	= librngd.a -lsysfs $(JSUBLIB) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
++rngd_LDADD	= librngd.a -lsysfs $(jitterentropy_LIBS) ${libcurl_LIBS} ${libxml2_LIBS} ${openssl_LIBS}
+ 
+ rngd_CFLAGS	= ${libxml2_CFLAGS} ${openssl_CFLAGS}
+ 
+-- 
+2.17.0
+
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index bda25e86a520..911b7587f660 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -10,6 +10,9 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
+	<flag name="jitterentropy">
+		Enable Jitter RNG entropy support
+	</flag>
 	<flag name="nistbeacon">
 		Enable NIST beacon entropy support
 	</flag>
diff --git a/sys-apps/rng-tools/rng-tools-6.3.ebuild b/sys-apps/rng-tools/rng-tools-6.3.ebuild
new file mode 100644
index 000000000000..17386bfd0054
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="jitterentropy nistbeacon selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	sys-fs/sysfsutils
+	jitterentropy? (
+		app-crypt/jitterentropy:=
+	)
+	nistbeacon? (
+		net-misc/curl[ssl]
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+	nistbeacon? (
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/test-for-argp.patch
+	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+	"${FILESDIR}"/${PN}-6.3-jitterentropy-linking-fix.patch
+)
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+	default
+
+	mv README.md README || die
+
+	if use jitterentropy; then
+		# Fool the build system into thinking that
+		# jitterentropy source code exists
+		touch "${S}"/jitterentropy-library/Makefile || die
+	fi
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	econf $(use_with nistbeacon)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 5c5b811edb89..b99e8f50ec56 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,6 +1,8 @@
 DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127
 DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb
+DIST toybox-0.7.7.tar.gz 843039 BLAKE2B fb4ef2ad483acd2b42905e765f7287b41fa8b1822796579c4a57a8ad3f5a3cdb8bbcd0e6790eddc8daf2ec41c50be478c7d19623d1c8db2e7b1d4db8b52fbbc6 SHA512 89369662eaf48bb52909f49932b98395eed6e672f6a37387819a02ba9c33f6b737686782ca3bf0ed0f9b60e1e2fff88ad1ebb678999582986acfec371d100827
 EBUILD toybox-0.7.5.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
 EBUILD toybox-0.7.6.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
+EBUILD toybox-0.7.7.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
 EBUILD toybox-9999.ebuild 1147 BLAKE2B bae964f1ef1e6ac5b432e6bdab775c2969f7c877c69b3bbbf61b931e74c8ea110ce4cf661a5c8a4519acee77aab986ace8e08fc75bdb6e1b1dea2520a1047d0b SHA512 cbe42d685c6837e010349b4c46d5527e85bc9a7c68a70ec882e6e56d79a71d39fa0fc763e5efd404d37138c8fa5c39708d314f6ba9c81e279de79929d353f4a9
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.7.7.ebuild b/sys-apps/toybox/toybox-0.7.7.ebuild
new file mode 100644
index 000000000000..876ef47e3464
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.7.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
+else
+	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# makefile is stupid
+RESTRICT="test"
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="http://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	epatch_user
+	restore_config .config
+}
+
+src_configure() {
+	if [ -f .config ]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	tc-export CC STRIP
+	export HOSTCC=$(tc-getBUILD_CC)
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}