gentoo resync : 15.09.2018

40 files changed, 474 insertions, 523 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d87ffda521e6..82727bd890b8 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index d669c62c9c10..a305d251907a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,8 +16,10 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
 DIST busybox-1.29.1.tar.bz2 2304866 BLAKE2B b8fb576507b952c241f733b76980a246fc0fad0bb5c97fe39a63d7e780e9934fae325d27e997641250248d1c7dc9f480ed42a09fdfc9b0bedc9eb909137c6ca9 SHA512 4506c149abb9ce0d98c75ee1f73d2915b124b8d1975cd9d20b9cd894b47226ea492c4fa802b28cfaae3082991fb7ab127f2376713401545ce4aea8810c36da76
 DIST busybox-1.29.2.tar.bz2 2305093 BLAKE2B 04344bab3dbce6ff01746ce60c7966a883af42987cbc3ef43c9a4c831872aaf5c2727e3ed89e2c8f71f547a7f2cb87b31a302367546cb5149c6f65cd9023a663 SHA512 16191a0773f51fb53ba54765813754982621e0ab391a1d07f66a3fb52d28c567ebff019e39f151cdf29f3c878d691f0fb7cdb4cb67e29b732d45224953c5d70f
+DIST busybox-1.29.3.tar.bz2 2305384 BLAKE2B dffb26be6d21faf87c7443f233468ec88430a5e4176855c8eb32303eb3e457c63bb7bfa55b59f9fd9da573dceb1cb44815149e90c6d67f2f5e3595fab9eb4ef5 SHA512 bf90e24b4564071e0ac2785e2ee4ec4ea0e229a1ff330bb38befe7a27c5a529e7b0657354ce731473814325a27a0c181ab922e0a0a89d5023ba08a6d80472297
 EBUILD busybox-1.29.0.ebuild 9283 BLAKE2B 3be1ae9bfc0a48820d9c10dbb860f89a6820705ecf5e72bb90293fd92030f1a6b5db5a53f2b88e0659598584b0368208b18c25a7c4e6db4d4847cc537aba9d02 SHA512 92e340e82758fd35734efa042d65ea3b0214aab6565eb7c54f2ad33c56738ae297741dc5c4f6083926c1bd348fd767675401cd58f1ac37b059fc45e652a21595
 EBUILD busybox-1.29.1.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
 EBUILD busybox-1.29.2.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
+EBUILD busybox-1.29.3.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
 EBUILD busybox-9999.ebuild 9296 BLAKE2B b9f3ab32e927752715f4275521fa01bf04ca7a9229f3df3aa436fdbb8f41fbbbbd85e0dfacfbfa88735e31877c827f1608c6e4e50c6ad6a97ef1fbf8c88e0ce9 SHA512 64f1dac97a289a8dccb7e5ec30b70232c01246312f981a1f5e1dbd79928be2f7188c833a2bbaf888aa6905346c5e3fb921e7dd64833b6747302a1d86e199ae81
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.29.3.ebuild b/sys-apps/busybox/busybox-1.29.3.ebuild
new file mode 100644
index 000000000000..4d493a7ed4f5
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.29.3.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 ~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/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index f00327ec881c..3fa01b21fd59 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,5 @@
 DIST colorized-logs-2.3.tar.gz 10270 BLAKE2B 3b0798139e96512b4d544c76bcbece81283a77dd7deca8b018bb0ddd9535eb80f88b8f10a9a9a20c4f98b67cc97bb7673de80339bcc45c5ce46b8e8dfe53a53b SHA512 a15616f0548c0a91dc290fb6a9c6a8376b66ebc2fb1af21e1caed03c95c07b8536d8a81dd9e199d54ffa5339d0f777cabe75e23fda3bb916575fe3ac31bf51f9
+DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f
 EBUILD colorized-logs-2.3.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
+EBUILD colorized-logs-2.4.ebuild 656 BLAKE2B 09244339e9bde0e720701a761edd70dcd3b4dd3a87c57c306b67fe16e2acad1ba41c4db9e8c02c989fcd7735157c1e7a3e795db9af5d1b59ea2571668623e6a8 SHA512 85028ef83188725dbe0a17ef341ca9f4f550453b5cd4aa92560b1e8cd9e36dc311e0cbe58846ec73bdb1b2f2bffe7cd542a0b120b0054360c9ce071025c7c28a
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.4.ebuild b/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
new file mode 100644
index 000000000000..bee91bfd74a9
--- /dev/null
+++ b/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Tools for logs with ANSI color"
+HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
+SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	# Rename to not collide with dev-python/ansi2html
+	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
+	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
+}
diff --git a/sys-apps/edid-fixdim/Manifest b/sys-apps/edid-fixdim/Manifest
new file mode 100644
index 000000000000..0d6884553814
--- /dev/null
+++ b/sys-apps/edid-fixdim/Manifest
@@ -0,0 +1,3 @@
+DIST edid-fixdim-1.tar.gz 3236 BLAKE2B 4ae6954fa4c93f143be5e84f364f4b229054bd385aa0bc2ec85b4dfcd2eece8e5e3f1a4039188fcb3fe979f0de473b6c876c73e9ba642d0e10f8656d62c36d8f SHA512 614908e2ca94c97cb998f789ec383a72237c5be4544cf8b02d7754817bea90de87993acc11d917c1c5b54009ca8f41560e7468d97dc3f21b7e2891a36d4dbffd
+EBUILD edid-fixdim-1.ebuild 549 BLAKE2B 2c4f9ae19ed72ce0c5de38692b4245529d6f24e50d03cb678413cf55adc4aed11576b5ed6cee4c7f096d2bb30f1c05fd091f96359677bb59129aa16d9b65bd99 SHA512 360ccdfdd0d9f7f077844dd4bc125ad7bd5d19196620dd87bf517968e9aaefa98352579f25602e75f0cf20921cca0b4f605ea7ad730dd7eb5428c64879b80655
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/edid-fixdim/edid-fixdim-1.ebuild b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
new file mode 100644
index 000000000000..d02cbbfe9821
--- /dev/null
+++ b/sys-apps/edid-fixdim/edid-fixdim-1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+inherit python-single-r1
+
+DESCRIPTION="Tool to fix screen dimensions in EDID data dumps"
+HOMEPAGE="https://github.com/mgorny/edid-fixdim"
+SRC_URI="https://github.com/mgorny/edid-fixdim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+	python_doscript edid-fixdim
+}
diff --git a/sys-apps/microcode-ctl/metadata.xml b/sys-apps/edid-fixdim/metadata.xml
index 56c124413057..0319eec4c8be 100644
--- a/sys-apps/microcode-ctl/metadata.xml
+++ b/sys-apps/edid-fixdim/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 3ecb148c3831..218b3875c0c8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,6 @@
 AUX fwupd 291 BLAKE2B e8125cdf0cb70adb3e9fb962383da71a101816764a022c13de2812f501bddabeea87a35eeb18096fb748d17f61592d8714661efb5bbad2b0393b76902ed1f3bf SHA512 ad569d342cf14290d4924582af92c7d634139cf04eb1d981b4a4573ed56a8f9115914adefa925c8486e1126dd4fbed36a786aad4afd07de14dd6cbdf7982b766
-DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
-DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae
 DIST fwupd-1.1.1.tar.gz 1669430 BLAKE2B 92073f1e3b6c6b68da48de792d58d218c0b0bfce2a3765c257253d6fb93974dccadc2ae71ab6275d0e9ad6775642eba1e2613ad2a3f11cd4d4225affdedc7561 SHA512 b825b565b6c85bbf703352eb0aff40de8e348c96537316373de718faf82bbdd425ba1b8091d1ab4b5403f2fbe46ceda45a502a5fea4ad3bd51e6cc5a2aad6ddc
-EBUILD fwupd-1.0.8-r1.ebuild 2571 BLAKE2B 319b1a34fdd87aadffcd39e73713b09b1cdf5191582c71bd2192fe07a4db3494a4108f92fa331c7cb5ab12725ece340df8dad94cd4544cf10cf0b3af3b8015c8 SHA512 4a42e8c3d1b860b7936b320b78d2e453f4412312d412176dc53f3dce0f8ce28311d2ec79dc2eedc381f46ddfe332c35e97e49775bdea9f1f07c600fd5ae866cc
-EBUILD fwupd-1.1.0-r1.ebuild 3031 BLAKE2B 04e01f707797f72f4854e6ce49dd40146a0f63445900bcd812f049ebcb35b75e3e735fe03595ae58500cef05ad3295a34cb2ffd83f116183e0eb558c19e3bc61 SHA512 d99e8963cc883fe3f631c15b52f5b0fe7f731e197565c3786c597ddfa607091b05861aa55c0a6395824396ba1d3d5a116c65e442c6261fd5b2999999e3b2353e
-EBUILD fwupd-1.1.1.ebuild 3031 BLAKE2B 04e01f707797f72f4854e6ce49dd40146a0f63445900bcd812f049ebcb35b75e3e735fe03595ae58500cef05ad3295a34cb2ffd83f116183e0eb558c19e3bc61 SHA512 d99e8963cc883fe3f631c15b52f5b0fe7f731e197565c3786c597ddfa607091b05861aa55c0a6395824396ba1d3d5a116c65e442c6261fd5b2999999e3b2353e
-MISC metadata.xml 889 BLAKE2B d567f74fb461b0740d21bbc1e2b37692928aa2dbab77250743b898b6aaab8579bea218d4aa1fe379f45422d7ca4b9b81fbcd6bb2c8c41b586b27c0b30f71715a SHA512 80c84c24df419837825e4dc4453dc360c32f4e3eef3d117fe51a8675717ebd6f64bae27df6221895d86d9f099092c3c7e9e5b7650851722ccfc927a874bec001
+DIST fwupd-1.1.2.tar.gz 1690384 BLAKE2B 988c27dbc522b27f03c94072aa85930f77d5b115aea93e485e9da853cea4f37a44aa6f8af542b24e5cd2f1ba65f4ede52e2f15dc2a366d2fa27370d8bda76164 SHA512 f9ca8d34608ee7b7fd2047c9897a898a8680da096db2fb123e698c9b5443d4285d91d67aa1fb928f3c653e9a6d3646a0228a0a630f9262b80e47525591b5659e
+EBUILD fwupd-1.1.1-r1.ebuild 3078 BLAKE2B d6a888e5d80eea9c916c43ac446edcd3dc7f866f0fc6b1159fb73a97eb41602cdb4b9d9ce909786eb63e415b63fa645b18181206cb2aae79d81cd0d4f28f3377 SHA512 20f7fb99062c561fc3eb12c674a811d47969177dafb393ea33df8caa613c2ef68804cbc3d4d7c6dd11d8586d5708b48aea8d069754a3229bd4c79189453bf7c1
+EBUILD fwupd-1.1.2.ebuild 3180 BLAKE2B 881a74e24ac51cd95d0ee705cc9178321339117112f11ba2e7073b09661c25216540dcf6f686dafd20a9a0b820d5e2213914ef7fc662b6943be1f154d9de95e2 SHA512 fc92f4f515c762c2ae490b22ef1c83e164e6a8049fb6cdc9689150608e92a9047a65d30ed9a41370728e088a7f49c179fd794dea0392b5252158cd0fd1f5eaf5
+MISC metadata.xml 948 BLAKE2B 8578206c4d73e98035e7af30868d299d8dc06db4ead6c60e7d5027f4f4de2db2fbb3e7fb351b4c936bc076559691af8a431df9f52a3613179b98da0305f62455 SHA512 0eeb5d9923b201a0803368b709586dd46615441300d764140e08fcfdf70189ee197d66ec603b5a9c26b8ec48fed960964c7844bd33cc50747042391e94196c31
diff --git a/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild b/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
deleted file mode 100644
index da2b82c2bba9..000000000000
--- a/sys-apps/fwupd/fwupd-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Package requires newer meson than eclass provides
-MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.7.4:=[introspection]
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/libgpg-error
-	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[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.3.3
-	)
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	systemd? ( >=sys-apps/systemd-231 )
-	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-10 )
-	uefi_labels? (
-		x11-libs/pango
-		x11-libs/cairo
-		media-libs/freetype
-		media-libs/fontconfig
-		media-fonts/dejavu
-		media-fonts/source-han-sans
-	)
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/gcab
-	app-arch/libarchive
-	>=dev-util/meson-0.41.0
-	>=dev-util/ninja-1.7.2
-	virtual/pkgconfig
-	$(vala_depend)
-	doc? ( dev-util/gtk-doc )
-	man? ( app-text/docbook-sgml-utils )
-	test? ( net-libs/gnutls[tools] )
-"
-
-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() {
-	xdg_environment_reset
-	local emesonargs=(
-		-Dconsolekit="$(usex systemd false true)"
-		-Dgpg="$(usex gpg true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged (yet?)
-		-Dplugin_thunderbolt=false
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dplugin_uefi_labels="$(usex uefi_labels true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild b/sys-apps/fwupd/fwupd-1.1.1-r1.ebuild
index 0b779394a532..7ea5b6e73fc7 100644
--- a/sys-apps/fwupd/fwupd-1.1.0-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.1-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi"
+IUSE="colorhug dell doc +gpg +man pkcs7 redfish systemd test thunderbolt uefi"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	dell? ( uefi )
@@ -54,6 +54,7 @@ RDEPEND="
 	)
 	systemd? ( >=sys-apps/systemd-211 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -99,8 +100,7 @@ src_configure() {
 		-Dplugin_dell="$(usex dell true false)"
 		-Dplugin_redfish="$(usex redfish true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged (yet?)
-		-Dplugin_thunderbolt=false
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
 		-Dplugin_uefi="$(usex uefi true false)"
 		-Dsystemd="$(usex systemd true false)"
 		-Dtests="$(usex test true false)"
diff --git a/sys-apps/fwupd/fwupd-1.1.1.ebuild b/sys-apps/fwupd/fwupd-1.1.2.ebuild
index 0b779394a532..6a8f73d7e3c9 100644
--- a/sys-apps/fwupd/fwupd-1.1.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.1.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 # Package requires newer meson than eclass provides
 MESON_AUTO_DEPEND="no"
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit meson python-single-r1 vala xdg-utils
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi"
+IUSE="colorhug dell doc +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	dell? ( uefi )
@@ -47,6 +47,7 @@ RDEPEND="
 		app-crypt/gpgme
 		dev-libs/libgpg-error
 	)
+	nvme? ( sys-libs/efivar )
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? (
 		dev-libs/json-glib
@@ -54,6 +55,7 @@ RDEPEND="
 	)
 	systemd? ( >=sys-apps/systemd-211 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
+	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
@@ -72,6 +74,7 @@ DEPEND="
 	$(vala_depend)
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
+	nvme? (	>=sys-kernel/linux-headers-4.4 )
 	test? ( net-libs/gnutls[tools] )
 "
 
@@ -97,10 +100,10 @@ src_configure() {
 		-Dman="$(usex man true false)"
 		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_dell="$(usex dell true false)"
+		-Dplugin_nvme="$(usex nvme true false)"
 		-Dplugin_redfish="$(usex redfish true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged (yet?)
-		-Dplugin_thunderbolt=false
+		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
 		-Dplugin_uefi="$(usex uefi true false)"
 		-Dsystemd="$(usex systemd true false)"
 		-Dtests="$(usex test true false)"
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index b15f190a058b..702c657eeb25 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -11,10 +11,11 @@
     <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="nvme">Build and install nvme plugin</flag>
     <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg>.</flag>
     <flag name="redfish">Install redfish plugin</flag>
+    <flag name="thunderbolt">Install thunderbolt plugin</flag>
     <flag name="uefi">Enable UEFI support</flag>
-    <flag name="uefi_labels">Enable UEFI labels support</flag>
   </use>
   <upstream>
     <remote-id type="github">hughsie/fwupd</remote-id>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 2124d8822cd0..6c4bc20738ff 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,6 +2,6 @@ DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26c
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 EBUILD gptfdisk-1.0.1.ebuild 1187 BLAKE2B bff741cf8c43f0f3b060e4febd75f9a41d76328ded6415f7d022e306e07836af7051fa5d6a755d59d88b97dee403eba2f260871435736863b6024e35e8ee4515 SHA512 f8d8c14f2a549aca37e9eb13e0365b6e3029568c44902fac2881374804b772abd8d7cf6d5d34f74c43d757dffbf1026014ad6ea11e6343b670c72c58c166d63e
-EBUILD gptfdisk-1.0.3.ebuild 1246 BLAKE2B afad4e13c8ea272f67d2dee58d76904740bddcd0f47884ffb10607429905700fa1be762f56165f0876caff67f30f51865c612e9056936717f0c036f07b36a08c SHA512 36336bdd8e9eb094a4737b1a494c5e07640384f70db3e0d7e9a8cccfadbdd72c5d8ebf382462137f804e2855b5071f0269a3cd95e7dbd9aa638bb798efbd009d
+EBUILD gptfdisk-1.0.3.ebuild 1245 BLAKE2B fe0861c438e837708fa8052f7ad0d9cc7926403fc6530cf638bd3326ef8b51ca2deabd7d2fd89002431454fea4b480b1f0648847e0d2cf0c9cf5553a9807f344 SHA512 9e4a5ee7a5ffc79e29396c01427ba9503c3623746e431809e30efac4563fe20e14a73cf5c0797bedde745517fb4008ce7b1013aec0a057c7ab3414d98c1cbb0a
 EBUILD gptfdisk-1.0.4.ebuild 1248 BLAKE2B ddc6d9cb111fbf70b5f2bc668f2b16402405007ea338f9597c39c5d900fb92dcc67a0b5802db00d6ab5f0e7df5cf16afe34e84b4e929d1c0d5e8ed593adebdf2 SHA512 c528801dd6b4d0d3495e0b70e0dcdec485682440f721ab07b8d186be365f3a3ad4cd698797e611623cdac6614c9323481339f1a45b99e748af69ff255a4903c0
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 7d30aa44a2e1..70a5f059ee87 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/ibm-powerpc-utils/Manifest b/sys-apps/ibm-powerpc-utils/Manifest
index 7e32eafbf3b1..02c08e448b42 100644
--- a/sys-apps/ibm-powerpc-utils/Manifest
+++ b/sys-apps/ibm-powerpc-utils/Manifest
@@ -10,5 +10,5 @@ EBUILD ibm-powerpc-utils-1.2.12.ebuild 598 BLAKE2B 55310cc9bf52a11ce113932e4d977
 EBUILD ibm-powerpc-utils-1.2.2.ebuild 665 BLAKE2B 56679bcd8f743edaa510ddd414eba7d4489db7323561cb1f232c10d21cc497d2b695ee155206a787566564298161da68b56721e3365faecb0517f8e2416eded9 SHA512 12def0f5b6ee857471ddb14ff098ff67e75f820e2407e5f613bb70c21a9fd03232cf94e46b3a3c0e3274282b38bdc6543a45af4c7fbdfb852e5df56a877b8f04
 EBUILD ibm-powerpc-utils-1.2.25.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
 EBUILD ibm-powerpc-utils-1.2.26.ebuild 561 BLAKE2B 1485722b43ef7f9bb2bdb0ffb66a15a21a062c0c034c13936182dd341cbcd0389995ff3b2a076f0a3dc4a12696cb3f1252a2e9777572e887c80a42f1b2bb2acd SHA512 d32c597cf482f8d80d13c1632308e8077a5644e278a344504d97375d5cdd91053bafdd3eadbf01208c9d3cfeaf534f73f00796aaca87e8f900f4ee8eaeb7bff2
-EBUILD ibm-powerpc-utils-1.3.5.ebuild 683 BLAKE2B 4fffac60f29875195aa8ed49c94e55fdb5096352b4fe0cccdf94607377dc3f28d93a499d1f19368adbd4066177684de7065fb6dd7276bb3ac1e54ffdb3b14424 SHA512 fbd5917ee6fd3d1827cc17e65f3f0d7d5792871717befef0a89c1b9dab4f9695771805273544e0d762e33279829a3eef4d7a2804fa99b4308521cddb74756ef0
+EBUILD ibm-powerpc-utils-1.3.5.ebuild 681 BLAKE2B 787ff813b26d9c29c0620906dabe88ec8f05f246ad0452d506f0a6205f5fa22be15775773ac92d5163ecdb44ea6bbfee100d446f79bcb23b00f52c5d6911aa80 SHA512 ab7c70d113eb8922251d8d455afda1ee22f54d6c5493c710a15c6f436b907c258dce3ced75d6f618011877fef2e24aaa5b6ee8c92a20bcd78a237bac25bf6633
 MISC metadata.xml 445 BLAKE2B 959df80121329addf838d5f9e087b0f325cfb7103e961089bbe019f6222ab43ebeb097280e57ff88baafd3b0bec5943158beb1e258e892f0dd5794653f8d4516 SHA512 8b125cee61a590d597b86ad8cb744725c8fff2cb2e5606ca9db69492dec4ff8ae4b1aa37b438e332ccea15be76834890ca835d6d18a652b043c30158e20302e3
diff --git a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild
index dd4248b2b486..17d1ba204788 100644
--- a/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild
+++ b/sys-apps/ibm-powerpc-utils/ibm-powerpc-utils-1.3.5.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P//ibm-}"
 
 SLOT="0"
 LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 
 DEPEND="
 	sys-devel/bc
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 763b41c9ef9a..419b51ed63f0 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,11 +4,11 @@ AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
 DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
 DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
-DIST less-533.tar.gz 341035 BLAKE2B 19e6250ef79d1356b296dd23f2aba45ddddedc1a4c365154d18cd7fa7b79d7ed8c60d8a56646523b8e713d6eede065f3e5fb33527d97053adb2b38fe1f93325c SHA512 a2fa8286f185de866d7c74d9468d201905dcd1b95dfc37013bff3a98a7c8229d76f31584c2db5fe980999cef3445b7db63d5c244078ae0459830fcee609a8e39
 DIST less-534.tar.gz 341351 BLAKE2B f309e486c80eb7573ebffa6cd0d43205bb517a0e1f56116ddca739fb5a94cb010157d7f64507a4e32401e28f499d25b9f1c33d160416cef8f7fba01c62cd218e SHA512 b6896061616b30ccdf4e4f03d95ed5372e912dd42832903015bb7ca1fc5596813b86581f02c6a34f6d6cc0e56f58ff62c8a7e1488a7014bd23acaca9236493fe
+DIST less-535.tar.gz 341464 BLAKE2B 9093fb6c0d249fb7a6945f36c5b2fc54c407216cddc8ce4e31ad5f074fb0922f9318fd0cc1f97cc954dad4cb4a3c25fb8a25202a4e7ae7850aba5f5ce36d2b9b SHA512 23f7270d88550fa52bc7770ed25ee6631674438ecc6cd157f4a15d800405bbee21ca188119f44c7171f6d1a4bbf7f91177d815a54ffec7367e327fb8fed25584
 EBUILD less-529.ebuild 1368 BLAKE2B 869dcc47d95cb6f8bc1fc56db2a1b6515b7b8c0e82943d603c05d125e1a6deae60d68b4034e4f691ecd66ee50c802e4c66cd0760e278f49dba74b33578aa656e SHA512 b1a6feb875564ff527d691253c01e3fe64097c511e087f44195f140fa727918d62d285a894a1fc018279ecc3d29c059436a10b490d6d1d04c80691d45bc7c29a
 EBUILD less-530.ebuild 1381 BLAKE2B 13673dbd46b697128c6db8ff626dbb90ccf8ece61472cd0388f6ba10eeda57b4c4e3c084729b81230423fbd96342ec19f251a4168575f83209afdda6cec10a67 SHA512 e787c5b63dcf1d2a2dc80d843bc5e674596ad992220849557ec6ffd93ba53f9279cd21fb02cd652ba2fa0c0d0ada2c6dfcf18198194c0089f770da3a4a40980a
-EBUILD less-531.ebuild 1415 BLAKE2B dd7f53379ee529bd725e8d03708c3310e792e36cdb001a5092e237cf5aa764bd984976204bec6f885950a308212b003164baa9865719898f300927cf88bbd104 SHA512 e5b8de631d3e540a8a67e6a67c2871d8d4490f75982debf71cdbab6c83234efd38edd3f7069588c070060eee9cf41f01ddf8216767ffc2d17c72d1d6dac76b40
-EBUILD less-533.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
+EBUILD less-531.ebuild 1408 BLAKE2B 70268fa7b95805f7c8d5837537e378a881b383c104d5c264b2113554a926659319e1457c470eb6ce1d2215fb2409e2d296643086ff7ca5666c4aa54b996050dd SHA512 7c4b7197acf8d0bc99fb4b3ed5fae4d1a85517d9e70b051fe093597eea640346f03107d0e383bd1e4f23359d2eddf5d6081099b68c103a8146dcd20611ed119c
 EBUILD less-534.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
+EBUILD less-535.ebuild 1421 BLAKE2B 07a8a7de925ed5dbe3a5eae336690aa023ea282b5a709e006692bbb502e2c229a920cd3e45c0d3affb81d0b7870e8fdb5f2a2efc3aa17489754e925fa8ef7bff SHA512 01e50b6c0b0c942be20fa1cc069fb94275f257b8bbb21e9b051366e0d2260ebb19e4322f4905146dac1052ab85b1ce4ee4228a8e61db3d14d5a0722d98f595dc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
index 7bc31b9a5191..fa0b767b29c4 100644
--- a/sys-apps/less/less-531.ebuild
+++ b/sys-apps/less/less-531.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-533.ebuild b/sys-apps/less/less-535.ebuild
index c4d58efa2269..c4d58efa2269 100644
--- a/sys-apps/less/less-533.ebuild
+++ b/sys-apps/less/less-535.ebuild
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 4a32a2a842b4..c4b5dad52731 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,10 @@
+AUX man-db-2.8.4-berkdb_build_fix.patch 661 BLAKE2B 2f8950d05ef4c467089ebef3d73b9df1d1a6f1f235ce01e87830b14644d9317da0b255702d7c40507c67d65710cb13a1cb85210739f55b4b7e7ee282acceedae SHA512 c99f61ef08be2e88feb90376dfe3c4f1b028c6916c46aea92d145de304ca380d381a334bb1c0bc5828ea38c24532960cf0d449c18cd6db59a47ca3bdc3fac43b
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
 DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
 DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d875edd79f0aad992d884e83fc28a8c3b7d82ded187293d858dfadae48eb088722c3ffc91eec64b71cdf46750be SHA512 3cc160a5a8a0a4e918f6f6546582d1e5fe9851a13c5bd8dc94e3fcbf4ec28cb3cd1524b1ae30722931c84981fa8ca9ac64c9c4d9544c2d0bea80ac9f39cb5e66
 EBUILD man-db-2.7.6.1-r2.ebuild 3162 BLAKE2B 5aefa5d09e68cc46d639cd09d55d8347046b9fab1b148d40e11a996cfbf94fcc43b8fc386941b3a157a2ac13dda2c6b4f8eafea75433af10560d86ee6f1270c7 SHA512 b42c3a488d2424c24a12f5eaeda2c15efeb18cf9b3c55230238e686712d78f127f9c9e2668dc0da84569cac1d532e19088cc78936d94146a981b776f82934fe9
 EBUILD man-db-2.8.3.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
-EBUILD man-db-2.8.4.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
+EBUILD man-db-2.8.4.ebuild 3433 BLAKE2B 3768e283d9d5f4d3f5527923cd0d3863433682a6d80e0b255324d4636419f0bf76b9b139a82f27f4c766696eac69ae915e3c891b3ae4d61142fb7bc44e2b11e7 SHA512 40848f7193559a635d8a340ca54db9739a8ffe43b6a3edbe602c17ec9d132843c3a7cbf82fca4e6bc96f832314e0fd2b7294644cfa430c76e4aae0c0620b022e
 EBUILD man-db-9999.ebuild 3378 BLAKE2B a101e51efdb07ed48674a0632ea445a56ba582779c0ed6c9755d8c05b2afee4b6df47b8572e670234af65a5c69a5c90788b4ca45f4d7ceba476694f5a0ede904 SHA512 b0785b4f12403bdd5993f40417582a343b1b64bb332699c8476bd347153b646fc997e753ce56b80cb798fc44049fa183c4c985d2d3c24c4687d8c7fbb7a96f75
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
new file mode 100644
index 000000000000..30052f268157
--- /dev/null
+++ b/sys-apps/man-db/files/man-db-2.8.4-berkdb_build_fix.patch
@@ -0,0 +1,27 @@
+From dd0f554b5c1d563f9ee625c19c8745d8982e00e3 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Thu, 2 Aug 2018 10:34:00 +0100
+Subject: Fix build with Berkeley DB
+
+Fixes Savannah bug #54425.
+
+* libdb/db_btree.c: Include <stdlib.h> for free.
+---
+ libdb/db_btree.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libdb/db_btree.c b/libdb/db_btree.c
+index fdd9b15..4469bf6 100644
+--- a/libdb/db_btree.c
++++ b/libdb/db_btree.c
+@@ -28,6 +28,7 @@
+ /* below this line are routines only useful for the BTREE interface */
+ #ifdef BTREE
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+-- 
+cgit v1.0-41-gc330
+
diff --git a/sys-apps/man-db/man-db-2.8.4.ebuild b/sys-apps/man-db/man-db-2.8.4.ebuild
index 670cbc0de539..42bdf6a7f67f 100644
--- a/sys-apps/man-db/man-db-2.8.4.ebuild
+++ b/sys-apps/man-db/man-db-2.8.4.ebuild
@@ -44,6 +44,8 @@ RDEPEND="
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
+PATCHES=( "${FILESDIR}"/${P}-berkdb_build_fix.patch )
+
 pkg_setup() {
 	# Create user now as Makefile in src_install does setuid/chown
 	enewgroup man 15
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 6d13edde0017..42218f9319cf 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,4 @@
-DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
-DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422b11b0cbe96abdbb855e24acb1f271c07c7f3d2b07105c46062b0f07c54c9ee06281ba3dd81224e0304174a6842c SHA512 cde896add266e672347841a9116e5d182084044c4543a847945825f98962192f0e8278a4f562fc47a580eb2ddc3d669ffc75a21922219b4d3c36cbe8a792e205
 DIST man-pages-4.16.tar.xz 1630064 BLAKE2B 7c436ebc01d5248378f40fa8f8004bd2e0760a8409b419d4d7aadf8f0075bfa9b89801172b328856ed0f0a70b75523a489957a9aacba66e893698bea1ac98efc SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-4.14.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
-EBUILD man-pages-4.15.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
-EBUILD man-pages-4.16.ebuild 1663 BLAKE2B 56422d9d813f110c23d84d133c65b4628e381c7d91d2e8c4cb3c35527c271a517e77a3ddd115b2dea4cd99ccd53b2c5b23ca6df48afa845d75521fd6fa9d0b91 SHA512 673726a6eed0f05f37e44550e35684d3305fb778778e4fa8c3b69a8a387eff4d05b1c2bd8e285500af7377dbf7c0696b99a3a3445657dad569a4e16a81f29075
+EBUILD man-pages-4.16.ebuild 1650 BLAKE2B 0662c50e59b56ed93eb22c4b2be0e3d21a413db695354c1a286d27cb87f7fe29808d3d10bc97b08618092f39db2f02bea1da31ded19f9991635e17077a38f010 SHA512 b98c8fc1e0c233586db21e276cac0b3a717b50b7223e401fcd5d799c63bec719cbc3bbab3e47090fbc7fb97241cae098b3b4305b2107bcc0a88c84cca8da624e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
deleted file mode 100644
index d1ebe8fa6a89..000000000000
--- a/sys-apps/man-pages/man-pages-4.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
-	mirror://kernel/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.15.ebuild b/sys-apps/man-pages/man-pages-4.15.ebuild
deleted file mode 100644
index d1ebe8fa6a89..000000000000
--- a/sys-apps/man-pages/man-pages-4.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
-	mirror://kernel/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.16.ebuild b/sys-apps/man-pages/man-pages-4.16.ebuild
index 946ba0ae743a..8711bf486e8c 100644
--- a/sys-apps/man-pages/man-pages-4.16.ebuild
+++ b/sys-apps/man-pages/man-pages-4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/microcode-ctl/Manifest b/sys-apps/microcode-ctl/Manifest
deleted file mode 100644
index cada8550e899..000000000000
--- a/sys-apps/microcode-ctl/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX microcode_ctl.conf.d 210 BLAKE2B b90844f3ec85a308d56ce230dcc948faf797564036de91da1e6248b7d1a7e21fa6693a77d57473fe80c4c928b146250bcc9b1558bb043791d2fd447f80308e9b SHA512 dfa157b0aaf4d5846fb09cc9ea570ce5400a6a31d5d9895f45d9200fa08271426289deff1d82a33a7b78a1830264e3ee4d325860f7526814764419f5db4564dd
-AUX microcode_ctl.rc 590 BLAKE2B 09dd568f72522a4a95c1c036f4032d7bb45754c0f46b6a5ac9573eb00e5a3d81c97caad5b47ed742df3d91ea5b8863d2ac69c570975ed96957e8313a6e723fda SHA512 a81eaf5628b62472520b59773e58ffa99938e70d9efd0f1c25cfe8a953f7a8632879657347147323c7299cc022c89bc82a7409fdf2d2aa59afa7173ef9d13438
-AUX microcode_ctl.rc-r1 621 BLAKE2B a4166842f8b8496a8b8b1cdac930b960a8c510d59a40def39552d5280aa66e381d9807bece1f07f9ed2d0b237950f187cc4c4080dde6b86a6cc3da11e747a406 SHA512 543e389ce415df3beac1a84f0d2b4dbdd7ad4a5f9bf33a51e4cbe34fc29249a5d0e044aeaefcaa17fcf38be1f53a5a75f04bd6116d7d5d9e91851bceb3329564
-DIST microcode_ctl-1.23.tar.xz 755448 BLAKE2B ad7811536584343254fee8ee77a192834ef3aedac49615d8a4d6dd46f8ad68f01d1a01ee8e54988ade5f6878dc903da0c9f08a93f5efed041cc7bd43c864969c SHA512 f33b4fd43c39b3d4e9b6eb9a12285c7ea26ee43e6c4aa1e45f9aa92a0d2b7d55d1a950ee82d8aea5c86faa15dd1e85e829719b6c772a2c09f262bea630bc7edb
-DIST microcode_ctl-1.28.tar.xz 876760 BLAKE2B 8523bdc59ab21a6ec2e1110116bfb4c7a18e859e7f1da65d9e765274b47d5c1909d61eb18017ecc9369b7eedb43cf11cbdc495439aaf1c525bc8d8f7c63ca3a0 SHA512 ed5deb0f96c895b7783c23a1c91d2e03f713a793a21140b049e1b5f08f553dce103b4a11016ebd5076424b1032342d009d952e0089badfea2e91ad486d2cf7f8
-DIST microcode_ctl-1.36.tar.xz 3553884 BLAKE2B 0667971e546a135aba6c49f7eb04908595540ab3ecaebbb175cabda0aeb3396fdb145245a7fab44ec095f447f88e3b78990b22cd4f07568ac4b80ef321109fa1 SHA512 be35b670eba65747aef8bc7a78e989d3481fa0cbfb1635332821da75decef2540f3249ab6ecbe5b95f4d52e9a982cda2c7df31d2f406c0ba27c0354b6b70c2bc
-EBUILD microcode-ctl-1.23.ebuild 1271 BLAKE2B 8a7adc9b789dfdadf4a44ee4301040c0047f4e68bc71d46b04acbfe2b1d9978415d6e184d328d05c39b65a37b59db34d5b274cc1168cf52e93775413862a0a0c SHA512 b5ef619c8b5821e4a52282f34e7e4880962e2d9d6f8f279f3ae7553ca5a72e28c69f4ac921b1370ea199635c63d705e89e78968ff3fe5520556c4732fbf68355
-EBUILD microcode-ctl-1.28-r2.ebuild 1145 BLAKE2B a82fc4d8ce1175a9f7361afd20cdcd4e5c61a067840118b011b6f733700bb2f75a8a6e795113a44ee2c173886a4762f757eab072abe746dee0f8a8eace8ab8d3 SHA512 397d5831a6aafc2217c0094cc4a31c1fc2943ec7fd084b9325492e471662acd2dcc727d7a9d7d28cf90f7cfef74b55b373e2ed795170bf3c75fd5c91cd0dc7ec
-EBUILD microcode-ctl-1.36.ebuild 1147 BLAKE2B 9bb9e2be7a589eaf4ffc30ebf95bb9a6f7f38019c5b598659dc7a037fa3051673c2185df8bfc7007205436246214cb40260ae8204f2ba0876ed33350b838bf95 SHA512 c6782fc6a6919a2eda6f6b229c0498b4ff1907cee8eab2dcfdf43017a6849cc996af39202daaadf2d7093c51752984938e7c77090c4b1529b7c2c7001bbdb4aa
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d b/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
deleted file mode 100644
index 0505a80ae92b..000000000000
--- a/sys-apps/microcode-ctl/files/microcode_ctl.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/conf.d/microcode_ctl
-
-# Device to pass to microcode_ctl
-
-MICROCODE_DEV="/dev/cpu/microcode"
-
-
-# Should we try to unload the microcode module after we
-# update the cpu microcode ?
-
-MICROCODE_UNLOAD="yes"
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc b/sys-apps/microcode-ctl/files/microcode_ctl.rc
deleted file mode 100644
index 2169e24ea85d..000000000000
--- a/sys-apps/microcode-ctl/files/microcode_ctl.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need localmount
-}
-
-start() {
-	local ret
-
-	# Make sure the kernel supports the microcode device ...
-	# if it doesnt, try to modprobe the kernel module
-	grep -qs ' microcode$' /proc/misc || modprobe -q microcode
-
-	ebegin "Updating microcode"
-	microcode_ctl -qu -d ${MICROCODE_DEV}
-	ret=$?
-	eend ${ret} "Failed to update microcode via '${MICROCODE_DEV}'"
-
-	[ "${MICROCODE_UNLOAD}" = "yes" ] && rmmod microcode >/dev/null 2>&1
-
-	return ${ret}
-}
diff --git a/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1 b/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1
deleted file mode 100644
index ed08c4a954b8..000000000000
--- a/sys-apps/microcode-ctl/files/microcode_ctl.rc-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need localmount
-}
-
-start() {
-	local ret
-
-	# Make sure the kernel supports the microcode device ...
-	# if it doesnt, try to modprobe the kernel module
-	grep -qs ' microcode$' /proc/misc || modprobe -q microcode
-
-	ebegin "Updating microcode"
-	microcode_ctl -qu -f /lib/firmware/microcode.dat -d ${MICROCODE_DEV}
-	ret=$?
-	eend ${ret} "Failed to update microcode via '${MICROCODE_DEV}'"
-
-	[ "${MICROCODE_UNLOAD}" = "yes" ] && rmmod microcode >/dev/null 2>&1
-
-	return ${ret}
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.23.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.23.ebuild
deleted file mode 100644
index 1eb00abb9289..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.23.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit linux-info toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://fedorahosted.org/microcode_ctl/"
-SRC_URI="https://fedorahosted.org/released/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-
-	newinitd "${FILESDIR}"/microcode_ctl.rc-r1 microcode_ctl
-	newconfd "${FILESDIR}"/microcode_ctl.conf.d microcode_ctl
-}
-
-pkg_postinst() {
-	# Just a friendly warning
-	if ! linux_config_exists || ! linux_chkconfig_present MICROCODE; then
-		echo
-		ewarn "Your kernel must include microcode update support."
-		ewarn "  Processor type and features --->"
-		ewarn "  <*> /dev/cpu/microcode - microcode support"
-		echo
-	fi
-	elog "Microcode updates will be lost at every reboot."
-	elog "You can use the init.d script to update at boot time."
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
deleted file mode 100644
index 5385973e6115..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.28-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs versionator
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://pagure.io/microcode_ctl"
-SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-}
-
-pkg_preinst() {
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.28-r1 ${_v}; then
-			# This is an upgrade
-			elog "The init scripts have been removed as they are unsafe.  If you want to update"
-			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
-			elog "details (and bug #557278 for genkernel users)."
-		fi
-
-		# Show this elog only once
-		break
-	done
-}
diff --git a/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild b/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
deleted file mode 100644
index 4ca58a106615..000000000000
--- a/sys-apps/microcode-ctl/microcode-ctl-1.36.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs versionator
-
-MY_P=${PN/-/_}-${PV}
-DESCRIPTION="Intel processor microcode update utility"
-HOMEPAGE="https://pagure.io/microcode_ctl"
-SRC_URI="https://releases.pagure.org/${PN/-/_}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="selinux"
-
-DEPEND=""
-RDEPEND=">=sys-firmware/intel-microcode-20090330[monolithic(+)]
-	selinux? ( sec-policy/selinux-cpucontrol )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
-}
-
-src_install() {
-	dosbin microcode_ctl
-	doman microcode_ctl.8
-	dodoc Changelog README
-}
-
-pkg_preinst() {
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.28-r1 ${_v}; then
-			# This is an upgrade
-			elog "The init scripts have been removed as they are unsafe.  If you want to update"
-			elog "the microcode in your system, please use an initramfs.  See bug #528712#41 for"
-			elog "details (and bug #557278 for genkernel users)."
-		fi
-
-		# Show this elog only once
-		break
-	done
-}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 81458645c76f..d1c1e1457f9d 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,11 +1,9 @@
-AUX sg3_utils-1.26-stdint.patch 758 BLAKE2B 08fa2bde2dbba27eff678b39d7e42489f2d75f6052ddb570a0f4ebc6eb62b3e1d8cf3c54a56925639586a9c0016f2147432c305803f531c02cb9d6052b6fbe0e SHA512 e7a9b51595a17a33513accf4b1b2fb98914fb8328664e77ca9cc6a9ebd1f2bd32e85c53c8b854e3b617130b750e858d235bb259052fea632f367d430b1f1d8f0
+AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
-DIST sg3_utils-1.40.tgz 1179730 BLAKE2B 219605afdf87dc7cb88dca5cc1603718e4ff4a0b74e61f2e455b88b27a8f9d5457654776098ec24c6efd74dd7ccccdcedb2dddaf2de629613bb39d0f04684cc3 SHA512 cf4909c46d509ea7c1c8930d81df2b20ce56c56092830f017e69fa4ce7eddb395ae1d17f51657d8dfb539fdd78229223e54e0db2d61d2612d23313cd6846043a
-DIST sg3_utils-1.41.tgz 1194212 BLAKE2B a9abfafbabebceb8e10dce5abb4363b12dcdf5da228594e5f4caed89671b6992faea2213b22efd27c8d75679994a2105c005b4962571d5a1332d4c8142cf9877 SHA512 ceca778a2f4d16dd341dd47cc1d92df5bc85d7f75d75e6b7c1a99c31e03e98103a18abf624880172e162bd0b751f760f0e919cbbb989303a9e1fbe9ff3eb1f46
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.43.tar.gz 1180760 BLAKE2B 20475d974f9f4c0f275499a63f921b587df76e1b8addcd5201fd5db95e100eb0b4c8c97aba7e9651ae069c43e30cd7b780643212307dec6d53e5b91cd2c653e8 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f
-EBUILD sg3_utils-1.40.ebuild 958 BLAKE2B 0c3e77fe8abd3e63c93238aecf1bdfb7d0f9bbb8c25fc4420965d59170bcad5a560f9f9062d7fffa211597dacbd4cee7a94dec7d90297f2663dbdce5df998e8e SHA512 e347e8fc51a5875b71f4f6350ae03a6d03c8d77b5aab42dab36c0ec43441ebf75a8b291a906dd6a2ee0f07d053bdb453dda8476d2a569c3e16b52eb95fec1102
-EBUILD sg3_utils-1.41.ebuild 969 BLAKE2B 6e4f1e17980afc6adafb681a857bb56e1d302b595c8e007492bd003fe12187e1d063ce14c99569d8cf592bcb42a99b20bcabddd0888339870b011152ba6e7263 SHA512 542582bd4130f2cc0bbacbc30a2a487ff8300845b43f0f7e4b83edfea4274d34468ddcf65ce919123afb93ecbd2d76853d80ce708456c4852390cb207f2e4055
+DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 EBUILD sg3_utils-1.42.ebuild 1030 BLAKE2B 7086604cc7f4e6ccbea214d7bbb9e66d1d07146d1cca14220dfc358ded7cfb4bd8f54b2f6fc49a082a2fbbb162ff3494b3bdb3a254448fb5e2db5b76018ca5c1 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59
 EBUILD sg3_utils-1.43.ebuild 1082 BLAKE2B 3fd661d203baa20ab824cfff31d60d5f3aa004c99e514b5182931c353f38f32a2948dded981637f85a7baf79c002e4df56768a1a3f0d630d2a5cdf45fddde761 SHA512 ebb7d708d91268e3e23b54a07060e8a351f97a32815821212872cc6645a8da06c5f558ea37c036e70b579bfcad03e7423e283f4d6e11445e2f1b7d6cfe8a44ff
+EBUILD sg3_utils-1.44.ebuild 1076 BLAKE2B 3b917030f5363a698efd36e3060f42935b7755259e0315fed930d861e54ad98f3e4b451c1a220b8aa1c63bd6a343861f9e773e31c1b122d7f7f5ac260651147e SHA512 db18c2fc70c535d6431f318e4dcaaec7a31c3eb66659bb553b0359f96f70ee3a5a7157fc58ac3783d3a5b396592942495e84164952255f2eb7ea3824f8a136be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
index a82ab6add9a4..62fb30240e10 100644
--- a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
@@ -7,8 +7,8 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 For uint64_t to be available, <stdint.h> must be included:
 http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
 
---- include/sg_cmds_basic.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_basic.h	2008/06/26 23:28:06
+--- a/include/sg_cmds_basic.h
++++ b/include/sg_cmds_basic.h
 @@ -30,6 +30,8 @@
   *
   */
@@ -18,8 +18,8 @@ http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
  #ifdef __cplusplus
  extern "C" {
  #endif
---- include/sg_cmds_extra.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_extra.h	2008/06/26 23:29:02
+--- a/include/sg_cmds_extra.h
++++ b/include/sg_cmds_extra.h
 @@ -30,6 +30,8 @@
   *
   */
diff --git a/sys-apps/sg3_utils/sg3_utils-1.41.ebuild b/sys-apps/sg3_utils/sg3_utils-1.41.ebuild
deleted file mode 100644
index d3355b724833..000000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.41.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	dodoc COVERAGE doc/README examples/*.txt
-	newdoc scripts/README README.scripts
-
-	# Better fix for bug 231089; some packages look for sgutils2
-	local path lib
-	path="/usr/$(get_libdir)"
-	for lib in "${ED}"${path}/libsgutils2.*; do
-		lib=${lib##*/}
-		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
-	done
-
-	prune_libtool_files
-}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.40.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index 0a444d19b7d5..d98714db0ff7 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.40.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils multilib
+inherit multilib
 
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
 RDEPEND=""
 PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+)
 
 src_configure() {
 	econf $(use_enable static-libs static)
@@ -34,10 +35,10 @@ src_install() {
 	# Better fix for bug 231089; some packages look for sgutils2
 	local path lib
 	path="/usr/$(get_libdir)"
-	for lib in "${ED}"${path}/libsgutils2.*; do
+	for lib in "${ED%/}/"${path}/libsgutils2.*; do
 		lib=${lib##*/}
 		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
 	done
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/sys-apps/systemd-readahead/Manifest b/sys-apps/systemd-readahead/Manifest
index c50c35f4ccbb..6c725ddf48af 100644
--- a/sys-apps/systemd-readahead/Manifest
+++ b/sys-apps/systemd-readahead/Manifest
@@ -1,4 +1,4 @@
 AUX systemd-readahead-216-sysmacros.patch 1814 BLAKE2B 74dc5ed9bd5bc1947889c8f7a7e5574322ee8bf2bdee3cd068cbb3a453eae09cf13500757608b4e6b4a24d012a9c7af3f67e444b6ea68ff4dc2b3b658e062b1e SHA512 e48c013913b4db636f070d045eb65dff193d0b5cd25a0d1c98ed62b4071bc6925dce7c835341122fd6e0dc3136d11a8fa4ed35332a8b44ffb6f13195db9d6763
 DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2
-EBUILD systemd-readahead-216.ebuild 4306 BLAKE2B 676cf7b52273b8a4d464a3d8b0ac8ce324901e8ea3ea62bb1c7e2a95e183a46d5c5d7d6f89ef7d7f1c6817421130282aaad2698f0b63eff46d4c9fe6840a08ec SHA512 b7ce0255c5620821294ae1781fe5ea38993edd6b32fa55a0dda33be87170d7611064a684a6ae1824e18fa50f7c60a10eff19dfbeb4ddad73cc1888c1dfe3a167
+EBUILD systemd-readahead-216.ebuild 4873 BLAKE2B 44a79597767759f87831c3cdbfe50b20764af32361b1a09eb973709cdcbd896508cb79f107153c9320b739ad6f13e73a33b1236f8e7fe7a1b0a96e1db630f93d SHA512 7953f2d2b213ccf6685b46d5377887fd621fb1f751ab2d54525b192be10f785033989e99f5936b57af1fa4d6f923396b65a80477779faf8116f65b88c7b28339
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
index e256882d9165..a7580f0a561f 100644
--- a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
+++ b/sys-apps/systemd-readahead/systemd-readahead-216.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
@@ -135,8 +135,16 @@ src_configure() {
 }
 
 src_compile() {
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > ./Makefile.extra
+	emake -f Makefile -f ./Makefile.extra BUILT_SOURCES
+
+	# Fix compilation, bug #607068
+	# From comments at https://aur.archlinux.org/packages/systemd-readahead
+	gperf < src/libsystemd/sd-bus/bus-error-mapping.gperf > src/libsystemd/sd-bus/bus-error-mapping.c || die
+	sed -i -e "/bus_error_mapping_lookup/s/size_t/unsigned int/" src/libsystemd/sd-bus/bus-error-mapping.c || die
+	sed -i -e "/lookup_errno/s/size_t/unsigned int/" src/shared/errno-from-name.h || die
+	sed -i -e "/lookup_af/s/size_t/unsigned int/" src/shared/af-from-name.h || die
+	sed -i -e "/lookup_arphrd/s/size_t/unsigned int/" src/shared/arphrd-from-name.h || die
 
 	emake systemd-readahead
 	emake units/systemd-readahead-{drop,collect,replay,done}.service units/systemd-readahead-done.timer