Sync with portage [Tue Apr 10 21:18:45 MSK 2018].

6 years ago · 5bc920ec67
parent 4f70cb321b
commit 5bc920ec67
119 changed files with 1376 additions and 417 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/sudo/sudo-1.8.22.ebuild
+++ b/app-admin/sudo/sudo-1.8.22.ebuild
@ -23,7 +23,7 @@ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 LICENSE="ISC BSD"
 SLOT="0"
 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 fi
 IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"

--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -6,3 +6,4 @@ DIST gnupg-2.2.1.tar.bz2 6537959 BLAKE2B 4ec500110358a9e5c7d01157e3e9b29a6c70842
 DIST gnupg-2.2.3.tar.bz2 6547069 BLAKE2B a5ac44f696cce2ffbac72b80f0efcd19fe09934fe00d3fe90c0a5be5618b40b686fa9fe3e78a451e72835342afa75f4316b7ea34d3ff9fe602e621111876cc4b SHA512 c73df3c6f7ce65bd9867a39d10f93548496bf596ba0901737fc0063b370fd2d834c0b912e5aa07ff31067bc9c1263acc9d314c6bfaf7c889b72c8d46087810cb
 DIST gnupg-2.2.4.tar.bz2 6571487 BLAKE2B ec678470e574fdc9f057cc727cbb902ce525f76adae740722731e318032707d0f72873628024c2070a72c21321f2b8da16153edeafcb4ddeba72de59ff5c73bd SHA512 3d5c93b7662433103e9549d066a6b1a0c09d595851fab712d2ee844a55157e952a8a2dd5deff70fa8dd6817481f81c3fe5135603bca03206857310d04c1067a8
 DIST gnupg-2.2.5.tar.bz2 6584756 BLAKE2B d19358caf65627243c37afbf348acb2ea91f785272f318aed9e95e097c34cf3b3b1a223919a86e3ff09c045cb0b56d8aed7c746ed1223dd6a6aa072d24c44bce SHA512 675d2acc2ba95d14b14f4c83364663d88c982332fb4c35a4cf32af19a6bd4453ad89905c80d45007adb50c01816247df84d1f525e94bb668b962a84815e49bf1
+DIST gnupg-2.2.6.tar.bz2 6605028 BLAKE2B 2de6f8d32e551a8af5c41b7e6220a43645472b3b7f25b168a54343c4279f412d5d8f7a5142451504192259b3fe4a3e3242d12520dadc385f466dd701a803073a SHA512 ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4
--- a/app-crypt/gnupg/gnupg-2.2.6.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.6.ebuild
@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"
+
+COMMON_DEPEND_LIBS="
+	>=dev-libs/npth-1.2
+	>=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.7.3
+	>=dev-libs/libgpg-error-1.24
+	>=dev-libs/libksba-1.3.4
+	>=net-misc/curl-7.10
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	tofu? ( >=dev-db/sqlite-3.7 )
+	virtual/mta
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+	!app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+	local myconf=()
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable ssl gnutls) \
+		$(use_enable nls) \
+		$(use_enable tofu) \
+		$(use_enable wks-server wks-tools) \
+		$(use_with ldap) \
+		$(use_with readline) \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--enable-all-tests \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@ -1 +1,2 @@
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
+DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
--- a/app-crypt/pinentry/pinentry-1.1.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
+
+CDEPEND="
+	app-eselect/eselect-pinentry
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	>=dev-libs/libgpg-error-1.17
+	caps? ( sys-libs/libcap )
+	gnome-keyring? ( app-crypt/libsecret )
+	gtk? ( x11-libs/gtk+:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	gtk? ( !static )
+	qt5? ( !static )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	export QTLIB="$(qt5_get_libdir)"
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_with caps libcap) \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable qt5 pinentry-qt) \
+		MOC="$(qt5_get_bindir)"/moc
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@ -1 +1,2 @@
 DIST alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
+DIST alertmanager-0.15.0_rc1.tar.gz 2982827 BLAKE2B 76c36dab3b2569c81d1738320b7ac7f480715cf119a416df8fa2d7718641390709cb984c48235d7ebfd2413cd7b9c90b62eaa69786e55dc3ad38626f0c46a486 SHA512 93e5d1b068a1dea37f6de3c91fbb86329275e9ecd4a518eb874a735c386acfc19399611c061fff8c7f53cfc0b73fbbce0e17a6ac4757ea120e701dfe673b44e0
--- a/app-metrics/alertmanager/alertmanager-0.15.0_rc1.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.15.0_rc1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="acb111e"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/*
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
--- a/app-metrics/node_exporter/Manifest
+++ b/app-metrics/node_exporter/Manifest
@ -1 +1,2 @@
 DIST node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
+DIST node_exporter-0.16.0_rc1.tar.gz 1414955 BLAKE2B 6a05e3ca934e59f292133c09f3e6a1d0babaf184f8daa2861fe04192e4fd6d978ea8a7b8530dbe777f81ab762cc7b0899aed39cb7dbd49eae635acd25a957772 SHA512 65a39d15a6645b9a5c5e1650a929229e3ef780fe0d047792f003581322497a6e9ecacfb26af7c22a8d4a7034fd5ce886913e9ec4bfd049d521f01db463573aa8
--- a/app-metrics/node_exporter/node_exporter-0.16.0_rc1.ebuild
+++ b/app-metrics/node_exporter/node_exporter-0.16.0_rc1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/node_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+NODE_EXPORTER_COMMIT="f3ff44f"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for machine metrics"
+HOMEPAGE="https://github.com/prometheus/node_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix node_exporter || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin node_exporter/node_exporter
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	popd || die
+	keepdir /var/lib/node_exporter /var/log/node_exporter
+	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
+	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@ -1 +1 @@
-DIST kuroo-0.90.5_p20180106.tar.xz 242108 BLAKE2B 6f72ed347f98cfffa3cf3d965065b25b72607111d04952cf821b97cd6b73944b930af1e61955ddb0df6e7fdf91b3901d14b016de76971a95bf9bb36e9e00f355 SHA512 10431273357098e236c11253f456cee0320115108e058d0c31383f709b0488402ced368380dfe1fc30844cac7619da974f526ec22cea95361187c61d1fe67c61
+DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
--- a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
+++ b/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
@ -0,0 +1,42 @@
+From 77941829f2aba22e05142a47b689e17d594da610 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 10 Apr 2018 16:27:47 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ src/core/categorieslistview.cpp | 5 +++--
+ src/core/versionview.cpp        | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/categorieslistview.cpp b/src/core/categorieslistview.cpp
+index d499397..1246aad 100644
+--- a/src/core/categorieslistview.cpp
+++ b/src/core/categorieslistview.cpp
+@@ -22,9 +22,10 @@
+ #include "categorieslistview.h"
+ 
+ #include <qpainter.h>
+-#include <QTreeWidget>
+-#include <QScrollBar>
+ #include <QFrame>
+#include <QHeaderView>
+#include <QScrollBar>
+#include <QTreeWidget>
+ 
+ #include <kglobal.h>
+ 
+diff --git a/src/core/versionview.cpp b/src/core/versionview.cpp
+index 1a2b701..e83e265 100644
+--- a/src/core/versionview.cpp
+++ b/src/core/versionview.cpp
+@@ -21,6 +21,7 @@
+ #include "common.h"
+ #include "versionview.h"
+ 
+#include <QHeaderView>
+ #include <QTreeWidget>
+ 
+ VersionView::VersionItem::VersionItem( QTreeWidget* parent, const QString& version, const bool& isInstalled, const int& stability )
+-- 
+2.17.0
+
--- a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
+++ b/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
@ -41,6 +41,8 @@ DEPEND="${COMMON_DEPEND}
 	kde-frameworks/extra-cmake-modules:5
 "

+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 pkg_postinst() {
 	if ! has_version app-admin/logrotate ; then
 		elog "Installing app-admin/logrotate is recommended to keep"
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@ -45,8 +45,8 @@ STRIP_COMPLETIONS=(
 	# Now-dead symlinks to deprecated completions
 	hd ncal

-	# Installed by sys-apps/util-linux-2.28
-	mount umount mount.linux umount.linux
+	# Installed by sys-apps/util-linux-2.28 (and now deprecated)
+	_mount _umount _mount.linux _umount.linux

 	# Deprecated in favor of sys-apps/util-linux-2.31
 	_rfkill
@ -95,7 +95,8 @@ src_install() {

 	local file
 	for file in "${STRIP_COMPLETIONS[@]}"; do
-		rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
 	done
 	# remove deprecated completions (moved to other packages)
 	rm "${ED}"/usr/share/bash-completion/completions/_* || die
--- a/app-shells/zsh/zsh-5.5.ebuild
+++ b/app-shells/zsh/zsh-5.5.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.gz
 		doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/ffcall/Manifest
+++ b/dev-libs/ffcall/Manifest
@ -1,2 +1,2 @@
-DIST libffcall-1.13.tar.gz 985185 BLAKE2B 78d9b9f046185a9a658ed2864167c64e373359e709cde7abc9360b21959c015b201423b46b8048120b98edfd0047dd20184c5f543c7d1d33a7ffad983036c043 SHA512 c059fa89eb3e85bad22d045de074bfc88fae42454821e10905ffd67209b6e6ea44eeab120b869696f77b816aacb9a5af3e4b51c640512e876df1b6da6f296bd4
 DIST libffcall-2.0.tar.gz 938605 BLAKE2B 1e6fcae8f1dcaad52ca84d0dcf97f8dde5bb8153244bbb9047dbab5f6a1dade0a00f149507e6bb14225369a7081cadb069d23c8bc7cdcfaec937d7b9d47d08c1 SHA512 d75aa1df97b14692a9137745bae5b24c4d8f739cb1c7f854e7ed47e4a77a49759122abd6b0e445efa56381f47932c13cd21a154b2783649afb9c7a39e73fea04
+DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
--- a/dev-libs/ffcall/ffcall-1.13.ebuild
+++ b/dev-libs/ffcall/ffcall-1.13.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,7 +7,7 @@ inherit eutils flag-o-matic toolchain-funcs

 MY_PV="libffcall-${PV}"

-DESCRIPTION="foreign function call libraries"
+DESCRIPTION="Build foreign function call interfaces in embedded interpreter"
 HOMEPAGE="https://www.gnu.org/software/libffcall/"
 SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"

@ -25,8 +25,6 @@ DEPEND=""
 RDEPEND=""

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-make-jN.patch
-
 	# The build system is a strange mix of autogenerated
 	# files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly.
 	# We are adding them consistently here and a bit over the top:
@ -53,6 +51,11 @@ src_configure() {
 		--disable-static
 }

+src_compile() {
+	# TODO. Remove -j1
+	emake -j1
+}
+
 src_install() {
 	dodoc NEWS README
 	dodir /usr/share/man
--- a/dev-libs/ffcall/files/ffcall-make-jN.patch
+++ b/dev-libs/ffcall/files/ffcall-make-jN.patch
@ -1,13 +0,0 @@
--- ffcall-1.10/callback/Makefile.in~  2003-10-01 21:46:19.000000000 +0200
-+++ ffcall-1.10/callback/Makefile.in   2007-12-18 21:10:51.302118000 +0100
-@@ -51,6 +51,10 @@
- all-subdirs : force
-       cd @subdir@; $(MAKE) all
- 
-+vacall_r/libvacall.la: all-subdirs
-+
-+trampoline_r/libtrampoline.la: all-subdirs
-+
- callback.h :
-       $(LN_S) $(srcdir)/callback.h.in callback.h
- 
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@ -1 +1,2 @@
 DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 BLAKE2B 2a511f84091ade374eb5b9a975fa6dafe75d69c4c057113790492840acfb9b8e50137bf4927814d8d77b2e17f4e0a7fe1ffda511f7c599a604bc69d4f38af406 SHA512 2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a
+DIST MaxMind-DB-Reader-php-1.3.0.tar.gz 18573 BLAKE2B 6f093b4343438d37a44639dd47d4c149bcfdd351b9fe68eb19c1b739a28e7c7605728e47471cc7d5d257d56df5da37b5ffd32c275cb705befe9e6d60a137ac46 SHA512 480fb38122d1700b18bb0b85d8062397ddc7f003897829f3533901c12a409d76eea9d499ffc0fdd1bfaf4d35b954a30606a053b78e787eda27771995e2a1800b
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+
+DEPEND="extension? ( dev-libs/libmaxminddb )"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	# We need to call eapply_user ourselves, because it may be skipped
+	# if either the "extension" USE flag is not set, or if the user's
+	# PHP_TARGETS is essentially empty. In the latter case, the eclass
+	# src_prepare does nothing. We only call the eclass phase conditionally
+	# because the correct version of e.g. "phpize" may not be there
+	# unless USE=extension is set.
+	if use extension ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	# The eclass phase will try to run the ./configure script even if it
+	# doesn't exist (in contrast to the default src_configure), so we
+	# need to skip it if the eclass src_prepare (that creates said
+	# script) is not run.
+	use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	# Avoids the same problem as in src_configure.
+	use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md
+	insinto /usr/share/php
+	doins -r src/MaxMind
+	insinto /usr/share/php/MaxMind/Db
+	doins autoload.php
+
+	use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+	# The PHP API has its own set of tests that isn't shipped with the
+	# release tarballs at the moment (github issues 55).
+	use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+	elog "and then most of the examples in the documentation should"
+	elog "work without further modification."
+}
--- a/dev-php/pecl-apcu_bc/Manifest
+++ b/dev-php/pecl-apcu_bc/Manifest
@ -1 +1,2 @@
 DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
+DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_INI_NAME="bc_apc"
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]"
+RDEPEND="${DEPEND}"
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@ -1,2 +1,3 @@
 DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
 DIST ssh2-1.1.1.tgz 27551 BLAKE2B 5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941 SHA512 92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
+DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
+RDEPEND="${DEPEND}
+	php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@ -5,12 +5,12 @@ EAPI=6

 PHP_EXT_NAME="ssh2"

-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"

 inherit php-ext-source-r3 git-r3

-USE_PHP="php7-0 php7-1"
+USE_PHP="php7-0 php7-1 php7-2"

 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
 HOMEPAGE="https://pecl.php.net/package/ssh2"

 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.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=6

-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"

 inherit php-ext-pecl-r3

--- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=6

-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"

 inherit php-ext-pecl-r3 git-r3

--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
--- a/media-gfx/scantailor-advanced/Manifest
+++ b/media-gfx/scantailor-advanced/Manifest
@ -0,0 +1 @@
+DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7
--- a/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
+++ b/media-gfx/scantailor-advanced/files/scantailor-advanced-1.0.14-qt-5.11.patch
@ -0,0 +1,182 @@
+From 64a151a3795013f58880d2a5f4ce4688ecb88838 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 10 Apr 2018 11:58:00 +0200
+Subject: [PATCH] Fix build with Qt 5.11
+
+---
+ DefaultParamsDialog.h                  | 9 ++++++---
+ ErrorWidget.cpp                        | 3 +++
+ filters/deskew/ApplyDialog.h           | 3 +++
+ filters/fix_orientation/ApplyDialog.h  | 3 +++
+ filters/output/ApplyColorsDialog.h     | 3 +++
+ filters/output/ChangeDewarpingDialog.h | 3 +++
+ filters/output/ChangeDpiDialog.h       | 3 +++
+ filters/page_layout/ApplyDialog.h      | 3 +++
+ filters/page_split/SplitModeDialog.h   | 3 +++
+ filters/select_content/ApplyDialog.h   | 3 +++
+ 10 files changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/DefaultParamsDialog.h b/DefaultParamsDialog.h
+index d9ec86e..043446c 100644
+--- a/DefaultParamsDialog.h
+++ b/DefaultParamsDialog.h
+@@ -2,14 +2,17 @@
+ #ifndef SCANTAILOR_DEFAULTPARAMSDIALOG_H
+ #define SCANTAILOR_DEFAULTPARAMSDIALOG_H
+ 
+-#include <QtWidgets/QWidget>
+-#include <unordered_map>
+-#include <set>
+ #include "ui_DefaultParamsDialog.h"
+ #include "OrthogonalRotation.h"
+ #include "DefaultParamsProfileManager.h"
+ #include "DefaultParams.h"
+ 
+#include <QButtonGroup>
+#include <QWidget>
+
+#include <unordered_map>
+#include <set>
+
+ class DefaultParamsDialog : public QDialog, private Ui::DefaultParamsDialog {
+     Q_OBJECT
+ private:
+diff --git a/ErrorWidget.cpp b/ErrorWidget.cpp
+index fb76cc4..6fb4c68 100644
+--- a/ErrorWidget.cpp
+++ b/ErrorWidget.cpp
+@@ -18,6 +18,9 @@
+ 
+ #include "ErrorWidget.h"
+ 
+#include <QIcon>
+#include <QStyle>
+
+ ErrorWidget::ErrorWidget(const QString& text, Qt::TextFormat fmt) {
+     setupUi(this);
+     textLabel->setTextFormat(fmt);
+diff --git a/filters/deskew/ApplyDialog.h b/filters/deskew/ApplyDialog.h
+index bf1a055..69f18e1 100644
+--- a/filters/deskew/ApplyDialog.h
+++ b/filters/deskew/ApplyDialog.h
+@@ -22,7 +22,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <set>
+ 
+ class QButtonGroup;
+diff --git a/filters/fix_orientation/ApplyDialog.h b/filters/fix_orientation/ApplyDialog.h
+index dcd25d5..e46d30d 100644
+--- a/filters/fix_orientation/ApplyDialog.h
+++ b/filters/fix_orientation/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <vector>
+ #include <set>
+ 
+diff --git a/filters/output/ApplyColorsDialog.h b/filters/output/ApplyColorsDialog.h
+index 4c525c7..81f4177 100644
+--- a/filters/output/ApplyColorsDialog.h
+++ b/filters/output/ApplyColorsDialog.h
+@@ -23,7 +23,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/output/ChangeDewarpingDialog.h b/filters/output/ChangeDewarpingDialog.h
+index de4f2c3..31ee19d 100644
+--- a/filters/output/ChangeDewarpingDialog.h
+++ b/filters/output/ChangeDewarpingDialog.h
+@@ -24,8 +24,11 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+ #include <QString>
+
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/output/ChangeDpiDialog.h b/filters/output/ChangeDpiDialog.h
+index 7ce6f58..1b86ac7 100644
+--- a/filters/output/ChangeDpiDialog.h
+++ b/filters/output/ChangeDpiDialog.h
+@@ -23,8 +23,11 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+ #include <QString>
+
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/page_layout/ApplyDialog.h b/filters/page_layout/ApplyDialog.h
+index ba25154..07f83c3 100644
+--- a/filters/page_layout/ApplyDialog.h
+++ b/filters/page_layout/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <set>
+ 
+ class PageSelectionAccessor;
+diff --git a/filters/page_split/SplitModeDialog.h b/filters/page_split/SplitModeDialog.h
+index 2cf9e91..351f1e2 100644
+--- a/filters/page_split/SplitModeDialog.h
+++ b/filters/page_split/SplitModeDialog.h
+@@ -25,7 +25,10 @@
+ #include "PageId.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <set>
+ 
+ class ProjectPages;
+diff --git a/filters/select_content/ApplyDialog.h b/filters/select_content/ApplyDialog.h
+index f0f7041..a7ff19e 100644
+--- a/filters/select_content/ApplyDialog.h
+++ b/filters/select_content/ApplyDialog.h
+@@ -24,7 +24,10 @@
+ #include "PageRange.h"
+ #include "PageSequence.h"
+ #include "intrusive_ptr.h"
+
+#include <QButtonGroup>
+ #include <QDialog>
+
+ #include <vector>
+ #include <set>
+ 
+-- 
+2.17.0
+
--- a/media-gfx/scantailor-advanced/metadata.xml
+++ b/media-gfx/scantailor-advanced/metadata.xml
@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">4lex4/scantailor-advanced</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
+++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.14.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop virtualx
+
+DESCRIPTION="Interactive post-processing tool for scanned pages"
+HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
+SRC_URI="https://github.com/4lex4/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libXrender
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-qt/linguist-tools:5
+	!media-gfx/scantailor
+"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon resources/appicon.svg ${PN}.svg
+	make_desktop_entry ${PN} "Scan Tailor Advanced"
+}
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@ -1,3 +1,4 @@
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
+DIST pragha-1.3.91.1.tar.bz2 755933 BLAKE2B db24a8752cfc52ded17a15555f3e39f2792c4f9717bca75a158d4672812fbee8d502149c08daa15113aa0de0fb1fe6f417d8a36c1b1b98c73f47d0319edca0a9 SHA512 ec0617ce0e1ead5ce2783c7bfb26cc4a2fc3f15a6f79ba887a02fc8a3dd01551ff91a41e90acc7fb23793a2261a340acdb80b9268fd08b5fa7dd26dd337fb07b
 DIST pragha-1.3.91.tar.bz2 740279 BLAKE2B c42f1b6d0c7071b56080d8feb8a11c9ba00b1339bc653a61cc80f09e1f076b2183091dbe2cbc42e7aa7347826492fa77cbbac980c25999ce3968a8e74dbc3623 SHA512 49b03ef69e7d12086e324a2088b4540eaebc01fd56247c43f069bd1b9fadbdd1b5f27af87b5086cc3e9a957281c3f7ff72c8ce3b0a6474514714a017ca5e0ab5
--- a/media-sound/pragha/pragha-1.3.91.1.ebuild
+++ b/media-sound/pragha/pragha-1.3.91.1.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.42:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.14:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	koel? ( dev-libs/json-glib:= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig
+	xfce-base/exo"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	koel? ( soup )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable koel json-glib-1.0)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 10 Apr 2018 11:38:28 +0000
+Tue, 10 Apr 2018 17:38:23 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 10 Apr 2018 11:38:29 +0000
+Tue, 10 Apr 2018 17:38:23 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
--- a/metadata/md5-cache/app-admin/sudo-1.8.22
+++ b/metadata/md5-cache/app-admin/sudo-1.8.22
@ -4,11 +4,11 @@ DESCRIPTION=Allows users or groups to run commands as other users
 EAPI=6
 HOMEPAGE=https://www.sudo.ws/
 IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
 LICENSE=ISC BSD
 RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
 REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e841e61b9b310386dac59a3a1c78b713
+_md5_=ce8b019a0d5117b7b84d94d780f65b9b
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.6
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.6
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo ) virtual/pkgconfig
+DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
+EAPI=6
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.7.3 >=dev-libs/libgpg-error-1.24 >=dev-libs/libksba-1.3.4 >=net-misc/curl-7.10 ssl? ( >=net-libs/gnutls-3.0:0= ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:0 ) ) tofu? ( >=dev-db/sqlite-3.7 ) virtual/mta app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.6.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=566933a15e42687c5dbec7f903233817
--- a/metadata/md5-cache/app-crypt/pinentry-1.1.0
+++ b/metadata/md5-cache/app-crypt/pinentry-1.1.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Simple passphrase entry dialogs which utilize the Assuan protocol
+EAPI=6
+HOMEPAGE=https://gnupg.org/aegypten2/index.html
+IUSE=caps emacs gnome-keyring gtk ncurses qt5 static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-pinentry >=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) gnome-keyring? ( app-crypt/gcr )
+REQUIRED_USE=gtk? ( !static ) qt5? ( !static )
+SLOT=0
+SRC_URI=mirror://gnupg/pinentry/pinentry-1.1.0.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=91509c9a28a5816e7bca699e58a7ac75
--- a/metadata/md5-cache/app-metrics/Manifest.gz
+++ b/metadata/md5-cache/app-metrics/Manifest.gz
--- a/metadata/md5-cache/app-metrics/alertmanager-0.15.0_rc1
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.15.0_rc1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.15.0-rc.1.tar.gz -> alertmanager-0.15.0_rc1.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=397bad149f629d98d4005eec3f720c5a
--- a/metadata/md5-cache/app-metrics/node_exporter-0.16.0_rc1
+++ b/metadata/md5-cache/app-metrics/node_exporter-0.16.0_rc1
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.9
+DESCRIPTION=Prometheus exporter for machine metrics
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/node_exporter
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.16.0-rc.1.tar.gz -> node_exporter-0.16.0_rc1.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5d138e55b94e9862534ab7dfa591c4e8
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
--- a/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
+++ b/metadata/md5-cache/app-portage/kuroo-0.90.5_p20180410
@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite:3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdelibs4support:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 kde-frameworks/knotifications:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 kde-frameworks/threadweaver:5 app-portage/gentoolkit kde-apps/kompare:5 kde-plasma/kde-cli-tools:5[kdesu]
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kuroo-0.90.5_p20180106.tar.xz
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kuroo-0.90.5_p20180410.tar.xz
 _eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8f780456cb757b67e5ef77593a758a73
+_md5_=c6efedab331059326d9f1233f085c0da
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
--- a/metadata/md5-cache/app-shells/bash-completion-9999
+++ b/metadata/md5-cache/app-shells/bash-completion-9999
@ -10,4 +10,4 @@ RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bas
 SLOT=0
 SRC_URI=https://bitbucket.org/mgorny/bashcomp2/downloads/bashcomp-2.0.2.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	25b08efef07cea6bcd45b8c6dcce2782	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=52fff17a209fef8d881c02a409b43655
+_md5_=77df6238b974a1ba068f88b51d37efb8
--- a/metadata/md5-cache/app-shells/zsh-5.5
+++ b/metadata/md5-cache/app-shells/zsh-5.5
@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=https://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !<sys-apps/baselayout-2.4.1
 SLOT=0
 SRC_URI=https://www.zsh.org/pub/zsh-5.5.tar.gz doc? ( https://www.zsh.org/pub/zsh-5.5-doc.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c8dea8069cd6bb1cab20ce7ff58ba4b
+_md5_=d08d78881abd78480af7618db73cc91a
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
--- a/metadata/md5-cache/dev-libs/ffcall-1.13
+++ b/metadata/md5-cache/dev-libs/ffcall-1.13
@ -1,10 +1,10 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=foreign function call libraries
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Build foreign function call interfaces in embedded interpreter
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/libffcall/
 KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+
 SLOT=0
-SRC_URI=mirror://gnu/libffcall/libffcall-1.13.tar.gz
+SRC_URI=mirror://gnu/libffcall/libffcall-2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ffb41739ae8eb6f54d31c66052884a26
+_md5_=0d598c986509aff67dadd3c94b1d11d1
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
--- a/metadata/md5-cache/dev-php/maxmind-db-reader-1.3.0
+++ b/metadata/md5-cache/dev-php/maxmind-db-reader-1.3.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=extension? ( dev-libs/libmaxminddb ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+DESCRIPTION=PHP reader for the MaxMind database format
+EAPI=6
+HOMEPAGE=https://github.com/maxmind/MaxMind-DB-Reader-php
+IUSE=extension test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
+REQUIRED_USE=extension? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
+SLOT=0
+SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.3.0.tar.gz -> MaxMind-DB-Reader-php-1.3.0.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2584780888208b6e1db57de62be8d075
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=Provides APC backwards compatibility functions via APCu
+EAPI=6
+HOMEPAGE=https://pecl.php.net/apcu_bc
+IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.4.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=44a10f36382e3adf278467380d0efd75
--- a/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-1.1.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/libssh2-1.2[-gcrypt] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=PHP bindings for the libssh2 library
+EAPI=6
+HOMEPAGE=https://pecl.php.net/ssh2
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/ssh2-1.1.2.tgz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c16e310fd56a066f4e814376f541455b
--- a/metadata/md5-cache/dev-php/pecl-ssh2-9999
+++ b/metadata/md5-cache/dev-php/pecl-ssh2-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) >=dev-vcs/git-1.8.2.1
+DEPEND=>=net-libs/libssh2-1.2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PHP bindings for the libssh2 library
 EAPI=6
 HOMEPAGE=https://pecl.php.net/package/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=7
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	git-r3	25b08efef07cea6bcd45b8c6dcce2782	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e2ba3e211ac1e52e96679087b8d5ee20
+_md5_=24c3e5a3321588671618a321b3815933
--- a/metadata/md5-cache/dev-php/pecl-zmq-1.1.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-zmq-1.1.3-r1
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
 DESCRIPTION=PHP Bindings for ZeroMQ messaging
 EAPI=6
 HOMEPAGE=https://pecl.php.net/zmq
-IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/zmq-1.1.3.tgz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e556f9126f99842e2eebbcb7c08511ce
+_md5_=68036c3f673dccf1c8b47a3362f6b6eb
--- a/metadata/md5-cache/dev-php/pecl-zmq-9999
+++ b/metadata/md5-cache/dev-php/pecl-zmq-9999
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) >=dev-vcs/git-1.8.2.1
+DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=PHP Bindings for ZeroMQ messaging
 EAPI=6
 HOMEPAGE=https://pecl.php.net/zmq
-IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
 LICENSE=BSD
-RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
 SLOT=0
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	git-r3	25b08efef07cea6bcd45b8c6dcce2782	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	63b281041baa106ff1ef59b602ca7e2a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b3aebbea4b65cae8b8e9a8c03be9ad6c
+_md5_=27e1e917d800fc7e0e95500c4c1b6d13
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
--- a/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14
+++ b/metadata/md5-cache/media-gfx/scantailor-advanced-1.0.14
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libXrender dev-libs/boost dev-qt/linguist-tools:5 !media-gfx/scantailor sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Interactive post-processing tool for scanned pages
+EAPI=6
+HOMEPAGE=http://scantailor.org/ https://github.com/4lex4/scantailor-advanced
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 x11-libs/libXrender
+SLOT=0
+SRC_URI=https://github.com/4lex4/scantailor-advanced/archive/v1.0.14.tar.gz -> scantailor-advanced-1.0.14.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1030a0ef150d1593571919b757718ef3
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
--- a/metadata/md5-cache/media-sound/pragha-1.3.91.1
+++ b/metadata/md5-cache/media-sound/pragha-1.3.91.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) koel? ( dev-libs/json-glib:= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) dev-util/intltool >=dev-util/xfce4-dev-tools-4.10 sys-devel/gettext virtual/pkgconfig xfce-base/exo >=sys-apps/sed-4
+DESCRIPTION=A lightweight music player (for Xfce)
+EAPI=6
+HOMEPAGE=https://github.com/pragha-music-player/pragha
+IUSE=cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-db/sqlite-3.4:3= >=dev-libs/glib-2.42:= media-libs/gstreamer:1.0= media-libs/gst-plugins-base:1.0= >=media-libs/taglib-1.8:= >=x11-libs/gtk+-3.14:3= >=xfce-base/libxfce4ui-4.11:=[gtk3(+)] cdda? ( >=dev-libs/libcdio-0.90:= >=dev-libs/libcdio-paranoia-0.90:= >=media-libs/libcddb-1.3.0:= ) glyr? ( >=media-libs/glyr-1.0.1:= ) grilo? ( media-libs/grilo:0.3=[network] ) keybinder? ( >=dev-libs/keybinder-0.2.0:3= ) koel? ( dev-libs/json-glib:= ) lastfm? ( >=media-libs/libclastfm-0.5:= ) libnotify? ( >=x11-libs/libnotify-0.7.5:= ) mtp? ( >=media-libs/libmtp-1.1.0:= ) peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] ) playlist? ( >=dev-libs/totem-pl-parser-2.26:= ) rygel? ( >=net-misc/rygel-0.26:= ) soup? ( >=net-libs/libsoup-2.38:= ) udev? ( virtual/libgudev:= ) media-plugins/gst-plugins-meta:1.0
+REQUIRED_USE=glyr? ( peas ) grilo? ( peas ) koel? ( soup ) libnotify? ( peas ) mtp? ( udev ) rygel? ( peas ) soup? ( peas ) udev? ( peas )
+SLOT=0
+SRC_URI=https://github.com/pragha-music-player/pragha/releases/download/v1.3.91.1/pragha-1.3.91.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cbc05047df678b8044db53ae35dabb4f
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
--- a/metadata/md5-cache/sys-boot/efibootmgr-16
+++ b/metadata/md5-cache/sys-boot/efibootmgr-16
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
+DESCRIPTION=User-space application to modify the EFI boot manager
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efibootmgr
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils >=sys-libs/efivar-25:=
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/efibootmgr/releases/download/16/efibootmgr-16.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a00af6bf94c8e84884f6f23aaa6192ed
--- a/metadata/md5-cache/sys-boot/unetbootin-625
+++ b/metadata/md5-cache/sys-boot/unetbootin-625
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
-EAPI=5
-HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
-SLOT=0
-SRC_URI=https://github.com/unetbootin/unetbootin/archive/625.tar.gz -> unetbootin-625.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d55600bc803619c1a09d6ce0050c143f
--- a/metadata/md5-cache/sys-boot/unetbootin-647
+++ b/metadata/md5-cache/sys-boot/unetbootin-647
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
-EAPI=6
-HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
-SLOT=0
-SRC_URI=https://github.com/unetbootin/unetbootin/archive/647.tar.gz -> unetbootin-647.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80ba2b4186b9972804c6f36f05fd1204
--- a/metadata/md5-cache/sys-boot/unetbootin-655
+++ b/metadata/md5-cache/sys-boot/unetbootin-655
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
-EAPI=6
-HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
-SLOT=0
-SRC_URI=https://github.com/unetbootin/unetbootin/archive/655.tar.gz -> unetbootin-655.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de667bb6661307e1b37123404bb7d147
--- a/metadata/md5-cache/sys-boot/unetbootin-657
+++ b/metadata/md5-cache/sys-boot/unetbootin-657
@ -4,10 +4,10 @@ DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB dr
 EAPI=6
 HOMEPAGE=https://github.com/unetbootin/unetbootin
 IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/657.tar.gz -> unetbootin-657.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de667bb6661307e1b37123404bb7d147
+_md5_=2e537bfe0dba2a52e744a014ebb6ae53
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
--- a/metadata/md5-cache/sys-fs/zfs-0.7.8
+++ b/metadata/md5-cache/sys-fs/zfs-0.7.8
@ -4,11 +4,11 @@ DESCRIPTION=Userland utilities for ZFS Linux kernel module
 EAPI=5
 HOMEPAGE=http://zfsonlinux.org/
 IUSE=custom-cflags debug kernel-builtin +rootfs test-suite static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=BSD-2 CDDL MIT
-RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.7* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
+RDEPEND=net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-0.7.8* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 !<sys-kernel/genkernel-3.5.1.1 !<sys-kernel/genkernel-next-67 !<sys-kernel/bliss-initramfs-7.1.0 !<sys-kernel/dracut-044-r1 ) sys-fs/udev-init-scripts
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.7/zfs-0.7.7.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/zfs-0.7.8.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d3f393e843c8a85ac0a9d34e4246a07d
+_md5_=0af89e5548b2410f720f38ff0682770f
--- a/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-0.7.8
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND==sys-kernel/spl-0.7.7* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=app-portage/elt-patches-20170422
+DEPEND==sys-kernel/spl-0.7.8* dev-lang/perl virtual/awk kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) >=app-portage/elt-patches-20170422
 DESCRIPTION=Linux ZFS kernel module for sys-fs/zfs
 EAPI=5
 HOMEPAGE=http://zfsonlinux.org/
 IUSE=custom-cflags debug +rootfs kernel_linux
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=CDDL debug? ( GPL-2+ )
-RDEPEND==sys-kernel/spl-0.7.7* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
+RDEPEND==sys-kernel/spl-0.7.8* dev-lang/perl virtual/awk !sys-fs/zfs-fuse kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.7/zfs-0.7.7.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/zfs-0.7.8.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d60764ad9b9742387120e9ef7eda135c
+_md5_=10e49aa6679f9f41e850b2bcbbf8c17c
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
--- a/metadata/md5-cache/sys-kernel/cryptodev-1.9
+++ b/metadata/md5-cache/sys-kernel/cryptodev-1.9
@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-1.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6a2bf6feb7f494d464f3ec817b629f54
+_md5_=d44cf2682d3718d96cfc08335b29cd74
--- a/metadata/md5-cache/sys-kernel/spl-0.7.8
+++ b/metadata/md5-cache/sys-kernel/spl-0.7.8
@ -4,11 +4,11 @@ DESCRIPTION=The Solaris Porting Layer provides many of the Solaris kernel APIs
 EAPI=5
 HOMEPAGE=http://zfsonlinux.org/
 IUSE=custom-cflags debug kernel_linux
-KEYWORDS=amd64
+KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/awk !sys-devel/spl kernel_linux? ( virtual/modutils )
 RESTRICT=debug? ( strip ) test
 SLOT=0
-SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.7/spl-0.7.7.tar.gz
+SRC_URI=https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.8/spl-0.7.8.tar.gz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	731711290c6e38e1cf7ddcdca7d445e1	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6e304bf6d6fc5dc2158788e01a39b1fe
+_md5_=f40972d04a0a283e934935504b4f6648
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
--- a/metadata/md5-cache/sys-libs/efivar-35
+++ b/metadata/md5-cache/sys-libs/efivar-35
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/popt >=sys-kernel/linux-headers-3.18 virtual/pkgconfig
+DESCRIPTION=Tools and library to manipulate EFI variables
+EAPI=6
+HOMEPAGE=https://github.com/rhinstaller/efivar
+KEYWORDS=~amd64 ~arm64 ~ia64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/popt
+SLOT=0/1
+SRC_URI=https://github.com/rhinstaller/efivar/releases/download/35/efivar-35.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c5185bdd1488af543a02f562ae29744e
--- a/metadata/md5-cache/sys-libs/timezone-data-2018d
+++ b/metadata/md5-cache/sys-libs/timezone-data-2018d
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare test
+DEPEND=nls? ( virtual/libintl )
+DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
+EAPI=6
+HOMEPAGE=http://www.iana.org/time-zones http://www.twinsun.com/tz/tz-link.htm
+IUSE=nls leaps_timezone elibc_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+LICENSE=BSD public-domain
+RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
+SLOT=0
+SRC_URI=http://www.iana.org/time-zones/repository/releases/tzdata2018d.tar.gz http://www.iana.org/time-zones/repository/releases/tzcode2018d.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c4f4748de4fcfd9de01ad5d7a30bcd46
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Tue, 10 Apr 2018 11:38:29 +0000
+Tue, 10 Apr 2018 17:38:23 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Tue Apr 10 11:38:28 UTC 2018
+Tue Apr 10 17:38:23 UTC 2018
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Tue, 10 Apr 2018 12:00:01 +0000
+Tue, 10 Apr 2018 18:00:01 +0000
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@ -1 +1 @@
-756e1e40a8d0fab66c5769aa0dac67caf9f5f96a 1523359949 2018-04-10T11:32:29+00:00
+109aa132797d677cd7eb2172547dde7a115e8515 1523379542 2018-04-10T16:59:02+00:00
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1523360101 Tue 10 Apr 2018 11:35:01 AM UTC
+1523381701 Tue 10 Apr 2018 05:35:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Tue, 10 Apr 2018 11:38:28 +0000
+Tue, 10 Apr 2018 17:38:23 +0000
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
--- a/profiles/package.mask
+++ b/profiles/package.mask
@ -29,19 +29,17 @@

 #--- END OF EXAMPLES ---

+# Andreas Sturmlechner <asturm@gentoo.org> (10 Apr 2018)
+# Depends on dead Qt4. Switch to media-gfx/scantailor-advanced instead.
+# Masked for removal in 30 days. Bug #633386
+media-gfx/scantailor
+
 # Andreas Sturmlechner <asturm@gentoo.org> (09 Apr 2018)
 # Obsolete dev-texlive/* cleanup. Content moved into other packages.
 dev-texlive/texlive-documentation-base
 dev-texlive/texlive-mathextra
 dev-texlive/texlive-science

-# Richard Yao <ryao@gentoo.org> (08 Apr 2018)
-# Potential data loss regression reported upstream. Masking until solved.
-# Bug #652828
-=sys-kernel/spl-0.7.7
-=sys-fs/zfs-kmod-0.7.7
-=sys-fs/zfs-0.7.7
-
 # Andreas Sturmlechner <asturm@gentoo.org> (08 Apr 2018)
 # Depends on dead Qt4. Masked for removal in 30 days. Bug #649124
 dev-python/PyFoam
@ -603,10 +601,6 @@ net-p2p/tribler
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7

-# Andreas Sturmlechner <asturm@gentoo.org> (11 Mar 2018)
-# Dead upstream, no revdeps left. Bug #639358
-app-i18n/libguess
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (03 Mar 2018)
 # Fails to build without rpc support in glibc (bug 631044);
 # no maintainer, requires obsolete hardware. Removal in
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
--- a/sys-boot/efibootmgr/Manifest
+++ b/sys-boot/efibootmgr/Manifest
@ -1,2 +1,3 @@
 DIST efibootmgr-14.tar.bz2 34972 BLAKE2B 78490756c5fd449f4319b79e0818e9d80340bd487f57d0de34f79f48cc24eb7b9c7309b535d00efad4babd40904d4cfb085cca278170625a1e875961e423f5dd SHA512 97935f8752440ce236162e174ea3404e907ebddc5877d597a97813da76ad580689fc2e97044885fc860a12a473af7183242b6120e78e53243d35e569fb002baf
 DIST efibootmgr-15.tar.bz2 35476 BLAKE2B 19b7c9ce51f3b930b2d59fa4a594c7a8bf5f1c7aa3224049e88cdafe82991799b1b719ec68c80131027f70c16bd19e38157f5d0bc7761843959410c667aa4070 SHA512 d9d9eef14d373d5da88141e8105f754fea4c039755ed0a0cb9b3c9c2bb285733ad930fd912df42075fe2cf750585699307b067f594d8e65269b3b8a5a00b1cd1
+DIST efibootmgr-16.tar.bz2 36603 BLAKE2B 3d09a9d3c4ecd48010315fccae60ab408c0d08e9c734e86a944130ea03e038835fa08745819f5353efbbe36f5017be64faded4b625ef0a0b55d4ca0d612ef232 SHA512 936318c7163c07b716f89be3d830957d9db68ba1b059223f7ea3d9eafe0dbf1c91b9aee096f5aed70955c6052c3b8547295c0a47f17cdf43788259d87d1990b9
--- a/sys-boot/efibootmgr/efibootmgr-16.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-16.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-space application to modify the EFI boot manager"
+HOMEPAGE="https://github.com/rhinstaller/efibootmgr"
+SRC_URI="https://github.com/rhinstaller/efibootmgr/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils
+	>=sys-libs/efivar-25:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's/-Werror //' Make.defaults || die
+}
+
+src_configure() {
+	tc-export CC
+	export EFIDIR="Gentoo"
+}
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@ -1,4 +1 @@
-DIST unetbootin-625.tar.gz 22671470 BLAKE2B 7420d804f1a490edd701646a3c228687316f0ec17005bf0832104858f9e46fbbf184b13c6aa5f8b6f30bf411e033cddfefece9b9ee6f6fcc7872440af9f88b48 SHA512 0dc672097eb857f8516208f8cbe5a0ec3229aa5dbe56108f64c415d2d9d4679a41e3f8a4b7279c511197303a2e020c95293a305de4df2dc63dc4522b3d13259b
-DIST unetbootin-647.tar.gz 16253287 BLAKE2B 4095e2cc990de6a01d46e3861d20cbbd1dbb04ad90c929ea72034d935b82669e482032ca3289e717fa9d7cdd9a147bb19ce2e5c610f046f5ab9470a494a35d83 SHA512 487be195286dd1e7712afa86cb75f8a79a3acce77f5cbd2571ddad74533d84a90e17b96afecfd2c9831825975b6c562bfb218b583a042600c49a14179129e8bb
-DIST unetbootin-655.tar.gz 16258032 BLAKE2B 2cdf307702851d87302aac3246118c13c5c2a99f1a3a3b98156c5e0ca905d8fe79c87ce90817fee696adf2572bf26a4684f56245ff1e3573a1b7f97a489da970 SHA512 723b4c1499b5c9afd93e5ee3803c9ca18ee5ef5f7731797eedc194a2bbcc2c5be93cc6cb1059f8514f93a8c9e6d650aec40513f649b41382ae27c2f92389d709
 DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
--- a/sys-boot/unetbootin/files/unetbootin-647-frebootbutton.patch
+++ b/sys-boot/unetbootin/files/unetbootin-647-frebootbutton.patch
@ -1,10 +0,0 @@
--- a/unetbootin.ui
-+++ b/unetbootin.ui
-@@ -708,7 +708,6 @@
-   <tabstop>driveselect</tabstop>
-   <tabstop>okbutton</tabstop>
-   <tabstop>cancelbutton</tabstop>
-  <tabstop>frebootbutton</tabstop>
-   <tabstop>fexitbutton</tabstop>
-   <tabstop>intromessage</tabstop>
-   <tabstop>rebootmsgtext</tabstop>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST scantailor-advanced-1.0.14.tar.gz 926267 BLAKE2B 2d901afebf3d9b405365ba71868f7aa29c23c537af72679a89a29351557a1a12692223b961dfd0ced3ea540c45f90dde8ea13bcd1667aa355e90a1c24a21e932 SHA512 113723b8a62da1b7141e03b5ad8ac7c426a2943f882cd229c9c51d10de75ee85d019ac21fc2d9eb4cc0d5bfb9ce66a4c41cf523698adc5a9a5d99da02369baf7`