diff --git a/Manifest.files.gz b/Manifest.files.gz
index ea3d35a689e7..af73cf2d146d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2759459eb4c5..1d56332ed9ac 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apache-tools/apache-tools-2.4.33.ebuild b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
index 83ac607083ab..c57b37d38cd7 100644
--- a/app-admin/apache-tools/apache-tools-2.4.33.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.33.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
index 5aa7a6543f2b..17a86ac9f6d1 100644
--- a/app-admin/conky/conky-1.10.8-r1.ebuild
+++ b/app-admin/conky/conky-1.10.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 sparc x86"
 IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 4381a00d96f2..f559db5149f2 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,2 +1,2 @@
-DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d74784aa0723b003f2e1d84ec4c13167de33c311b785fddf7b045b3312955c4d84cf6e35ef7ec9265ef5de503670 SHA512 eec3091c5e386e8b7a52cb263e3c5ce6f41e285d2ae7974f4876e2ffa93b00f9f939055d978c6b9032ee1be2561992015560cdfa93a1ff2b1720ea0100fcf96d
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
+DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.13.ebuild
similarity index 82%
rename from app-admin/eselect/eselect-1.4.11.ebuild
rename to app-admin/eselect/eselect-1.4.13.ebuild
index cfe033136423..0e087c1df2a8 100644
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit bash-completion-r1
 
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/monit/monit-5.25.1.ebuild b/app-admin/monit/monit-5.25.1.ebuild
index 0cbe43595233..0d26490402be 100644
--- a/app-admin/monit/monit-5.25.1.ebuild
+++ b/app-admin/monit/monit-5.25.1.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
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="libressl pam ssl"
 
 RDEPEND="
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0ac57760d5cb..36baae7cd069 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gcab/gcab-0.8.ebuild b/app-arch/gcab/gcab-0.8.ebuild
index 6c0f56688307..77ff088306e0 100644
--- a/app-arch/gcab/gcab-0.8.ebuild
+++ b/app-arch/gcab/gcab-0.8.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-arch/pixz/pixz-1.0.6.ebuild b/app-arch/pixz/pixz-1.0.6.ebuild
index 488b2bce873f..7f7eb5c348ff 100644
--- a/app-arch/pixz/pixz-1.0.6.ebuild
+++ b/app-arch/pixz/pixz-1.0.6.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"
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index b6bdb2bbc41c..101ad65b2420 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
index 20d20168d47f..01d301ec01f2 100644
--- a/app-benchmarks/siege/siege-4.0.4.ebuild
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.joedog.org/siege-home/"
 SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos"
 SLOT="0"
 IUSE="libressl ssl"
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index aaeadbd69f93..ee9b9edb4c18 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
index 393d4f048431..949a6813ce01 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.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=5
@@ -8,7 +8,7 @@ inherit eutils
 MY_P="EasyRSA-${PV}"
 
 DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="http://openvpn.net/"
+HOMEPAGE="https://openvpn.net/"
 SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/${PV}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
index cf48b3864eeb..5604cb713a69 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.3.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.3.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=5
@@ -8,7 +8,7 @@ inherit eutils
 MY_P="EasyRSA-${PV}"
 
 DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="http://openvpn.net/"
+HOMEPAGE="https://openvpn.net/"
 SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/libsecret/libsecret-0.18.6.ebuild b/app-crypt/libsecret/libsecret-0.18.6.ebuild
index bb2a01f9ac06..5337020694d9 100644
--- a/app-crypt/libsecret/libsecret-0.18.6.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.6.ebuild
@@ -19,7 +19,7 @@ IUSE="+crypt +introspection test vala"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index b69170f2844f..17b847394789 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
index 94044217f8d1..035383b82d28 100644
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 04b9de92e421..486f3e182465 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 399c8449828a..2661d690a6d1 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,2 +1,3 @@
 DIST emacs-w3m-1.4.528_pre20140213.tar.xz 751532 BLAKE2B 14527b80ed3938f2685a98cf37633a9ba046b070d94dffd7c8082d65c09dfca4a63114aff55d0bfe85853d8623db55dd63db3e7d10142871287312281fa4ef59 SHA512 f4ccb41f2011354c091c9b07b2ab596f030a6b2e8ef2ef674db75c93e5bfe7347b8b3602283e169e7fd591c44b222482d1a399880c60176fc55a5e77ed728483
 DIST emacs-w3m-1.4.570_pre20170203.tar.xz 765108 BLAKE2B 75568e543719a25863ee943293f1a6ca4fff8b5af19a39d910efe5a8bfa7f311ef3620c34a6fcfe23e231e33d61c9ba5a03cf39b23155982079a0cf28471a341 SHA512 d1940679055d7ad74b7c417dc9e56061524f5afdf758075139e279c2df325af10eae334a6b83d40d39857237396da04744f19c293ffb8adb2e579c32ed118b52
+DIST emacs-w3m-1.4.625_pre20180518.tar.xz 788404 BLAKE2B f621071c8657cab848789d359d492e5bee0fe401af48871fa54298571d87192de7186b1ea92fd3d64e6f1713fd12e5750b49b7e54c94e8d3b455d614ef0d0683 SHA512 f60317024f6dca23699510c21f185c162a5b3f0be551c681ce69b3b46e6fc7860e875fa6fc46a0bfafd8e5e6aaa9f1b29af0e0731685fbca2ce2b636eca7ad93
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
new file mode 100644
index 000000000000..cfd2bfcc7f22
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.625_pre20180518.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp autotools readme.gentoo-r1
+
+DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
+HOMEPAGE="http://emacs-w3m.namazu.org/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+DEPEND="virtual/w3m"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+SITEFILE="70${PN}-gentoo.el"
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	sed -i -e '/^configure:/,+2d' Makefile.in || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	default
+}
+
+src_compile() {
+	emake all-en $(use l10n_ja && echo all-ja)
+}
+
+src_install() {
+	emake lispdir="${ED}${SITELISP}/${PN}" \
+		infodir="${ED}/usr/share/info" \
+		ICONDIR="${ED}${SITEETC}/${PN}" \
+		install-en $(use l10n_ja && echo install-ja) install-icons
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	dodoc ChangeLog* NEWS README
+	use l10n_ja && dodoc BUGS.ja NEWS.ja README.ja
+
+	DOC_CONTENTS="If you want to use the shimbun library, please emerge
+		app-emacs/apel and app-emacs/flim."
+	readme.gentoo_create_doc
+}
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 671fa0f49258..f559db5149f2 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,2 +1,2 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
-DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
+DIST eselect-1.4.13.tar.xz 177848 BLAKE2B 70e5a793759e16119f5233b2c974e0fcc8d213b2033e2b3b76e0a047797b1a0f2feb21ad3beda72f644b498725b4d8ff5c221dcd0870adf5197eaf81c6f3c895 SHA512 5ce10bd288268bc5b52031703f8ac8f3cf07bb22039339bb00c92583ed226162ea8865788f5c1ff4e058d38f0bf25e3557273fb1e839e0391c1fafb9f702bc11
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
similarity index 62%
rename from app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
rename to app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
index cbc16c8b03ab..349169b3ecde 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.4.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit elisp
 
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 00298ff9eed2..78ec9933e208 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/coldfire/coldfire-0.3.1.ebuild b/app-emulation/coldfire/coldfire-0.3.1.ebuild
index ac3e77cd5aa0..21e971272979 100644
--- a/app-emulation/coldfire/coldfire-0.3.1.ebuild
+++ b/app-emulation/coldfire/coldfire-0.3.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Motorola Coldfire Emulator"
 HOMEPAGE="http://www.slicer.ca/coldfire/"
@@ -14,16 +12,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses
-	sys-libs/readline"
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-headers.patch"
+)
 
 src_install() {
-	dodir /usr/bin
-	einstall || die
+	dobin coldfire
 	dodoc CONTRIBUTORS HACKING README
 }
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3c29889a4cd7..ddb94cb037ab 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild
index 3e80505179b1..0c4db18b0aad 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Displays a binary clock in your terminal"
 HOMEPAGE="http://www.ngolde.de/binclock/"
@@ -17,16 +17,15 @@ IUSE=""
 RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
-src_prepare() {
-	sed -i -e s/strip/true/ Makefile || die
-}
+PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die "emake failed"
+src_configure() {
+	append-cflags -Wall -pedantic
+	tc-export CC
 }
 
 src_install() {
-	dobin binclock || die "dobin failed"
-	doman doc/binclock.1 || die "doman failed"
-	dodoc CHANGELOG README binclockrc || die "dodoc failed"
+	dobin binclock
+	doman doc/binclock.1
+	dodoc CHANGELOG README binclockrc
 }
diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
new file mode 100644
index 000000000000..15a510186b55
--- /dev/null
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2018-05-29 10:18:47.795059054 -0400
++++ b/Makefile	2018-05-29 10:21:37.126740904 -0400
+@@ -18,8 +18,6 @@
+ # Boston, MA  02111-1307, USA
+ #
+ 
+-CC = gcc
+-CFLAGS = -O2 -Wall --pedantic
+ BIN = binclock
+ SRC = ./src/binclock.c
+ INSPATH = /usr/local/bin/
+@@ -28,8 +26,8 @@
+ CONF = /etc/
+ 
+ all : $(MAINSRC)
+-	$(CC) $(CFLAGS) -o $(BIN) $(SRC)
+-	strip $(SOURCEPATH)$(BIN)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC)
++	true $(SOURCEPATH)$(BIN)
+ 
+ install :
+ 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 41f3aee3ef22..d8b3ed8c6c7c 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index bbb56588dfc1..33cacb1f856c 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,24 +1,12 @@
-DIST amd64-debug-libreoffice-5.4.5.1.tar.xz 1157575908 BLAKE2B 8e1d646aa90c6739afe00da67fcaa93431c2504c190e8537393cac5a77033672a3df45f2b261e8dd262cbcb0e0cea0992994e8bd53f5cebcc5b55d0044115553 SHA512 dac4a9bc7e0c2c11f2d4d45dbb4bc6b91ad32ab226a26cebb81b070b2d672fa03c0b5bc9aee08447d55b285b915a118e6d0fc27c9cba27d9d93ea233c12915bd
 DIST amd64-debug-libreoffice-6.0.3.2.tar.xz 1229801400 BLAKE2B 7803c708814a8551c495d6dacd1f15cfe54bbe95b2101f1551519718dc464f990d86ef6bf3f0de88189f0f1119dd23c00b6557c5b59f7a11c12f56849db6a690 SHA512 46a3d5b27598ffe5fa20683aa4419119659e40fdf64e45a6770627e1b308efb19297ab7f856b2b89caeb3df409d569ed4095ae13fb39b1ea4e10305d2caef3ac
-DIST amd64-debug-libreoffice-gnome-5.4.5.1.xd3 331679185 BLAKE2B aa8e055aa7be3cbca196934e4f2d7ddceb3cccf92a1d3f1bb4bfc8b8e73274abd7b36dfa515e3f11052e131fa31af500761d88e28839c697ca2951e62015b2a3 SHA512 c3d9f4b5732a870090c598fc3d697a7c508b418574899fe36aadc4e691155887b9366ca46dedc30ea4d59bbf7643d839bdcf949abe3fbd683d4e161a20b6ae8c
 DIST amd64-debug-libreoffice-gnome-6.0.3.2.xd3 337274654 BLAKE2B 469596571d6fd22622218c6dc45d9b72638fb7f00cae7137c8a18a7ba716f0049c9b0e63d6811028784a8bdba999442d3da75d1de1d6a07ac09f66b1eb1e0191 SHA512 4020dc29a8c316f6fab9ff9d77faf30008219b01c0bb0cb2a3b48edf6680b390cfebeee22d361ee4e779af30a3e59c8b1f6677669a87f9a41c11a83ea73dd6c7
-DIST amd64-debug-libreoffice-gnome-java-5.4.5.1.xd3 563805504 BLAKE2B 8b4cdf10ef011c4657cec26a78d8ed79c1c8de36a67a62a0fd0daa3d7f9d739bd38d611cf1f79aa7a25c189ec2fb1fa22f292bb79769686dc73be11373b7135a SHA512 52c618371722136bce7440ed20b7d3a01c66a215d13c037a8bb2eb8691f51d38ff37310b063598f8e5750235304de018de9acb77f93912d44f9e22877ed27670
 DIST amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 611891145 BLAKE2B 9877d89fc3445401754facf2df41c962cc6b69889b2f67b536b6f7bca22ca9b608d834c10eb09ae11f602fe0196b71a37b84f9b92266d72f56c562ef27fcf4de SHA512 175ef1ca77c090e3a6f788925a79b177a7e34e1509d1eb169ca70384821b83b3b32bf4ff4913e6175cddfa3e92ec45dd18ccf1f43c8af9751617e932ff0f58e0
-DIST amd64-debug-libreoffice-java-5.4.5.1.xd3 555709754 BLAKE2B 13131e8c9e61663b6b595af308d307806ab3ded347796d669d397782b3795dae4bb477ca214007cd7470c7476b7ff0fb8e4b0b90a2581ff09bfe273f1ac81eb2 SHA512 809c7787b36a5354295d60a311ae3e5f48f078f7e0a596aa48ab099796d59f3aa30d40441cf834480665717dd72b98e28205e3cc985611901d8ba85d99c4a318
 DIST amd64-debug-libreoffice-java-6.0.3.2.xd3 602837451 BLAKE2B 71a87e3cfe01391ff0fc921e1e8227e5a5f60ea45fba1ea44c657f5a970edad464b161b60c051a8ae01570407994aebba8d69780475f7200d2c4bbf0faa167b9 SHA512 3c07c774e8b7aeb2ccd0977b9fd0737725fb3818c84d2ea35213e10b87543b73a3f7fc4a0c9748b3ca317c4f631308375720c8f73fe7a488bf07374064fd25ab
-DIST amd64-debug-libreoffice-kde-5.4.5.1.xd3 337957489 BLAKE2B d7599148be2770423226666c10511ce721bc59ed29ba54dacc696b6b00768baa6f4f2ebaebad227457db22454e0adc1ea59aab4a63c592b10b87ac773af02b2a SHA512 06a2afb7d014fd6ddbfc935267e59c82a9295c37bd30d17d210627b0678bd6050810c54e675e41627f5f9fe4814c14768c7cc25436388bcbafe5839868fe4964
 DIST amd64-debug-libreoffice-kde-6.0.3.2.xd3 342896759 BLAKE2B ef402abc0739975818feda3c3112f3af36654d0ca912f017beb76b9d3043d371316b8d294ae56d98acd4d3f4073d9505895f6f8f59f1003dde39a2907db4482b SHA512 877575d6c920db5ceb81f259053c8f7296f596e6bfaf75176bb522592f5eff0b4599f5901b42a553fc224a2245cff15b002f959f001be8e438f5c6c081ea77c4
-DIST amd64-debug-libreoffice-kde-java-5.4.5.1.xd3 557521078 BLAKE2B 343b9dc888cc1582e2ac14532f5de2e2b728be3919204296696e208774da82f3e90a2f447bc5c3d703383c57e6155486fd0b7f5900185969141c69877dfafb16 SHA512 519a0977a003c2e1b47832a0a1ebc2de197522b4193a1890330f9f040d23a93b285a1b4e8efbe4de357a40537b68592c8f40cb72dec3d80fa871938f3c246e64
 DIST amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 617577189 BLAKE2B e22f192a8533d3500a3cc362c3d0f713d6e6fbc0874d337cc1742cf7825e4348301885317412ac2c038c6e83269f20e67c526792e0fde91df3cbbe46e5b5bbd5 SHA512 25973bade0ff78f6a482f88449de70cd237d430da1ff8ef561c6fe7eb4459d3e582ceae4721c37e589304324446bf877005de3923b857279c98f112180dca9a1
-DIST x86-debug-libreoffice-5.4.5.1.tar.xz 1130163208 BLAKE2B 2288afbf5773ca93d7eb28e95ea388b4f8770684b55923c291dd80327853d7b58a0895ff053769809a407981d36c4aca3a94bbc3e40ed4daa07acf07c2a40e4e SHA512 7cd7a73996ab43e17b4b6c941c109a0ac99a44727056a54a6ea40a45d59bcb86c1875748834a7b0e84b31c92f1d120898bc63b4400e3be0743bdcfaeae2d04b8
 DIST x86-debug-libreoffice-6.0.3.2.tar.xz 1201421892 BLAKE2B 205c3eda17dde4f096347e962bd3e4b9806da6e1b9266c72fe85b3ecce1d8286ff16857ee32108daea3641cc9fdb92fdbc7b0f175db5b6513d8cea2407ffc071 SHA512 93211e233504f590e3b00a6322038ff40840c446e09094e781d5779d11d0c746cb3b783bee582401cda994ee9424643d5b05fb1673906deeb022b7aee7ecbcb6
-DIST x86-debug-libreoffice-gnome-5.4.5.1.xd3 321731155 BLAKE2B c6c459e01ea90133773436c1ade2911099f8299808c30f92bb55e095c42dc30fffb8052bf43b0f4aa7635e0eb17569644d02bcce9eafe5f6ccce1d35c1ccfe09 SHA512 1047c0c633914ddcb06e430ef8aefe6d3c74d1e70ac63005c6e22982210daa6eb092380cf74d8b41c87d979249f4fe0cbbf6bce7793a3b0a6785acf484616cad
 DIST x86-debug-libreoffice-gnome-6.0.3.2.xd3 327309281 BLAKE2B c27828cced30fe648ceb1005df12c2ca931dc65d3ca696dc763cf458991c92ec8ba89a98c96c30eb60b8ba7f4f6d6df40015c7e1472c656c6cb694f25e83397a SHA512 572a7126a762a8d9c3783f772b9b6b8de931e384d5699a549466157f2fa464843e3d931261e6193221fb1dc53df22e96ba8ab4f68d920bcbfa254c1a397a9082
-DIST x86-debug-libreoffice-gnome-java-5.4.5.1.xd3 535171694 BLAKE2B e3467d6d9656bc76c76fc98a2c5844675b85da47c56512588cd8221935aa53ecebd4bff07e09a27cb9980fad8015fb12f458b47fcb6ac1b6e8e8794a9f1fe621 SHA512 03f065f5a2e4d7fd608cd8820866562d40fb1db64b729522c27e8732c809f5425046858286d91085fe01dcfa3bd33725f8fad7a55f1b078c8b06815982acd5a4
 DIST x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 590466385 BLAKE2B ce857408beada974f07df57f83e4abcd905994be1c393ee5a0319b879c561192fa2a2f7a122f530d82a0cc16ded766e49244c37b463c26bccadf2cfd811a0654 SHA512 2e1981190931cee047dc80bbc43f189447c0e7c3f533438efc7bdc001116db560530af3cd89e6e11d31d65fd05dac914fb40b0b715e5494968436fedc600ca49
-DIST x86-debug-libreoffice-java-5.4.5.1.xd3 527291958 BLAKE2B 5fb90285b7573e4d4bd3b6aaa8fdda01c3bf14fed3f4c9eb0b754ceb899627e2b091e6901370cad28fa407a8a3940e717b191bef3487c54d4f61dd8eaf6fe323 SHA512 8cbd19d8983f310976242c6c4f46be6bcc5e5693e074e997ae4e2b18589bb1d99df6417a7bae1cb7a421374049f5878f333452b12f56b672a48683e4ea72181b
 DIST x86-debug-libreoffice-java-6.0.3.2.xd3 581633470 BLAKE2B 83f32dbc5c095738a485f0dae6ce0a436f64032d9ae4e3ec789f3e1e3e73fb3155ede192fa9132f407556029c33c3915d08f5fb0a5ca05ddcd5b2f99ad48b3d7 SHA512 c31ce9b366879e7d43001212d6a49bb787bfa916b34e2b3faef8560a7b87f8a3eb25d08b2b1daea615c89e36dc98dfc79878e37038433ba3c26427230c90928f
-DIST x86-debug-libreoffice-kde-5.4.5.1.xd3 328651433 BLAKE2B bd54186c17798909ca555d493083b7fe2f7f0820def97b6c09644e7652e722cb2be4cbd8cb6bfc637bd9d982aeb5f5e5dd19d7fc7ec79ca8599ab8e3f913e12e SHA512 776f17374f45d2914946e0ebbba3a75585b2a416660c1a0c79c5b395c33bf1cbe9bd9b37276c9ba82dcd5ca820ad4dc6c1e932e06c0a5adc70e315db72eca2fb
 DIST x86-debug-libreoffice-kde-6.0.3.2.xd3 326143479 BLAKE2B f1e4a4804b0f5b9bd26f7cada129c6de72d39706e41fde3223d933ced0aa50ff60922dee22e6d3dfbfbfb26e5d219a92644e394793fe413041173672de7704ad SHA512 22a1e19316be3f5bec3ae62dc470ef46065ebe2cc3963fe4952d0285efdb4a434224034eb8dfaa60da866ce2854e0020518e088a4be322b944f7929ceb06bb11
-DIST x86-debug-libreoffice-kde-java-5.4.5.1.xd3 529080140 BLAKE2B d6cc31c28189ce1dd1b1e085bf6317914c85abebb4dfad64c15bbdf90689701ba35105ea24692086e81fbe17d691761f1305b938d4256a7dd5857e6ccb13feb8 SHA512 d5e5ee39c102ec951b437611186577b2f2ea25a529d26c01b97dd2452f38a52a2a0649944494246255451efd65af6cdea2fd724aa27d8b295570eb4658c01e3b
 DIST x86-debug-libreoffice-kde-java-6.0.3.2.xd3 589281609 BLAKE2B 7446486d969b3672dee561b98360fdaaf4a8c61de6bec38c7de92716db5694641b6429b3aec025649a0970d30b70e8b6a168bad320571b7c72061985b14acf92 SHA512 aa25befbad574afa525477ff23ff77bc59edebdd7bd66bb20174bcce0a99164a149c572054ccc888fd0179bcb539f746b74201f01bdc35dc613b116a6b86bf49
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild
deleted file mode 100644
index ca7d569d701d..000000000000
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.4.5.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="debug"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
-
-DEPEND="dev-util/xdelta:3"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/*"
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
-}
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
index e634b05d6fe5..ca7d569d701d 100644
--- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.0.3.2.ebuild
@@ -46,7 +46,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 50cddbbea12d..c46d0dc34840 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,24 +1,12 @@
-DIST amd64-bin-libreoffice-5.4.5.1.tar.xz 75480304 BLAKE2B 6a7b018e5cfd66b97e7f16e40dff7b6154ce622a2a992deae0b49114ce8bb2077553e2be7ce9b1a702495ba996b80bff39647cb864b688593dbb0edd026d8f35 SHA512 739a80cab6b508244e3bcc8b282bb728271b65d8f48b347ca4eb9e15239b1f35252f322efff85e3c47ddf420cd4f36a9d522fa675c1774f17868c2a69dd82164
 DIST amd64-bin-libreoffice-6.0.3.2.tar.xz 80241340 BLAKE2B ccf0df99283356aa384bae7d33c92fd44adb3aca4ddfd18a1afefad6c1dbf40e6fd31f2fea2ab53f15beb9d13707632c651d94a512ebc3959ae1dbce432139d7 SHA512 72a955f80c371c899c39ca2b2ad29e029ac5d71d5690b7cc198b413cbd2cf50064ee8340fc7fec82b5db24a1d94148788dfa3685dfd70ca7437aad3c0a443939
-DIST amd64-bin-libreoffice-gnome-5.4.5.1.xd3 16216047 BLAKE2B 0ea40233b41c637069174532c509fd36efecb03df10c35b23bb315379212ae08e41318a4cb28e2ae55680e410474a5b1b1fb40c6f533d2f1fdfa98d3f18c58cd SHA512 239cc60220719b1a46b25c6bd5482973b302b3c2b126e87091911355a837eaf653bd2cc5de81ee882ce839522ceda9bd19d47222e1933a3b6c847628d9dd32c3
 DIST amd64-bin-libreoffice-gnome-6.0.3.2.xd3 16533839 BLAKE2B 32513b9df6f67fa54ff61abbf26e48e785cc47ab7f1df38ce5b30bb5e156b79834bbd3933dd9fc15397453af44eb5d1cd60bb07b238df5360ead432f08600bc8 SHA512 677538bf28049dfd4e285ebbe260392ef12730b96c9d5772e919afbea87e07ccbfc427258ecc2715e4dd97e0e0e6c23150a972747848b352281be1da765e07ae
-DIST amd64-bin-libreoffice-gnome-java-5.4.5.1.xd3 26624424 BLAKE2B a79e5e50dfee66e628e217f702c3bd838c582aff3a0501c3423ab275e03122515ea30edbab709179ecbce973604a6b6222b7d2904001f22896efed8c6610eff9 SHA512 9a01c47a996e26de4508383451a4be669512b89f2a0a6cc96cd7f363f05610cf9d244fd30a801303d8db7e866935c4fce622a472f5991d26adfacae9db700bc4
 DIST amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 27088942 BLAKE2B 3642466bec0631a8c801d10e699c027db8ef2b7ffb207113afd4a80cd165c5575647927095e513dbc7ba5cfc256b9b24058559a18ef47107d3632608da5c1744 SHA512 71c47127cdafc1f89a1bbec5d640916fe4005beb3a3cae750685050724817805a564c4c6ffaa1b70157e0769b363bb79b2cd5a70e42edb439e59e8a7678aec57
-DIST amd64-bin-libreoffice-java-5.4.5.1.xd3 25747222 BLAKE2B 28a189cab3e748056d3b32f7f36037e517aab966ccaa42211e8a4e7f2c1db763b9ff2c84a9dab076c367da7143a6b0c8782f9898e075ff9769f1c4d3e8a5669c SHA512 54d0de9b7f32d9e65e32a8ad0cab5ff212b2751a41c1297fd7c38728f7ff2bb3fcaa9b1bad55714097d1ed726449783b0ed17e43d8032e0e35cc8696b5ed9907
 DIST amd64-bin-libreoffice-java-6.0.3.2.xd3 26086875 BLAKE2B 8b11a74400a5d275c72325842024cc911e38e987bd33f8a42292c4bbba1c6c25f95374c37ddf25377f02e799e47c745704faad0482840e867e53790e76a1fb41 SHA512 b8ecbc631de6451c27a40c5dbe373a829a6a1ac8ad7762817182aac71cb2efb70859badc9f08d67ccb836f32958d79f029236a910f0cd32cd583aff68422af33
-DIST amd64-bin-libreoffice-kde-5.4.5.1.xd3 9238961 BLAKE2B ca7f2853f8fa53eba373ef8f48f32d2f457b9a65d99b94baccc14dfb3e96b2a00f4e4cb164bdef1823c846b71906cbb932a59f4189113d62035c27de64dcf357 SHA512 14ef861c7166b939667fa9e759e3114aaa958bacec0924f98c0562e63c4c5c42986f5c5fc9cfb223b8a7848ddfe653a4f1871581fa4d776a8c64f30a3a577e7b
 DIST amd64-bin-libreoffice-kde-6.0.3.2.xd3 16836580 BLAKE2B b71b5945367d20e0b05cf17304ff860ba6d504a4922c125028ce02748c7fa88dabf086a0c57f35257f511475f87169137332a0b1a44e7e380041c5cf301266ed SHA512 0ff269492903f66b8702168fc9c0d432aa287ee01d167919abe7cd913e1975b8ae63b28fa4383d96cffced5a71420b445f762aa9ec3163301b164122dbe167cf
-DIST amd64-bin-libreoffice-kde-java-5.4.5.1.xd3 25851121 BLAKE2B a81d6a0588b54c8fe2cadf3ac5afed6791f1d752a9fd1da59845e54fee51247fbfe76dd0ed8ef4238e8a3043f24c88e437ace3bc9b07dca040035e9609d92e83 SHA512 120dcce55692e7b3cd681492b96202166a3155db104e8f984c2ff746a747594cf41cb91c400fa9015134e60aafacf77f8f8b7ed3d31ce8c1797b8b2820680560
 DIST amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 27332736 BLAKE2B 6ec2d1b3e66bc05bce17706206fbecc8cb00d1d472795e1b194286e2da4137aacb97f8fffe86b8628d61c3fcfd95e766ba1e58c0aca4f1ac7bfad26c143a1820 SHA512 7116c9ccac4c6453c5f859c12157ee908ad718958922b3c7cfff460319cb6b214f177f1f922fc670a395ce08630987b7f85497dc20f5802e5d2fc4c1aa7fbb45
-DIST x86-bin-libreoffice-5.4.5.1.tar.xz 77649164 BLAKE2B a7b5188dfa3c321a69a0328bf70e3637677350efbb399619937a255cf9d7d91fc16ac27c9acad3627f65e958009930270dbd3512e08021bd45743b380acff565 SHA512 7b7964fc84a1aa6f8300df5be166a76629848ea123f1dd582fe0ce93b4a85dfe5cda7dc5080adca5bd14cf85614172b8530b738a96b3ff40720c4ba41c0e692a
 DIST x86-bin-libreoffice-6.0.3.2.tar.xz 82383316 BLAKE2B 24841434c900c08fe8090e1981cf700b671dc19b7e38bc4d2a228dd86a31feec70de4c569bf9fafae48ca5adba7f7822d491433dd9579a889c9b29da319d00b6 SHA512 c9f16eacdc3efcb30c27df072851e31f519de421254b75196e566c594ae7bb9dab89effb37755554db7c24293bd96efd3647ab586ca63d20cdaf0f69512f49df
-DIST x86-bin-libreoffice-gnome-5.4.5.1.xd3 14266862 BLAKE2B aee448047f2d975de0b3420e125cb337bf9f5131bf89a9fc10294b81751ed107a6de282ea6a27a2e1be91e705c5a34613a1d38a0f169139f48aebbad56266fe7 SHA512 2321c78301c25d37cc06dac987105863faded7ea9128ee0a5a32645837ead75e3c85f78d0f017be6e5c21a9fe4b41ea1775ef3d5ce6544cc4d7931bbc4bf9c60
 DIST x86-bin-libreoffice-gnome-6.0.3.2.xd3 15746873 BLAKE2B ea6ba788dea6e4bf7d02359fc9278306536d6dc67fd1cdf034df012ce66ebf0ffed7a1992ec3630da8788516a07dc4960b7afd1cd885c959f758af80c436b13d SHA512 227556f927e1a9b02120d280605675e2b89598cf8d0af14074cd2caf12da1a939b275c9c720c3eb90319ab88ac5c452e4e84a0dedc62f4b0d02c3ab015503bad
-DIST x86-bin-libreoffice-gnome-java-5.4.5.1.xd3 25919818 BLAKE2B 4ef28d9c32a0caa39e034f14abf9f513c308734fdb1b1c1016ab431da3893b130c04c21110aad464b4f5aa1ff5955023eee5fb722e6734a76da78579d8d02360 SHA512 df2eb1b920899cc26d54780ba3b2d8673ce8c93d72bb2f5d7472abe1b8024d0f2426f935e8e9b9d83f2fc7d2c76c65acb804ca0d41332063637991bfa2857d0c
 DIST x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 25278665 BLAKE2B 73f17e5a6f247aec8183af3602a0e006670e128402fc313ee9421a279a35f39fe4143351df5570e2210fa0b1fe8380f54a719275ea8f35a64883209d599fa04c SHA512 0910cf556e3f6aebafe95f9dd0db45bbb90032f42a4b0245a2447b82f0cd0dd38837a499f4fa308409866fe0c3c3daa8601d75ab831fb5e5e521a02a5984542b
-DIST x86-bin-libreoffice-java-5.4.5.1.xd3 22349280 BLAKE2B b53fbafa5ca66800152af5e548f3600e69d8368b769dcb5553e13a1f657e57a1961438667a3745d1d0e8f46e69caaf31ad7450ef18f2e684a271233584422441 SHA512 8be523caf6b726c3844c7115d5ce922168eed27493c611028e528a98f64650413dcaeac0e589b8f78b52698f17e86fb3b55e712afe6a388dae32cdcf0b5f3d3e
 DIST x86-bin-libreoffice-java-6.0.3.2.xd3 22891551 BLAKE2B 9c83e2028c83f4b03cc4ff2b09fc207ef7dfe7168afb982519ef1581b06d97f78852fc92beebed3af04c92619d4852bf2e087601f02db6ccd3ebebb19ce8a540 SHA512 ef3b518da2d30ebab5d3a86a672adc696f68a970ab69cfd575f9687ea257985d5ccdde68587803830ad2583c1bfcc3f9e7fd30c70ede3abd8bf34b3d978c1d8b
-DIST x86-bin-libreoffice-kde-5.4.5.1.xd3 5234235 BLAKE2B f1c4f2db89cd4f6f013af9a5b9e89b88c1d5a8710ef7f03c136cd99c57d690a358741697f260a4220b74ee2c03280d80669c28112d7f53ca4d1f20d0fb63428c SHA512 993be8a8e65680f4e82040ac0232193c81b600f467d61cf2d8f009d3be3f22a2f24cc3479104c4e64c6cc0a5ddfef3cecd7a51b5d44abf3630d3a93d467a0159
 DIST x86-bin-libreoffice-kde-6.0.3.2.xd3 14377062 BLAKE2B dfd9f68bb720ab03b13c3b5af83d43bbbab28ac5f263806aa89e140654b8be2a6ddf973a3ba26d97ec517ecd97c939517376f3bb8214d38bdd50d844eda0edce SHA512 d87c81ff379e3d59f014a4c14397c4020c5022db353cd5b1e00d56a4cb9aeb1f3e608b9ec1396fc54bd54c8fecd2e48cccce6cf0f4a0831763703f6f512e2fbe
-DIST x86-bin-libreoffice-kde-java-5.4.5.1.xd3 22411985 BLAKE2B 6517ef3900e53d9b96ee41d68760de67a4b9f97d404eea0718efaba6e03771e1428002f1d2a2dd9d63712b9d0cf2c967a530f9579fee32bfe20622a2c5db7d94 SHA512 67eab09e4b46b52a587709244aba99ffa6414d6188340405d24d69abc6da194ccee8164b89a76be8a88c639dc4628322aaf18d2061e491681946201e4d0bca37
 DIST x86-bin-libreoffice-kde-java-6.0.3.2.xd3 26149695 BLAKE2B 7b8d349b888ca929472a519161ea915c3737cdbabbd4fdc7f850e326efa0cfb24890eb1c13e77ec600878bcd9ec22be87cfa1fa63bb692a739872e2264c28742 SHA512 3a3dbc2824afa8258ec546e500c6e232b8db49ddd489f63ed2d23d3492865bf7fc473518b115099ff68917e91d96188931b870d54f19602f3c8c3e37a5bf56cf
diff --git a/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
deleted file mode 100644
index 24e891a72836..000000000000
--- a/app-office/libreoffice-bin/libreoffice-bin-5.4.5.1.ebuild
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-BASE_PACKAGENAME="bin"
-BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
-BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="threads,xml"
-
-inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
-
-DESCRIPTION="A full office productivity suite. Binary package"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI_AMD64="
-	${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-SRC_URI_X86="
-	${BASE_X86_URI}libreoffice-${PVR}.tar.xz
-	kde? (
-		!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
-	)
-	gnome? (
-		!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
-		java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
-	)
-	!kde? ( !gnome? (
-		java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
-	) )
-"
-
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-IUSE="gnome java kde"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BIN_COMMON_DEPEND="
-	app-text/hunspell:0/1.6
-	=app-text/libexttextcat-3.4*
-	=app-text/libmwaw-0.3*
-	dev-libs/boost:0/1.65.0
-	dev-libs/icu:0/60.2
-	>=media-gfx/graphite2-1.3.10
-	media-libs/harfbuzz:0/0.9.18[icu]
-	media-libs/libpng:0/16
-	>=sys-devel/gcc-6.4.0
-	>=sys-libs/glibc-2.25
-	virtual/jpeg:62
-	kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 )
-"
-
-# PLEASE place any restrictions that are specific to the binary builds
-# into the BIN_COMMON_DEPEND block above.
-# All dependencies below this point should remain identical to those in
-# the source ebuilds.
-
-COMMON_DEPEND="
-	${BIN_COMMON_DEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/openssl-1.0.0d:0
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	net-print/cups
-	dev-libs/dbus-glib
-	gnome? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.24:2
-	gnome? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde-frameworks/kdelibs
-	)
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
-"
-
-PDEPEND="
-	=app-office/libreoffice-l10n-${PV}*
-"
-
-DEPEND="dev-util/xdelta:3"
-
-# only one flavor at a time
-REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test strip"
-
-S="${WORKDIR}"
-
-PYTHON_UPDATER_IGNORE="1"
-
-QA_PREBUILT="/usr/*"
-
-pkg_pretend() {
-	[[ $(gcc-major-version) -lt 4 ]] || \
-			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
-		&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
-	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-
-	local patchname
-	use kde && patchname="-kde"
-	use gnome && patchname="-gnome"
-	use java && patchname="${patchname}-java"
-
-	if [ -n "${patchname}" ]; then
-		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
-		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
-		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
-	fi
-
-	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/50-${PN} "${T}"
-	eprefixify "${T}"/50-${PN}
-	default
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	dodir /usr
-	cp -aR "${S}"/usr/* "${ED}"/usr/
-
-	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
index a74a787a4bca..47d6493690f4 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.0.3.2.ebuild
@@ -51,7 +51,7 @@ SRC_URI="
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BIN_COMMON_DEPEND="
 	app-text/hunspell:0/1.6
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 72357ae6ece3..50312194f77d 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -1,171 +1,3 @@
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_am.tar.gz 7942048 BLAKE2B d2d3ce1308c3e36d39f7c1a09bb876c38efd0557750b464e678d8e6f0f232eb59db1cf620984d33aba98cf21defb79d882693372fd763c37331dd79aaac8316c SHA512 9bad61d053235f65319348e181a7ebef85dbc5672874db6f8c152daeb5d6bd8da229b8a25bd56a15db12bf99ac037a221a9256c09f99572d20512fb3c2d642c4
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ast.tar.gz 7872016 BLAKE2B c03fa7a496b1d80d6a78dd45d3cb33fea0e8121910d421a1a76b414e85e4f8da1bf291142f7dc3f0d198906566bf3e79978adf03066cfd8ee0b1b878d4b9a3e9 SHA512 390617b1f18946a9b62537e3cb347ff785f53254e07735af25bf174ab7952d5ff073bbbcbe521509615dd252a0a5fe5039be38d98eebedd8eb82b68c08a8e55c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bg.tar.gz 8414586 BLAKE2B 265c01a43666abbd2011f8b9016e648ad3c7b1d7609d605b6ebc447bad5a09df51bfdc8ba14b95002b4ee06503fb0bc0277355ff47f9ed82fc49a4b627e4730c SHA512 cac8a033f4f5edf6e207e2103bb2cf0bc8577ab0302af63cda8281170242c3d8b52876ac552e4ca3c924c05954a8678dded497b23cc925ed2d14e295ee6bfaef
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn-IN.tar.gz 9126968 BLAKE2B c6900ce0e7b1e3cfcf91661f9e7033e8771ae266b9e54b390441fa46611b36eb377eae65225290d7b1cc8fb7bc19ca002996243360d0b98713c3074abf6143b5 SHA512 965f173db0405c8c57ca3cc0214ed2356cd4d78b6e5400159e76e3c18f5bd0e4d8427ce1d97d4cb433d89dbbd1577cf91eab06e5c92b669dd9d2489e8b2152bd
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn.tar.gz 9127333 BLAKE2B 318b8105432096539b9f8f0f5b7da0decf57dc9163808a53ce9d5e460c3937730c5cab28e5881844cd7a258d506e84f88c616945481988198aa8ca6c84b13604 SHA512 bf0b6dbea5003ea1f4c7237bb91e35152f7e908e41f4a7008f60fdd5dbc2601d5d6ac57f80d15e3919011815cd23249e70dcb383c23bd9d37dd4aa004e98f0f9
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bo.tar.gz 8873231 BLAKE2B 5c31e91d54c90fb27b5df4e8073c25b1deec56d0bf0135108e70af6c425b04331ae52af12f55803afc4185343fe4fab76343fb138bccbb49930727f578792a5f SHA512 2b84c676c2f6fdaea128d40cbe774c9e35e6851778e2f615146dc66352cc3a2433054f575120a1be41e2a90a5cbcde2cd065e38ec7733f73fa4b73fad11f726f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bs.tar.gz 7174779 BLAKE2B ed0e942e60e96d4cd97a7c38b15834f862098657393dd4b53c01fee8305bb66196e5d46a36967464304c3e098750cda582e875812c4144a6b085a25b6494ab4f SHA512 d88731ff95959449039aeed5f0d17c901caa2836028edc1bbd941c1c0cc609302c6a7c83ce7b8bb376b4e995a726269945be3500c57bbc457bfba7caaa77b6ce
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz 8010439 BLAKE2B 79a382e708975b0b8ff2e71d7fdc2870ef7a5c0246eac2cbc9e7c22dd706f647654ec09dd736f7fae9145749f41db510b15f0ba6f762ab62fb64550dbce0f2f5 SHA512 2c880f932353490f154bb08519f702000f31168d80416ec6f0111454707bc9cd461fe1ef03efd62c262596d970ebfd9cac04c205b080c3476e9aa07e75326b17
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca.tar.gz 8047134 BLAKE2B e187ae725ce4314708b28b2c27baff471192814fdcead2d28ae0502ae34147fd581f3075939b676dd18fc6ac7ff0aa8f6494fcf7057704eeac0aca653dcb4068 SHA512 7bc7f20168298f7e045fd3d4de4a7fb10e4c4ade5a7f5822ee54625b658194b477057560acc293203d1e70a1e4eef34c6cb43b2b26ad434a903a9de8bc0c5c18
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_cs.tar.gz 7734751 BLAKE2B 26beb0cd1c843e393a6d0dd12b7f318e18f45f69b0814aee78619f9ac7e39f300e9aa6aa8506714d9a36016ec71cf862c2131d8b3c547cc95874579461670c90 SHA512 15080f205d85d41cc9ece6027585e7fdbfd4aaf7e1ce22419bacdfc591fd68237c8c18fa1a4fdeec96fbf31787270c696c0fdb230e902e72c2fbb26a91b82660
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_da.tar.gz 7679157 BLAKE2B 3abddd387c082354b8a47c1077357b08969104575b9c7ce0c9ff6487b6d709c8e55a05a00d023fd0c0b4129af644f8e1cbc777dd691ea52fc148f8ea79b14eaf SHA512 f4db7e83f52c87b0975b6b0d43bb16c0c0b64b6813d2ea01918c905bff6dc7a263a2d8185a53c9051ea59ed19e2261a4343288b63b39e7b37cf63ceeebd93b6b
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_de.tar.gz 8190123 BLAKE2B a105bad535b30084c0d5e9ab6e7d5133061f3793c7c94c79137bfbc0f5217c2e9bcf5f6b88ebda958ac33fe2bc82229713c8ccf6e127fe5864607558ff1c6576 SHA512 6060c5da204a54e4dd89f18207a5491b1bc7d66035e779b3eb9c77ec4a0886b2f9c145b7177c4ecd53f521c946c1cd3d25bccf83cb3df77f4cc18b246f775802
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_dz.tar.gz 10258414 BLAKE2B 4bf1fd12db7b19fff51db9ae2656d6b63445bab85cf25aa8bf490a836e9923e197b2a31f21a85539d535bc670a6a464d04fa4b2ec455e04bf42899e2f7422848 SHA512 1d005b22c1095337a283bae4d79e380e50b0c23a01160b3bb7a7ae77e971712b6b5513f7c30d88ede680bfc006d33b05635a984900e742de64a13a863842caa4
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_el.tar.gz 9061728 BLAKE2B 38a45a774b06d5d50b42a783431d701a475d0aaba3987eb0a23701247e59bd6bcf33ace91031a7c8d664b46174e04fe576dfa45f8e705af52fda314a517f7953 SHA512 b27f7c3575715acff4b772a933b4307c9367a100fac10ac9cc748551e67cfc75f5da61fd8289a4601ba9ad38c3f4a0150f1fea7e1194f66080a76c05079d6673
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-GB.tar.gz 6513332 BLAKE2B ae0e6fad5350f11dde8fe88898c6746570baf2af4a7b0bef977a4892a4ed976341b781d5de67aa38cdea2d8ca687e2ef369ce499d91936f8715e7e4569f51e9d SHA512 af6f305ec45af002425917742eb1d4942457bf5e886eb4f7300774ba6f60640e1d7dcda25e96170332668fb726e85a713cfe18fcee589b175c7495b7ede4a898
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-US.tar.gz 6550085 BLAKE2B 0e48ceca6a1882a9d4c6b9a4f253aff628d43e12d607069ebb8548977d18e8802afb587e6fabcf0744e3f36d4525ef151591c7ec43f49e11d07f2be0da82fe66 SHA512 17f09bf0e8db0892e5de678d30c01443d2facc3f35403edc96cfdaedb6bedc357de9e362755f567d6de0d3331e5f683c200a659f854cf97b4eb8666725f673e5
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-ZA.tar.gz 6494766 BLAKE2B dee040439f2c6a955196461c83c769618b7db5cd598db0f9e0c45833f9e98c89265cca04174b5ffff49e2a904963f7f676d96a61e9b5900d507def1dea067636 SHA512 a4140d1b3545934667a87f67d3c8e0de1faed4405c38ac062ed5055d9b062aead836509b04d33cd0aba4e18a6f1a0ccc12df2fab31c0108689662a320e824d43
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eo.tar.gz 7076731 BLAKE2B 5dc2d13a5af4ae9e12607d938cea807a53a57b48c5da66ad6922d0949f4d27a10baf46a2ffb7fc2a788a63da5e7011acfdd06bdc3fb4b57ef778095bf7e9fb49 SHA512 2389d0f1bc4e147e33472610eada063b4cd07f6192a84c837b32bf7c6849d879b255184734f6cb818335221336c10fd2cd3380926428b397036e1a668faa45c7
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_es.tar.gz 8099642 BLAKE2B ee75148bb50b53ef150a88ad06502af5503c2ee3cb2943c332d147d0c47bb91a8385c05d1176c0207f0faf29106070287de7242c1501c7df1f4193bcc694aba2 SHA512 b1a4850992c6e6f3ca5513712bc2514db73b0beb82a7de54abd281f71acadec45fa74033b85fb6892b832573b085a891c700155af220ab93a3b4fd66fa692ed9
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_et.tar.gz 7604312 BLAKE2B 2f607171c6eebf27266cde3146464c644f93a1cb81783b1e99fdac61da6fc1d5ec0db2b692579c2a75764e36edf1562783aad5bcbdda298d776ecab98a994b8d SHA512 96eab3690bee036c8d4cc0fd8f29400855bf51da65fda192c1f992bbef9ac468cc584feac7935400a3eb338d27457a525b9922719cbdee78922c8e1c36145dc3
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eu.tar.gz 7672905 BLAKE2B e019342712b67f812c254ac49f376f7d752855963a2c844f71fc777a6a5c63b8c1e16f84966b8564c7833005191274a1adf7525bb852a6ce1ca9be1493610dad SHA512 d77cbd2e5c96579667fadc0950138338709f0f55d0b6cda30376d95d9490640b9515c8ec3a6dbe6a6cf9707922226daaaa848807d0a97074428e9d0de8e29ee8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fi.tar.gz 7839152 BLAKE2B 667a31e39b5803648419c4b82939c3cb8183f8c9755e62f90a131a4c7a1e1952bbbddabee849c1ad95c06d2c828d47f9778cc1eb2730f882f091117e3e28e21f SHA512 245bbd19341fc1e819ec1fda5f9f506d594eda956dfaeeaf26ddef0a53dcc996a598df82a069afdd94dfb9c6adff038bd624f7ad2ac2b4884a3f5952489726ed
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fr.tar.gz 8274179 BLAKE2B d2d3e39d35eae480a72ac15d11f95170e3cbf8aa84465354d8345f68221cb43d5c34de0a2a8063d97256361a6f7cf1447245bd3cfbf96c83ba6dd3456ca79bb7 SHA512 fd307cb23db897e522a191f175dd24fa58a94213683da366ab9a83138f64a93508720fe438ede87f0f2e9d9c769fc262056649f0b8afc12bc9a8ec5b2be05ef5
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gl.tar.gz 7762715 BLAKE2B 59585e74c4af788be379096bc97d2f897331997ed34c925efff740865a72d3ec934ec101c792e40414de1666812ed84828ac7429cab57ecc57320b30f3eed3c5 SHA512 acbab78e9e315a7f476bef8f6aac89c72cfe3b60596a48b2c393c94fe80ea7dc9c99cc78ff9e2aea894c385f41caede1673d6b3c7302723f4bf14f6f93ce39f3
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gu.tar.gz 6709325 BLAKE2B 0d0e2024d5f1eddf60206c91fe30473a9f72f2347b5f41e884ea86d6e3d88cbf52ba764a21f916388a3cc9f30491bb985673f379658ae731e7232e22c1c949e3 SHA512 ca2c77508ec04d34369cf7eaea1947452826bd6dd4d4bce66214cd8e4e30acf30d7380f651883a957a6f7df326832642a661844a4c7d0349aa9c84c269b7ae9a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_he.tar.gz 6321054 BLAKE2B fbbe5ac1be322920d4f2922ea1117c67e925227eb800b22c9842159b9efb198c697a65a1368056cc9f7d48bdc9790cd8c865cc92cbe360d5214628c23bc33bd9 SHA512 250263f0ff9af1bcd2068ba4954efa4d35e3719af47d69808f4571bc066b730fc2a87a14b68dbf6ef7eed33c5a88215655af4deadc2dabc5da98d6d95e04b374
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hi.tar.gz 7359967 BLAKE2B 8225c19827e4a9472557f15f3e190540436a0d4747f01fdb7ca07d681b6922ff0bb26e3c29d10f3893fd32ddb682d95f83d9688df001df8309fbae351a472dfd SHA512 64feff94bf4fea2c232818f9bff6b85cf2991e19a29c8fb32b443e495fdee1dd6b67caed66645d79f02fed4b2d40b4ac42803c9cf46ad24527636b0d83d17cf0
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hr.tar.gz 6863774 BLAKE2B 56b4dd343cb003ef530371b7d4f9948cb946eba0788d7b891133596f061086b58ee193239610b68f4e021fe0ac71f21ba8bcfbcc9c716890168fe64a0e69331c SHA512 4f646dbecc8efad1904639630c7dd2aa841c953f00e336ad6972b72d1bfe8106ebab0821f4b53a947fca94cecd1de9588dd467cae15ee7711b5b476a488e9bc1
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hu.tar.gz 8151094 BLAKE2B 716ea65d6a84d4661a1933b30a73914294785b4b52887e54a2c45c89f5862133365ae7f0cf537e271850c1c2a1cfcafb920b1f7b4f8bee48044cd014e30642ba SHA512 d409cd18553890e5204ed8a67f4a9a64eea2f15fbeeaa2c902d5a1f4325eb7b2ad144bfa03ef10b14d122dc8b36862985a70f8627b6edee585eec2b389b19922
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_id.tar.gz 6916661 BLAKE2B 6d6496b6bec090ad0b000b360baa4964638e89b298206190d40679c87df7f6a2555cd8a1658aa624f7ae6f5aeb558ad9ed17f23e1108cde59572ac85b685c0fd SHA512 1796c86c53aae07cfe0c8a14f6daeb93b69fc4d41bf5e97f246d3800fd8fa2165d56338189a8bb4eb3057c691b6b2c514679898893c327ea85e1301826acdb6d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_is.tar.gz 6994988 BLAKE2B ab26b25d90178a1484822980b1e9fe7548b6410ea5dc19df0675f0236c3368c8ae2ed3ebc8a818fdaf28304801dd90707cf0f57c2403f51bf7a376cc31ea8dbd SHA512 d58b2e627356da9cdcc0f9fafe289153eb3a02b0c572814e7795ffdc757bc0a521a389146009fd3a034a68392667185187fc8eed26601e46a46d512a1d258247
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_it.tar.gz 8031548 BLAKE2B 21c34a18ca2760744b5b27e3524d79478710b8598b47a16c8cb02237a70c22c5edca8fb025e889c1c0da59e60d58629bc74c298c038a2a6ffdd48a50cfc27eed SHA512 b8dbcc981e510980756608cc16c18a9bc064d28fb214dd5cfe5af615d553430cc38bdb60ed501258829d159980ad040ada582cba0cacf8752117a5bf15cc4533
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ja.tar.gz 13187917 BLAKE2B a15cdcd7245dc4f2c42222e713de839ff8ebdc110cc46d9e4906f9b2527b3f20604aa3fa4f8c0f6e6911f5aa31153b5278e323e76c644b193c089cc9230cdc46 SHA512 e2c9d59248c4caf089213641e01a298fc8693e6b726783dbe668bf98d67bfab7ce36a6b1cd920255e83675a1d673e68ba20fe53871e9a0265f12e21f2abe8fb2
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ka.tar.gz 7157981 BLAKE2B 6969003062162878cfd95bfe3106459203af7ff5360bbf55c2f6807a31e28d72cca1694271c3c99d28ce68280e6972019e9c3752bce3323b834dd3ab41ca7d69 SHA512 f4f0f7da2daac4b6da1a1907a7c340d6151e9e48784050e5a47bb33047502e76fc1327ea982dec554391f764f533c8984a7c8a63dfe1f7f9744abcee55c6b425
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_km.tar.gz 10320737 BLAKE2B d8c6026f6e9529379cd77f4869e1a2ae1313d39e976d5438a19eed7fc400ee9b14199dc99677a215dbbe1919e5ae5d1d1b44c1b667be38a67d981d8425dc8526 SHA512 30b5978bdeb1d83d55180954d153807ae30de35bf8717694d8ea0efa04f8ae78074a8ee9b98d5949c3a00687dc3264bb49b35247adcab1ee354613842573222f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ko.tar.gz 9396458 BLAKE2B d747a70c038f69c4d2732e75ae30becacdffd80caa491607b5db04cc9db1a83b8630f1d7beeb3f7aff0066dc2212dd85435270cba5a5c19285a22d2915e686cd SHA512 23bb82d77012b3032e1bbf2bc3a6c5d7233825bed0b91807d8262f8c8eb90957fc7bad6a59fe9641e53e3d85249a3b653fb82ecab5d68e717b6ba3588e157168
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_mk.tar.gz 7374034 BLAKE2B 49745015411b75e1148c2c6d2205ee89c65f6827080cc970a24d670ed27c94e2ff087a98a0234fca612795639349d06546d5be50a0194788c754c28ddb23c83d SHA512 288ed0a9e1a3d681cf88f363765f5171712465fb084f3b172204d3297ee3a8d17927e4d4ffef0688fc1e6511777ede5edb2e66b4708408135684a4f3ba764d6a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nb.tar.gz 7728313 BLAKE2B 5706934c22a183091818c6f6293d81fff625ae559191e93eebad1650ec1499bf633643ff3ee701bdb6446f4d44b0fe9c6b87c3201345625f56ee4ca7386fe79b SHA512 8b07d83e4a96df2bb29b6c1773fac58a66a1fd9032b84e720476972092789be446f1c73962fc171b81a7a797ffbc6b0fa83954e63fd553fc4a65b7827ac22c88
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ne.tar.gz 9751206 BLAKE2B 93155f6f4793b3f0c53224a5a89da5339623b0f2d7e10f7d4a03d243e82b5f97b93a4279893c6d395a39cf954fa76dd85722e51344ea32975d3bd140f4dd3ea0 SHA512 55f85d02225559b50d984efc6846909fa9aa772a6e25a8097f591bc9eefcadcafee7c86e40f3892578f2caaf17cd076c410197ffd0923ed644f6bd040c36b195
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nl.tar.gz 7834576 BLAKE2B f3aca157c0f9350f4b34880739097dacef41a3ee4938171ba84a394c4061bda207e57b04ce244f982bdba1b703780cb5031ad2dd7e7a9c42c7fe75097ca8f62c SHA512 d7d20d6d55e0626fddc388f1ab6bda466ba330bd30fee80efabcc5bcec8d9e932123e111c6e5ee0a1e8567647b621da1c89b24206f841de301334f6dd1926063
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nn.tar.gz 7708113 BLAKE2B 18d47e6284011ee1a865f9579d712c45a57ed2f74483422b3cd84621ab4dd9d0c202a15854544bba3ee90e409ea5a7dbb9894077bd81937091e5350385cb7b0c SHA512 fdfbb1e90ccc5ee8db20427e0b73d4c1f1858dc36f5989c123b902de2ef8339936f3594d23b8f88e9229b98bb44d1ac03e9542f37ea6d90ebf4909eaed5b3854
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_om.tar.gz 8028182 BLAKE2B be3b413869f36cda3993a834223b59a9bf6f25c0cee6ef896d77507bff3ee14e97da59d3ac29de3f98597e22494294a5ea36e54ccc47997ddd770849e29e7f3c SHA512 6e6e8abab7c8416e3eb0e2cd1f2396a03ad472c1a9e49ab8439aa3633c212371f55cc8ec5042bc0eff98f79eb4e2fc33da09df319cee70c3eadd15a384eb148f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pl.tar.gz 8169197 BLAKE2B 927f1bbefe00a5137f367fbd29ef118bc1efda1930eb17bd9011b4ef631062b75b760a56f6e1956ff27fa397f91eb07e071670bcae4427647eae283e0aaaf7e4 SHA512 79c59edbe70c051d5f2784f99d1e81a2d8b45db77923d5cf6fc2817fbc5cbaf4f4cfba20544a1e1a77332f040755319bde59387d8294da334eb359019f2b5709
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt-BR.tar.gz 7842285 BLAKE2B 3b47ffe62943a74990f22dccea8547981dede41ba3bfc3f0c2d0c74a5bee9c2f41633d3bc7166c05bbf298c5dd93ea3f43805f908368f2646e8ff3081f753c7a SHA512 1a350d74a19e62fccaec2e04686b5bf3da0d5a7a157f53a8f2424c080deedfdf893d47423fae7aa5f6be629c635facf71769ffe478be7ffab161af12e26ade44
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt.tar.gz 7811669 BLAKE2B 64b3f993b594a421d7bc0d52c4c334d4f3bdd74e234163e36523cd0bfa2763e0e1776f3ac1efa1155674ed4685daa3cae66938b48cf9100b838135fae66fcbe9 SHA512 593f085faa13ba6de6a0ef234add7105953db23b7c72ba58ebe11c23e7ffb3014787aa66186ebe39833ed5c58665e92ab9ff72834c2bb530cf008311bdb26b48
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ru.tar.gz 8460838 BLAKE2B de88593c9f05c3a458087251136cf9c7d857de23a4cced7a1a52ba5351092718aaaa695c69be92ca72e77cbc1b616d4c24787fa81a8dfd5abfca81402838466c SHA512 ff01e3e58a4d6053419802977df56a419228a8f4fae41958c9c66fee9355f918d874c5fdfca4f8c50435823576f65d706a721ebe7b66b9cd1581d332f2d0b1da
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_si.tar.gz 7249042 BLAKE2B 717ebc5365a35721a8c7b66ddab9d0a55cd7d3b9cfcb3e6b4f15ab0340ffa9fe281c68e41aa6a6a22066279f70f1eade4319d36fa6ad401f39c9084e1c8d3c8d SHA512 432aea409880aad33ba914a1b33e2f48477b7f031aaecc057747c31d53b819bec7f138ab1dd24bcbf65f2deaf6bd7ae8735abb78c51efbc99d27180ad3bc5709
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sk.tar.gz 7551287 BLAKE2B 8b4de9d41935944b2903286cdef026aeee6e474abcae2574d404b24ccd23d1a093b718a62c554a0512913b9cdc9a73896ddf8e41946ac72b4a34bdcef97c85aa SHA512 3225f541c0765f8bb0ea8437f6f578eae4991a11813abd52198ac8b6878629746453d8575e6e096d594ab284ffc7348c47cc0dd1e6518e103cc69962b4321cde
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sl.tar.gz 7852220 BLAKE2B 902b06252ede4df26bbadf1546e8e29f6da54a644f974221a6bc7eff32d5faaf3ed3deb1959df10fb963d90abd1b384d2822e653dd52d4faf809d435cefe2ba4 SHA512 3453d0e68c36670e0aa7d1a508d6b88b9f68bce382b2740226d5d19f4d5f85e74e96789a9c6a0c8128f6f34be24e66a3c81a86271d02fef3e4ca82f84af984cd
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sq.tar.gz 6905308 BLAKE2B 3c75bda60e947c0f62673f2f3e429f583f4796b821280315e4c6acce4b735e90d27c5909a1dda63a21dab6c7f915caca3ecf9cbb03276216a6c8defdeb5aebdc SHA512 85a17cd04721c47327b8df6b57cd97ad9668ed895c890210f404915583ea6fed5c6c9254230afcabbbe44dd44e92490a5972a48f2318f1ff2cc874172e3e5d98
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sv.tar.gz 7774033 BLAKE2B 2150da0c9aaa58fdb5902d61b98ef36177118186ba6a86abfa60361b2b44247a38cfeca16ce7e81cd6673670aac5e348dff68328865b580f89a2a2b81ba3a6a1 SHA512 791f9def7f49a3108f2da6298e33827ecf15b779ec7b25863dcc833b66b95899aa7bcf5741058880a0d5aade2acc857bb917c9a257bd05255a5f9d128e88b0f7
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tg.tar.gz 7209764 BLAKE2B 1b1e2f16f2871c617a943c58ebe14cf5ff9ec588c83b6f23a97e0630d44786378867515de3b8742c5e4416aa953d8598ba97a04597f6fe4eb9f7144e1e66dcbc SHA512 9120df94979a6704f5826874e274d8b0c05f55aa81136c28acbe1c67690023a5d7df5b0844e05529f1499c884b2156d84e2fb76c371b0b49bf84a08cc4bfc52d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tr.tar.gz 7998466 BLAKE2B 68fbe274820a194ec99432acfd607d06cb709c7bd87f083f72f8af3813dc1073cf6c1aa48c9608046fd6fe94ac2318203cea0d10a66d3e468f528e233ce52136 SHA512 dfc4f068728750b6e7179fd62821c3dc7ef3709d697a38b0f0993afdfa68315921c2fdd5ae9c2977552d02b1977e8d5e1d012fb5ad02ce635e890d7fb47a09b8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ug.tar.gz 6900982 BLAKE2B 60fa9c5901e347e23095e7365066c228ea009a3c7b7459faa8299bddbadffe92f7a9c7043d50cc18fea70c001f9649982587a219cfe16271014cb3d439e55189 SHA512 501879c39148e79cb160993c744311d9e2e64bf8692556e052fee83804b7edd0953a0abe0074d2c3e9df7ed7fec40be6fcef393993ee0ab90cb3f446721e81f7
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_uk.tar.gz 7914236 BLAKE2B 404f7b75f868b2186b73ee806ef6a825903524580832a1cbab77c7d82f71a46f84dc33563a79bfc27f67325f7419e71a10762a00389cdc3a5fffbb49801648d2 SHA512 f5ffb073f0f826bbf3376e4db434566d83c97794d7cc5e0d2d4133bb55c1d6203891a26378c9c5ac2c6c0169060414f7791042cc3dab55b07d33222f446fcd82
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_vi.tar.gz 8157115 BLAKE2B 9c938d8bf1c5c67f42d5d8d79809628a4e461da3cdf24bf4ebf61fb4215b31959bbdd11fc7f84dc097aba3e9b8e928d81641d00ef0880602be46dd087576cbc5 SHA512 e2a94fe9c545021eb785c90fafa85cb635d4c793bc1825e9d40bed29abbc3cc2f033a674dc8a9fcc819f1f1eca9740890f8fb6b8fb7d5154dbf305621d3dac0f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-CN.tar.gz 10730737 BLAKE2B 857bff1ab646a1cceecf11a648e65f39cd2e138aef59ddd82cb1153b68c0325b9649488883b9fada0771a665f4df640b191ffcc1ec06e20d7e6bc86d63158b1e SHA512 be5969da3277924cafae4e432f281f9c96fc2fcd2224f4b56121eed556973af024dd6cfb9dd9beac40085dbed82d1704c4c7cbb2c2b0064ba596d5fe7bd6b272
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-TW.tar.gz 10695002 BLAKE2B c90cd21a2c37150dc17b6b35550fe3b8ccaf73ece31caec6b311ed95becbab6b796e8f7e24e6e349ec3d494151e032bb6a20778b506867dc4be0ee0b88b57ee5 SHA512 9d98a95af555812f9165b59344176b93111064643f2da2d87a7262968a99a24b8dfd7468e5b88f303ab592d416a3675447e064747035a12391f140154cf685bc
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_af.tar.gz 1055598 BLAKE2B 1970873397cf989643e2c4c3037db8b5aeacf88c33b00e6a6edf771018ad94af17b1342a5245e30117cb0d794f8d911fb5f46a3e393a88ad194db9541da2fca9 SHA512 68615942e24531dba6bdffa2b2051a69610d2a16fe437b6717080cdf0339e6013997d3116def9cfa72859e33891b38dc8cbb8cf9cf2f61bb6dde3ea950036bcf
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_am.tar.gz 466707 BLAKE2B ded3868d5cadd239a331f3043c845ef1054d3af9d309ea2fe8ce82bfe8421983c1f7bb08ac8cdf227d531908cf4d6dd303bdcd44132930a3c5fbad36d53acc1b SHA512 a9fb58e539801152169e5bab239e009d18c6d6975cb70fac104708cd37b23b26288cc62f6e1942028cdd4d85666a4db0d46ec4158beddd7368aa3cbbd70a32f6
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ar.tar.gz 2205917 BLAKE2B 2a55ddb0608b2a2a52949da6ee2e17dc05fc1abc80b855e13f272c82867b9412be88c3577b816ac97c10b1640896c53e5a5e4772cdcdb4b8291e9a929fbc305c SHA512 41d38d049aa91e5f80dfb13a4361a69aa2dd55e56cf32aae125591fb25f5e50c5e686ed48422db659ace6c2c7f0189739b1949e2baa1732c9ca6b08ca06f7ecd
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_as.tar.gz 482893 BLAKE2B 07bc2855bb546274eaacb999324f8d87e8f9eecdd995215d2fa8acaf082720ebca312e5f97bc792926dde6323946e1bcc9ea640c10fff2fbdd5d08ed62fca7c8 SHA512 ab247e009077fbda572c915ef73d63ff2a5cb30c957f01e25c42c8993c0f94e2ab51adf119d4223c8899c563210a33117e53021ba876d40506439aefa3ee2d29
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ast.tar.gz 443080 BLAKE2B feb686c3835280725d601056d096be27ea213e1b710b81d7e7e9cbb5fca23a894c33f660472094b8b72a78a41fe7df4c8bea600817bc74942165946fc950733d SHA512 befb886c9b212b4dee907800eb437b307c5e5d13113429f0bc7f222e5ff3ea32febdef2b8dd2729ef5d4795c64566862aad59ecbaa1cb6a2e2003d2ae0d92c4e
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_be.tar.gz 841309 BLAKE2B f7d934e6434a20d4f04b005be5b4746d7111369e811a3bdab20ff67b20dc658ec003fa888f70286f5d79f3f30c7f3ea7e56cb4fbf9aafd549fc85ac9344d4c2b SHA512 6a1e927dcdb550ea70a9686bb75fc364f5c83b22163d0e82de645f5d81c4c98469503f0194db39ea871d0f83555608824d743046b2f7d7c35e198e55799089d5
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bg.tar.gz 1904331 BLAKE2B fe01d599ad24301a1c2f65e0e06318ceca4e51a448deb4aa5eb00da9fdb36cc93b73a0171ff28149071c14279b41f2255cabeccd7c5a919270c7efdb916659e8 SHA512 e667556bfc99f5317b166c6cd2a2eb81f56b5479fb00e715720e4cb9a54e37e3198c5130edb42cdfee6c17ae66dd6a7e9fd58af94a83e90bdd4e63a4bf715b87
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn-IN.tar.gz 490713 BLAKE2B 0c5f257ff6fe6225c95386c332f749f1a43c5b67ea96be7a948d7398b30c73cfa32d8e5ac40f567bcfd317ae6bf2d772968506b11fcffb1f093c5824a3211112 SHA512 d4392f24d604e726741a59bd2d5062c21ad1e16d2727df52214581c418e349acf14dfa3d2cf58112192b1a7abda40359980e55923d432765eaad9ca71b6ceb0f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn.tar.gz 835811 BLAKE2B 6859afe9dbc548335e86a285e0cb8a367b369ebdb79b71f89e8af067bed0ee64ce671da09dfd235c75e8b19195f859e49c44b83e78966f5169185eff73ba75e5 SHA512 df90da969c420c6b9fb2fee363c335d6ea5b981abe7f18345876d724b34e7566a57790a2c6be17d2f56b54253bec69a3eaae5503de2b29d49dc6239b6b0564b6
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bo.tar.gz 474165 BLAKE2B 434941989e8532b44a9a15d2ccf0e39c0e4f937db054127a357a73bf2a94a32859f225de3c5845ad2443926c72aced4b94ad3e84cb1765ede416d373a4813164 SHA512 cac208bea76baeb59d89f6d5db0a20d8ad034e35ee05f8baa080d101f6875648c84beacbe53e0c8ec42b5598637ff26aeaed0af1b3fe909ccb938babd9e6e14a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_br.tar.gz 1662370 BLAKE2B 6b42c6bd83c117386a5fa0e2c94c3222f8e95c79dc6a009036b1af91504b9d0143cd209139d27e543f7b8b0f22d5631601e950ef9606f5b20155f2d389099739 SHA512 ebddadd3e760c5e3b9c93741b3df58214c40a7e1919e80224478cd7d4c51b1c6d39aa9e2c086fe188053c4ff2cd497a9f1c8e97804560bb6bcdaa87f6703d1bc
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_brx.tar.gz 451366 BLAKE2B 01694f4baebf4860538207951f53d3f3b81e3b97842c480185421ba06afdb713dcdba7c4e35c5d04e2330ddda87e53e16810f595d1a2e0dc1a7e48bee41e25e6 SHA512 52496c3e92ae66cabdc6ee930c93cd563e5dd2513a099e049cb658c8789c87d7e37989c9abc771847bf9db701c1d061f9a182cddd0fba5c5bc1604ec6f848f8f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bs.tar.gz 557886 BLAKE2B a69be6d2825f0b419ecb8d67f79048e153c1bfce21bc8abe81c7e5c3b671542df1028af05719f266929f7e2c6ef15864fc276ac4976c6ec9255724a2ae6934bf SHA512 fefd8fa25888c7d266f2854d2914c9de6b223357ca0c520b4c5be277bd65057d48a7031d85c31381a90cda057f6abf00b79a0ccf2eb016e4e113901e246e39cb
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1714104 BLAKE2B 8ce7aca3a4a8940b76b0577f72f120ebe4f490257155e45c9ae0a38455a4523dc93feaaa4c1e5dd0df51b8ef39a865746e7fc325c8ffb2c764101478d6ecd33a SHA512 b040f86d1f0dbf144a2367a4ad9103dd2780f870840823f6df44eeeac71e87ecb40fba8a746e3cb987a30d13a401d17a534ea5a35392d972a5c549e818d67415
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca.tar.gz 1715968 BLAKE2B 542f6066e1f1101156915aade02c662a12e158865006f0cdf4899ba04805cf5ad8c409e949e6f029b96d265038f74cb6f773f2cc250240f46c75a466e6918764 SHA512 8cdeefd05444ec3362d21ca14e2245d7e7dba9d7b30bd1ffe406448bc26bd4a00574f3fc0f30cb6ad39bcccf3bd1aa109a6b35964a58ddb1ff16cdeddfcf117d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cs.tar.gz 2883283 BLAKE2B e3bd411c7eb0690e0a0639ab9030b709bef8d90115c7ec91f1a934a71def554a50d679a60609aac26fde06ad4288dd72cf46e82c12e2cb4ce5667027c0b422dd SHA512 da7fd941f784a2024b241bc4ae1f5d57163663a19114d647866801174b9ec93b22ff45ac6b313bd2779237e85bed2c903c678e09f526f75e6cbe4eef7f428442
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cy.tar.gz 426076 BLAKE2B ef36a80bb4271eb73d9cfbd832c0042560a239a7e776674ea2b6caaab321fd15b7776c0469d37d0a40e537c9426023bd6fa830ac6c89d3e4ae91d66a56f0d453 SHA512 7171f1d8db390a7939924ef2de01ce0fd6ad9d467c3c27c4759676c9bff0662fd76916b5de60c179f5a3202e7761c6e0b7d21ba0e979b1e3b07de504aecad6e7
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_da.tar.gz 2329880 BLAKE2B 7ffc58b0281900b5abd9f83228bbb56210608a35694e966d0ba084c53595ac376918d7fc1727496153719d22c526ad051ea88b11c69793f2a59be5d659627489 SHA512 7df9b04a432ad574e14c682d95045ea895c209c17f683e0ff83ef7f58508cbcae2ee70738da49f9daf775eee898ed2cbfd6d0858d3f123a29b1e27475b6aa736
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_de.tar.gz 21456715 BLAKE2B 447f3051308f6b4544577223fddeb1d7e82db09fe1ce12becae083dcde2077bb29485497019e6ac1e014dc848e9d2efc4759d8c42c2e5b31cfab399d63f198be SHA512 0a6a01ad2b121bda03ef6b9a52d8df3ae94916a8529b504a3e7b2ff9aabf14007898cd2b97c0ac0ffa4d3906a868a4bf722e1e923682e542b2d5e2cd2bce16d0
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dgo.tar.gz 478766 BLAKE2B 2ea140c33136aed4cbf90d8d1fc69dbef1d32b11953774cc08f5c1cff39019b5d087719ef799848762f84b29179bd87dbdfc3fda3d51845490e65d54965914d7 SHA512 4b38042250b598f7b4ec0642c216a19f7fc64e84b4d575818ea41aa5380c59810f722c9ccfecd87b1794bac9ac78d2775953433c1f19d4a968eef1af39f58028
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dz.tar.gz 472650 BLAKE2B bb719c88206cd1dfcb0a2c77e122f3e1dffafe6457c7381388c00a6956687c3eb2fdc065ce6cbde873c9bc4f0432dd0ed4596acc0971829f00588c22dc91c258 SHA512 4b59fb9cd597f514fb38f2d15c432a790f5fdcd54d4e50a203339c4eb900f25f80161dd6f4e3c95f694aa64d510a75a6dd9c67894915ddc7549b573e388e8436
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_el.tar.gz 2521058 BLAKE2B 9db9c89c4823a6d8b69244001d88a303eb1729e1af3fef77322ccebdb83f6a2cc45c09bb6a8f9006518118b8f55a24e53f9d70776f97062113363d5cc131871c SHA512 d2b403ec1db26571c0893efddd5b91977dadd4f30fe96a56c744891043289a049353d058da9dfb726647df2c289ce5eee839ea8d133f2ddf6ca4683c45a00fa8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-GB.tar.gz 6961995 BLAKE2B 7335224c2ca030f56c7ad5870359da8a47e1c566fdad017d19345dbe7483a9f3bf4f1fa7fee2eb32c5dec47d517fcd7ec74d2edaee4401e276934750477ae340 SHA512 bcc98e70f0fa338e920fc0bf72cbf6c52c60f98332eef2faab75def76dd30e72c06278eb4cb01170bba6a33866a72468b3df13f5dc7e2321dbb07da5d0b1e547
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-ZA.tar.gz 6879331 BLAKE2B 6168a1491aed32838576487727746d6de70844f0fd2054ebc68729e091415fc591110be9b39e97a68678dbc6837d744b4acf9602961b276e52092b66de06db4e SHA512 77f159e56cdcb2c0cfa4b03df563b50c26e7f744ac041df6abc1029162cb026e94fcd4d2b681bdeb6899ac3eeea293288ef1ae36481d30ee8b443964f4dbb830
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eo.tar.gz 421662 BLAKE2B 15c0315d7ef53a884d551014c36216ead1070b95927c3e3d4926e0e3ee81b8cbc59381ca98da2f8d4f8c24b981e23f616dac4d052dbb879890bd3cf5f6e7eec3 SHA512 b1d2672f9690b3390ada4f92d3d23c740801591d5ab9974b71a60621ffba856bfe072d71f7f1362e6b347cd6db8c72d967eb99ba2726a0c5eb8c3f2e0494a41b
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_es.tar.gz 1922189 BLAKE2B 3757add9b0af786c90ea678e672ac6a6783439f772a131099739e084f08bb9397d45c4a3f0340700c3561088114e834cb53a97a3f4348808d6bd031c2ed3a6fe SHA512 7e608d7d8a7bf13b95ebefb161a615f0fe622d8e78e06e6a28bbc69dd3fb8bd6e07bd86b43b00701d131f863920d94b054a2e65a19cbc99c618ea7bcb60f82c4
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_et.tar.gz 1333777 BLAKE2B b4a56c1eb02e9b9719aa1050e8138e32f92f498cf3c9c285c172a2f818c8c77e581059d487afa8416116bc28d7ad9fa35d6681105d9c6d1eb977a34b96e43de2 SHA512 cfc3550b8720c8a41f853e9b19f27f15dd8a53c29132268c8aa8a6c3a984aef69ecfc61cab0e10811a8aba0e7550975c7361ba0fca51197cee23e43621fc80ee
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eu.tar.gz 429832 BLAKE2B d606000d7a653755f907713f74b9d0e25aa034ff40e8c2fb240487c323294064e1b8e608544d10851996e6ae6e3176954184c0bbe27856032fdaffdcc1811fb5 SHA512 b5278522da5f161f9c2cc21e1ef93523d655ba8618829c2100a53a7cee9e7893d4d80fbe2bad877dfd6faf9bb08b0be329ee82bd1721754d2899a08762ddb94a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fa.tar.gz 448575 BLAKE2B 16755c6a7deedaa2bc1776645cc075265c7ac06e44f5d159fbb208c6a4140e4fdac6b10ccbee8e8a1da708cd9bb96b11e7e79f2149356a1dd0b580da91bddad3 SHA512 66da07daf05d4031c6f4c70dee8917ddad641f0d9bfa6a78cf126d85bffddeedc9bd191a2d562de0eca4ddf928be90fffffc5bd00c5c3b01bafb9cfd2d5ca08e
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fi.tar.gz 436418 BLAKE2B 8d4820694b0ad2fd51a3d9b4262024672eedc40d29e0ec61c8a96c20c4fce67ad1be805d24bea6267c4ae0367dc54f5cf1fb8e5278780260d257424dc7e2bfef SHA512 ce712812838574e4a2c295923beff44d5acd5c5bd9f36550469717f3decc90dc203563b9c14813b26e19b9294b5b405cf896dba29f8bafdabc9f9119bbb1cdbf
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fr.tar.gz 2732887 BLAKE2B d0f2dd0475421a246cf7079661dc0391e5788c7245b89369146bab16d637dc6f04bf9406fa84be0f2330dc8296d698b042cfd695b25cbc04fc55e4964f7508d5 SHA512 fda47ce541877c49d4484194a4b92e3184158b1edaf8a7f65bbc8fdd23cf570ff2afacc5b266d7c3cc364dcfb269e8b13b0e8e2a98f020c3f0c88db71b02782e
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ga.tar.gz 447802 BLAKE2B 9c7c0e3a92ee2950c83ae98229478918f8cf6056b43513d862d960fe4e0c503eae591b507bd0706e1e808a2e213eccbc0578b60081b697ee3021c1e2ce509a8e SHA512 fa0ee5f85c2d3b19cddba768ff64aa93f13a18f64a091c3588e5fd364f826a6e27cc8d71d98e06eba749056735a8b3ff83db63c1cc9d170c5caa5564f945c6f1
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gd.tar.gz 1480656 BLAKE2B b40d558fc19bc4a4f992a9b65307982241401c313ef245099ebff9c1ee1f07ff0bd8320839167c7bd081bff13efb9f665aaaecdf9a57bdd8b6dfbd7f06853bb7 SHA512 4ad68084cf95381d9e04d4d0607dc83014c28015d4edb89897191e86677dc5e19eddf37823f01712471c2a7b9def7216b94a8812dd9a2a7788220e8cc0b5626c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gl.tar.gz 995337 BLAKE2B 53a3007db6e915bdfb50ded4da1434c79ab3360cf67e5f83cc2dff7c4d8845e276b107bed2ee4fd0d8f3db920dcfb303f6a27b98788f4a4377371ee439c06888 SHA512 ac23d82fbd630ab8bd05db973b9c69c943722508afd40f796098610f95b9f27978b8dbf070ca7c59893e1993cf8d7a7454fa9847446d2ef181edab19b1358a13
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gu.tar.gz 1128088 BLAKE2B d5b6f6b7d61ad42c67fb83e2252eef6eb1d2eb002b38d4d3aa795ead9f977da9d62d70a8a3f466d7be7c73d787f132e30f5797cdc74f79c9af823d23aa954d5d SHA512 80596496af4efb6eca484d8625a1e9c46a5e7725e8f8f06e8dae428930887b3f3c4712bb52e65928f4d97fb77f476fe7f2dde496301e47b6b4f871269e9f0e9d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gug.tar.gz 445726 BLAKE2B 936465fda52c630a4cff00e18e8df472306d90253ccdd623641128fa6bda99e8bed4d9bce2e236c6fcfc240c742ade19267a01798a21dc8c61d19113e940ef13 SHA512 6451ce0c2d803447ac7d7315dc7bca813eda7f7775211eb623580f418686a62a97b867acb33df664134d39f4dce9dd265ebc97e7e3d725cd7466d056b4106dd0
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_he.tar.gz 1535997 BLAKE2B 62012ee11d226193e5c17b4f86340add2cb274fcc040bef9fb113592823d910a685b862ac96e99dba970a82b9b321b1976363c5040a2e0b7816ada5e0390fe95 SHA512 9fca7cc8fde36eab8ddb189b964b8ad57c589beb85fb7e289f0c4a78b731533949c24ef9a68b7bb8399944e4a5f2a53ba54ba1daa2ba6adbfe724d19d3ae132f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hi.tar.gz 546921 BLAKE2B 5eaf65502463e5260114a892e01f9a1229bf30e4feb66a33d62f6afff998ece2588e405be642725d5f2d56899e7c5eb3123fb5bc826ed8ee5d79d0917a7d13e2 SHA512 c56d9ab70cc6e6256d4f0d1d5133b4d7de51c1f5501b506f10e92df4f7fc1136c9e46dfdf1d31503fb94468427978d3ea64aa6c3303cbb669e35d9991c0f37c0
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hr.tar.gz 678252 BLAKE2B a77f4b75608dfa5396767f2960c0e6356af068daaca0cfe42fb99e5a859c21ec5f9bb4c74ec2eb7f1e052d03e521ed6372742c0290fe13b6f1b9a21153a166fb SHA512 6b765f44cbd2f7e262a782b49480593946270cf075546ed8472a954ac02f4e888d7ab76735b4fa5c52c6b868b66dfa4cbe22e62f526bf57b682cc36ac36e36fd
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hu.tar.gz 2658834 BLAKE2B 8e05378216fdcd42557538e65300d5a78ae45217bcc0c1e3d87cd951a26565c1ad4e7653da87432db8b5f07bd258971f58302937ca8c209e018a1ebd006dc1b5 SHA512 a88f4eb4e5b581c3c5641c16013cb392f1633d0b6c8ae7b3af873ebc3a063a0c629d40479e051b751950c632c0e10076243e927f6979b55a8c31a8051cf0abd3
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_id.tar.gz 422908 BLAKE2B 9939907962d3b18e2ef865eca670e7892ce94b2e47dbf55022e853516618ff47037e3cb35998012d1096c0d8d51698cb0a945c494355ded1b29f8f38395a1a60 SHA512 eade5c1fd4cad264aa6ddbe0c489f6ef81bb91488795f67df82936db95b3d4ec8f9bb40d22f35800a1d23354519a2ec74c4b7f6a852a0be08d0e75d90e8e924a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_is.tar.gz 1232445 BLAKE2B f97808ee2e7aa612d212a644d73df7ecede9a6e70c2892ecfb8313104b01462b0cf57a8b19afb6a494c2699bd824d0da5907a421f8b3c2a3c20a15f830adb6f7 SHA512 98c9db394dd08a5b74771802a2972f80e6c6ab4f562ece61ad2936f7656fa584e98a35e0ee53c5211f12297614ba5ec63eb67d833177b3c6a31d8a4724f1d533
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_it.tar.gz 1768304 BLAKE2B 2cddb7d126ccce8e72b47ba139c6dd8bcbaf93d9726630f33e87010ac57409c15a7f69a1b9b66559dd4b80e6efc38b15377e50d94dd41891f26376c5d2ec1970 SHA512 ea3f3ef4723cf5f8ef0ed3cc80f4dbd5753f226ed5409e810a84589f17bece4877807aa0a746f145f5f390b410be8e515ee65e4adb5a7da83855b93e72f1f69d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ja.tar.gz 531546 BLAKE2B e032880d236fdd611087e16880f96bc9ad030b396a552c63608ac30659951781f583c595b09222ed580892c26df813936b7328fd34c42cc0f8fbd6555cc6fed1 SHA512 681e1a0e6cd9e1787b57d603efa271e72f6ef89f7eaef094b926be9fd84a5304baa3dc4a0fce9b080f5f18d79f1728a7e7b938ac05826cf39bceb60b3fa05bff
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ka.tar.gz 456928 BLAKE2B d7387dfb1cd0c6f9c001cc319ff75caf5ae2123d72432f973f170f7b05537900ed937bcec8a95bdd48afe4689efd805b23fa6bdfcbf71e96aa7e3bd2db941b27 SHA512 625886f4bafd3053d813c7c8fdbf58d58ee1228e95cc5e7b3e8e8d420912bc77fa0984a7c740a9d8684e3bf13b7e2cf153181ed10c37f8eee573337b08508180
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kk.tar.gz 478893 BLAKE2B f20a92b18fa973e2e27fffad201e4a29675c362c31cd83fd7524c5f7f9692466c4aca3dd7021cf58fb98f14e01361389145812aa23846486f11e724b25cf98cd SHA512 33e1333842db0412adc0fa1410ca3e2826827871e876b60bb3520073a2026c6f9eb8ec8a0598f4b4c3d827f35eca63da9e77d3ebb01ad976aaee5797a6a7ab07
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_km.tar.gz 579282 BLAKE2B fa0fd9b27bd4da9fc6f7f8879d70cc3cbdf49e1276b6edaf376164bbf93da44185a8098dcff942073f3e46e55369bbeab3dad0b802c61094ec6bae3116fb73c6 SHA512 55028e33bda07e3855bc13214932a24b7ac215530ab744b1c0f57f6aa1c03d326df45b2447013a8e608e827f2fa1795c2be5093f7df30bebbf1360841480ed5b
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 434578 BLAKE2B 7861a455ab6931cad1795bf195a24a1ffd2f06da5db662b091c435f86d8e03c527f8451a6f7ab275bac73fbb5a08b6ad05be7dd3ceddbd2112c85101a5d0f164 SHA512 b1ec524c76644887fa359443da818587b07f05c850020e8c4ea287bddb6c6b810289c0e5b9d141aa148833fcb0245cd8d4d0705e201a430739ffbf91959d461c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kn.tar.gz 494876 BLAKE2B 8f95b0dafb06cc114bb12187a69f1b0fb3e82bb7dff273df3ec293f3f2fa6c2f199ce015c075cf6a8c4814ab2a81e48dbd83e8d77702aea68824a12fed5f41dc SHA512 5ab57e82f61322b3a86e77eea09c234d6d5bb0f38be402dea3dac47a2cd902a9aba013e74dcf761dd1261e6fcac7b004749c5b3a3014a29d99c702f18147e4d1
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ko.tar.gz 528559 BLAKE2B 332994f9b35157c16ec4bb575f0dcd6c6d6c6a5943113cb8ae4087b7f71ad6edf68152f5fac49f1157d8a02b711c3659b0004d2fab9aa6eeb96fa68c150e4e47 SHA512 b05efae987fde4c07d69506d6cfd356e251aec42896043577a511a1aa38f1892adb447a4e13b0e7a5e16385a47ae344150fd410d0dce981f7791823afc4d3847
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kok.tar.gz 472778 BLAKE2B e2b6acb10eabc1ccfd250f5ed8dc53ce206ac4c3daaa1135e3d2fbb52fcccf3f3f79a67c396ab5d9133536e4780f546926e4f6155a25a2663cf7e4223a2b3de5 SHA512 4a73f4cbec761196ed9c98d12858c494fb28b643ebe40201d7318394d89bc3e898480a2ebd12a535067a1280cb9dc8671f088c53c2db47558f640cd51cd96541
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ks.tar.gz 451355 BLAKE2B d1f4068adf03592f0c96fb7461d74fae12d289e3d9fd7a7839a6ed04657c343db08dc7c2f49ca916090bfd58a7e76434291eb6b6bf95ebddb5afaa959acc243e SHA512 8120d5956b3e28bb0725f90bf62a58475e4e009baa2fb103fe5c3b8b0c3006de12c9fb000858a4bc3901ae4da6ac798efcd1d9c82838d83b63511eee1d03e72d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lb.tar.gz 412009 BLAKE2B 9ef5a0fae98a47c7a721d3ba1fc4a68422ebe7cacea27c0056788ba9f22318a763aff75a2fb95057c12634b6cc2aedcc81e1acf72fab2e2d5c5b73537d82e6f6 SHA512 f9f6880661b30cc06054c457db6ee751a550050088dde96faf462cccdc906e3dccbb2fec0b241127cc4b8050c1fa46d7929fbe50a153adc681a209d7f1626bc8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lo.tar.gz 496228 BLAKE2B 355013cd721d1964afb33328e0f1731e1a57bba036bf19625e56dea021bb5972191131e81f63026daf22da77f2fc221f6eb1bab76dc5bd78e29966244b168057 SHA512 c714948620a7744302b6d51764d82172c2fcdf4e12760c0ee272c3e86282b78dc07808c1f9f1721b9e6041edd948d67a2ef0a98d65e67cceaceecb8e1989062d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lt.tar.gz 777763 BLAKE2B a489dbe0347bf8356429d435474809b466fcfc51b1f12f4e22044ecc5cea6e8dbabb135074b798c526eb69e12a0e79fc4b28b2e09f75921f241e2c88c91e2909 SHA512 9949c8b6d309ec98f92af7fc6f3d2d1629eecee7fd8e245b38b36161c3909b3ab24356f96ca198551b2a4b510bf1dfc6493a71ee185ad534e71e9dec6fa1d2cb
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lv.tar.gz 1194115 BLAKE2B 148ac5f2cdc806ceedf553818be1697b6b478e6c77b108cf4f6bd9bc235e23a37a19230f54f497e5f5da2c4fea0ae3ad68d0b9ce6ebf0e882891852ce0341030 SHA512 b38d1aa9a7280d57b79238717166f8f6e28d66af49c08f185b09f7c8ab100d0c52e97203d7b14ae2db6c45fbd44911d508acb74480850cc9c6b3bf078ef533aa
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mai.tar.gz 453571 BLAKE2B e091ce6bc0e98b7a73cbb0ffa4af1fcdc57d756a832032a3bb568c4241d07e37b7412dd97c87afd10098b17e5523c0e9d1cadb8041774903fce2d52115d3200f SHA512 f3b8bdba517b62a9b3219c65d0ed106699909bfb7d63f00fb3d7560e541392c08cc7f65ad01832c4f241e8d58d77d26750e95ed409ed44a0a9aa27592d63c966
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mk.tar.gz 454942 BLAKE2B 11b82a9e50846851786bdc1353569188247c7fb33398655825d69b10bbbe6e50b51bc793429669041917a2abb24f861b6ec6badc9c4a007bb451655713e74544 SHA512 8d4c41778274eec73e7da324020b4f6ad33ee479d2e81b1b0a652c1563bc7856d352e3edd43d75e43082d85b75d000e4c07492d4c293c6e3067f50d3c1dac211
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ml.tar.gz 493935 BLAKE2B 53827e7453bf0dd753a70c7ac13abbad3255b99c643e3efd66fbde50c6ac1d3f18221eb737b67c76324497aebd667331133aa06661e3d68942b5e71f8e48751e SHA512 8a7ef90f945217ae2f0ab29ff204b783e41ab7f524766aef71988bf55c4fd649f0c3234ff33a7c971cc81348198b1af6466f928d662451a94e52509fe0cc651c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mn.tar.gz 543892 BLAKE2B 44a39d6407d1881b309c547f139d9fd4a3d29c9f55964196fcc8b226c748cf306fc603839a1fe37f16d928e86a518da495fb6b3365b101df725d729d1e458176 SHA512 f10529f98a0c9ddd4abbd4a3a5afd46074887ea8668002be4c4ed6f5162fd70fe4f45b2ddcdb0ce5b0ead4cf0676a4d1b8425d955ff293771a81c1f25dceaa3d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mni.tar.gz 466193 BLAKE2B e6eb6c251e23c5a2393ff5a2d5e71dcf49e7a3ca88794563ee7ebcab9ae5b01c60115607dd972bcf17570bb9b96b3498ecdef649137871f261ace6f0ef09df92 SHA512 41e50985a5302459e6b70ccddf42d32b04af9460220f040820287a884ca4d5608cddd47c3e32dc4489c0bf905c7bd458b8e1ddd443f6f4c5c8d773d5c156f4a7
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mr.tar.gz 489433 BLAKE2B 85ddeda8ac0a79a0d2616c9e0f9a60e684c514f675bf13ba4299f50c7282bd8b1b79999e000c7fdc1c69624bc54e2e51d8f13be972e8e9d21d7c381609379e7b SHA512 a170e63108cbee3e1f4ed356bd315e1cf6b909991d30ad8b4d026d83c5d7014147cb21832ae66fbb00aa8711e17948804bdce36fad8e4677eed13e25e0582365
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_my.tar.gz 485001 BLAKE2B 6e53223180013508865162a25d01dfa1fa47c5046f5c6aafdbb2b4b774b6d2087794e8c9f4ea92972b7acbeb63d9815a4ff5876a09f22b0bc76b5bb83ee55b52 SHA512 a817620d5f6b69c490ec559c5fd3499254e06c1d1a2ee07d4a6d2ad7596741ff0097b01b6fce2d97809a749d13ba424ef44cf07bf5240eb4749edebe2d4314f8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nb.tar.gz 3425994 BLAKE2B a332b1d00423a06548cc9ff626b4cc69f89ce97ffbd4c74e928d2c3fe375c3dcfc8adf69d226c2ac390e8f82af5972fbd0001017159b08f9a81a070fb37c4e94 SHA512 dd0e8b8b6e55a15560cc56337a94687b59067e729ada784e0f07bd7d87e10bacb7204c519d20c910755412fd997d5b2cf0f2c1f79675c58399fb5ca326c49a49
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ne.tar.gz 858804 BLAKE2B 1c851b36773050cd1246e57a7965fa3b7971efd00709419057c0802504573e902fd0943434179036637714bb26c242611dc5188c637185e08f08c8efd6ac4dd2 SHA512 9690ecd6aa9fa457da88754ff0ab4022424b93eec29b55a3e4863a91a02633edb74a055fa259825f30997345ee25ac7c1c34279c864169d8573e101d03c5e2b5
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nl.tar.gz 1226504 BLAKE2B d12bf240dc04a2a4b4c45cac2289bb8a519c374a1fc88037952ea218db4aa0e3b16bc7add44c703e7d86f92a9ab2e0b628c8c0ceb676f15ca832c6f7ccb4df8e SHA512 9c27a91c29141366b61ac1a0fb22c410196c3d91a27d64e07458a6069d599fc1a6971c71c475db42bea148ef1a3b159ec85af9eeaa7b1e01cc3f5864c680043a
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nn.tar.gz 3425969 BLAKE2B a7e4ec0216d112d98a9c91bf3f298dd99ba1f10b6c33086dc02a479e5a19562f288654092e91095cd73697f0fb75854093cacae890f8050e961eed0a9a8e2ffb SHA512 8f74a811fef9a79b54a855e38ea29cb6e85c9928a0fb07c8820d3e6f3a1d76c09fcf6644f7911f4062e18e71617a1f8013a6a487fe2d476048b96154632bd02d
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nr.tar.gz 432795 BLAKE2B 712bfc04e77ca56ce3f24a94f46e3092013816bc818a9cd04fc38f45373366dfeae8880d7e7a28ab64e1c32492beb73dfe0e5cd16ade8197557906d44e8c0487 SHA512 74d4b447ccadd87aff5b9994845b8cd9b2c83d487265ac67a95ebf25cd21571544f5a0029bdfb4b17fe4622afe00a1981475db053c28dfa4efd8e86df5704582
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nso.tar.gz 430602 BLAKE2B b597d43546f1bb8ca01b5046e283dbd9560d72d375e80dcfa8c7648f82bb718006184e5052b10757d2c6b759dbc35accd65ac036a1769780ee9058199a1dc538 SHA512 1105af3f97a66e0bb2c1dc96a6a674a9337e290c4ad61228a946d8cba980c48cee2763df41dbf76230bfe58b5e1af8cd3b20a8783d18d745b8620822d231d689
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_oc.tar.gz 638258 BLAKE2B 4024d435ed2c1501f77cd93e532217ac72fb3bde23adb3f67e10531a251ae30160a167548cca4cba7efbd79c602ef034513366bfa5adf8b091ac643d02f892de SHA512 85f75c3f603b8809623c432d9d1f11881339b3d6095b1c4dd160ed5bc798db69344992b34f8c30f2767b4e2ccf48b1339bc707cd41e7bb6afc4bf996658b2982
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_om.tar.gz 427004 BLAKE2B 13f6bad889c6665e8acbcf6ebc723d80e3609a2e9292845e3a780ac6f92f0130c173ff143a8c7204a8ab797d86e905b30d346a1e2281168cf599b58d7114668d SHA512 161fe58bb7eef8a8170fe0d27fab030cc5cdef0f0e9ca20ede445d59eeb2f7d8fbc8abb5476c627e5015f51d1f4f97c94c7ee9ea9a168202a5421d696391d1c2
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_or.tar.gz 490664 BLAKE2B 9afec460d5bd444c07b5c4539ff4c7464479ff738e6b51d3925916ad886d0147142f56780213e098b5adfe33ddfcc7338417a62f4c18df02e2d9457a4e9669df SHA512 4199b09295ced2d44afd9a324879276b0d5cab296c08623aa15927391a9e9cb80c4b044440b1cf24a8dbb26344b9bb6d2404282b966dd35938aabca31967b096
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pa-IN.tar.gz 462387 BLAKE2B bebaec1def2ad8d0cfcdd639938c2e7aa75d763456742bb88e4a378e229da6b48291374056581f57393e23d8572352065a57f1b0851ce1edfd8ba856858ef8dd SHA512 8bf4f9486ae6106d2ff04adb1df0e1fbe6d428e8e56c9315876965c117e0df959080ffdbdfdc97b5a86ba6d727c8a473facb88c9f0678f6b20337c442464a300
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pl.tar.gz 2794597 BLAKE2B 473323defe0247d79c16d7bf7f178ee790e878261627b1bd7e05d7470d907669ebacc715c5e7a2f6d910ae6a902fb8d1692ff4d39d59f444240bf86f005889db SHA512 9a8a981fd10af323e536b3cd70d642df62a5e1f56226322b3e562cbeed9ae55d030942cc04be643cebbf948513b1c10e5f2275e33ccda35ecfc576b2ab21028e
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt-BR.tar.gz 2517552 BLAKE2B 29c1b0f281238f1b8907d65fc3133ea46b54fda8d71e418bb8eb981bf0f774893796a1c2f9527738b30fe8f92716b1adc38924f7f22ebf7df3bfdca7dcc41235 SHA512 a6d76e61c2bfa811fcb41eb26a05d51565bbbf3cba12c450a9ebc56b140a054b6f6ff32ecdc05706e39aa004259bab7fc9a25a7c620e921bc286dcfcd57abcfc
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt.tar.gz 2071789 BLAKE2B 56329dea5f150820c3d22b0a0ba9c4578b0608b9e5a82a1a39209b63d58ecac796203c0335646195e3dad94ad150730e654f5e06680a9a7d7c1aebfbbccfc249 SHA512 41c3f467b657646aec98500cc808f11e100a176c6de51d6daea169b4d191a10d1c53726565c624500f06e7dd2585b397370c9ad2ec708457d9fe890e72fedab3
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ro.tar.gz 2305017 BLAKE2B 154c68b4d307225d4935e66831ea0c7135e92bc9b7a8587abf2f612afbbee76f0961aa0866f36accbd790864337afabd1f99c475ffa23f6aa606cce1bf27d6c4 SHA512 b11c0270980496eedf605bcbc2cce895b3216e26ede27cd22b3bffb7c2727da9eaad1150a2d1db4dbb8d7456922d789d62d1e1c9d03daba470d8e07e66a4512f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ru.tar.gz 1594616 BLAKE2B 2fb5e3200632eb62d5f6c99f58b0913af71dd5db8e303964c9952955a9dc5172d395512aa1e1be6578322115298938bf6c909f4fc4dd8db70e99618fbff98a8c SHA512 aeeb7e4c98f74744d802f52eeb6c3cbe6e860497e139987ba834d8b720979372d5bbc90c868d5fed8efe20d4968af0ede213127ce51b80cb3e9722af50d01f12
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_rw.tar.gz 429131 BLAKE2B 5716500a7d52a319bd9ee6b42e3d1326bbafd441a4ad65692471a80991e4027f5f20ae6fed87505bd5c5a718574a0add5d57044228135d3386a53ec551a46512 SHA512 cbd82f2a7eb707af7db445ac87761bcc46c7e4fa526c129089883aff32747b847688a5bdf342919693e960d9cdd43602c58d4ec6825332cb9cd548e59ef483fc
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sa-IN.tar.gz 474782 BLAKE2B 74cafb69309321d1e91b5bd00bec4a04b18def4028c87213fba687783ada270afa9118e0a39e318db02aee5d82a9343555d4646239dc4de2f06a227e4d53c3b1 SHA512 f3ded5148cbe60b963295755793783e1dbabc98d1807c6242dc3e266cb9d9c3f873f1c61d12cce216b19fe04156c1c0d200218672b260616b05012152cad4c59
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sat.tar.gz 504760 BLAKE2B cc781f69dcec025e076bde82536538fa7bc334b7e9f97584fab592c2369dceab2d7284387a6278a5c8fd155f28870f9d58d3b36f994b3f8cf402ec0b3d12186e SHA512 d0204dc9bd5f3bdcbb27fd5678b5e98af08eb4b1c66d16c6a177906447713464d5d7348911403c3a897edc7d8d4da39c6e41b2491897b16b941cc014c5ef4ab6
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sd.tar.gz 468461 BLAKE2B fc5a6af5c37d1477a935189dbdf4e8f12ffe2b758a0ed45d70a50b21c3ad634a55d413c7246a74178296e066b07cc11c391a4253dfb288226d662e15caee3f79 SHA512 b948f14aa8e486e914727d23b6071bf8b688941a9fdf65046ef0556ba05d4d025c0b4d2dcaf953d13aedddc2d9aa34fad02fb71971a30347bea5e169a06a7110
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_si.tar.gz 758237 BLAKE2B 1c53ed5486abba8f477f5f1beb227ad25edd65d7b17ff7c08c766948b0e46065b3d150389a6d76c820ad20d04e827e287aba8e5bc17837dd89f6c86615ff19b7 SHA512 09893093b8f2f5dbe975e6858ba0a29fb11015f496bbd584dcf1fc26e4238bfda275d81169f8523a0b797dad4c9a96a18ea2e94283258a7dd446966e372bbee9
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sid.tar.gz 434185 BLAKE2B e1d536346ebae6b3c4a2108594f0bf6afbb8be1cc39128e3e7963cc3ae104dc8e0e77179d845f275349cd21e7d1e87a7e69c8350be06d74fcfeda6efc899f1b6 SHA512 d1871cdb7b6498f9e78e91b04163b8998be5fc55c3fdbf2d7db1ee9c6f0617d2b3046e06936c7c0e68b9b314240a605098e9ea375ffbd3ae9349180b41d0fa1f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sk.tar.gz 1724995 BLAKE2B 2c78018f801d78e2b20f9adcd0acc20d1f2dc668f06174eccc89b79ab487b733b3a503dd4c4d16f101a39525ee4d7bff3d9f23922903f33b1ddbb1d58f1555fb SHA512 1931a19a7848c91d20c55a42618c41fe5325f9669f41651fb89edd62a18474d51822262e4b44304a5c4e6a1999ed109ac878e1c3e1de08998271f6004d21ea1c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sl.tar.gz 2103785 BLAKE2B 7aa2383b765acd903fb5c8f550fa05cd430f2a56a8b4acb3eefddd23fda033841cedbd425db4bd0e10ac4b2621c2f7bdfaee582bc98ddfe819867e6bba214e98 SHA512 55a489060188cc6777cc1f201b72da7ed52967404c42906ded60247541bb88db26ea003b13d99326be5b6968b2f3bbc717dec3c3e4acb01387e97577a4ea0d3e
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sq.tar.gz 446718 BLAKE2B f074924883f0537ade61e1eb40c0e63d0f9ef9f8e14579aaef57e1498d348cb1a074198d56b3bea004548fd7c5791d6024ee7cb044b58f155395773e65fd8dbd SHA512 eb0e24e187d3935aedeb58c7fbbe9fc0ce680a3c2a57d10b27105c6e6404ed35f824f14eabf267b0ddc25b28164a14c0f2e7a3f2b6545722c9bb627cba846a69
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1597227 BLAKE2B b9d7bce1e0cb906bb920bda361c32d82eda3f0de7822890f16bc01c56bdbcd70c71ab4c5105a0c865d0c0e6cd57e0e308901c21aedaf9f482e8585135df352dd SHA512 5c7c1181515d912d75f7d7c438420934e94f64a6897a42fa8fbeb12e1b598a105391ccaf1a62983cbba1ddeef1eaa306d576d94649912336ddb89733ff213f02
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr.tar.gz 1616737 BLAKE2B 5bb4d8cfbb2af77177a6db252d5925b57d987ec739e836d626850eff3af95e619437725a5787db133bef554d8a9f76d7b11e5c9d0d2508745dc88a1b962f791e SHA512 ec9129912b5da110e831679d616fca59093dbe2469f724f7c269bed430fa4ea197dc085c7688591fb7bbc8065129bca47807768dda5ece9fb5fc6af5f83ce5c2
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ss.tar.gz 431296 BLAKE2B 814d2da997323fa5ab6ed3334a64b5e66f36f78b195b5468953399e8641a404f73e7a1b47e24f069785532ca2a10035a542ba5f4d5cec4368dc9cf8f9f9c9f3c SHA512 edb2db43098b9d7b2cf9309f5da14d70fba27723eb11ef2848964976685d165bffd7df714c762759be47335cbc2ce97f2e193569c21390c11fff47e9a68bb383
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_st.tar.gz 430482 BLAKE2B 65e706eb7bdfa32a11dd279b97ba3bdd36f78829f2d2810611f547f448672a83a614c7043503562310065f99b4e06dad0ee3e546f1eb47fa46b6fcf32f7ba961 SHA512 cf7cced0b80fb186146b4aa9ddd36381e662ec03bdcf377d724d1f628ad8c8941e5db127e375e1bb27f29cc439b711909b8d7ffb3370c4b9b30298732c399746
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sv.tar.gz 2313570 BLAKE2B 2242579dea193833504ef7b56909214d1053f7c906026f230cd97444064e49c430a0b57a5d6c17b0ed8612f1ab94f18162aeb2a43d8c57309ec129532251666c SHA512 714646481f3e2a48ddc3b96965607e95000920cec66b29215b47557670273589ae87895202ce747a1019df739f3e41f35799b187021dbd1714025679b22c9934
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz 421281 BLAKE2B 95a086410d99ae71282be3e665bfba3ef19bce5efa02ddfafbc5dd105ad4fff2aaa58ff7e0ed0c47f8676f86130c1341f13379c5565d80b3b4885852f37e8b8b SHA512 dabcd756da75243e5c47f95d34dfce9a351d5c32be6106468c17dbe136c80cf5e0767ff2174a912769f269c702c11880e0573d15fe344435409da01892365961
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ta.tar.gz 489744 BLAKE2B 0dc402f1956395e21eda7fd2c175ec4cb93849092f9a5080846db9e188fda9b6a23c72bb7bfcafe48b28b303bc07e16570ad0e8009ecace6c3a07a244a109c16 SHA512 b038eb00be7d25fd5a06da3faff251a85b846c2248fe2c5ae6c6e8c6482d5e6737bf80483d4ea580587b05cf8acb0ce8b1ccc2c15cab2c22ff045a07ca2b44d6
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_te.tar.gz 1039300 BLAKE2B 1bd1bde39694a73a5a9184ff8a0f8431a5af3a03eb4514d95acca17037485082da2eda90ed7774b902d5f1c0d1f010328af22886379b1f7f760a817f57c8ded1 SHA512 d2fd487fc9eae465b8a8de24046a425459be0808ecd9d7df806a0d8c28a2b5f833ad9d59171a2811aa862f6c00464c82c45d9953a7200090d096c470e4c24fda
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tg.tar.gz 447508 BLAKE2B cc210673d7da5d6fc59ad0a882569f5472226da6245b0c02e3f9d136ee5ba33917323bd7c05027ab4b03b75a61c02273ce731f990650863c495d87035324fdcf SHA512 99baff9bd3a2a9eed70a7dd753e7859b734f6c52ef9ade21576c1c1ff28f290488327e010b6ac7568f638d18cca51bf1847472e2c0dd1d00a03f1fc3e184fbe5
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_th.tar.gz 626379 BLAKE2B a273db03e1530f6a4f80aa42df37e691655f79007a6faf6a6363e583e84ea71e8e9444a9da192e0272c8fe9776c51e6a01149bbf25eda583c772f1157fef35dd SHA512 862a94cd441cefa43809bd3f0499c1ebd946aff9cb0a36048126852287ff80ad1b70b2d014559adeb5838b917d604ec8a4a5f91383da3569c2890e16cd3da964
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tn.tar.gz 422966 BLAKE2B 6a667d17d9675034132168a68f953e92d63eb5272d11510b539c8264217415b5a6ed0d5096bb2e88144bc39f57cbfaebcb722267cb3f59a703b0873b85e087d1 SHA512 713f944882c50cedab7908aeb8d75102d3419701654600e6d1eb72051595c4a7ae4d707b02f1a84f44720ff338e1e365fdc2f6f22b94d8caefa8ab5aef030e8f
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tr.tar.gz 476120 BLAKE2B bc7d41d92a13265d452e0e1aadb8e288099ab4f15840451eefe86b174cb4b6fb81c602682cdf14c1b938dfd5760f70c43a8ed34ad357910e381f4692f373c155 SHA512 8ee9a06b850c6a2cce938d614e3be2e1277fdfe8b8c3528961e32bb5015a2d4028e7d9a65d57d96d63fec26ed228d8ebe16bf44fa8cb39740e71f44238916201
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ts.tar.gz 430666 BLAKE2B c27a66f8ab4175f92dfa4b30555610bae05acc6cba4e57e709ee8e0d7bbafa84bde3be740a3069428c1211a1075483274e90309c76adea120cf1da3f0ef64893 SHA512 49a847dc995828c42f84ef33aae6ba31959cebf1c056a62c6b72a13dc017e7cc73c503b3aa5dcb1deec80fcc60d6a802300136fa1a425dfd67e42c85f34c1372
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tt.tar.gz 428411 BLAKE2B de9985750d494287fe6fb399f93ee6de6e382ac4e8457b5c85e78002971003ea152cd487b8571024fa698d888c242e5fd56bda2a924ef25676ce633dd4b453d4 SHA512 592d3dcb14445316ca5a5b3999bfa090b9280a3c6a7aaf336fe61d6af42f20ce87a90052343347b895cd219cf76fa901b334b339477113de01c385d1bf1a06de
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ug.tar.gz 465068 BLAKE2B f076c063669cd823da5d1c2bf5552f25b4253b6dc53e9e37310fe40bac77a7fb1c4c19c88cd7c83ccec1d0e078faf4ab9867bf6876db699add754915a7c4a2b7 SHA512 908376f95f2eb640415e2cc99eb6363cf4ae8b1a265c0f01ef27ddd8a735207ea9ca29a2007f6562ec97eecfb14f0452a4601a158d0ee8e1f7ee6e8ee22c1701
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uk.tar.gz 1315258 BLAKE2B 92d4b9d9c66028670021be12efe976d9318faf3cf85ac8cd224d2b6b4cf3a79a6c52b091e9f287da05c6aa903421b9cfce9672e89d419f47906088f4da6356b3 SHA512 2cb864a8c5a4aafb6a714514cab2f7f2fa65d9dbe7db8775e5c2aa8e296ec7b9253e97740a56aadb6e70e4683e654a9e188aba013a9214114606879e045048c1
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uz.tar.gz 426559 BLAKE2B edaffa645520d85ceb753d60a41d27d99726afde2282a941067d0db2d289e44eb2eba0cc607e73e15d048cde3368ba4fd9441d30473d3ac85d433cc6e4ac15d9 SHA512 d74ceae85d198c9e5c261c5ac0a775fbc8988c7e1507f13815b74fd3a3d041815612541ddbe4bbf507f94cf5b432d68454090e7b00194d0c424d9dda97af1ab4
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ve.tar.gz 433322 BLAKE2B 01ff860a7e12409c6e8cff124c5c967a2420a7983d8c7fcd1bdf708acab295b15d3613de2187ac3b7fdd33eb8c97606faff222b2e5fbdd2a8be77ccf72a0c9af SHA512 df3d4a0d2bb127748eb4e2f6c4892323ae9b1117b634146782068a49fabaf485645dac10df9af415f80e8cd6451fe141efbadfdfc2e89df7d63210b785b4887c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_vi.tar.gz 466498 BLAKE2B 36d8151c9154c4d294fa0b34d908e076b8790f2b860741fc4f2da2aff6b6b52a242311581e9986480be9e8d27a768ba800367ff8c13ae9dd0b6e972c3a0f6342 SHA512 efb792e0a9d136c873c9848763ee8a7dc5334e42f66b5b1d9aafd63a47fc80e5bf1a1ef4fb059bf9f3ae7a35f90423f4de51cc39fb114c1192ec1ed88e77ded8
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz 437472 BLAKE2B 8ee7530805ef1ccb15f5e147db05143a5febcd308690881084376ecacb797c24297e17572679bb21ac4f7a2b8d8a7e99a01092b80eb3e9acf665aa4d5917a9a6 SHA512 d3c4d6f102fcfd6be2e9e3802c730aceae56c05c2337cde71ed09c075c413752dc72cf4add8569985ec6c25f94e3e7b9640a3cdf13257070225ca0f7f7fc541c
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz 516406 BLAKE2B 5a99d46e1c0ad6b33e9f8c5c3eb72ee52ddbc407d8bf0ae9d57416b471f41129c0af58125277f085bf281d66eb1f5f312ddce6ce10babd895a96390dd6a11e17 SHA512 e9401a7e5a5f9e298256970ebc83f94a580a3a7b2357a54e417b814ca7c9e989779b024f15ba19dad62981cb2b3cd91835013d82f7265609788f04db741ae284
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz 513878 BLAKE2B 632532eb9cf75725015ccdeacc14278dd6f08b5fa97670e0f98e922ba6c5f242dcfae68e55405dcf682d44bcbd6531ecd653b51e284ed8ebf0cbcf5efcce49ae SHA512 c78d4ea18e81011a2c537b13c3d6fcdcea1758187da92855349a2016f0da82421d125893aefe13f93d3a97b7a1df152e467149ffcca6eb9a3b44c9d6af78e268
-DIST LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zu.tar.gz 440572 BLAKE2B 05a70ad0535d041843f0fb4f98652468195c9768d6d31f734e9bfb9284d066405a0508fc796a71a2d4a4b72a995115ebafc76e2d726064d5b321a5859c507457 SHA512 365600d8ddf721be0ed873b17bbe9ec03e5f59e490439163eec3e41aa328d1ab7335bb5ffe5b78ca0336988b51fbabf77f686c702db04bc08800c7a6fc648184
 DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_am.tar.gz 7942171 BLAKE2B 55fe01c6bde8688fb58dcf34bba5094c37abc8d7c5556db49d541fbab3ef45c680c5c8e15282605a0d5a24b3e6097bbc1e049d87aeb161567da15df47f944eb8 SHA512 0bca472a857562c22fa8d8bc9b26e3b1ed0677c7f94484891fa9a87ba488ca223a0009fc4f47fdc2af2046b79f8ae51c8701b88e151584b7ae62e29cb09dd5c7
 DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_ast.tar.gz 7872153 BLAKE2B 3a5c45223be61f178aa2e032be288006d3e55a535bf8ce3693ed1b15f83ac4cf4209465d00066652afbe1739c2e86a828921bf14eb3ab60ec099bd027fd2adb6 SHA512 e1a962cc358903b5c7653d076bfbbb170132e2684544cc8ecd43fc80755efb73a21cfc9861f18e651fec4585ad20afaa7a1cf5891444946b47d1c2e69c7a1e3c
 DIST LibreOffice_5.4.7.2_Linux_x86_rpm_helppack_bg.tar.gz 8413835 BLAKE2B 48c671460b8d97a881211d223d50fb0c486f95a5407ae81b2e97c527e14ebce854d67e8334f8655f52fad3c15c17c09d804c8f2ff7704e581ad0d054b6417bb5 SHA512 63fc31cd4f3f7f59c375e77f905af00a83e5e124466629a962c1d45d8e089516f8d7febb8be0084de7a134c87964fbc9298763a5660b0636e37dbd312717a777
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild
deleted file mode 100644
index eade0e87ec02..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.4.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm versionator
-
-MY_PV=$(get_version_component_range 1-3)
-
-DESCRIPTION="Translations for the Libreoffice suite"
-HOMEPAGE="https://www.libreoffice.org"
-BASE_SRC_URI_TESTING="https://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
-BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-#
-# when changing the language lists, please be careful to preserve the spaces (bug 491728)
-#
-# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
-LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
-	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
-done
-for lang in ${LANGUAGES}; do
-	if [[ ${lang%:*} != en ]]; then
-		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
-		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
-	fi
-	IUSE+=" l10n_${lang%:*}"
-done
-unset lang helppack langpack
-
-RDEPEND+="app-text/hunspell"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	local lang dir rpmdir
-
-	# First remove dictionaries, we want to use system ones.
-	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled
-		use l10n_${lang%:*} || continue
-
-		dir=${lang#*:}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang%:*} != en ]]; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
-			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
-			rpm_unpack ./${rpmdir}/*.rpm
-		fi
-	done
-}
-
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
-	# Condition required for people that do not install anything eg no l10n
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
-		die "Failed to remove extensions"
-}
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
index d69b5f0314df..eade0e87ec02 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-6.0.3.2.ebuild
@@ -14,7 +14,7 @@ BASE_SRC_URI_STABLE="https://download.documentfoundation.org/${PN/-l10n/}/stable
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fd4255c15c35..9efb1f11845f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,16 +1,13 @@
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
-DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 BLAKE2B dd66515fb2835c40905f91338a89921608f6aa96f0df2a0f2396d8ce397c2fd76173e1f72eff437d0167d5f831b3dd6b3050d5590ed88131921d269d0c63a8d2 SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c180997055648a8b1a33cc89988b74628bad8aa012242e0c1afa5b5b8568323c107187072207ee69bd841ba4ca3bbfe27ef65223ddc729d1a1aa6590 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
-DIST libreoffice-5.4.5.1.tar.xz 193846832 BLAKE2B 50e9afb84d6e1901c3a6c99d1a4d3e274894d001afce71a0ced6a3ba0682995adf75e21eed40cfbc6d159581bf152273fad85615030fee33ba63dbf1ca15148d SHA512 70ef595aab3ddc81a000c18f2f783e5a87d98326fd3b69923c43e94e832a7f4d89f0d7444073d9ec48590e9a90b9fcd049ba0c85d17ac7921cd022cb2d0bebd5
 DIST libreoffice-5.4.7.2.tar.xz 194486484 BLAKE2B 82c28025f20842dc6a1cf410e84953208ec36462e2018cc07edfcd9d1086c8e83ac93dcf75148df6b670c4b20cd8c1c7904851e3c7eb46c62c521781e013926e SHA512 712c66de9216b5b7fd48310610801b4f1f17465f8ff282cb7e070a50104ccdb4a5a71f6a58eedb828a7a58f7521b5c725745d5e0f6ece62596b7485161cf01f8
 DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157dacc96aa9d3344d683f3303e5c284a83c0f8783d23881402393f2361d4db1270cf75424ff6f12e5b16540b3f7ccb624c29ccc8c71416 SHA512 f6632afe1c7bcdfb1ca82059d299f808e5eee982c176aa2cc5d728e11b833c3fe921c9c627847bc12128ae5e32c901cbbdfec0b71a22bb9a4b5041b645ed934f
 DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879
 DIST libreoffice-6.0.4.2.tar.xz 204556512 BLAKE2B 2131fb0f810c81803f9905bc1f3f9bfa04615deceb8eb443644a35d6b4226f6876ffdbb8ef00c9ffe8e5a677877513b3c2adb40b3f87ddcdb46946c5bf3d6183 SHA512 004cef88c1a6d908a519b8813562d4dd623c899608026aa603dd86012a3d0b9a5d776c05e0e2d7541c691f4a9fc6c4d62c278fe88627872a1c6f841bddc2736e
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
-DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d
 DIST libreoffice-help-5.4.7.2.tar.xz 2343112 BLAKE2B 690c147e8bfdea9d1860131ad8528e2e2eea64da7293c8b7c3a4ad07e771749573b69fb11bed8c8c171b5760ec67a0a3b30eab06e38e5a725ffc11d0959c71c6 SHA512 8abd0bbf70dcfd5cf0ad713c8d34be541ddd27cda98403cbb331b62a4099c08b14be784362b857a41b8b2c756d01e36f043b97bdd5062a2bddeae29b8b70f6a2
 DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40
 DIST libreoffice-help-6.0.4.2.tar.xz 2972636 BLAKE2B 0528ad30fc754269a94a4b2a0c9eab26ecb707b1e9a230686a982a24215fbc91016813fecef687499ee4cfb49228febbfbaaaff7371053d130adefd705a1bb49 SHA512 ebdfc93e8dd5e44b6fc5baa087c86777b91bb18008809dc493dd0ddaf143b26c50349f99cc884678cb6db3f8d60b615c9a816872e73ceddeec8be126d65d2651
diff --git a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch b/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch
deleted file mode 100644
index 850f56465c77..000000000000
--- a/app-office/libreoffice/files/libreoffice-5.4.5.1-pyuno-crash.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 42e2c4af310deb7660b07c6307459c9d2a42bb8b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Thu, 1 Feb 2018 13:52:00 +0100
-Subject: tdf#114815 pyuno: avoid 2 threads initing python in parallel
-
-According to the crash reports, it's possible for the grammar checking
-thread to call GetGrammarChecker, instantiating lightproof, at the same
-time as the main thread instantiates LngSvcMgr, which also instantiates
-(some?) (all?) grammar checkers.
-
-Ensure that pyuno_loader::CreateInstance() initialises Python only
-once with a C++11 thread safe static.
-
-For the backport, use rtl::Static instead, because on the 5.4 branch
-MSVC does not have HAVE_THREADSAFE_STATICS enabled.
-
-Change-Id: I5b1faba9107355c508831a078366e4a29fdbfadf
-(cherry picked from commit 5357ca82846ea7147ad61e9340f25647a5934eb0)
-Reviewed-on: https://gerrit.libreoffice.org/49116
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-(cherry picked from commit 362b0c521c1c58dc8ea5e87ecbb482d5bdc073f4)
-Reviewed-on: https://gerrit.libreoffice.org/49298
-Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
-Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
----
- pyuno/source/loader/pyuno_loader.cxx | 25 +++++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
-index adbf6c8..0408af0 100644
---- a/pyuno/source/loader/pyuno_loader.cxx
-+++ b/pyuno/source/loader/pyuno_loader.cxx
-@@ -31,6 +31,7 @@
- #include <rtl/ustrbuf.hxx>
- #include <rtl/strbuf.hxx>
- #include <rtl/bootstrap.hxx>
-+#include <rtl/instance.hxx>
- 
- #include <cppuhelper/implementationentry.hxx>
- #include <cppuhelper/factory.hxx>
-@@ -176,11 +177,10 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
-     osl_setEnvironment(envVar.pData, envValue.pData);
- }
- 
--Reference< XInterface > CreateInstance( const Reference< XComponentContext > & ctx )
-+struct PythonInit
- {
--    Reference< XInterface > ret;
--
--    if( ! Py_IsInitialized() )
-+PythonInit() {
-+    if (! Py_IsInitialized()) // may be inited by getComponentContext() already
-     {
-         OUString pythonPath;
-         OUString pythonHome;
-@@ -236,9 +236,26 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
-         // PyThreadAttach below.
-         PyThreadState_Delete(tstate);
-     }
-+}
-+};
-+
-+namespace {
-+    struct thePythonInit : public rtl::Static<PythonInit, thePythonInit> {};
-+}
-+
-+Reference<XInterface> CreateInstance(const Reference<XComponentContext> & ctx)
-+{
-+    // tdf#114815 thread-safe static to init python only once
-+    thePythonInit::get();
-+
-+    Reference< XInterface > ret;
- 
-     PyThreadAttach attach( PyInterpreterState_Head() );
-     {
-+        // note: this can't race against getComponentContext() because
-+        // either (in soffice.bin) CreateInstance() must be called before
-+        // getComponentContext() can be called, or (in python.bin) the other
-+        // way around
-         if( ! Runtime::isInitialized() )
-         {
-             Runtime::initialize( ctx );
--- 
-cgit v1.1
-
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
similarity index 87%
rename from app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
rename to app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
index b25e4fc3ae5a..03421c5e12be 100644
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
@@ -214,40 +214,3 @@ index 4d65beeb90c4..f3d71501c41a 100644
 
  DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
  {
---- a/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:08.228434985 +0100
-+++ b/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:37.428824309 +0100
-@@ -114,7 +114,7 @@
-     /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
-     void testODFBrokenDsigGPG();
-     /// Test loading an encrypted ODF document
--    void testODFEncryptedGPG();
-+//    void testODFEncryptedGPG();
- #endif
-     CPPUNIT_TEST_SUITE(SigningTest);
-     CPPUNIT_TEST(testDescription);
-@@ -143,7 +143,7 @@
-     CPPUNIT_TEST(testODFUntrustedGoodGPG);
-     CPPUNIT_TEST(testODFBrokenStreamGPG);
-     CPPUNIT_TEST(testODFBrokenDsigGPG);
--    CPPUNIT_TEST(testODFEncryptedGPG);
-+//    CPPUNIT_TEST(testODFEncryptedGPG);
- #endif
-     CPPUNIT_TEST_SUITE_END();
- 
-@@ -743,14 +743,14 @@
-     CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
- }
- 
--void SigningTest::testODFEncryptedGPG()
-+/*void SigningTest::testODFEncryptedGPG()
- {
-     createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
-     SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
-     CPPUNIT_ASSERT(pBaseModel);
-     SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
-     CPPUNIT_ASSERT(pObjectShell);
--}
-+}*/
- 
- #endif
- 
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
new file mode 100644
index 000000000000..55f2d8a55fc7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
@@ -0,0 +1,37 @@
+--- a/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:08.228434985 +0100
++++ b/xmlsecurity/qa/unit/signing/signing.cxx	2018-01-27 18:21:37.428824309 +0100
+@@ -114,7 +114,7 @@
+     /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
+     void testODFBrokenDsigGPG();
+     /// Test loading an encrypted ODF document
+-    void testODFEncryptedGPG();
++//    void testODFEncryptedGPG();
+ #endif
+     CPPUNIT_TEST_SUITE(SigningTest);
+     CPPUNIT_TEST(testDescription);
+@@ -143,7 +143,7 @@
+     CPPUNIT_TEST(testODFUntrustedGoodGPG);
+     CPPUNIT_TEST(testODFBrokenStreamGPG);
+     CPPUNIT_TEST(testODFBrokenDsigGPG);
+-    CPPUNIT_TEST(testODFEncryptedGPG);
++//    CPPUNIT_TEST(testODFEncryptedGPG);
+ #endif
+     CPPUNIT_TEST_SUITE_END();
+ 
+@@ -743,14 +743,14 @@
+     CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
+ }
+ 
+-void SigningTest::testODFEncryptedGPG()
++/*void SigningTest::testODFEncryptedGPG()
+ {
+     createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
+     SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
+     CPPUNIT_ASSERT(pBaseModel);
+     SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+     CPPUNIT_ASSERT(pObjectShell);
+-}
++}*/
+ 
+ #endif
+ 
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
deleted file mode 100644
index a8b1cae3566d..000000000000
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ /dev/null
@@ -1,578 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	done
-	unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC=(
-	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1[X]
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( media-libs/opencollada )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-base/dconf
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	gltf? ( >=media-libs/libgltf-0.1.0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		gnome-base/dconf
-		x11-libs/gtk+:3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		kde-frameworks/kdelibs
-	)
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/oxygen-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.2:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	x11-libs/libXtst
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-	"${FILESDIR}/${PN}-5.4.4.2-gtk3-no-gtk-build.patch" # bug 641812
-	"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
-
-	"${FILESDIR}/${P}-pyuno-crash.patch" # 5.4.5 branch commit after release
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
-		ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		unpack "${PN}-help-${PV}.tar.xz"
-	else
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
-	default
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/officehelper.py || die
-	# sed in the tests
-	sed -i \
-		-e "s#all : build unitcheck#all : build#g" \
-		solenv/gbuild/Module.mk || die
-	sed -i \
-		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
-		Makefile.in || die
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	if use kde; then
-		# bug 544108, bug 599076
-		export QMAKEQT4="$(qt4_get_bindir)/qmake"
-		export MOCQT4="$(qt4_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --enable-*-link: link to the library rather than just dlopen on runtime
-	# --enable-release-build: build the libreoffice as release
-	# --disable-fetch-external: prevent dowloading during compile phase
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	local myeconfargs=(
-		--with-system-dicts
-		--with-system-epoxy
-		--with-system-headers
-		--with-system-jars
-		--with-system-libs
-		--enable-cairo-canvas
-		--enable-largefile
-		--enable-mergelibs
-		--enable-neon
-		--enable-python=system
-		--enable-randr
-		--enable-release-build
-		--disable-breakpad
-		--disable-ccache
-		--disable-dependency-tracking
-		--disable-epm
-		--disable-fetch-external
-		--disable-gstreamer-0-10
-		--disable-online-update
-		--disable-pdfium
-		--disable-report-builder
-		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system")
-		--with-build-version="Gentoo official package"
-		--enable-extension-integration
-		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
-		--with-external-tar="${DISTDIR}"
-		--with-lang=""
-		--with-parallelism=$(makeopts_jobs)
-		--with-system-ucpp
-		--with-vendor="Gentoo Foundation"
-		--with-x
-		--without-fonts
-		--without-myspell-dicts
-		--without-help
-		--with-helppack-integration
-		--with-system-gpgmepp
-		--without-system-sane
-		$(use_enable bluetooth sdremote-bluetooth)
-		$(use_enable coinmp)
-		$(use_enable collada)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable dbus)
-		$(use_enable eds evolution2)
-		$(use_enable firebird firebird-sdbc)
-		$(use_enable gltf)
-		$(use_enable gstreamer gstreamer-1-0)
-		$(use_enable gtk)
-		$(use_enable gtk3)
-		$(use_enable kde kde4)
-		$(use_enable mysql ext-mariadb-connector)
-		$(use_enable odk)
-		$(use_enable pdfimport)
-		$(use_enable postgres postgresql-sdbc)
-		$(use_enable quickstarter systray)
-		$(use_enable vlc)
-		$(use_with coinmp system-coinmp)
-		$(use_with collada system-opencollada)
-		$(use_with gltf system-libgltf)
-		$(use_with googledrive gdrive-client-id ${google_default_client_id})
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
-		$(use_with java)
-		$(use_with mysql system-mysql-cppconn)
-		$(use_with odk doxygen)
-	)
-
-	if use eds || use gtk3; then
-		myeconfargs+=( --enable-dconf --enable-gio )
-	else
-		myeconfargs+=( --disable-dconf --disable-gio )
-	fi
-
-	# libreoffice extensions handling
-	for lo_xt in ${LO_EXTS}; do
-		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
-		else
-			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
-		fi
-	done
-
-	if use java; then
-		# hsqldb: system one is too new
-		myeconfargs+=(
-			--without-junit
-			--without-system-hsqldb
-			--with-ant-home="${ANT_HOME}"
-			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-jvm-path="${EPREFIX}/usr/lib/"
-		)
-
-		use libreoffice_extensions_scripting-beanshell && \
-			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
-
-		use libreoffice_extensions_scripting-javascript && \
-			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# hack for offlinehelp, this needs fixing upstream at some point
-	# it is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
-		source "${T}/config_host.mk" 2&> /dev/null
-
-		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-		mkdir -p "${path}" || die
-
-		echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/helpimg \
-			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || \
-			ewarn "The help images list is empty, something is fishy, report a bug."
-	)
-
-	local target
-	use test && target="build" || target="build-nocheck"
-
-	# this is not a proper make script
-	make ${target} || die
-}
-
-src_test() {
-	make unitcheck || die
-	make slowcheck || die
-}
-
-src_install() {
-	# This is not Makefile so no buildserver
-	make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-	# bug 593514
-	if use gtk3; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# Hack for offlinehelp, this needs fixing upstream at some point.
-	# It is broken because we send --without-help
-	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
-	insinto /usr/$(get_libdir)/libreoffice/help
-	doins xmlhelp/util/*.xsl
-
-	# Remove desktop files to support old installs that can't parse mime
-	rm -r "${ED}"usr/share/mimelnk/ || die
-
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 3c8a7c4dac39..837b49a029d8 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -70,7 +70,7 @@ $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
@@ -245,7 +245,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+	"${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
 	# 6.0 branch
 	"${FILESDIR}/${P}-poppler-0.64.patch"
 
diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index 433d077bc2c2..a7f087f49e26 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -246,7 +246,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 433d077bc2c2..a7f087f49e26 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -246,7 +246,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index f72d5cc7d181..174cf72da38f 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -12,15 +12,12 @@ computer. It will however make a snappier LibreOffice than the binary
 version</longdescription>
   <use>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
-    <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
-    <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
     <flag name="googledrive">Enable support for remote files on Google Drive</flag>
     <flag name="gtk2">Enable legacy gtk2 frontend</flag>
     <flag name="gtk3">Enable experimental gtk3 frontend</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
     <flag name="odk">Build the Office Development Kit</flag>
     <flag name="pdfimport">Enable PDF import via the Poppler library</flag>
-    <flag name="quickstarter">Build the system tray quickstarter</flag>
     <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
   </use>
 </pkgmetadata>
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8a2152b1402a..7601fb831535 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 630d0aed2ca8..9884cd75e44d 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1,2 @@
-DIST kbibtex-0.7.90.tar.xz 4059532 BLAKE2B 790cda2885e300c2f1701e1dccebce463275c439215a680c45954dc243d22b11168359c8d3dbb60a77e64d328ca62d6e11855b6cb1e44673e8173ba2a1b1d3b9 SHA512 d3aedff22f043608b99642c4332330d6472ea7cf960100ae0cdb2255e71702d1609333fee66918d5b276fdf3978cdbf91ef42512d7339b2245deb02e3c7279e2
+DIST kbibtex-0.7.95.tar.xz 4060200 BLAKE2B aa08cd10c4e67bd8cdfc52803df03326a3c49b86aff699d7be2c40082f5d7359ef8aeb399dd3ab7c6b62f63274ad5d545c6acdaf4f77ed2b922583346557e76a SHA512 683456504861271df46d4b423ed8994f7e97d653e3b634c81c14b0187efa51ebae6d72bc4ccbe7cf18682ccfd9ff2cfcc2ba399a1d7f6bac62e3cb9e79710cd6
 DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild b/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
similarity index 99%
rename from app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
rename to app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
index d5566c47efc8..e581fd7cf61f 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180526.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-MY_PV=0.7.90
+MY_PV=0.7.95
 KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 24dfe74af611..907099d0d309 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,2 +1 @@
-DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
deleted file mode 100644
index f2e745a44d20..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
-Subject: fix build with boost 1.59
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
-
-fix build with boost 1.59
-
-Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
----
-
-diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
-index 5766f39..d12d8e2 100644
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -26,6 +26,7 @@ generated_files = \
- 	$(top_builddir)/src/lib/tokens.h \
- 	$(top_builddir)/src/lib/tokenhash.h
- 
-+libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
- libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
deleted file mode 100644
index 1df274afbe8f..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
-Subject: coverity#1259904 dereference before null check
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
-
-coverity#1259904 dereference before null check
-
-Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
----
-
-diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
-index cf914bf..426ab54 100644
---- a/src/lib/ABWParser.cpp
-+++ b/src/lib/ABWParser.cpp
-@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
- void libabw::ABWParser::readM(xmlTextReaderPtr reader)
- {
-   xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
--  m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
-   if (key)
-+  {
-+    m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
-     xmlFree(key);
-+  }
- }
- 
- void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
deleted file mode 100644
index 4854072bc8a0..000000000000
--- a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
-Subject: coverity#1259905 do not let AbiDocument::parse throw
-X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
-
-coverity#1259905 do not let AbiDocument::parse throw
-
-This also fixes coverity#1259906 and coverity#1259907 .
-
-Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
----
-
-diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
-index b8ab661..23ff750 100644
---- a/src/lib/AbiDocument.cpp
-+++ b/src/lib/AbiDocument.cpp
-@@ -110,7 +110,7 @@ is not protected
- \return A value that indicates whether the conversion was successful and in case it
- was not, it indicates the reason of the error
- */
--ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
-+ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
- {
-   ABW_DEBUG_MSG(("AbiDocument::parse\n"));
-   if (!input)
-@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
-     return true;
-   return false;
- }
-+catch (...)
-+{
-+  return false;
-+}
-+
- /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
deleted file mode 100644
index a1015d7310f3..000000000000
--- a/app-text/libabw/libabw-0.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library parsing abiword documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.46
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
-	# from git master
-	"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
-	"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
-	"${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug 619470
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index 93e138cf1a8e..9bc7f96f1b3a 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
index d6ff7af29cad..300033a02b9b 100644
--- a/app-text/libepubgen/libepubgen-0.1.0.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 358bec7b7081..a7a301490ef3 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index d0769c66950d..709bbbbb8ce5 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index c65c85ddd67f..9444428a270b 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.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=5
@@ -12,7 +12,7 @@ MY_PV=${PV%_*}
 DEB_PATCH=${PV#*p}
 
 DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="http://recode.progiciels-bpi.ca/"
+HOMEPAGE="https://github.com/rrthomas/recode"
 SRC_URI="
 	mirror://gnu/${PN}/${MY_P}.tar.gz
 	mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz"
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
index 7ec8284a8d04..a6c2e5b129fe 100644
--- a/app-text/recode/recode-3.7_pre20140303.ebuild
+++ b/app-text/recode/recode-3.7_pre20140303.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
@@ -6,7 +6,7 @@ EAPI=6
 inherit flag-o-matic libtool toolchain-funcs
 
 DESCRIPTION="Convert files between various character sets"
-HOMEPAGE="http://recode.progiciels-bpi.ca/"
+HOMEPAGE="https://github.com/rrthomas/recode"
 REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
 SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
 
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 9a0508821fb2..853fc3b700e1 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
 HOMEPAGE="http://fallabs.com/tokyodystopia/"
@@ -17,28 +15,27 @@ IUSE="examples"
 DEPEND="dev-db/tokyocabinet"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath.patch"
-	epatch "${FILESDIR}/fix_ldconfig.patch"
-	epatch "${FILESDIR}/remove_docinst.patch"
-}
+PATCHES=(
+	"${FILESDIR}/fix_rpath.patch"
+	"${FILESDIR}/fix_ldconfig.patch"
+	"${FILESDIR}/remove_docinst.patch"
+)
 
 src_configure() {
-	econf --libexecdir=/usr/libexec/${PN} || die
+	econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	HTML_DOCS=( doc/. )
 
-	dohtml doc/* || die
+	default
 
 	if use examples; then
 		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
+		doins example/.
 	fi
-
 }
 
 src_test() {
-	emake -j1 check || die "Tests failed"
+	emake -j1 check
 }
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 02c0978b9818..99ad20ef9e12 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild
deleted file mode 100644
index 3296d12046cb..000000000000
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.48.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath.patch"
-	sed -i \
-		-e "/ldconfig/d" \
-		-e "/DATADIR/d" Makefile.in || die
-	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
-	sed -i -e 's/-O3"$/"/' configure.in || die
-	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
-	# flag only works on x86 derivatives, remove everywhere else
-	if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
-	eautoreconf
-}
-
-src_configure() {
-	# we use the "fastest" target without the -O3
-	econf $(use_enable debug) --enable-off64 --enable-fastest
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 5e6025fe80a4..4a26588bb8c0 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
index 52c9fcfcb1cb..e80406ec016a 100644
--- a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.1.0.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"
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="static-libs"
 
 DEPEND="virtual/libusb:1"
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 57ba7a8c69e9..d4d0660495b3 100644
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0.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="5"
@@ -13,7 +13,7 @@ else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm x86"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
 fi
 
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index cfef3351b842..2c73c5ef2bed 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
index c93be4bb9040..bb1679e7da87 100644
--- a/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
+++ b/dev-games/quake4-sdk/quake4-sdk-1.4.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://idsoftware/quake4/source/linux/quake4-linux-${PV}-sdk.x86.run"
 
 LICENSE="QUAKE4"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 RESTRICT="strip"
 
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5d8142883745..50e47f05a67f 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/vala/vala-0.34.16.ebuild b/dev-lang/vala/vala-0.34.16.ebuild
index 90d69ebfce64..446d4e8033c9 100644
--- a/dev-lang/vala/vala-0.34.16.ebuild
+++ b/dev-lang/vala/vala-0.34.16.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.36.13.ebuild b/dev-lang/vala/vala-0.36.13.ebuild
index c0d657637f70..9cd322cba8a6 100644
--- a/dev-lang/vala/vala-0.36.13.ebuild
+++ b/dev-lang/vala/vala-0.36.13.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5049f7d210ab..3bfcca4029eb 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libgee/libgee-0.20.1.ebuild b/dev-libs/libgee/libgee-0.20.1.ebuild
index 19fde83d3599..5d2cd2b848ed 100644
--- a/dev-libs/libgee/libgee-0.20.1.ebuild
+++ b/dev-libs/libgee/libgee-0.20.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.8/2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="+introspection"
 
 # FIXME: add doc support, requires valadoc
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index a2afb89f3ca4..f0a4b24c4615 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -1,2 +1,2 @@
 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f
-DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee1f6655cc1b7b03af14afc77ca8b341a666f65d5ef8db771ec9e6242a987074ea98bdea1b4134885e9a529d808 SHA512 764e4f1bdb5f5b8c3e121057f475c7eca7acf5c514ac2c2527ae0ad93cd30a1c809a9e2107be2957247223f1f2936842999579c96ca19cd58b84571a29638091
+DIST libical-3.0.3.tar.gz 866624 BLAKE2B 6d7c11aeb80dbd6b72001484a0ad89ff9b0f892c9400cec3f0d131d1edbabdafa8ef9717d1fed92c4999ba0934e8676e5cc58ebb3cb74fdbb8e5f5c816cc97bb SHA512 319a9e02b34835eb222728cb691b18e4f490b21f7faa55d266f298c07dafb5e15a492fb2105e2c3ab6d60d2affcf430b5b248cc38abc1e3bc29143662676fe70
diff --git a/dev-libs/libical/files/fix-libdir-location.patch b/dev-libs/libical/files/fix-libdir-location.patch
deleted file mode 100644
index 53eb2040bc09..000000000000
--- a/dev-libs/libical/files/fix-libdir-location.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-This is a patch for Gentoo bug 560572, provided by Georgi Georgiev.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 773cf0c..e282ce4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -336,7 +336,7 @@ endif()
- set(VERSION "${PROJECT_VERSION}")
- set(prefix "${CMAKE_INSTALL_PREFIX}")
- set(exec_prefix "\${prefix}")
--set(libdir "\${exec_prefix}/lib")
-+set(libdir "${LIB_INSTALL_DIR}")
- set(includedir "\${prefix}/include")
- set(PTHREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- 
-diff --git a/libical.pc.in b/libical.pc.in
-index 7774dce..bf88476 100644
---- a/libical.pc.in
-+++ b/libical.pc.in
-@@ -8,5 +8,5 @@ iculib=@ICU_LIBRARIES@ @ICU_I18N_LIBRARIES@
- Name: libical
- Description: An implementation of basic iCAL protocols
- Version: @VERSION@
--Libs: -L${libdir} -lical -licalss -licalvcal ${threadslib} ${iculib}
-+Libs: -lical -licalss -licalvcal ${threadslib} ${iculib}
- Cflags: -I${includedir}
diff --git a/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
new file mode 100644
index 000000000000..7f0ffc4b4280
--- /dev/null
+++ b/dev-libs/libical/files/libical-3.0.3-findicu-pkgconfig.patch
@@ -0,0 +1,58 @@
+From 5c682db0dd1cfd7090dd191e89613ad5fb9fc078 Mon Sep 17 00:00:00 2001
+From: Allen Winter <allen.winter@kdab.com>
+Date: Sat, 26 May 2018 09:06:10 -0400
+Subject: [PATCH] cmake/modules/FindICU.cmake - allow pkgconfig to get is a
+ hint
+
+---
+ cmake/modules/FindICU.cmake | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake
+index 12a1812d..53213efe 100644
+--- a/cmake/modules/FindICU.cmake
++++ b/cmake/modules/FindICU.cmake
+@@ -23,16 +23,12 @@ if(WIN32)
+   file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _program_FILES_DIR)
+ endif()
+ 
+-if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+-  # Already in cache, be silent
+-  set(ICU_FIND_QUIETLY TRUE)
+-endif()
+-
+-#set the root from the ICU_BASE environment
+ file(TO_NATIVE_PATH "$ENV{ICU_BASE}" icu_root)
+-#override the root from ICU_BASE defined to cmake
+ if(DEFINED ICU_BASE)
+   file(TO_NATIVE_PATH "${ICU_BASE}" icu_root)
++else()
++  find_package(PkgConfig QUIET)
++  pkg_check_modules(PC_LibICU QUIET icu-i18n)
+ endif()
+ 
+ # Look for the header file.
+@@ -42,6 +38,7 @@ find_path(
+   HINTS
+   ${icu_root}/include
+   ${_program_FILES_DIR}/icu/include
++  ${PC_LibICU_INCLUDEDIR}
+   /usr/local/opt/icu4c/include
+   DOC "Include directory for the ICU library"
+ )
+@@ -56,6 +53,7 @@ find_library(
+   ${icu_root}/lib/
+   ${_program_FILES_DIR}/icu/lib64/
+   ${_program_FILES_DIR}/icu/lib/
++  ${PC_LibICU_LIBDIR}
+   /usr/local/opt/icu4c/lib/
+   DOC "Libraries to link against for the common parts of ICU"
+ )
+@@ -98,6 +96,7 @@ if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+     HINTS
+     ${icu_root}/lib/
+     ${_program_FILES_DIR}/icu/lib/
++    ${PC_LibICU_LIBDIR}
+     /usr/local/opt/icu4c/lib/
+     DOC "Libraries to link against for ICU internationalization"
+   )
diff --git a/dev-libs/libical/libical-2.0.0-r2.ebuild b/dev-libs/libical/libical-2.0.0-r2.ebuild
deleted file mode 100644
index c0e34d96a4ea..000000000000
--- a/dev-libs/libical/libical-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="An implementation of basic iCAL protocols"
-HOMEPAGE="https://github.com/libical/libical"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
-SLOT="0/2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc examples static-libs"
-
-# The GOBJECT_INTROSPECTION build is broken, and upstream has given up
-# on it at the moment (it's disabled in Travis). It will probably come
-# back in v2.0.1 or later.
-# This snippet belongs to RDEPEND:
-# introspection? ( dev-libs/gobject-introspection )"
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-DOCS=(
-	AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
-	doc/{AddingOrModifyingComponents,UsingLibical}.txt
-)
-
-PATCHES=(
-	"${FILESDIR}/fix-libdir-location.patch"
-	"${FILESDIR}/${P}-tests.patch" #bug 532296
-)
-
-src_configure() {
-	# See above, introspection is disabled for v2.0.0 at least.
-	#local mycmakeargs=(
-	#	-DGOBJECT_INTROSPECTION=$(usex introspection true false)
-	#)
-	use static-libs || mycmakeargs+=( -DSHARED_ONLY=ON )
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local myctestargs=( -j1 )
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples; then
-		rm examples/CMakeLists.txt || die
-		dodoc -r examples
-	fi
-}
diff --git a/dev-libs/libical/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.3.ebuild
similarity index 92%
rename from dev-libs/libical/libical-3.0.1.ebuild
rename to dev-libs/libical/libical-3.0.3.ebuild
index 851a3c097a0e..fe0236af8a46 100644
--- a/dev-libs/libical/libical-3.0.1.ebuild
+++ b/dev-libs/libical/libical-3.0.3.ebuild
@@ -27,6 +27,7 @@ COMMON_DEPEND="
 "
 DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( ${PYTHON_DEPS} )
 "
@@ -39,7 +40,10 @@ DOCS=(
 	doc/{AddingOrModifyingComponents,UsingLibical}.txt
 )
 
-PATCHES=( "${FILESDIR}/${P}-pkgconfig-libdir.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-pkgconfig-libdir.patch"
+	"${FILESDIR}/${P}-findicu-pkgconfig.patch"
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -47,8 +51,6 @@ pkg_setup() {
 
 src_prepare() {
 	cmake-utils_src_prepare
-
-	use doc || cmake_comment_add_subdirectory doc
 	use examples || cmake_comment_add_subdirectory examples
 }
 
@@ -57,6 +59,7 @@ src_configure() {
 		-DICAL_GLIB=OFF
 		-DGOBJECT_INTROSPECTION=OFF
 		$(cmake-utils_use_find_package berkdb BDB)
+		-DICAL_BUILD_DOCS=$(usex doc)
 		-DSHARED_ONLY=$(usex !static-libs)
 	)
 # 	TODO: disabled until useful
diff --git a/dev-libs/libixion/libixion-0.13.0.ebuild b/dev-libs/libixion/libixion-0.13.0.ebuild
index aa2431360549..ba41158d8f25 100644
--- a/dev-libs/libixion/libixion-0.13.0.ebuild
+++ b/dev-libs/libixion/libixion-0.13.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/ixion/ixion"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of libixion.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="debug python static-libs +threads"
 
 RDEPEND="
diff --git a/dev-libs/liborcus/liborcus-0.13.4.ebuild b/dev-libs/liborcus/liborcus-0.13.4.ebuild
index a3396f03cd5e..2ee6cc7086e2 100644
--- a/dev-libs/liborcus/liborcus-0.13.4.ebuild
+++ b/dev-libs/liborcus/liborcus-0.13.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
 LICENSE="MIT"
 SLOT="0/0.13" # based on SONAME of liborcus.so
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="python +spreadsheet-model static-libs tools"
 
 RDEPEND="
diff --git a/dev-libs/libunistring/Manifest b/dev-libs/libunistring/Manifest
index 1b2a4e819c55..5b8d6ed5abf7 100644
--- a/dev-libs/libunistring/Manifest
+++ b/dev-libs/libunistring/Manifest
@@ -1,5 +1,4 @@
-DIST libunistring-0.9.5.tar.gz 3487957 BLAKE2B 31c345d503476467ac0178cb127d85d2af343bc7d65504600b2950d44e50996d84d77750cc89af643667568f1d01beb2742aba5122bd4e4a50ab8c8225f1cf63 SHA512 89404b8f0fde264c3faa4285e4717487f2b6c348fa9374ccff2251eb3db6dda208fe013056a22f496c1fb099abe7e79b72a203d15499c641e3ac48e7957ba1b4
-DIST libunistring-0.9.6.tar.gz 3565883 BLAKE2B 8cd9e05f78e37246036ae134ae7d6c570da46c04822f749297ffeec7ec529ad17cee22a9d9ebbf3f1e36398efde41714c3953efdc3859d3f1e454281ad591249 SHA512 244f4ef6343047d2dedfdbe536a7a29584a58f668a41ba3183fc86d2f167186acf120708e024e31551ee2f035b9bee35e9ed24a276a4de9359cf08aec198c20a
+DIST libunistring-0.9.10.tar.gz 3744814 BLAKE2B 3ddc55b8021c0f4822beb83b807bb21dbbf10bbb866747f64e060df3ab822a4143528855e1ce6a13144630bc8daa14f1fa830db77fb605e57cae21d46de804d6 SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9
 DIST libunistring-0.9.7.tar.gz 3589989 BLAKE2B 5ba029be96adf3804e9591ee0c271f41111a9c48c773d50adbf2408577e98ddd06d54dc665d3791a835698012021384c9290da0e3ce3d331f20283462c6a3c75 SHA512 43cb60163299a781b57bca326ddeb6333cde0b12d274fcd2b176971c8080ee8868f8c11bf9c524596d3a56dc0213ed1d3246fb805db1de950257c3764eb34ae0
 DIST libunistring-0.9.8.tar.gz 3720294 BLAKE2B 873dbccbe869c9dd6fe72f17759aefadc6495f97ba26e2cc62a1d94c9ca966a5f35d8d40a480077b90018602abf04342de51dfd64a4034db2ef0ff8a0f102c03 SHA512 91c0da429cc13272bf94cc1afa2bcc6cb0afa2af8b9c05fde2c1cd3ed0f54c6571803c303e20579bba51600d0e63fe917b415ccbb3751353cd8310388dddb72f
 DIST libunistring-0.9.9.tar.gz 3736674 BLAKE2B cb328e2378aeabd8f1282ed6f66f556c6301a88bdbb11d1a7ea73569700a8af9bbbfa9336faa7b390e5f5df628001d5e9bf2081f0c36d139296f16d657e70de6 SHA512 dbf067ba5c748e198f8837e603710ff63714d1bb4642a2cd2facb8f1034b617250c8695f4e1caad77c417bdcb0f1e1664eafa5a18eca77126741a4363a1c9cf4
diff --git a/dev-libs/libunistring/libunistring-0.9.6.ebuild b/dev-libs/libunistring/libunistring-0.9.10.ebuild
similarity index 53%
rename from dev-libs/libunistring/libunistring-0.9.6.ebuild
rename to dev-libs/libunistring/libunistring-0.9.10.ebuild
index b0c96cbf1033..ba7327e2d797 100644
--- a/dev-libs/libunistring/libunistring-0.9.6.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils
+inherit eutils multilib-minimal libtool
 
 DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
 HOMEPAGE="https://www.gnu.org/software/libunistring/"
@@ -11,23 +11,34 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-nodocs.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nodocs.patch
+	default
+	elibtoolize  # for Solaris shared libraries
 }
 
-src_configure() {
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
 	econf $(use_enable static-libs static)
 }
 
-src_install() {
+multilib_src_install() {
+	default
+
+	prune_libtool_files
+}
+
+multilib_src_install_all() {
 	default
+
 	if use doc; then
 		dohtml doc/*.html
 		doinfo doc/*.info
 	fi
-
-	prune_libtool_files
 }
diff --git a/dev-libs/libunistring/libunistring-0.9.5.ebuild b/dev-libs/libunistring/libunistring-0.9.5.ebuild
deleted file mode 100644
index 27f51500592b..000000000000
--- a/dev-libs/libunistring/libunistring-0.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Library for manipulating Unicode and C strings according to Unicode standard"
-HOMEPAGE="https://www.gnu.org/software/libunistring/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0/2"
-KEYWORDS="amd64 arm x86 ~amd64-linux"
-IUSE="doc static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-nodocs.patch
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	dodoc AUTHORS README ChangeLog || die "dodoc failed"
-	if use doc; then
-		dohtml doc/*.html || die "dohtml failed"
-		doinfo doc/*.info || die "doinfo failed"
-	fi
-
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild
index 0d83dca0a9df..d62ed683c3fa 100644
--- a/dev-libs/libxml2/libxml2-2.9.8.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -81,9 +81,11 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=760458
 	eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
 
-	# Avoid final linking arguments for python modules
 	if [[ ${CHOST} == *-darwin* ]] ; then
+		# Avoid final linking arguments for python modules
 		sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
+		# gcc-apple doesn't grok -Wno-array-bounds
+		sed -i -e 's/-Wno-array-bounds//' configure.ac || die
 	fi
 
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
diff --git a/dev-libs/vala-common/vala-common-0.36.13.ebuild b/dev-libs/vala-common/vala-common-0.36.13.ebuild
index f8acc02fc09e..130a76cf0fd0 100644
--- a/dev-libs/vala-common/vala-common-0.36.13.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.13.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index bd8067ba73fd..8dadc4a669d8 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index c2cbe704f293..10453f66a1be 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -19,3 +19,5 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.4.7-source.tar.bz2 6031614 BLAKE2B b98d8c3891e4f3180624ef0ccc1e81146d97e58c577c9efb2b3ac178f81a836f4019111a6c33ec31edb47d41920249c33a87955303c02ffc608ea42747b7f662 SHA512 b6eb749878920bec90f50f19c8c8700f700677ae1a7f7fb1ba1bbaa37f218d36eeee0dea65eb200f0cd09a9694600969f4c15042faf357395715b5390a6fdb6b
 DIST sbcl-1.4.7-x86-64-linux-binary.tar.bz2 10380734 BLAKE2B 0d39cc7b0873e938e85182b687b0a1be9200c4ebe67c7175b7c9c6393b27c8f78bd2afa201b7ca91c39bcaeed4456f2578901518850b1db0975cddd55e9b0210 SHA512 517b6935e51ea56ee2c67692980fe7fa7382a2e4501437c7ec00a52aefeebd5e442f4bb8dbfdbe32e43a301fc5f0c584604027e7889ebb8ba269cafe866d6381
+DIST sbcl-1.4.8-source.tar.bz2 6040563 BLAKE2B e4d16993cec80a8d40bad9071c6ce0a9ce80aae4d49f682fc58d4a8124dd14200229dc063cb653af753afece1ca98d77b600d2c7f80d17e6b9fd8af33a5297f3 SHA512 f8bd6b4126b19de4e73557319118aa03999caf84c8913bdd51ce18b8ddba14944f3d1daf08f852b72ae862ae0e613dbfbfdddca3750f4464c1be924d685ccc9d
+DIST sbcl-1.4.8-x86-64-linux-binary.tar.bz2 10353701 BLAKE2B 5b56f46fbdb87f015ed1fe103b6caaf43d2d424b45e2574e306b3d3cbc3c7bdfa48847a2e6d7d819e6bf4b59fa02ea01f9ce6b023802ae6f91fc7f56e5a260de SHA512 f3cb3c30dec1b7e6ac0c1b67de26192723871f8a8d543a41d7c4d04b0813fd7da1043433237b648a2c23f73169fe38f2ec3a3c2bd412eb4c9d36ed929c40f27d
diff --git a/dev-lisp/sbcl/sbcl-1.4.8.ebuild b/dev-lisp/sbcl/sbcl-1.4.8.ebuild
new file mode 100644
index 000000000000..f07d8939edfa
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.4.8.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=1.4.8
+BV_PPC=1.2.7
+BV_SPARC=1.0.28
+BV_ALPHA=1.0.28
+BV_ARM=1.3.12
+BV_ARM64=1.4.2
+BV_X86_MACOS=1.1.6
+BV_X64_MACOS=1.2.11
+BV_PPC_MACOS=1.0.47
+BV_X86_SOLARIS=1.2.7
+BV_X64_SOLARIS=1.2.7
+BV_SPARC_SOLARIS=1.0.23
+
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://sbcl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
+	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )
+	arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 )
+	arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 )
+	x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 )
+	x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 )
+	ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 )
+	x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 )
+	x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )
+	sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-* sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	# bug #468482
+	eapply "${FILESDIR}"/concurrency-test-1.3.15.patch
+	# bugs #486552, #527666, #517004
+	eapply "${FILESDIR}"/${PN}-1.4.0-bsd-sockets-test.patch
+	# bugs #560276, #561018
+	eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+	eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+	eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.patch
+
+	eapply_user
+
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
+		-i src/runtime/GNUmakefile || die
+
+	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
+		-i make-config.sh || die
+
+	# Use installed ASDF version
+	cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+	# Avoid installation of ASDF info page. See bug #605752
+	sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+	# change location of /etc/sbclrc ...
+	sed  "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	if use pax_kernel ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
+			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
+	fi
+
+	# clear the environment to get rid of non-ASCII strings, see bug #174702
+	# set HOME for paludis
+	env - HOME="${T}" PATH="${PATH}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" PATH="${PATH}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# bug #517008
+	pax-mark -mr "${D}"/usr/bin/sbcl
+
+	# rm empty directories lest paludis complain about this
+	find "${ED}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dodoc -r doc/internals/sbcl-internals
+
+		doinfo doc/manual/*.info*
+		doinfo doc/internals/sbcl-internals.info
+
+		docinto internals-notes
+		dodoc doc/internals-notes/*
+	else
+		rm -Rv "${ED}/usr/share/doc/${PF}" || die
+	fi
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}
diff --git a/dev-python/Babel/Babel-2.5.3-r1.ebuild b/dev-python/Babel/Babel-2.5.3-r1.ebuild
index 8a64938ac16f..254db65acaff 100644
--- a/dev-python/Babel/Babel-2.5.3-r1.ebuild
+++ b/dev-python/Babel/Babel-2.5.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-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 ~x64-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 ~x64-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4fa922ef5822..02ff05c4bc46 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/betamax/betamax-0.8.0.ebuild b/dev-python/betamax/betamax-0.8.0.ebuild
index e39b5dd1f255..35eeba71ce33 100644
--- a/dev-python/betamax/betamax-0.8.0.ebuild
+++ b/dev-python/betamax/betamax-0.8.0.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/freezegun/freezegun-0.3.10.ebuild b/dev-python/freezegun/freezegun-0.3.10.ebuild
index cd858343f8e2..2e7dd7ae6b8e 100644
--- a/dev-python/freezegun/freezegun-0.3.10.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
+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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pandas/pandas-0.23.0.ebuild b/dev-python/pandas/pandas-0.23.0.ebuild
index 57471830de8c..3664e9b78fea 100644
--- a/dev-python/pandas/pandas-0.23.0.ebuild
+++ b/dev-python/pandas/pandas-0.23.0.ebuild
@@ -76,6 +76,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 6bf3185ad30c..469385a6a855 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -77,6 +77,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/ipython[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
 		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
 		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/pyyaml/pyyaml-3.12.ebuild b/dev-python/pyyaml/pyyaml-3.12.ebuild
index 47a7cf1510a8..e374c93b7ad5 100644
--- a/dev-python/pyyaml/pyyaml-3.12.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
index bd0cabd5197c..a3058c171dd2 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
index 2c80cfeca796..3e515ed35068 100644
--- a/dev-python/traits/traits-4.6.0.ebuild
+++ b/dev-python/traits/traits-4.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index f3b1ac21dd75..ccee37113014 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/css_parser/css_parser-1.6.0.ebuild b/dev-ruby/css_parser/css_parser-1.6.0.ebuild
index 30f3f4402e31..cd0b5ad80ff6 100644
--- a/dev-ruby/css_parser/css_parser-1.6.0.ebuild
+++ b/dev-ruby/css_parser/css_parser-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOC_DIR="doc"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index be80fd0bee61..e1276decc15e 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,3 +1,3 @@
-DIST maxitest-2.4.0.tar.gz 15370 BLAKE2B 1645e818c06c42590e919f73c581407aa38dc4f1ff58fe06c7a5a734c3570a4342c7952cbf5130ca9db66f081a3e4c5d32ca2166d6ed5937474a3bbc093ab13c SHA512 41fc6e8eaaebad76278e19574c48e5192363ef466327e83cfd5a3490b98d157bb736556cde57c01180a353ac383e583fed6433443e24a5a5fb6159ed9821a323
 DIST maxitest-2.8.0.tar.gz 60742 BLAKE2B 313e7efeca866961f3ee4c43279557bf628bd5d6d75e119fc9723b16a4dc7d38784a34078a9c6c6c5893f4bd28723757658122794deeca70f1abf54187819acf SHA512 cf05087052bb9162d20cca5180808edc00606d0125d461968c033cc4ee44a193d45a337fa2d61f34e8c2097d71bad5eba16da6cf10166ee8afaacda29654ab89
 DIST maxitest-3.0.1.tar.gz 60926 BLAKE2B 9ef03af6e55e7565acfa89d64e04aab40ef11445f0266ee85e68daa7224000922b8107c72cf77e75c4ba630ec19207cab3f5b0ce08f42270756deabfa5124b28 SHA512 c71e8af37387a8dd8f73aa01cde1c5baf772a7fe6125df5962ffb1aaf07515ebcd6d0f8530f306cc60927a289f21e4c75e0fece674230d8cdab82f5bfecfb899
+DIST maxitest-3.1.0.tar.gz 60956 BLAKE2B 5819137a548dfe1ae1c641ea3ddb4fbdf522e08b35eddbeb5dd4f3cfe2f320d16779d48166be820215e3dedecbe1f77d2db475403d476e53d5019631a0972d09 SHA512 37fdba5658cd640de311efaaa50ca32b9415c0819b9adc919d6471ae9317f9a60eb5004afa29d67386b6b9524bda06791054b1d34e31ccbe160a56c315f44b76
diff --git a/dev-ruby/maxitest/maxitest-2.4.0.ebuild b/dev-ruby/maxitest/maxitest-3.1.0.ebuild
similarity index 80%
rename from dev-ruby/maxitest/maxitest-2.4.0.ebuild
rename to dev-ruby/maxitest/maxitest-3.1.0.ebuild
index a14fa048dc9e..e82293c8bdc0 100644
--- a/dev-ruby/maxitest/maxitest-2.4.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
@@ -19,10 +19,10 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/minitest-5.11:5"
+ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 6a1f197b55b0..e5ce81d92e69 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/guile-www/guile-www-2.35.ebuild b/dev-scheme/guile-www/guile-www-2.35.ebuild
index c7874f6886eb..7d6ac0143416 100644
--- a/dev-scheme/guile-www/guile-www-2.35.ebuild
+++ b/dev-scheme/guile-www/guile-www-2.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/guile-www/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-scheme/guile"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5df0a1b1b5db..5a358733b5cf 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 6e9f8a0a0842..88a5ebd3ed06 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,4 @@
 DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
 DIST byacc-20170709.tgz 743677 BLAKE2B 453e0083671ae17e3401bbc474a9724091fb3314adcee0e13ba55a95a12c4cd351ef901b645cb46e0df89d2053054e46a05703d418706bc962a0cacf55bb3201 SHA512 81b6e2dfe674d7e7650e1583c46f67e20cc5ff56b06ef73a54ec2070abd7f4af1a0db7909f31264d0e6157acd3661c19c3478e06c9bab395f53d0371bc1e9097
 DIST byacc-20180510.tgz 744070 BLAKE2B 9ba861ffcd310462513d7eb4b663c5c44f5cb6dc06ecf1cbcb41c309054905781c4ba1ffada88eaf0071caf16d78a5746d53e66190081e388b95f4a148684cca SHA512 89ac9d4bd1edfdcfa304b0efacc478dbdd84cc2a1cd4ef75515863b1ea2731b106202c758b469c39a4379bb155c0a2365baa290797da0a6bb3904295431556d6
+DIST byacc-20180525.tgz 745273 BLAKE2B 5b4732cede6d284f9f866b8e7f7f1f48b7eea26fcf203e633767115a2ba324586590477b9668b2f7e961db4765e2602ba78d78a2ed55d0c102153b5ed15e9cea SHA512 ab200b7f1f0295731cda0aff08ee60c1f8a4e057ca9de265b916de690e900abe67ce9b5f6f5d0e69945485e9adb5505b079d82f8e126eb1ea12d22bc6015d73a
diff --git a/dev-util/byacc/byacc-20180525.ebuild b/dev-util/byacc/byacc-20180525.ebuild
new file mode 100644
index 000000000000..e0e5a971f5d0
--- /dev/null
+++ b/dev-util/byacc/byacc-20180525.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index e514589a0ea8..d309f688a8cc 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1 +1,2 @@
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
+DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
new file mode 100644
index 000000000000..be58ae776f20
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/gengetopt/gengetopt-2.22.6.ebuild b/dev-util/gengetopt/gengetopt-2.22.6.ebuild
index 74404faced25..cd8b5f7a020c 100644
--- a/dev-util/gengetopt/gengetopt-2.22.6.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.22.6.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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index c7773d9c16d8..70eb30d633cc 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 04645c28c485..17e25d96eae2 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,2 +1,3 @@
 DIST nb802_visualvm_02102016.zip 23257637 BLAKE2B b18570b69a646c975c4b93028438cb7827f82e4e8d7d02bd11a76faf2a40164b9171626a1bd3b0664a216a30e27ff8b14d68941c8eff92e426fb92a45fb95687 SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5
 DIST visualvm-1.3.9.tar.gz 3623394 BLAKE2B 8132447427b4abd206a825b4ce45ac54055cbb761a03624438baed7f58decb370d36bd13bb233638daad55086e04e01502b971fd0c95a31648a5b0795d8eb30f SHA512 580e2f3dd7cab1f71c8ae3004101c1067d04a7b4c164e6a59bbe95ca927dd275b8b4389e724cb7d8b38586986762126f261abc1779fb229a778c1c8db0f20387
+DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
new file mode 100644
index 000000000000..b29eb860b654
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.4.1.ebuild
@@ -0,0 +1,65 @@
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NBV=90
+NBT=24042018
+NBZ=nb${NBV}_${PN}_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+# Netbeans plattform is already included in the main archive this time
+#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.7"
+
+DEPEND="
+	>=virtual/jdk-1.7"
+
+S="${WORKDIR}/${P}/${PN}"
+
+EANT_BUILD_TARGET=build
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+    unpack ${P}.tar.gz
+    cd "${S}" || die
+    # unpack ${NBZ}
+    unpack ${S}/${NBZ}  # archive is included in the main archive
+}
+
+src_prepare() {
+    default
+
+    # Remove unneeded binaries
+    rm -rv netbeans/platform/lib/*.{dll,exe} \
+       netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+    find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
+         -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+    # this is the visualvm cluster
+    insinto ${INSTALL_DIR}
+    doins -r build/cluster netbeans/{platform,profiler}
+
+    # configuration file that can be used to tweak visualvm startup parameters
+    insinto /etc/${PN}
+    newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
+
+    # visualvm runtime script
+    newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
+
+    # makes visualvm entry
+    make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 706b4534f21d..f76e0e8fe2e0 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index ba377ad15aa5..d9bcf01f766d 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,9 +1,12 @@
 DIST git-2.16.1.tar.xz 4961656 BLAKE2B d94328da5d027cb82f1f23804a12dfc5df1577bf2c28cc376d4bb5c9e34d317886437f7eee2ac4503b8e2639d2e24c35660ab82a50207f500b7ed6fb104d3624 SHA512 09e30ada7bcf41f78f15784908062c10162d58d2fd7a68ad27e42fd49dc37eb0e82c19ad21db31034a189a8cdd009013a29f943e1ae5d5ab5688c913d2a4d42a
 DIST git-2.16.3.tar.xz 4966248 BLAKE2B cd4d2573afd02a23766c4dd0da8397ac36193f68e18c162fc85d60d7595a50da7707f592ccc3a9f00a22fdcb8a8cada82139fe30f97af193fb367a4e392cbaa8 SHA512 73520cf3500b2d13b77eb1e5ec0d60263aad07732d25631732f0d986abd023f97b8a6db4abff64d342cb053018289b5f7a3e32f10b86bd9092a37ee0585adc8a
-DIST git-2.17.0.tar.xz 5011556 BLAKE2B 73b3ad74d85759704c034b7ab2f604150c08aec45f4b86f5fcfa826801da49f4922599de210d8056b25781f77ff826610ef4a47309dc9e9e3ce18ef97a8e34da SHA512 dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9
+DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
+DIST git-2.17.1.tar.xz 5015484 BLAKE2B d3a61023872a15e3176e4dae6df83d4c2369a377244d44dfd7a63a15ecc3a7b145093afd5d6fa72e4eca98ba4f81f7ccd89ac2400c9cf8107ac04fd35d8bf6e4 SHA512 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960
 DIST git-htmldocs-2.16.1.tar.xz 1160372 BLAKE2B d426fbc85772e5f04550071dea50a75e6d581fd040e8b37b3b342a8d6569d0dcf456445bab1dec3d84e254e82468c900afff7c6be1ebd6771e7fad5884b92515 SHA512 f2bb8b88ab5aa3d6204874aae583249d5137193c5fe3925df7ae1bcdaec0564b496df9a648c180bebb0c8ff4573f27e330802020d3c9207c2738ddd5c52d99c9
 DIST git-htmldocs-2.16.3.tar.xz 1164252 BLAKE2B 43d5b0317d3cb181c24347933b6ee3ce586f7be7e38ae30555bc732b369287f080879ff0408601db125a4104b665956f6bcef3f243496008d3ec1601110b06df SHA512 6271ff7780053347ceba47754db00fa8a0a39ff622c490e273ed286faa6ade3f7d6580fa396c913b4485a942b2ad0cdd898de467fde497de1d850fb6d3debd1e
-DIST git-htmldocs-2.17.0.tar.xz 1172652 BLAKE2B 9e6ccc120aa45ee98a21ac862a130a964e6cd04cd85d51ddf40cbb34197f699fd8f5046f53265a0685191a96ef5aa0cb398367679b719cb3a2bba0156732d45b SHA512 441d485d42a8b3ba8ef5617e47480be0b587f0f5d35c4288a6cfe8f2b8a84fffcd13a414dcce44855cf580af817b411654999e80502073782c7da38aa40209ba
+DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049
+DIST git-htmldocs-2.17.1.tar.xz 1173296 BLAKE2B 5133a86fb73cd58d6a9d4ed05d32949f642c9a670a49ea67c7170dfb39c4ff3f63d5f220abebcc979f87a360ec2990ccf5a9e3c18e8fcb07082bac111ecb12c7 SHA512 69054b087ffd1c88532672c6edea3cd27e08421f25c09a1a304420ec6aa20806888f71e4ef21aac1bc2fed81a045a64ae164a9dc377eb48d61887bf8d787782c
 DIST git-manpages-2.16.1.tar.xz 417188 BLAKE2B 239fb33967d17c8b10efb2e0d1963f7be3404b7f262b49f89b3f4a538135d80268fbe7fe0e561c9cb2d86840eb46b61653ed363d8da27d1169c435d8e1d5e851 SHA512 20c7646b5f1e3c633ce6aae5ee5fcbe4ca1e59fc9253ec9a9e45c7cd8a8ac7a5e71e36258eb747e3bd6d51b3b7971137315dcdbdff493e0f8774ecd3e309735a
 DIST git-manpages-2.16.3.tar.xz 417152 BLAKE2B 2719a9a603dc49db1a61a2cec42427bdcdc96fab9d21d16c5a8c70d7dba271a1e5b29f4f83f32c525c4866e3497352017af3777a769893c9543e65d625972375 SHA512 b34a3658412a144fed6f818acc05c0b4be2453ae63f9430dcd53cda750f737bd3da50390bd3f4266e69befa521eddd222985fd531acca1ebd4ca62c6c5b2a85c
-DIST git-manpages-2.17.0.tar.xz 419316 BLAKE2B f8c4e586d376c31e7728e1fb78032249cc8b20d356e2d7c8d42f1c4a6025dc89d5de81548ea2fb1af5c95276bd3b3f9e650379357f30edd773000b98371fcceb SHA512 b2f7734416f5c336cea272baa87efd10b175a357f5f722f20bb5d287b1886bdb213c4fc2f0c6a3b83fa34423e83139bab5eac70dc9669a72c75c2392dbd517f1
+DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d
+DIST git-manpages-2.17.1.tar.xz 419400 BLAKE2B af8cef1ac43c6b5ee073c7e18c161ba3ebe0669e474833211c95e72b33524050c30ca133ada98e07c8b481ffc4a5cbce1e7d68427b7aeb9bb80534c2ef3623f0 SHA512 fbdd4ef99419d244bc7c03b10cf09e92d1f0894879fe159ee1f53262daebdc7fe72d6c2bbe9e21fe354f8afb26fa06b35788e54b0c078b686706b511bf7c33ee
diff --git a/dev-vcs/git/git-2.16.4.ebuild b/dev-vcs/git/git-2.16.4.ebuild
new file mode 100644
index 000000000000..8994fd9d1500
--- /dev/null
+++ b/dev-vcs/git/git-2.16.4.ebuild
@@ -0,0 +1,699 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+		myopts+=" HAVE_CLOCK_MONOTONIC=1"
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=" HAVE_GETDELIM=1"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{64,}/perl5/ ; do
+			if test -d "$d" ; then find "$d" \
+				-name .packlist \
+				-delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=" t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=" ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=" ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=" ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=" ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=" ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-2.17.0.ebuild b/dev-vcs/git/git-2.17.1.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.17.0.ebuild
rename to dev-vcs/git/git-2.17.1.ebuild
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 8cf19d546bc4..cecc1cc0ae5e 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index 1c3b4506b6fc..a45277e699da 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1 +1 @@
-DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 SHA256 0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929 WHIRLPOOL d53f4636606c03a5977b9603495f61aaedc3f1851a1ca2bd8b4b2bda6feff8de0f9ec488fa10b052870fbfbea875673f2fe27fafd92ee0c663b0ae158171c2ee
+DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 1e43003601d2..83143df9a7fe 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
index 8a3d87c28541..356344824fce 100644
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	udisks? ( udev )
 	systemd? ( !elogind udisks )
 "
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	app-crypt/gcr:=
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index c99da4f47900..b1eb1fc8baa4 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
index d4d62395703f..e06bd6f6be41 100644
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index c35eb222d5d0..3803313bf60d 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
index 80b3a5a32511..a23e682a6f28 100644
--- a/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
+++ b/mail-filter/couriersrs/couriersrs-0.1.2.ebuild
@@ -1,28 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="SRS (Sender Rewriting Scheme) wrapper for the courier MTA"
 HOMEPAGE="http://couriersrs.com/"
 SRC_URI="http://couriersrs.com/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE=""
+
 DEPEND="dev-libs/popt
 	mail-filter/libsrs2"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-automake-fixes.diff" )
+
 src_prepare() {
-	rm m4/*.m4
-	epatch "${FILESDIR}/${P}-automake-fixes.diff"
+	default
+	rm m4/*.m4 || die "rm failed!"
 	AT_M4DIR="m4" eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index d22b6811ad58..de75376fb9d8 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/esmtp/esmtp-1.2-r1.ebuild b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
index ac16a7833d1b..bd1d86f7997a 100644
--- a/mail-mta/esmtp/esmtp-1.2-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ DEPEND="${CDEPEND}
 "
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dodoc AUTHORS ChangeLog NEWS README TODO sample.esmtprc
 }
 
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c033af6a7d6c..c235e9047216 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/alegreya-serif/Manifest b/media-fonts/alegreya-serif/Manifest
new file mode 100644
index 000000000000..4a319c36ce4d
--- /dev/null
+++ b/media-fonts/alegreya-serif/Manifest
@@ -0,0 +1 @@
+DIST alegreya-serif-2.007.tar.gz 14729050 BLAKE2B ccf4dd3827e6b3c32b1009de273723a2bd63aee992710676b20ef3a0dbb17a5608046d7d5955d5d38a6a11a4268ffb0985f5fb8044239de5a42ab5b5fd06efb3 SHA512 7220aaf9f9861ed4f3104aeb16f33267b5cc2139b91ddafbd7ff86f94faeb37bca558c642a03108094d0a60f9db77167c19996fdaeeca3fcac0346205ba4e785
diff --git a/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild b/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
new file mode 100644
index 000000000000..fa29261d0d10
--- /dev/null
+++ b/media-fonts/alegreya-serif/alegreya-serif-2.007.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Alegreya"
+inherit font
+
+DESCRIPTION="Alegreya serif type family"
+HOMEPAGE="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro"
+SRC_URI="https://github.com/huertatipografica/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DOCS="CONTRIBUTORS.txt README.md"
+S="${WORKDIR}/${MY_PN}-${PV}"
+FONT_S="${S}/fonts/otf"
+FONT_SUFFIX="otf"
diff --git a/media-fonts/alegreya-serif/metadata.xml b/media-fonts/alegreya-serif/metadata.xml
new file mode 100644
index 000000000000..52a13773a341
--- /dev/null
+++ b/media-fonts/alegreya-serif/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>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">huertatipografica/Alegreya-Sans</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 59e2be1942ec..2fe65dc91cec 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/cellwriter/Manifest b/media-gfx/cellwriter/Manifest
index fdc4ac04e0d3..4777296cfe13 100644
--- a/media-gfx/cellwriter/Manifest
+++ b/media-gfx/cellwriter/Manifest
@@ -1,2 +1 @@
-DIST cellwriter-1.3.4.tar.gz 284647 BLAKE2B 93d970c6422c2f250ee516d37e65fe4841efd504ced7ad43c21157574281df4ec0bf57cad5b2802c149d48d14b5ae2b4bfac404028ab4cfa6d9d6e0a2fc5fcd2 SHA512 5839670912a456cc9becef61b9f293575bc04fd4113877a21e9fea247a964917a399393007c3793066fa92a2ba0560776100d56ea56d1dadd49052a4844e1582
 DIST cellwriter-1.3.5.tar.gz 293241 BLAKE2B 57d287782af21ae8010dc43ea89a2da081ecee854740cd8c5991de62450929a89f04c1601ff77ac69b945d5997042c8f739defa00614aa0af947655d5251f8ef SHA512 a9b682babda4335ea18716032ac52e73578459e9ab8866b20177f6d0cb606b9da2bf5a3fae2e2547277351db2533c7e92461f5c6a6ebc542ffe5844ff7ae65d6
diff --git a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild b/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
deleted file mode 100644
index cb3737df9143..000000000000
--- a/media-gfx/cellwriter/cellwriter-1.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="Grid-entry natural handwriting input panel"
-HOMEPAGE="http://risujin.org/cellwriter/"
-SRC_URI="http://pub.risujin.org/cellwriter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnome"
-
-RDEPEND="x11-libs/libXtst
-	>=x11-libs/gtk+-2.10:2
-	gnome? ( gnome-base/libgnome )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf $(use_with gnome)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index ff807541c73b..7bb21efe1f5b 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.26_p20171104.tar.gz 28368697 BLAKE2B 50013cf0bf30a2a476b02d5db4027fca268a4b38733762eb4c08e5f3bdfaf737038e9a62f7ef471fecb10250d8ae686ef683f9b0ea4ccc5d109440ba534371e4 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474
 DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
deleted file mode 100644
index 0da64ed3f8d4..000000000000
--- a/media-gfx/exiv2/exiv2-0.26_p20171104.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-if [[ ${PV} = *9999 ]]; then
-	EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
-	EGIT_BRANCH="0.26"
-	GIT_ECLASS=git-r3
-else
-	COMMIT=900d2417dbeb46e14cbf65fc2798ed1d043ab76d
-	SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-inherit cmake-multilib python-any-r1 vcs-snapshot
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/26"
-IUSE="doc examples nls png webready xmp"
-
-RDEPEND="
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
-	png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	webready? (
-		net-libs/libssh[${MULTILIB_USEDEP}]
-		net-misc/curl[${MULTILIB_USEDEP}]
-	)
-	xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		${PYTHON_DEPS}
-		app-doc/doxygen
-		dev-libs/libxslt
-		media-gfx/graphviz
-		virtual/pkgconfig
-	)
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
-	# TODO: Take to upstream
-	"${FILESDIR}"/${PN}-0.26-fix-docs.patch
-	"${FILESDIR}"/${PN}-0.26-tools-optional.patch
-)
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]] ; then
-		if [[ -d po ]] ; then
-			pushd po > /dev/null || die
-			local lang
-			for lang in *.po; do
-				if [[ -e ${lang} ]] \
-						&& ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then
-					case ${lang} in
-						CMakeLists.txt | \
-						${PN}.pot)      ;;
-						*) rm -r ${lang} || die ;;
-					esac
-				fi
-			done
-			popd > /dev/null || die
-		else
-			die "Failed to prepare LINGUAS - po directory moved?"
-		fi
-	fi
-
-	# FIXME @upstream:
-	einfo "Converting doc/cmd.txt to UTF-8"
-	iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
-	mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
-	if use doc; then
-		einfo "Updating doxygen config"
-		doxygen &>/dev/null -u config/Doxyfile || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DEXIV2_ENABLE_BUILD_SAMPLES=NO
-		-DEXIV2_ENABLE_BUILD_PO=$(usex nls)
-		-DEXIV2_ENABLE_NLS=$(usex nls)
-		-DEXIV2_ENABLE_PNG=$(usex png)
-		-DEXIV2_ENABLE_CURL=$(usex webready)
-		-DEXIV2_ENABLE_SSH=$(usex webready)
-		-DEXIV2_ENABLE_WEBREADY=$(usex webready)
-		-DEXIV2_ENABLE_XMP=$(usex xmp)
-		-DEXIV2_ENABLE_LIBXMP=NO
-		$(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	if multilib_is_native_abi; then
-		use doc && emake -j1 doc
-	fi
-}
-
-multilib_src_install_all() {
-	use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc samples/*.cpp
-	fi
-}
diff --git a/media-gfx/fontforge/fontforge-20170731-r4.ebuild b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
index 046325111fab..197ac6b31054 100644
--- a/media-gfx/fontforge/fontforge-20170731-r4.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
index adf9c1f83bf1..bf31c418c6d9 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.15.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ppc64 sparc x86"
 IUSE="aalib exif ncurses nls readline"
 
 # aalib -> needs libjpeg
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index 8121a9a6b952..72f4d50d3f19 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/jpegpixi/jpegpixi-1.1.1.ebuild b/media-gfx/jpegpixi/jpegpixi-1.1.1.ebuild
index e0158313e68a..78bf7510b840 100644
--- a/media-gfx/jpegpixi/jpegpixi-1.1.1.ebuild
+++ b/media-gfx/jpegpixi/jpegpixi-1.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="almost lossless JPEG pixel interpolator, for correcting digital camera defects"
 HOMEPAGE="http://www.zero-based.org/software/jpegpixi/"
@@ -15,7 +15,7 @@ IUSE=""
 DEPEND="virtual/jpeg"
 
 src_install() {
-	dobin jpegpixi jpeghotp || die
-	doman man/jpegpixi.1 man/jpeghotp.1
-	dodoc AUTHORS NEWS README README.jpeglib ChangeLog
+	dobin jpeg{hotp,pixi}
+	doman man/jpeg{hotp,pixi}.1
+	einstalldocs AUTHORS NEWS README README.jpeglib ChangeLog
 }
diff --git a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
index 9f562f293b31..3f7d60695389 100644
--- a/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
+++ b/media-gfx/jpegtoavi/files/jpegtoavi-1.5-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2010-03-02 23:06:07.000000000 +0200
-+++ Makefile	2010-03-02 23:11:59.000000000 +0200
+--- a/Makefile	2010-03-02 23:06:07.000000000 +0200
++++ b/Makefile	2010-03-02 23:11:59.000000000 +0200
 @@ -1,4 +1,4 @@
 -CC=gcc
 +CC ?= gcc
diff --git a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
index eb054f06923d..5da0a3e24689 100644
--- a/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
+++ b/media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="JPEG to AVI/MJPEG animation command-line conversion tool"
 HOMEPAGE="https://sourceforge.net/projects/jpegtoavi/"
@@ -13,17 +13,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die
 }
 
 src_install() {
-	dobin ${PN} || die
+	dobin ${PN}
 	doman ${PN}.1
 	dodoc CHANGELOG README
 }
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
new file mode 100644
index 000000000000..967398bad995
--- /dev/null
+++ b/media-gfx/yafaray/Manifest
@@ -0,0 +1,2 @@
+DIST yafaray-blender-exporter-3.3.0.tar.gz 377928 BLAKE2B 7876c78ca6228282648909e566803b33304be0082fab48819340845e3927877b9734f7bc7e09702bf7cbf6477c68932637eb766dc98b9e8e4ab42ca99d2a3595 SHA512 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
+DIST yafaray-core-3.3.0.tar.gz 1135360 BLAKE2B 67f6956a3866bfe0b4167f30a7c2c7f05ee23556e9fff7041ff3937e90011e4c2538b706ae27e02351ae555d0d05531f3eb711257591d85f779683c9c42ac6f7 SHA512 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch
new file mode 100644
index 000000000000..9bf4f2b91f68
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-blender-exporter-paths.patch
@@ -0,0 +1,15 @@
+diff --git a/work/Blender-Exporter-3.3.0/__init__.py b/work/Blender-Exporter-3.3.0/__init__.py
+index 85dc1c2..70a79e8 100644
+--- a/__init__.py
++++ b/__init__.py
+@@ -22,8 +22,8 @@ import sys
+ import os
+ import ctypes
+ 
+-PLUGIN_PATH = os.path.join(__path__[0], 'bin', 'yafaray-plugins')
+-BIN_PATH = os.path.join(__path__[0], 'bin')
++PLUGIN_PATH = '/usr/lib/yafaray-plugins'
++BIN_PATH = '/usr/bin'
+ YAF_ID_NAME = "YAFA_V3_RENDER"
+ 
+ # Version to be automatically populated during the cmake build process, getting the version from git tags
diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch
new file mode 100644
index 000000000000..c22ff7e41ea6
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-respect-cflags.patch
@@ -0,0 +1,14 @@
+diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt
+index 75fd2c6..94c2502 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -219,9 +219,6 @@ if(NOT WIN32)
+ 		set(YAF_BINDINGS_RUBY_DIR ${YAF_LIB_DIR})
+ 	endif(NOT YAF_BINDINGS_RUBY_DIR)
+ 
+-	# build flags
+-	set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
+-	
+ 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
+ 	else(USER_RELEASE_OPTIMIZATION_FLAGS)
diff --git a/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch
new file mode 100644
index 000000000000..3bdb4eeef361
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.3.0-strip-debug-mode.patch
@@ -0,0 +1,12 @@
+diff --git a/work/Core-3.3.0/CMakeLists.txt b/work/Core-3.3.0/CMakeLists.txt
+index 75fd2c6..52c6b3d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,6 @@ option(WITH_YAF_PY_BINDINGS "Enable the YafaRay Python bindings" ON)
+ option(WITH_YAF_RUBY_BINDINGS "Enable the YafaRay Ruby bindings" OFF)
+ option(WITH_OSX_ADDON "Enable the use of blender's included python lib on OSX platforms" OFF)
+ option(WITH_OpenCV "Build OpenCV image processing support" ON)
+-option(DEBUG_BUILD "Enable debug build mode" OFF)
+ option(EMBED_FONT_QT "Embed font for QT GUI (usefull for some buggy QT installations)" OFF)
+ option(FAST_MATH "Enable mathematic approximations to make code faster" ON)
+ option(FAST_TRIG "Enable trigonometric approximations to make code faster" ON)
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
new file mode 100644
index 000000000000..cee5f0b787f1
--- /dev/null
+++ b/media-gfx/yafaray/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>herb@hlmjr.com</email>
+		<name>Herb Miller Jr. (herbmillerjr)</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
+		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
+	</longdescription>
+	<use>
+		<flag name="blender">Install addon for <pkg>media-gfx/blender</pkg></flag>
+		<flag name="fastmath">Enable mathematic approximations to make code faster</flag>
+		<flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
+		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+	</use>
+</pkgmetadata>
+
diff --git a/media-gfx/yafaray/yafaray-3.3.0.ebuild b/media-gfx/yafaray/yafaray-3.3.0.ebuild
new file mode 100644
index 000000000000..3b077ecb4aa8
--- /dev/null
+++ b/media-gfx/yafaray/yafaray-3.3.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="A free open-source montecarlo raytracing engine"
+HOMEPAGE="http://www.yafaray.org"
+SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz
+	https://github.com/YafaRay/Blender-Exporter/archive/v${PV}.tar.gz -> ${PN}-blender-exporter-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/libxml2
+	sys-libs/zlib
+	blender? ( media-gfx/blender )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] )
+	openexr? ( >=media-libs/openexr-2.2.0:= )
+	png? ( media-libs/libpng:= )
+	python? ( ${PYTHON_DEPS} )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
+
+S="${WORKDIR}/Core-${PV}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s/@YAFARAY_BLENDER_EXPORTER_VERSION@/v${PV}/" "${WORKDIR}/Blender-Exporter-${PV}/__init__.py" || die
+
+	eapply "${FILESDIR}/${P}-strip-debug-mode.patch"
+	eapply "${FILESDIR}/${P}-respect-cflags.patch"
+	pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
+	eapply "${FILESDIR}/${P}-blender-exporter-paths.patch"
+	popd || dir
+	eapply_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DYAF_LIB_DIR=$(get_libdir)
+		-DWITH_YAF_PY_BINDINGS=$(usex python)
+		-DWITH_YAF_RUBY_BINDINGS=OFF
+		-DBLENDER_ADDON=OFF # addon is a separate package called blender-exporter
+		-DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
+		-DFAST_MATH=$(usex fastmath)
+		-DFAST_TRIG=$(usex fasttrig)
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_OpenCV="$(usex opencv)"
+		-DWITH_OpenEXR="$(usex openexr)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_QT=OFF # qt4 only at the moment
+		-DWITH_TIFF="$(usex tiff)"
+		-DWITH_Freetype="$(usex truetype)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
+	python_domodule "${BUILD_DIR}/src/bindings/_yafaray_v3_interface.so"
+	rm -v "${D}"usr/$(get_libdir)/{yafaray_v3_interface.py,_yafaray_v3_interface.so} || die
+
+	if use blender; then
+		pushd "${WORKDIR}/Blender-Exporter-${PV}" || die
+		rm README LICENSES INSTALL CHANGELOG .gitignore || die
+		# grab blender version number for plugin directory
+		local blender_plugin_dir=$(best_version media-gfx/blender)
+		blender_plugin_dir=${blender_plugin_dir##*/} # remove category
+		blender_plugin_dir=${blender_plugin_dir#*-}  # remove package name
+		blender_plugin_dir=${blender_plugin_dir%%-*} # remove revision number if exists
+		insinto /usr/share/blender/${blender_plugin_dir}/scripts/addons/yafaray_v3
+		doins -r .
+		popd || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To confirm your installation is working as expected, run"
+	elog "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
+	elog "as an input file, then compare the result to"
+	elog "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
+	if use blender; then
+		elog
+		elog "To use within Blender, navigate to File -> User Preferences -> Add-ons (tab)"
+		elog "and enable 'Render: YafaRay v3 Exporter'. This will make YafaRay available"
+		elog "in the render engines drop-down."
+	fi
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 73ca21bb7ad4..f834576c3b08 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/celt/celt-0.5.1.3.ebuild b/media-libs/celt/celt-0.5.1.3.ebuild
index 9f9e2598cac0..8d4ede3a5894 100644
--- a/media-libs/celt/celt-0.5.1.3.ebuild
+++ b/media-libs/celt/celt-0.5.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="CELT is a very low delay audio codec designed for high-quality communications"
 HOMEPAGE="http://www.celt-codec.org/"
@@ -22,8 +22,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README TODO || die "dodoc failed."
-
-	use static-libs || find "${D}" -name '*.la' -delete
+	default
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die "Pruning failed"
+	fi
 }
diff --git a/media-libs/dssi/dssi-1.1.1-r1.ebuild b/media-libs/dssi/dssi-1.1.1-r1.ebuild
index ee5f8943082e..686a3cb12271 100644
--- a/media-libs/dssi/dssi-1.1.1-r1.ebuild
+++ b/media-libs/dssi/dssi-1.1.1-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	eapply_user
+	default
 	sed -i \
 		-e 's:libdir=.*:libdir=@libdir@:' \
 		dssi.pc.in || die
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index a60cc3d73ec8..b34fe2ceb5bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -1,3 +1,9 @@
+DIST freetype-2.8.tar.bz2 1873526 BLAKE2B c2336a3774cee0334bd342f4323524063a982c8a46dc5623a420be1a0ccb76ed5adc710673ea2401b0013f80a5c22bbc07e2adb4e842a0763ee1b0afc3cedb82 SHA512 3842c34bf6100a8c9b78258146b2ff35e9bb4c993937d3ef09982c1e2552dfd15f8849ddd8a1e84edf08b5a5fb918b68cf7b1584545c5900e22a00bfa1c89ff5
 DIST freetype-2.9.1.tar.bz2 1926385 BLAKE2B f165d638e0f49749a2640aabba96aca20441c76028cc18bb2482fd620a29dd368bc55ea020c1e74fa6effe9fed3c59a53c7fdf2dd6021f445032b7007201948e SHA512 856766e1f3f4c7dc8afb2b5ee991138c8b642c6a6e5e007cd2bc04ae58bde827f082557cf41bf541d97e8485f7fd064d10390d1ee597f19d1daed6c152e27708
+DIST freetype-2.9.tar.bz2 1915013 BLAKE2B 6474230507a0bcf9408846cf45d8e0c69314783e38ed71de6ce69031da9b418fe513056068768e4b350a93dd13dadfe8363d72b1d20d5347d5ce1d30d9d9fe08 SHA512 28465f3453baf9a187529432118389de8f1b85273c9fb787d2c8f0feee8ab64b387ddd936b4e67ec58dcf71e33884e7e25f01169b737824221ab143839a9161a
+DIST freetype-doc-2.8.tar.bz2 2127740 BLAKE2B 891b43a7a6b0eae4a0f91110367b47c1c0ebd05a2d1a309669415f98fa08736738504b243d315a100a385074888382c6767f0741dd79814f5783cd215a716ca5 SHA512 3a970a7dd6f0ba580c9f8084b271c11e6e87111ab9a5b6a3148eb1087e45ee18e998aa7e36a4311067a3b674cb784b1e827cf8c3a853e380078219be3eccce06
 DIST freetype-doc-2.9.1.tar.bz2 2130292 BLAKE2B 667032fa447fbc28c0f753df3ade7a07a4f8d4d26cdd00fed2fa0e8098e9d6a083572608b7d06446ea91baa932e3c6d18beb1f86f6b549a8cd2c07a2df567da0 SHA512 1668f02f67e6e047df04e5e2fccb564cd9af780ec9b3c4878109868302a83eaec7b627390ff82c3e875122400e6f20fc690936a1e4964dfa65143e5309fa22d4
+DIST freetype-doc-2.9.tar.bz2 2128135 BLAKE2B a192237e9f2cd0b14cf081ba09d58d6e42793d7c8034815d9d8a11a7abf5775bc9181f960405c7f2b12c6994329f8caee3c3ae62cc8b08fbbc3fd285f76922b8 SHA512 0ffd38541f8fd0ae6efb97025bb585209580b964d632e15c66944bc2549e2b0e6c375a141df5061621e8c32eeaed017834530169addc4daa2e83399f88efde2f
+DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051ceb3f77762f2fad51ec7a21d34cdbc35a6e828d1755b374d05801d11b0f9968361a34efbb6a6239769b8cd730a SHA512 dffdf6a493e8145c6513be34b57734a9a99c61f758a0e1ea691ef4284cee4c274ad7c3a8120a8ec425d86e33a70cd879d9db258e9c67b6a4db79c3243d4c9fb3
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
+DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
diff --git a/media-libs/freetype/freetype-2.8.ebuild b/media-libs/freetype/freetype-2.8.ebuild
new file mode 100644
index 000000000000..4dfd2a7b4962
--- /dev/null
+++ b/media-libs/freetype/freetype-2.8.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://nongnu/freetype/${P/_/}.tar.bz2
+	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+		mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+		mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
+	infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+
+	# patches from upstream (can be removed with the next version bump)
+)
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	default
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	ECONF_SOURCE="${S}" \
+		econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	prune_libtool_files --all
+}
diff --git a/media-libs/freetype/freetype-2.9.ebuild b/media-libs/freetype/freetype-2.9.ebuild
new file mode 100644
index 000000000000..4d9867d2f4f4
--- /dev/null
+++ b/media-libs/freetype/freetype-2.9.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+
+INFINALITY_PATCH="03-infinality-2.6.3-2016.03.26.patch"
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+	mirror://nongnu/freetype/${P/_/}.tar.bz2
+	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+		mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+		mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz
+	infinality png static-libs utils"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+
+	# patches from upstream (can be removed with the next version bump)
+)
+
+src_prepare() {
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	default
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED%/}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	prune_libtool_files --all
+}
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
index 545b781f4045..33273e3ba801 100644
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ b/media-libs/gd/gd-2.2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
 
 LICENSE="gd IJG HPND BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
 
 # fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
index 190e46d04b77..588c83ce9b5c 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 LICENSE="Old-MIT ISC icu"
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
index dc69fb983636..a3953efd3513 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
@@ -1,5 +1,5 @@
---- IlmThread/Makefile.in
-+++ IlmThread/Makefile.in
+--- a/IlmThread/Makefile.in
++++ b/IlmThread/Makefile.in
 @@ -209,7 +209,7 @@
  			  IlmThreadMutexPosix.cpp
  
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
index d822092254d8..a4e186058fe8 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
@@ -1,5 +1,5 @@
---- Imath/ImathMatrix.h
-+++ Imath/ImathMatrix.h
+--- a/Imath/ImathMatrix.h
++++ b/Imath/ImathMatrix.h
 @@ -37,6 +37,8 @@
  #ifndef INCLUDED_IMATHMATRIX_H
  #define INCLUDED_IMATHMATRIX_H
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
index eb979ea8ca4c..b92d275e1df2 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils libtool
+EAPI=6
+inherit libtool
 
 DESCRIPTION="OpenEXR ILM Base libraries"
 HOMEPAGE="http://openexr.com/"
@@ -16,20 +16,22 @@ IUSE="static-libs"
 RDEPEND="!<media-libs/openexr-1.5.0"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-asneeded.patch"
+	"${FILESDIR}/${P}-gcc43.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+	default
 	elibtoolize
 }
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-	find "${D}" -name '*.la' -delete
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/media-libs/libepoxy/libepoxy-1.5.2.ebuild b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
index 21db4db9f63b..a814fceec62f 100644
--- a/media-libs/libepoxy/libepoxy-1.5.2.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.2.ebuild
@@ -26,11 +26,12 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
+RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
-	media-libs/mesa[egl,${MULTILIB_USEDEP}]
+	${RDEPEND}
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	>=dev-util/meson-0.44.0"
-RDEPEND=""
+	>=dev-util/meson-0.44.0
+	virtual/pkgconfig"
 
 src_unpack() {
 	default
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 17eb5ee20a7c..476702c15fb7 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -26,11 +26,12 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="test +X"
 
+RDEPEND="media-libs/mesa[egl,${MULTILIB_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
-	media-libs/mesa[egl,${MULTILIB_USEDEP}]
+	${RDEPEND}
 	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-	>=dev-util/meson-0.44.0"
-RDEPEND=""
+	>=dev-util/meson-0.44.0
+	virtual/pkgconfig"
 
 src_unpack() {
 	default
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index d55089897700..0ca3ce3d2785 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libwebp/libwebp-1.0.0.ebuild b/media-libs/libwebp/libwebp-1.0.0.ebuild
index 6ef54b5061d5..ea796fca8f7e 100644
--- a/media-libs/libwebp/libwebp-1.0.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint"
 IUSE="cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
 
 # TODO: dev-lang/swig bindings in swig/ subdirectory
diff --git a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
index ed92ded207ab..b58e538b8fed 100644
--- a/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
+++ b/media-libs/tse3/files/tse3-0.2.7-gcc4.patch
@@ -1,5 +1,5 @@
---- ./src/tse3/cmd/Phrase.h~	2002-07-28 17:17:11.000000000 +0200
-+++ ./src/tse3/cmd/Phrase.h	2005-07-29 15:45:03.000000000 +0200
+--- a/src/tse3/cmd/Phrase.h
++++ b/src/tse3/cmd/Phrase.h
 @@ -19,6 +19,7 @@
  
  #include "tse3/cmd/Command.h"
diff --git a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
index 29c54edc084f..fe628c306670 100644
--- a/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
+++ b/media-libs/tse3/files/tse3-0.2.7-size_t-64bit.patch
@@ -1,5 +1,5 @@
---- src/tse3/file/XML.h.orig	2002-07-28 18:17:11.000000000 +0300
-+++ src/tse3/file/XML.h	2004-04-25 14:51:56.000000000 +0300
+--- a/src/tse3/file/XML.h
++++ b/src/tse3/file/XML.h
 @@ -154,6 +154,7 @@
                  void element(const std::string &name, const char        *value);
                  void element(const std::string &name, int                value);
@@ -8,8 +8,8 @@
                  void element(const std::string &name, bool               value);
  
                  void comment(const std::string &comment);
---- src/tse3/file/XML.cpp.orig	2002-07-28 18:17:11.000000000 +0300
-+++ src/tse3/file/XML.cpp	2004-04-25 14:54:01.000000000 +0300
+--- a/src/tse3/file/XML.cpp
++++ b/src/tse3/file/XML.cpp
 @@ -116,6 +116,12 @@
      out << "<" << name << " value=\"" << value << "\"/>\n";
  }
diff --git a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
index 4581da9d0bf7..0ff1ebb6ea1d 100644
--- a/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
+++ b/media-libs/tse3/files/tse3-0.3.1+gcc-4.3.patch
@@ -1,5 +1,5 @@
---- src/tse3/Serializable.h.orig	2008-06-08 12:17:05.000000000 +0200
-+++ src/tse3/Serializable.h	2008-06-08 12:17:27.000000000 +0200
+--- a/src/tse3/Serializable.h
++++ b/src/tse3/Serializable.h
 @@ -20,6 +20,7 @@
  #include <iosfwd>
  #include <iomanip>
@@ -9,8 +9,8 @@
  namespace TSE3
  {
 
---- src/tse3/TSE2MDL.h.orig	2008-06-08 12:17:41.000000000 +0200
-+++ src/tse3/TSE2MDL.h	2008-06-08 12:18:02.000000000 +0200
+--- a/src/tse3/TSE2MDL.h
++++ b/src/tse3/TSE2MDL.h
 @@ -22,6 +22,7 @@
  #include <string>
  #include <iostream>
@@ -20,8 +20,8 @@
  namespace TSE3
  {
 
---- src/tse3/MidiFile.h.orig	2008-06-08 12:18:26.000000000 +0200
-+++ src/tse3/MidiFile.h	2008-06-08 12:18:42.000000000 +0200
+--- a/src/tse3/MidiFile.h
++++ b/src/tse3/MidiFile.h
 @@ -25,6 +25,7 @@
  #include <string>
  #include <iosfwd>
@@ -30,8 +30,8 @@
  
  namespace TSE3
  {
---- src/examples/recording/recording.cpp.orig	2008-06-08 12:18:56.000000000 +0200
-+++ src/examples/recording/recording.cpp	2008-06-08 12:19:18.000000000 +0200
+--- a/src/examples/recording/recording.cpp
++++ b/src/examples/recording/recording.cpp
 @@ -26,6 +26,7 @@
       *
       **************************************************************/
@@ -41,8 +41,8 @@
  
  // Used in step 1
 
---- src/tse3play/tse3play.h.orig	2008-06-08 12:19:34.000000000 +0200
-+++ src/tse3play/tse3play.h	2008-06-08 12:19:53.000000000 +0200
+--- a/src/tse3play/tse3play.h
++++ b/src/tse3play/tse3play.h
 @@ -19,6 +19,7 @@
  
  #include <string>
@@ -51,8 +51,8 @@
  
  #include "tse3/Transport.h"
  
---- src/tse3/plt/Alsa-0.9.cpp.orig	2008-06-08 12:39:53.000000000 +0200
-+++ src/tse3/plt/Alsa-0.9.cpp	2008-06-08 12:40:25.000000000 +0200
+--- a/src/tse3/plt/Alsa-0.9.cpp
++++ b/src/tse3/plt/Alsa-0.9.cpp
 @@ -25,12 +25,11 @@
  #define HAVE_SYS_ASOUNDLIB_H
  #endif
@@ -68,8 +68,8 @@
  #include <sys/asoundlib.h>
  #endif
 
---- src/tse3/plt/OSS.h.orig	2008-06-08 12:45:46.000000000 +0200
-+++ src/tse3/plt/OSS.h	2008-06-08 12:46:06.000000000 +0200
+--- a/src/tse3/plt/OSS.h
++++ b/src/tse3/plt/OSS.h
 @@ -21,6 +21,7 @@
  
  #include <string>
diff --git a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
index b4fc927a7183..7a0d0918b142 100644
--- a/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
+++ b/media-libs/tse3/files/tse3-0.3.1-parallelmake.patch
@@ -1,5 +1,5 @@
---- src/tse3/Makefile.am.old	2007-02-06 23:57:38.000000000 +0100
-+++ src/tse3/Makefile.am	2007-02-07 00:08:01.000000000 +0100
+--- a/src/tse3/Makefile.am
++++ b/src/tse3/Makefile.am
 @@ -53,7 +53,7 @@
  
  noinst_PROGRAMS = test
diff --git a/media-libs/tse3/tse3-0.3.1-r1.ebuild b/media-libs/tse3/tse3-0.3.1-r1.ebuild
index 08519f982de1..9c10927b83eb 100644
--- a/media-libs/tse3/tse3-0.3.1-r1.ebuild
+++ b/media-libs/tse3/tse3-0.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils flag-o-matic
+EAPI=6
+inherit autotools flag-o-matic
 
 DESCRIPTION="TSE3 Sequencer library"
 HOMEPAGE="http://TSE3.sourceforge.net"
@@ -17,17 +17,21 @@ IUSE="alsa oss"
 RDEPEND="alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.7-size_t-64bit.patch"
+	"${FILESDIR}/${PN}-0.2.7-gcc4.patch"
+	"${FILESDIR}/${P}-parallelmake.patch"
+	"${FILESDIR}/${P}+gcc-4.3.patch"
+)
+
 src_prepare() {
+	default
+	mv configure.in configure.ac || die "Moving configure.in -> .ac failed"
 	if use oss; then
-		cp "${WORKDIR}"/awe_voice.h src/
-		append-flags -DHAVE_AWE_VOICE_H
+		cp "${WORKDIR}"/awe_voice.h src/ || die "copy failed"
+		append-cppflags -DHAVE_AWE_VOICE_H
 	fi
 
-	epatch "${FILESDIR}"/${PN}-0.2.7-size_t-64bit.patch \
-		"${FILESDIR}"/${PN}-0.2.7-gcc4.patch \
-		"${FILESDIR}"/${P}-parallelmake.patch \
-		"${FILESDIR}"/${P}+gcc-4.3.patch
-
 	eautoreconf
 }
 
@@ -44,7 +48,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README THANKS TODO doc/History
-	dohtml doc/*.{html,gif,png}
+	HTML_DOCS=( doc/*.{html,gif,png} )
+	default
+	dodoc doc/History
 }
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index fb3c3a7f8749..a1a85eca8fec 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
index b617584f94de..f71f13163e25 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
-+++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,9 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
index 38fad9bc9abc..0bf9b05a5ca4 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -1,5 +1,5 @@
---- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
-+++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -9,6 +9,8 @@
  # 0.11-gentoo
  #     * Jeremy Huddleston <eradicator@gentoo.org>:
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
index 20361f1b9835..10588d87e1d9 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -1,5 +1,5 @@
---- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
-+++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -6,6 +6,10 @@
  # <http://www.opensource.org/licenses/artistic-license.html>
  
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
index 65f7a83454fa..1b08f5453350 100644
--- a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/328953
 http://qa.mandriva.com/53477
 
---- mp32ogg
-+++ mp32ogg
+--- a/mp32ogg
++++ b/mp32ogg
 @@ -167,7 +167,9 @@
  }
  
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
index 72c5e39e14aa..92d9ea2f2c79 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
@@ -21,17 +20,17 @@ DEPEND=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-r4-mpg321.patch"
+	"${FILESDIR}/${P}-r4-quality.patch"\
+	"${FILESDIR}/${P}-r5-german_umlaut.patch"
+	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-r4-mpg321.patch \
-		"${FILESDIR}"/${P}-r4-quality.patch \
-		"${FILESDIR}"/${P}-r5-german_umlaut.patch \
-		"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
+src_unpack() {
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die "Copying sources failed"
 }
 
 src_install() {
-	dobin mp32ogg || die
+	dobin mp32ogg
 }
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
index 469306c080f7..e62c87864b42 100644
--- a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="A perl script to convert Ogg Vorbis files to MP3 files"
 HOMEPAGE="http://www.gitorious.org/ogg2mp3/pages/Home"
@@ -18,6 +18,6 @@ RDEPEND="media-sound/lame
 DEPEND=""
 
 src_install() {
-	dobin ogg2mp3 || die "dobin failed"
+	dobin ogg2mp3
 	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
 }
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
index 0440a8040b8c..c331baa8b906 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -1,5 +1,5 @@
---- vorbis_header_utils.c.orig	Fri Aug 31 14:47:55 2007
-+++ vorbis_header_utils.c	Fri Aug 31 14:51:23 2007
+--- a/vorbis_header_utils.c
++++ b/vorbis_header_utils.c
 @@ -153,15 +153,15 @@
      die("malloc");
    
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
index 8945ca47c082..0c8758027a00 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
@@ -1,5 +1,5 @@
---- avilib/avidump.c.orig	2004-11-02 15:30:16.000000000 +0000
-+++ avilib/avidump.c	2004-11-17 19:12:02.730255128 +0000
+--- a/avilib/avidump.c
++++ b/avilib/avidump.c
 @@ -54,7 +54,7 @@
                     ((x<<8)  & 0x00ff0000) |\
                     ((x<<24) & 0xff000000))
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
index 8457918beb8f..00c2ee06c6b9 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
---- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
-+++ ogmtools-1.5/ogminfo.c	2009-05-12 12:41:58.000000000 +0300
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -513,7 +513,7 @@
                stream->serial, stream->size,
                (stream->size * 8.0 / 1000.0) / now,
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
index 085cc5d978d3..5b71402649eb 100644
--- a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -1,6 +1,5 @@
-diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
---- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
-+++ ogmtools-1.5/ogminfo.c	2009-05-12 12:42:56.000000000 +0300
+--- a/ogminfo.c
++++ b/ogminfo.c
 @@ -188,7 +188,7 @@
      }
      vorbis_comment_clear(&vc);
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 8e6971a61fc0..2615313a813f 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Information, extraction or creation for OGG media streams"
 HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
@@ -17,12 +16,12 @@ RDEPEND="dvd? ( media-libs/libdvdread )
 	media-sound/vorbis-tools"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-comments.patch \
-		"${FILESDIR}"/${P}-endian-fix.patch \
-		"${FILESDIR}"/${P}-vorbis_verbosity.patch \
-		"${FILESDIR}"/${P}-summary_length.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-comments.patch"
+	"${FILESDIR}/${P}-endian-fix.patch"
+	"${FILESDIR}/${P}-vorbis_verbosity.patch"
+	"${FILESDIR}/${P}-summary_length.patch"
+)
 
 src_configure() {
 	econf \
@@ -30,12 +29,10 @@ src_configure() {
 }
 
 src_install() {
-	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat
 
-	if use dvd; then
-		dobin dvdxchap || die "dobin failed"
-	fi
+	use dvd && dobin dvdxchap
 
-	dodoc ChangeLog README TODO
+	einstalldocs
 	doman *.1
 }
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 07835fb5d9f1..7f6eae4e4f37 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a5f18bc13c4a..d3a85a7c1676 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,2 @@
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
-DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c
 DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec205517580000a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f
diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
deleted file mode 100644
index 6ea45d5abf0b..000000000000
--- a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Janne Grunau <janne-vlc@jannau.net>
-Date: Mon, 19 Feb 2018 00:47:53 +0100
-Subject: arm: make the assembler functions compatible with non ELF/gas
- platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Allow assembling arm neon functions for IOS and arm windows.
-
-Signed-off-by: Martin Storsjö <martin@martin.st>
-(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005)
-Signed-off-by: Thomas Guillem <thomas@gllm.fr>
-
-[Add modules/arm_neon/asm.S missing from orig tarball.]
----
- modules/arm_neon/asm.S | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
- create mode 100644 modules/arm_neon/asm.S
-
-diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
-new file mode 100644
-index 0000000..728391e
---- /dev/null
-+++ b/modules/arm_neon/asm.S
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 2018 Janne Grunau <janne-libav@jannau.net>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ */
-+
-+#ifdef __APPLE__
-+#   define EXTERN_ASM _
-+#else
-+#   define EXTERN_ASM
-+#endif
-+
-+#if defined(__APPLE__) || defined(_WIN32)
-+#   define HAVE_AS_ARCH_DIRECTIVE 0
-+#   define HAVE_AS_FPU_DIRECTIVE  0
-+#else
-+#   define HAVE_AS_ARCH_DIRECTIVE 1
-+#   define HAVE_AS_FPU_DIRECTIVE  1
-+#endif
-+
-+.macro  function name
-+	.globl  EXTERN_ASM\name
-+#ifdef __ELF__
-+	.type   EXTERN_ASM\name, %function
-+#endif
-+EXTERN_ASM\name:
-+.endm
diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild
deleted file mode 100644
index 1ac9c9a5b143..000000000000
--- a/media-video/vlc/vlc-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	SCM="git-r3"
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-9" # vlc - vlccore
-
-IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394
-	debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig
-	+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca
-	libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications
-	macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
-	omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp
-	run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg
-	taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx
-	wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse
-"
-REQUIRED_USE="
-	chromecast? ( encode )
-	directx? ( ffmpeg )
-	fontconfig? ( truetype )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	postproc? ( ffmpeg )
-	skins? ( qt5 truetype X xml )
-	ssl? ( gcrypt )
-	vaapi? ( ffmpeg X )
-	vdpau? ( ffmpeg X )
-"
-RDEPEND="
-	net-dns/libidn:0
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
-	virtual/opengl
-	a52? ( media-libs/a52dec:0 )
-	alsa? ( media-libs/alsa-lib:0 )
-	aom? ( media-libs/libaom:= )
-	archive? ( app-arch/libarchive:= )
-	bidi? (
-		dev-libs/fribidi:0
-		media-libs/freetype:2[harfbuzz]
-		media-libs/harfbuzz
-		virtual/ttf-fonts:0
-	)
-	bluray? ( media-libs/libbluray:0= )
-	cddb? ( media-libs/libcddb:0 )
-	chromaprint? ( media-libs/chromaprint:0= )
-	chromecast? ( >=dev-libs/protobuf-2.5.0:= )
-	dbus? ( sys-apps/dbus:0 )
-	dc1394? (
-		media-libs/libdc1394:2
-		sys-libs/libraw1394:0
-	)
-	dts? ( media-libs/libdca:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= )
-	dvd? (
-		>=media-libs/libdvdnav-4.9:0
-		>=media-libs/libdvdread-4.9:0
-	)
-	faad? ( media-libs/faad2:0 )
-	fdk? ( media-libs/fdk-aac:0= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] )
-		libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] )
-	)
-	flac? (
-		media-libs/flac:0
-		media-libs/libogg:0
-	)
-	fluidsynth? ( media-sound/fluidsynth:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error:0
-	)
-	gme? ( media-libs/game-music-emu:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? (
-		sys-libs/libavc1394:0
-		sys-libs/libraw1394:0
-	)
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( media-libs/libkate:0 )
-	libass? (
-		media-libs/fontconfig:1.0
-		media-libs/libass:0=
-	)
-	libcaca? ( media-libs/libcaca:0 )
-	libnotify? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		x11-libs/libnotify:0
-	)
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( dev-libs/libtar:0 )
-	libtiger? ( media-libs/libtiger:0 )
-	linsys? ( media-libs/zvbi )
-	lirc? ( app-misc/lirc:0 )
-	live? ( media-plugins/live:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	matroska? (
-		dev-libs/libebml:0=
-		media-libs/libmatroska:0=
-	)
-	microdns? ( >=net-libs/libmicrodns-0.0.9:= )
-	modplug? ( media-libs/libmodplug:0 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( media-libs/libmpeg2:0 )
-	mtp? ( media-libs/libmtp:0= )
-	musepack? ( media-sound/musepack-tools:0 )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	nfs? ( >=net-fs/libnfs-0.10.0:= )
-	ogg? ( media-libs/libogg:0 )
-	opencv? ( media-libs/opencv:0= )
-	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= )
-	postproc? ( libav? ( media-libs/libpostproc:0= ) )
-	projectm? (
-		media-fonts/dejavu:0
-		media-libs/libprojectm:0
-	)
-	pulseaudio? ( media-sound/pulseaudio:0 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		X? (
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-		)
-	)
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl-image? ( media-libs/sdl-image:0 )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( media-libs/libshout:0 )
-	sid? ( media-libs/libsidplay:2 )
-	skins? (
-		x11-libs/libXext:0
-		x11-libs/libXinerama:0
-		x11-libs/libXpm:0
-	)
-	soxr? ( media-libs/soxr )
-	speex? (
-		>=media-libs/speex-1.2.0:0
-		media-libs/speexdsp:0
-	)
-	ssl? ( net-libs/gnutls:0 )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo:0
-	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( media-libs/libtheora:0 )
-	tremor? ( media-libs/tremor:0 )
-	truetype? (
-		media-libs/freetype:2
-		virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 )
-	)
-	twolame? ( media-sound/twolame:0 )
-	udev? ( virtual/udev:0 )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] )
-	vcd? ( >=dev-libs/libcdio-0.78.2:0 )
-	vdpau? ( x11-libs/libvdpau:0 )
-	vnc? ( net-libs/libvncserver:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
-	wayland? (
-		dev-libs/wayland
-		dev-libs/wayland-protocols
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-keysyms
-	)
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( net-dns/avahi:0[dbus] )
-	zvbi? ( media-libs/zvbi )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	amd64? ( dev-lang/yasm:* )
-	x86? ( dev-lang/yasm:* )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${P}-arm-neon-fix.patch # bug 649798
-	"${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	# https://bugs.gentoo.org/647668
-	if use chromecast && ! use microdns; then
-		einfo "USE=microdns is required for Chromecast autodetection support"
-	fi
-}
-
-src_prepare() {
-	default
-
-	has_version '>=net-libs/libupnp-1.8.0' && \
-		eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	# Disable running of vlc-cache-gen, we do that in pkg_postinst
-	sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-		-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-aa
-		--disable-dependency-tracking
-		--disable-optimizations
-		--disable-update-check
-		--enable-fast-install
-		--enable-screen
-		--enable-vlc
-		$(use_enable a52)
-		$(use_enable alsa)
-		$(use_enable altivec)
-		$(use_enable aom)
-		$(use_enable archive)
-		$(use_enable bidi fribidi)
-		$(use_enable bidi harfbuzz)
-		$(use_enable bluray)
-		$(use_enable cddb libcddb)
-		$(use_enable chromaprint)
-		$(use_enable chromecast)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable dbus)
-		$(use_enable dbus kwallet)
-		$(use_enable dc1394)
-		$(use_enable debug)
-		$(use_enable directx)
-		$(use_enable directx d3d11va)
-		$(use_enable directx dxva2)
-		$(use_enable dts dca)
-		$(use_enable dvbpsi)
-		$(use_enable dvd dvdnav)
-		$(use_enable dvd dvdread)
-		$(use_enable encode sout)
-		$(use_enable encode vlm)
-		$(use_enable faad)
-		$(use_enable fdk fdkaac)
-		$(use_enable ffmpeg avcodec)
-		$(use_enable ffmpeg avformat)
-		$(use_enable ffmpeg swscale)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable fontconfig)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable gme)
-		$(use_enable gnome-keyring secret)
-		$(use_enable gstreamer gst-decode)
-		$(use_enable ieee1394 dv1394)
-		$(use_enable jack)
-		$(use_enable jpeg)
-		$(use_enable kate)
-		$(use_enable libass)
-		$(use_enable libcaca caca)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable libtar)
-		$(use_enable libtiger tiger)
-		$(use_enable linsys)
-		$(use_enable lirc)
-		$(use_enable live live555)
-		$(use_enable lua)
-		$(use_enable macosx-notifications osx-notifications)
-		$(use_enable macosx-qtkit)
-		$(use_enable matroska)
-		$(use_enable microdns)
-		$(use_enable modplug mod)
-		$(use_enable mp3 mad)
-		$(use_enable mpeg libmpeg2)
-		$(use_enable mtp)
-		$(use_enable musepack mpc)
-		$(use_enable ncurses)
-		$(use_enable neon)
-		$(use_enable ogg)
-		$(use_enable omxil)
-		$(use_enable omxil omxil-vout)
-		$(use_enable opencv)
-		$(use_enable optimisememory optimize-memory)
-		$(use_enable opus)
-		$(use_enable png)
-		$(use_enable postproc)
-		$(use_enable projectm)
-		$(use_enable pulseaudio pulse)
-		$(use_enable qt5 qt)
-		$(use_enable rdp freerdp)
-		$(use_enable rtsp realrtsp)
-		$(use_enable run-as-root)
-		$(use_enable samba smbclient)
-		$(use_enable schroedinger)
-		$(use_enable sdl-image)
-		$(use_enable sftp)
-		$(use_enable shout)
-		$(use_enable sid)
-		$(use_enable skins skins2)
-		$(use_enable soxr)
-		$(use_enable speex)
-		$(use_enable ssl gnutls)
-		$(use_enable svg)
-		$(use_enable svg svgdec)
-		$(use_enable taglib)
-		$(use_enable theora)
-		$(use_enable tremor)
-		$(use_enable twolame)
-		$(use_enable udev)
-		$(use_enable upnp)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi libva)
-		$(use_enable vcd)
-		$(use_enable vdpau)
-		$(use_enable vnc)
-		$(use_enable vorbis)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_enable wma-fixed)
-		$(use_with X x)
-		$(use_enable X xcb)
-		$(use_enable X xvideo)
-		$(use_enable x264)
-		$(use_enable x265)
-		$(use_enable xml libxml2)
-		$(use_enable zeroconf avahi)
-		$(use_enable zvbi)
-		$(use_enable !zvbi telx)
-		--disable-asdcp
-		--disable-coverage
-		--disable-cprof
-		--disable-crystalhd
-		--disable-decklink
-		--disable-gles2
-		--disable-goom
-		--disable-kai
-		--disable-kva
-		--disable-libplacebo
-		--disable-maintainer-mode
-		--disable-merge-ffmpeg
-		--disable-mfx
-		--disable-mmal
-		--disable-opensles
-		--disable-oss
-		--disable-rpi-omxil
-		--disable-shine
-		--disable-sndio
-		--disable-spatialaudio
-		--disable-srt
-		--disable-vsxu
-		--disable-wasapi
-	)
-	# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8
-	append-cxxflags -std=c++11
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	xdg_environment_reset # bug 608256
-
-	if use truetype || use bidi; then
-		myeconfargs+=( --enable-freetype )
-	else
-		myeconfargs+=( --disable-freetype )
-	fi
-
-	if use truetype || use projectm; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myeconfargs+=(
-			--with-default-font=${dejavu}/DejaVuSans.ttf
-			--with-default-font-family=Sans
-			--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-			--with-default-monospace-font-family=Monospace
-		)
-	fi
-
-	econf ${myeconfargs[@]}
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values may break the build (bug 523144), so definition should not be removed.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h
-	sed -i '1i#undef _FORTIFY_SOURCE' config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
-		rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-video/vlc/vlc-3.0.2.ebuild b/media-video/vlc/vlc-3.0.2.ebuild
index 9ee5edc366b8..36c348442d57 100644
--- a/media-video/vlc/vlc-3.0.2.ebuild
+++ b/media-video/vlc/vlc-3.0.2.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
diff --git a/media-video/vobcopy/vobcopy-1.2.0.ebuild b/media-video/vobcopy/vobcopy-1.2.0.ebuild
index fe6ab57ce9e7..f51dff5679b7 100644
--- a/media-video/vobcopy/vobcopy-1.2.0.ebuild
+++ b/media-video/vobcopy/vobcopy-1.2.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=6
 
-IUSE=""
+inherit toolchain-funcs
 
 DESCRIPTION="copies DVD .vob files to harddisk, decrypting them on the way"
 HOMEPAGE="http://lpn.rnbhq.org/"
@@ -13,17 +12,18 @@ SRC_URI="http://lpn.rnbhq.org/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=">=media-libs/libdvdread-0.9.4"
+RDEPEND=""
 
 src_configure() {
 	tc-export CC
-	./configure.sh --with-lfs
+	./configure.sh --with-lfs || die "Configure failed"
 }
 
 src_install() {
-	dobin vobcopy || die "dobin failed"
-	doman vobcopy.1 || die "doman failed"
-	dodoc Changelog README Release-Notes TODO alternative_programs.txt \
-		|| die "dodoc failed"
+	dobin vobcopy
+	doman vobcopy.1
+	dodoc Changelog README Release-Notes TODO alternative_programs.txt
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index a353a78d75f9..e23ae3139d5a 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a91b7b558ed1..6c7c9850bffe 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 29 May 2018 11:08:26 +0000
+Wed, 30 May 2018 05:38:28 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 6046dcbced99..01498410bd1f 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-201805-13.xml b/metadata/glsa/glsa-201805-13.xml
new file mode 100644
index 000000000000..701ee3093bcd
--- /dev/null
+++ b/metadata/glsa/glsa-201805-13.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201805-13">
+  <title>Git: Multiple vulnerabilities</title>
+  <synopsis>Git contains multiple vulnerabilities that allow for the remote
+    execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild">git</product>
+  <announced>2018-05-30</announced>
+  <revised count="1">2018-05-30</revised>
+  <bug>656868</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-vcs/git" auto="yes" arch="*">
+      <unaffected range="ge">2.16.4</unaffected>
+      <vulnerable range="lt">2.16.4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Git is a free and open source distributed version control system
+      designed to handle everything from small to very large projects with
+      speed and efficiency.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Git. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>Remote attackers could execute arbitrary code on both client and server.</p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Git users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-vcs/git-2.16.4"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-11233">CVE-2018-11233</uri>
+    <uri link="https://nvd.nist.gov/vuln/detail/CVE-2018-11235">CVE-2018-11235</uri>
+  </references>
+  <metadata tag="requester" timestamp="2018-05-30T00:57:53Z">whissi</metadata>
+  <metadata tag="submitter" timestamp="2018-05-30T01:20:47Z">whissi</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a91b7b558ed1..1811ca45c688 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 29 May 2018 11:08:26 +0000
+Wed, 30 May 2018 05:38:29 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 3ea0d85593b7..8fdce6dcbe36 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-be2cb1458d4134bc7640ad3be9ba831a525b5b72 1527350128 2018-05-26T15:55:28+00:00
+c2627901b70325badf7e46bfb8ece47745838693 1527643522 2018-05-30T01:25:22+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 447742adef81..f7a20200824f 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b0ab7e70f34b..be12ca3dd186 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.33 b/metadata/md5-cache/app-admin/apache-tools-2.4.33
index 8c3b96205a27..bfec8d5a9948 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.33
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.33
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1= dev-libs/apr-util:1= dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.33.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39143e349f272c65421ba78c3f14111c
+_md5_=6c0b98acea245acd0980955c20b34380
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r1 b/metadata/md5-cache/app-admin/conky-1.10.8-r1
index cf595ea3b622..12cba98d5fbb 100644
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r1
+++ b/metadata/md5-cache/app-admin/conky-1.10.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=An advanced, highly configurable system monitor for X
 EAPI=6
 HOMEPAGE=https://github.com/brndnmtthws/conky
 IUSE=apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar weather-xoap webserver wifi X xmms2
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc ~ppc64 sparc x86
 LICENSE=GPL-3 BSD LGPL-2.1 MIT
 RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( || ( x11-drivers/nvidia-drivers[tools,static-libs] media-video/nvidia-settings ) ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 ) xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( >=virtual/mysql-5.0 ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) >=dev-lang/lua-5.1.4-r8:0 apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9f7b8501360ff3ada644fa8a651865af
+_md5_=8f2ffb1255984d39f15a26b2a1176c45
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.11 b/metadata/md5-cache/app-admin/eselect-1.4.13
similarity index 65%
rename from metadata/md5-cache/app-admin/eselect-1.4.11
rename to metadata/md5-cache/app-admin/eselect-1.4.13
index d325e3d63082..0a82dc734ee4 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.11
+++ b/metadata/md5-cache/app-admin/eselect-1.4.13
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst
 DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) doc? ( dev-python/docutils )
 DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=5
+EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.11.tar.xz
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.13.tar.xz
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9a8066df3759a2a22a8c502f295b4362
+_md5_=6c2990339b708051a3e331606bd12505
diff --git a/metadata/md5-cache/app-admin/monit-5.25.1 b/metadata/md5-cache/app-admin/monit-5.25.1
index 6dd26d270227..31da93416ee5 100644
--- a/metadata/md5-cache/app-admin/monit-5.25.1
+++ b/metadata/md5-cache/app-admin/monit-5.25.1
@@ -4,10 +4,10 @@ DESCRIPTION=Monitoring and managing daemons or similar programs running on a Uni
 EAPI=6
 HOMEPAGE=http://mmonit.com/monit/
 IUSE=libressl pam ssl
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=AGPL-3
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://mmonit.com/monit/dist/monit-5.25.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b3d5adbf632076738584fd43d4f66974
+_md5_=140fbcd2e6c38da15883ef793a0647ae
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 3ea3134b3e38..361bae52d08a 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/gcab-0.8 b/metadata/md5-cache/app-arch/gcab-0.8
index 973f49a057b4..7e579d3a4e92 100644
--- a/metadata/md5-cache/app-arch/gcab-0.8
+++ b/metadata/md5-cache/app-arch/gcab-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Library and tool for working with Microsoft Cabinet (CAB) files
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/msitools
 IUSE=+introspection vala
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.32:2 sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-0.9.4:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gcab/0.8/gcab-0.8.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d148cdbcac6466aed2308f03bb41dba
+_md5_=425aac317930bdb21c4b9e502778cc82
diff --git a/metadata/md5-cache/app-arch/pixz-1.0.6 b/metadata/md5-cache/app-arch/pixz-1.0.6
index f9e3de6d78d8..e19ef4d15cc2 100644
--- a/metadata/md5-cache/app-arch/pixz-1.0.6
+++ b/metadata/md5-cache/app-arch/pixz-1.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel Indexed XZ compressor
 EAPI=6
 HOMEPAGE=https://github.com/vasi/pixz
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD-2
 RDEPEND=!static? ( >=app-arch/libarchive-2.8:= >=app-arch/xz-utils-5 )
 SLOT=0
 SRC_URI=https://github.com/vasi/pixz/releases/download/v1.0.6/pixz-1.0.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3db5c3c56847b11f31263192d3ef1fd7
+_md5_=dbf67d7fd4ea3974408c1f4125839b49
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index 8e0dfde4ca48..39e369539ae1 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/siege-4.0.4 b/metadata/md5-cache/app-benchmarks/siege-4.0.4
index c396e3b46261..ac5c6e702f5f 100644
--- a/metadata/md5-cache/app-benchmarks/siege-4.0.4
+++ b/metadata/md5-cache/app-benchmarks/siege-4.0.4
@@ -4,10 +4,10 @@ DESCRIPTION=A HTTP regression testing and benchmarking utility
 EAPI=6
 HOMEPAGE=https://www.joedog.org/siege-home/
 IUSE=libressl ssl
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos
+KEYWORDS=amd64 ~arm ~hppa ~mips ~ppc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=http://download.joedog.org/siege/siege-4.0.4.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e75fb4bb20dc35b57117cdce494060cb
+_md5_=1bf3aecfeca97db53ff571ca8ec19fc6
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fdb37e1fa666..f6af59e9c627 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
index c3f2a8486347..bf2719b3c058 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
 DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=5
-HOMEPAGE=http://openvpn.net/
+HOMEPAGE=https://openvpn.net/
 IUSE=libressl
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/3.0.1/EasyRSA-3.0.1.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=09a34da6723a116136ff5cc0436e1173
+_md5_=4b4612f426814732a6e309820b1a626e
diff --git a/metadata/md5-cache/app-crypt/easy-rsa-3.0.3 b/metadata/md5-cache/app-crypt/easy-rsa-3.0.3
index f4c61c7110c6..848ad3da6d1d 100644
--- a/metadata/md5-cache/app-crypt/easy-rsa-3.0.3
+++ b/metadata/md5-cache/app-crypt/easy-rsa-3.0.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=install
 DEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl )
 DESCRIPTION=Small RSA key management package, based on OpenSSL
 EAPI=5
-HOMEPAGE=http://openvpn.net/
+HOMEPAGE=https://openvpn.net/
 IUSE=libressl
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl
 SLOT=0
 SRC_URI=https://github.com/OpenVPN/easy-rsa/releases/download/v3.0.3/EasyRSA-3.0.3.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb8a703bc1965f730ad8afecfe12779f
+_md5_=4365e1a0c23b760a9c7aace449e112a8
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.6 b/metadata/md5-cache/app-crypt/libsecret-0.18.6
index 34148d080405..3c680154b444 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.6
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.6
@@ -4,7 +4,7 @@ DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 IUSE=+crypt +introspection test vala debug test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=>=gnome-base/gnome-keyring-3
 RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29:= )
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=08125d1d3254ba1935e1266acba3d556
+_md5_=0e65e782ed645223e46a3ccd9df11adc
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index d6ddf546493e..56f816fba552 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1 b/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
index d322d1ba9788..b808fb6b7eb0 100644
--- a/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
+++ b/metadata/md5-cache/app-doc/doxygen-1.8.13-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Documentation system for most programming languages
 EAPI=6
 HOMEPAGE=https://www.stack.nl/~dimitri/doxygen/
 IUSE=clang debug doc dot doxysearch latex qt5 sqlite userland_GNU
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl dev-lang/perl media-libs/libpng:0= virtual/libiconv clang? ( sys-devel/clang:= ) dot? ( media-gfx/graphviz media-libs/freetype ) doxysearch? ( =dev-libs/xapian-1.2* ) latex? ( app-text/texlive[extra] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=doc? ( latex )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.13.src.tar.gz https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52907ac109d9b8065f9194e42a69782e
+_md5_=1d22c9a217d9129697afbf706909c2e9
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 946dc3011575..7e13e1e6c88b 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
new file mode 100644
index 000000000000..8a0c36c5da7b
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.625_pre20180518
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=virtual/w3m >=virtual/emacs-23 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=emacs-w3m is an interface program of w3m on Emacs
+EAPI=6
+HOMEPAGE=http://emacs-w3m.namazu.org/
+IUSE=l10n_ja
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=virtual/w3m >=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.625_pre20180518.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp	71fc1fea53f2bcc9e39073663574ce4a	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=75b43078b19c6756e51110852963886d
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.13 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.13
new file mode 100644
index 000000000000..32f6991253ea
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=virtual/emacs-23
+DESCRIPTION=Emacs major mode for editing eselect files
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
+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
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.13.tar.xz
+_eclasses_=elisp	71fc1fea53f2bcc9e39073663574ce4a	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=a9c3481235d0004c1abcbb9e4e57abbc
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.4 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.4
deleted file mode 100644
index e88324aa0f3c..000000000000
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=virtual/emacs-23
-DESCRIPTION=Emacs major mode for editing eselect files
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/emacs-23
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.4.tar.xz
-_eclasses_=elisp	71fc1fea53f2bcc9e39073663574ce4a	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f
-_md5_=41aa36651b638db1bb3131c69f49be45
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index cb41e768682d..3382bac888d8 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/coldfire-0.3.1 b/metadata/md5-cache/app-emulation/coldfire-0.3.1
index 34b52c8a9460..2899252b7528 100644
--- a/metadata/md5-cache/app-emulation/coldfire-0.3.1
+++ b/metadata/md5-cache/app-emulation/coldfire-0.3.1
@@ -1,12 +1,10 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses sys-libs/readline
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0= sys-libs/readline:0=
 DESCRIPTION=Motorola Coldfire Emulator
-EAPI=2
+EAPI=7
 HOMEPAGE=http://www.slicer.ca/coldfire/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
 SLOT=0
 SRC_URI=http://www.slicer.ca/coldfire/files/coldfire-0.3.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c87bb539d61aaddfa11ff7358f67fbd1
+_md5_=f1ff275744b0ca7135a2b599634d47f9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index fbf27a5792cc..68880e08df0b 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/binclock-1.5 b/metadata/md5-cache/app-misc/binclock-1.5
index 165cfe2b998a..605f271a6c42 100644
--- a/metadata/md5-cache/app-misc/binclock-1.5
+++ b/metadata/md5-cache/app-misc/binclock-1.5
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install
 DEPEND=>=sys-apps/sed-4
 DESCRIPTION=Displays a binary clock in your terminal
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.ngolde.de/binclock/
 KEYWORDS=alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.ngolde.de/download/binclock-1.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=221ca74ea2335c00a7bd6f5f3fc90f3f
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8ded41700dac66d977145d6d538d4e83
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 332eaef525de..a6b08cae10e9 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-5.4.5.1
deleted file mode 100644
index 8f8ba52c095b..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-5.4.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !<sys-devel/make-3.82 >=dev-libs/libatomic_ops-7.2d >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3 dev-util/intltool >=dev-util/mdds-1.2.2:1= media-libs/glm sys-devel/bison sys-devel/flex sys-devel/gettext sys-devel/ucpp sys-libs/zlib virtual/pkgconfig x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-1.6 ) odk? ( >=app-doc/doxygen-1.8.4 ) test? ( dev-util/cppunit media-fonts/dejavu ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf googledrive gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-PDEPEND==app-office/libreoffice-l10n-5.4*
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) collada? ( media-libs/opencollada ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) gltf? ( >=media-libs/libgltf-0.1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) bluetooth? ( dbus ) collada? ( gltf ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
-SLOT=0
-SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-5.4.5.1.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/src/5.4.5//libreoffice-help-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-5.4.5.1.tar.xz https://download.documentfoundation.org/libreoffice/old/5.4.5.1//libreoffice-help-5.4.5.1.tar.xz collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=efde8c5fe0c74b7a16f5e43d57bd8559
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
index 23eb0f60bd7a..960821245651 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher elibc_FreeBSD java python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 PDEPEND==app-office/libreoffice-l10n-6.0*
 RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) libressl? ( dev-libs/libressl ) >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender bluetooth? ( net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( dev-libs/dbus-glib ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) vlc? ( media-video/vlc ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.3.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-6.0.3.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.3//libreoffice-help-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-6.0.3.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.3.2/src/libreoffice-help-6.0.3.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0477a2ec4c13db582fb8b7dd206b9cd
+_md5_=7f660985f3742e8d39a636afa00802d5
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.4.2 b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
index c33f9e9cb28e..36667fa02e50 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.4.2
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.4.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-6.0.4.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-6.0.4.2.tar.xz https://download.documentfoundation.org/libreoffice/src/6.0.4//libreoffice-help-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-6.0.4.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/6.0.4.2/src/libreoffice-help-6.0.4.2.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=418f14e705a079968dd3506714aacaf9
+_md5_=18c3b9a3ea20710ca50c51ca355d15e5
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index b5271b14ff5e..89a1ba629eb8 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~asturm/distfiles/libreoffice-6.0.3.2-patchset-01.tar.xz java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=418f14e705a079968dd3506714aacaf9
+_md5_=18c3b9a3ea20710ca50c51ca355d15e5
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1
deleted file mode 100644
index b65902bc1529..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-5.4.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=A full office productivity suite. Binary package
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-PDEPEND==app-office/libreoffice-l10n-5.4.5.1*
-RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/60.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 kde? ( >=kde-frameworks/kdelibs-4.14.37:4 >=dev-qt/qtcore-4.8.7-r3:4 >=dev-qt/qtgui-4.8.7:4 ) python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.12* dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1 >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender virtual/glu virtual/jpeg:0 virtual/opengl net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/oxygen-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_5
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-5.4.5.1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-5.4.5.1.xd3 ) ) ) )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7820a07e885bc6cb7cbc9f41097ebe2e
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
index 41c1ee0f6418..68e741c26171 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.0.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=A full office productivity suite. Binary package
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_5
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 PDEPEND==app-office/libreoffice-l10n-6.0.3.2*
 RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/60.2 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-6.4.0 >=sys-libs/glibc-2.25 virtual/jpeg:62 python_targets_python3_5? ( dev-lang/python:3.5[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.13.3 dev-libs/librevenge dev-libs/nspr dev-libs/nss >=dev-libs/openssl-1.0.0d:0 >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/dejavu media-fonts/liberation-fonts media-fonts/libertine || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-bin-libreoffice-java-6.0.3.2.xd3 ) ) ) )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46748cc1d44cc9fa3f25fc359f7a7591
+_md5_=18a3a9cf97347a1a8cb4ec36fc7faccf
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1
deleted file mode 100644
index b4631a085fd3..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-5.4.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=dev-util/xdelta:3
-DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=gnome java kde
-KEYWORDS=-* amd64 x86
-LICENSE=LGPL-3
-RDEPEND==app-office/libreoffice-bin-5.4.5.1[gnome=,java=,kde=]
-RESTRICT=test strip
-SLOT=0
-SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-5.4.5.1.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-5.4.5.1.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-5.4.5.1.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-5.4.5.1.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-5.4.5.1.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-5.4.5.1.xd3 ) ) ) )
-_md5_=e038bdcfc6c1bd6bcbc04efb2cff4f87
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
index 604c87a48122..da16ca5e5f6d 100644
--- a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.0.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=gnome java kde
-KEYWORDS=-* amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=LGPL-3
 RDEPEND==app-office/libreoffice-bin-6.0.3.2[gnome=,java=,kde=]
 RESTRICT=test strip
 SLOT=0
 SRC_URI=amd64? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) ) x86? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-6.0.3.2.tar.xz kde? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-kde-java-6.0.3.2.xd3 ) ) gnome? ( !java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-6.0.3.2.xd3 ) java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-gnome-java-6.0.3.2.xd3 ) ) !kde? ( !gnome? ( java? ( http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-debug-libreoffice-java-6.0.3.2.xd3 ) ) ) )
-_md5_=d34cff65c83733063dbcb166838110b8
+_md5_=e038bdcfc6c1bd6bcbc04efb2cff4f87
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1 b/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1
deleted file mode 100644
index 7729d2b9434e..000000000000
--- a/metadata/md5-cache/app-office/libreoffice-l10n-5.4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=Translations for the Libreoffice suite
-EAPI=6
-HOMEPAGE=https://www.libreoffice.org
-IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-3 MPL-1.1 )
-RDEPEND=app-text/hunspell
-RESTRICT=strip
-SLOT=0
-SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86/LibreOffice_5.4.5_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/5.4.5/rpm/x86/LibreOffice_5.4.5.1_Linux_x86_rpm_langpack_zu.tar.gz )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=282f3803470f7e9646bc04a8a91e4e82
diff --git a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2 b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
index 908fb0ac2749..40030c187fa5 100644
--- a/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
+++ b/metadata/md5-cache/app-office/libreoffice-l10n-6.0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Translations for the Libreoffice suite
 EAPI=6
 HOMEPAGE=https://www.libreoffice.org
 IUSE=offlinehelp l10n_am l10n_ast l10n_bg l10n_bn-IN l10n_bn l10n_bo l10n_bs l10n_ca-valencia l10n_ca l10n_cs l10n_da l10n_de l10n_dz l10n_el l10n_en-GB l10n_en l10n_en-ZA l10n_eo l10n_es l10n_et l10n_eu l10n_fi l10n_fr l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_km l10n_ko l10n_mk l10n_nb l10n_ne l10n_nl l10n_nn l10n_om l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sv l10n_tg l10n_tr l10n_ug l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW l10n_af l10n_ar l10n_as l10n_be l10n_br l10n_brx l10n_cy l10n_dgo l10n_fa l10n_ga l10n_gd l10n_gug l10n_kk l10n_kmr-Latn l10n_kn l10n_kok l10n_ks l10n_lb l10n_lo l10n_lt l10n_lv l10n_mai l10n_ml l10n_mn l10n_mni l10n_mr l10n_my l10n_nr l10n_nso l10n_oc l10n_or l10n_pa l10n_ro l10n_rw l10n_sa l10n_sat l10n_sd l10n_sid l10n_sr-Latn l10n_sr l10n_ss l10n_st l10n_sw-TZ l10n_ta l10n_te l10n_th l10n_tn l10n_ts l10n_tt l10n_uz l10n_ve l10n_xh l10n_zu
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 MPL-1.1 )
 RDEPEND=app-text/hunspell
 RESTRICT=strip
 SLOT=0
 SRC_URI=l10n_am? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_am.tar.gz ) ) l10n_ast? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ast.tar.gz ) ) l10n_bg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bg.tar.gz ) ) l10n_bn-IN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn-IN.tar.gz ) ) l10n_bn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bn.tar.gz ) ) l10n_bo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bo.tar.gz ) ) l10n_bs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_bs.tar.gz ) ) l10n_ca-valencia? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca-valencia.tar.gz ) ) l10n_ca? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ca.tar.gz ) ) l10n_cs? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_cs.tar.gz ) ) l10n_da? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_da.tar.gz ) ) l10n_de? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_de.tar.gz ) ) l10n_dz? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_dz.tar.gz ) ) l10n_el? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_el.tar.gz ) ) l10n_en-GB? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-GB.tar.gz ) ) l10n_en? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-US.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-US.tar.gz ) ) l10n_en-ZA? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_en-ZA.tar.gz ) ) l10n_eo? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eo.tar.gz ) ) l10n_es? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_es.tar.gz ) ) l10n_et? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_et.tar.gz ) ) l10n_eu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_eu.tar.gz ) ) l10n_fi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fi.tar.gz ) ) l10n_fr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_fr.tar.gz ) ) l10n_gl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gl.tar.gz ) ) l10n_gu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_gu.tar.gz ) ) l10n_he? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_he.tar.gz ) ) l10n_hi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hi.tar.gz ) ) l10n_hr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hr.tar.gz ) ) l10n_hu? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_hu.tar.gz ) ) l10n_id? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_id.tar.gz ) ) l10n_is? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_is.tar.gz ) ) l10n_it? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_it.tar.gz ) ) l10n_ja? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ja.tar.gz ) ) l10n_ka? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ka.tar.gz ) ) l10n_km? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_km.tar.gz ) ) l10n_ko? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ko.tar.gz ) ) l10n_mk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_mk.tar.gz ) ) l10n_nb? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nb.tar.gz ) ) l10n_ne? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ne.tar.gz ) ) l10n_nl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nl.tar.gz ) ) l10n_nn? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_nn.tar.gz ) ) l10n_om? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_om.tar.gz ) ) l10n_pl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pl.tar.gz ) ) l10n_pt-BR? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt-BR.tar.gz ) ) l10n_pt? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_pt.tar.gz ) ) l10n_ru? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ru.tar.gz ) ) l10n_si? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_si.tar.gz ) ) l10n_sk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sk.tar.gz ) ) l10n_sl? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sl.tar.gz ) ) l10n_sq? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sq.tar.gz ) ) l10n_sv? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_sv.tar.gz ) ) l10n_tg? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tg.tar.gz ) ) l10n_tr? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_tr.tar.gz ) ) l10n_ug? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_ug.tar.gz ) ) l10n_uk? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_uk.tar.gz ) ) l10n_vi? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_vi.tar.gz ) ) l10n_zh-CN? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-CN.tar.gz ) ) l10n_zh-TW? ( offlinehelp? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_helppack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_helppack_zh-TW.tar.gz ) ) l10n_am? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_am.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_am.tar.gz ) l10n_ast? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ast.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ast.tar.gz ) l10n_bg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bg.tar.gz ) l10n_bn-IN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn-IN.tar.gz ) l10n_bn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bn.tar.gz ) l10n_bo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bo.tar.gz ) l10n_bs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_bs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_bs.tar.gz ) l10n_ca-valencia? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca-valencia.tar.gz ) l10n_ca? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ca.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ca.tar.gz ) l10n_cs? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cs.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cs.tar.gz ) l10n_da? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_da.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_da.tar.gz ) l10n_de? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_de.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_de.tar.gz ) l10n_dz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dz.tar.gz ) l10n_el? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_el.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_el.tar.gz ) l10n_en-GB? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-GB.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-GB.tar.gz ) l10n_en-ZA? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_en-ZA.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_en-ZA.tar.gz ) l10n_eo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eo.tar.gz ) l10n_es? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_es.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_es.tar.gz ) l10n_et? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_et.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_et.tar.gz ) l10n_eu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_eu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_eu.tar.gz ) l10n_fi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fi.tar.gz ) l10n_fr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fr.tar.gz ) l10n_gl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gl.tar.gz ) l10n_gu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gu.tar.gz ) l10n_he? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_he.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_he.tar.gz ) l10n_hi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hi.tar.gz ) l10n_hr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hr.tar.gz ) l10n_hu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_hu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_hu.tar.gz ) l10n_id? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_id.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_id.tar.gz ) l10n_is? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_is.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_is.tar.gz ) l10n_it? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_it.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_it.tar.gz ) l10n_ja? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ja.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ja.tar.gz ) l10n_ka? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ka.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ka.tar.gz ) l10n_km? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_km.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_km.tar.gz ) l10n_ko? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ko.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ko.tar.gz ) l10n_mk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mk.tar.gz ) l10n_nb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nb.tar.gz ) l10n_ne? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ne.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ne.tar.gz ) l10n_nl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nl.tar.gz ) l10n_nn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nn.tar.gz ) l10n_om? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_om.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_om.tar.gz ) l10n_pl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pl.tar.gz ) l10n_pt-BR? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt-BR.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt-BR.tar.gz ) l10n_pt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pt.tar.gz ) l10n_ru? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ru.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ru.tar.gz ) l10n_si? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_si.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_si.tar.gz ) l10n_sk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sk.tar.gz ) l10n_sl? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sl.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sl.tar.gz ) l10n_sq? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sq.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sq.tar.gz ) l10n_sv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sv.tar.gz ) l10n_tg? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tg.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tg.tar.gz ) l10n_tr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tr.tar.gz ) l10n_ug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ug.tar.gz ) l10n_uk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uk.tar.gz ) l10n_vi? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_vi.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_vi.tar.gz ) l10n_zh-CN? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-CN.tar.gz ) l10n_zh-TW? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zh-TW.tar.gz ) l10n_af? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_af.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_af.tar.gz ) l10n_ar? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ar.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ar.tar.gz ) l10n_as? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_as.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_as.tar.gz ) l10n_be? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_be.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_be.tar.gz ) l10n_br? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_br.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_br.tar.gz ) l10n_brx? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_brx.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_brx.tar.gz ) l10n_cy? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_cy.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_cy.tar.gz ) l10n_dgo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_dgo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_dgo.tar.gz ) l10n_fa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_fa.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_fa.tar.gz ) l10n_ga? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ga.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ga.tar.gz ) l10n_gd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gd.tar.gz ) l10n_gug? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_gug.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_gug.tar.gz ) l10n_kk? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kk.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kk.tar.gz ) l10n_kmr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kmr-Latn.tar.gz ) l10n_kn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kn.tar.gz ) l10n_kok? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_kok.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_kok.tar.gz ) l10n_ks? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ks.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ks.tar.gz ) l10n_lb? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lb.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lb.tar.gz ) l10n_lo? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lo.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lo.tar.gz ) l10n_lt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lt.tar.gz ) l10n_lv? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_lv.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_lv.tar.gz ) l10n_mai? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mai.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mai.tar.gz ) l10n_ml? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ml.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ml.tar.gz ) l10n_mn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mn.tar.gz ) l10n_mni? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mni.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mni.tar.gz ) l10n_mr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_mr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_mr.tar.gz ) l10n_my? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_my.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_my.tar.gz ) l10n_nr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nr.tar.gz ) l10n_nso? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_nso.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_nso.tar.gz ) l10n_oc? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_oc.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_oc.tar.gz ) l10n_or? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_or.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_or.tar.gz ) l10n_pa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_pa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_pa-IN.tar.gz ) l10n_ro? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ro.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ro.tar.gz ) l10n_rw? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_rw.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_rw.tar.gz ) l10n_sa? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sa-IN.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sa-IN.tar.gz ) l10n_sat? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sat.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sat.tar.gz ) l10n_sd? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sd.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sd.tar.gz ) l10n_sid? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sid.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sid.tar.gz ) l10n_sr-Latn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr-Latn.tar.gz ) l10n_sr? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sr.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sr.tar.gz ) l10n_ss? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ss.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ss.tar.gz ) l10n_st? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_st.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_st.tar.gz ) l10n_sw-TZ? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_sw-TZ.tar.gz ) l10n_ta? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ta.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ta.tar.gz ) l10n_te? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_te.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_te.tar.gz ) l10n_th? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_th.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_th.tar.gz ) l10n_tn? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tn.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tn.tar.gz ) l10n_ts? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ts.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ts.tar.gz ) l10n_tt? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_tt.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_tt.tar.gz ) l10n_uz? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_uz.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_uz.tar.gz ) l10n_ve? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_ve.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_ve.tar.gz ) l10n_xh? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_xh.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_xh.tar.gz ) l10n_zu? ( https://download.documentfoundation.org/libreoffice/stable/6.0.3/rpm/x86/LibreOffice_6.0.3_Linux_x86_rpm_langpack_zu.tar.gz -> LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz https://download.documentfoundation.org/libreoffice/testing/6.0.3/rpm/x86/LibreOffice_6.0.3.2_Linux_x86_rpm_langpack_zu.tar.gz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3ab0c94d5a2c6622212bfba3847c0b5e
+_md5_=282f3803470f7e9646bc04a8a91e4e82
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d118f72f09a7..4f041b3bef91 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526 b/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1
similarity index 97%
rename from metadata/md5-cache/app-text/kbibtex-0.8_pre20180526
rename to metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1
index 83af13f4e438..71fce0c669b7 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526
+++ b/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1
@@ -10,6 +10,6 @@ RDEPEND=>=kde-frameworks/kcompletion-5.43.0:5 >=kde-frameworks/kconfig-5.43.0:5
 REQUIRED_USE=?? ( webengine webkit )
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/unstable/KBibTeX/kbibtex-0.7.90.tar.xz
+SRC_URI=mirror://kde/unstable/KBibTeX/kbibtex-0.7.95.tar.xz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0e22bac4ae498ce7bfaf23c10088e8a
+_md5_=4448ff301f01dc83c0f20e6fe9fd6e62
diff --git a/metadata/md5-cache/app-text/libabw-0.1.1 b/metadata/md5-cache/app-text/libabw-0.1.1
deleted file mode 100644
index c64f68cd5aca..000000000000
--- a/metadata/md5-cache/app-text/libabw-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library parsing abiword documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
-IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f48c459ffe80eb5e2e2ea839a997fe6f
diff --git a/metadata/md5-cache/app-text/libabw-0.1.2 b/metadata/md5-cache/app-text/libabw-0.1.2
index 2f3bf4a13552..9294932306a4 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.2
+++ b/metadata/md5-cache/app-text/libabw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing abiword documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.2.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d0f7862a9f8d4c144b7636c4c6ce7fde
+_md5_=3ba34be1d43339f990bb32437edfdc3f
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.0 b/metadata/md5-cache/app-text/libepubgen-0.1.0
index 27d6481f9021..a5cd94e8d5f0 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.0
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.0
@@ -4,9 +4,9 @@ DESCRIPTION=EPUB generator for librevenge
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libepubgen/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.0.tar.xz
-_md5_=f5a5b32a65ba232ea066d6ad38eeb534
+_md5_=18d5ce6fe7fb5b61d310c83b341f3aaa
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.4 b/metadata/md5-cache/app-text/libmspub-0.1.4
index fb851856ed7d..24d2b66c6424 100644
--- a/metadata/md5-cache/app-text/libmspub-0.1.4
+++ b/metadata/md5-cache/app-text/libmspub-0.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing Microsoft Publisher documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=05fc09b22182e64658e914b7fec9d29b
+_md5_=ecd3f0d964dba6c6a6df63c80a7d3b84
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.1 b/metadata/md5-cache/app-text/libqxp-0.0.1
index 0b4071d30766..09baf4075d3e 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.1
+++ b/metadata/md5-cache/app-text/libqxp-0.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=Library parsing QuarkXpress documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 IUSE=debug doc test tools
-KEYWORDS=amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.1.tar.xz
-_md5_=2fc4166c9da7a42d167b5562b1bd9457
+_md5_=f8d56c345a216e29daa4fda427775a6c
diff --git a/metadata/md5-cache/app-text/recode-3.6_p20-r1 b/metadata/md5-cache/app-text/recode-3.6_p20-r1
index ce331122ba1d..1917410d9ad8 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20-r1
+++ b/metadata/md5-cache/app-text/recode-3.6_p20-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/flex nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Convert files between various character sets
 EAPI=5
-HOMEPAGE=http://recode.progiciels-bpi.ca/
+HOMEPAGE=https://github.com/rrthomas/recode
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 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 ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62141245e192ef10eb63541fad3676e2
+_md5_=8864d85540404fb62d76e58a7deff17e
diff --git a/metadata/md5-cache/app-text/recode-3.7_pre20140303 b/metadata/md5-cache/app-text/recode-3.7_pre20140303
index e4b4d1a24b60..0f91957ef6c2 100644
--- a/metadata/md5-cache/app-text/recode-3.7_pre20140303
+++ b/metadata/md5-cache/app-text/recode-3.7_pre20140303
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install
 DEPEND=sys-devel/flex nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
 DESCRIPTION=Convert files between various character sets
 EAPI=6
-HOMEPAGE=http://recode.progiciels-bpi.ca/
+HOMEPAGE=https://github.com/rrthomas/recode
 IUSE=nls static-libs
 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 ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pinard/Recode/archive/2d7092a9999194fc0e9449717a8048c8d8e26c18.zip -> recode-3.7_pre20140303.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f3b88aac13803b20418b275ab7fd6c9
+_md5_=177a9b2843de74457ca31f60b70dd878
diff --git a/metadata/md5-cache/app-text/tokyodystopia-0.9.15 b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
index 6da98d4bea9e..f712fec06392 100644
--- a/metadata/md5-cache/app-text/tokyodystopia-0.9.15
+++ b/metadata/md5-cache/app-text/tokyodystopia-0.9.15
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install prepare test
+DEFINED_PHASES=configure install test
 DEPEND=dev-db/tokyocabinet
 DESCRIPTION=A fulltext search engine for Tokyo Cabinet
-EAPI=2
+EAPI=7
 HOMEPAGE=http://fallabs.com/tokyodystopia/
 IUSE=examples
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-db/tokyocabinet
 SLOT=0
 SRC_URI=http://fallabs.com/tokyodystopia/tokyodystopia-0.9.15.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5b256e37837a38fe724cb8d344bd9949
+_md5_=3bd0d48820a38f026f0a2dc926767012
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 04fb270b911e..1b140cd43a4a 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
deleted file mode 100644
index 99496e721442..000000000000
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.48
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/bzip2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library of routines for managing a database
-EAPI=2
-HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=debug doc examples
-KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6c496c247c629a3d2dd7b10ee58ba8c9
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index e140d28013e7..c9386751cc83 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
index d0b280ea9466..0f4e5b053eae 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Library to access J-Link devices
 EAPI=6
 HOMEPAGE=http://git.zapb.de/libjaylink.git
 IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/libjaylink-0.1.0.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c668fdd1151c3a669df5188092caf8f
+_md5_=73fb8199e52bac650aaf2866988de3df
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.10.0 b/metadata/md5-cache/dev-embedded/openocd-0.10.0
index dedf9a1e6488..d954cdd340e7 100644
--- a/metadata/md5-cache/dev-embedded/openocd-0.10.0
+++ b/metadata/md5-cache/dev-embedded/openocd-0.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=OpenOCD - Open On-Chip Debugger
 EAPI=5
 HOMEPAGE=http://openocd.sourceforge.net
 IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=05249801af3e0f8129b970c4394c62c7
+_md5_=a12634d4c8a695e5d49f1e5ec3352f09
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index a21083d5147e..6423c89964f5 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1 b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
index 1b40dbbbc85d..83ac665aad98 100644
--- a/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
+++ b/metadata/md5-cache/dev-games/quake4-sdk-1.4.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Quake4 SDK
 EAPI=6
 HOMEPAGE=https://www.iddevnet.com/quake4/
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 ~x86
 LICENSE=QUAKE4
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://idsoftware/quake4/source/linux/quake4-linux-1.4.2-sdk.x86.run
 _eclasses_=unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=2ad36318c34fe7482079bfff5870e5c8
+_md5_=56f964b8d02c1ea45ee0b30a8e30853b
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b5a3d7d570bb..3cc2d603b3d8 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/vala-0.34.16 b/metadata/md5-cache/dev-lang/vala-0.34.16
index fd109f0e6eca..5494faea6651 100644
--- a/metadata/md5-cache/dev-lang/vala-0.34.16
+++ b/metadata/md5-cache/dev-lang/vala-0.34.16
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.34.16
 SLOT=0.34
 SRC_URI=mirror://gnome/sources/vala/0.34/vala-0.34.16.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e88f0ec71a6dcdc504f1ed776c71ca1
+_md5_=a2e5ee4e844faee80088f0f0d08eb1fe
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.13 b/metadata/md5-cache/dev-lang/vala-0.36.13
index ca5da72237c9..8e6b7ed0b4d1 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.13
+++ b/metadata/md5-cache/dev-lang/vala-0.36.13
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.13
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.13.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cddc7456c84daacff341d88927966ef
+_md5_=39eb007ce4472b7e445d634202b8c6a8
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f80f3534720f..4e1eb1a66cec 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libgee-0.20.1 b/metadata/md5-cache/dev-libs/libgee-0.20.1
index 59ab26505f38..f67e5281e28b 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.1
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.1
@@ -4,10 +4,10 @@ DESCRIPTION=GObject-based interfaces and classes for commonly used data structur
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
 IUSE=+introspection
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sh sparc x86 ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~ppc ppc64 ~sh sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2f3daeb15322a4eea1306498c69360b0
+_md5_=ed301955ba71744aeffb7a1bc9db816f
diff --git a/metadata/md5-cache/dev-libs/libical-2.0.0-r2 b/metadata/md5-cache/dev-libs/libical-2.0.0-r2
deleted file mode 100644
index 42ebd77f61a3..000000000000
--- a/metadata/md5-cache/dev-libs/libical-2.0.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/icu:= dev-lang/perl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An implementation of basic iCAL protocols
-EAPI=6
-HOMEPAGE=https://github.com/libical/libical
-IUSE=doc examples static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( MPL-1.0 LGPL-2.1 )
-RDEPEND=dev-libs/icu:=
-SLOT=0/2
-SRC_URI=https://github.com/libical/libical/archive/v2.0.0.tar.gz -> libical-2.0.0.tar.gz
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83592ff5ea61d5f776812d8a7fab5e55
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.1 b/metadata/md5-cache/dev-libs/libical-3.0.3
similarity index 78%
rename from metadata/md5-cache/dev-libs/libical-3.0.1
rename to metadata/md5-cache/dev-libs/libical-3.0.3
index a0df7bcee151..19df05cb0a4a 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.1
+++ b/metadata/md5-cache/dev-libs/libical-3.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) dev-lang/perl doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) dev-lang/perl virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=An implementation of basic iCAL protocols
 EAPI=6
 HOMEPAGE=https://github.com/libical/libical
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
 SLOT=0/3
-SRC_URI=https://github.com/libical/libical/archive/v3.0.1.tar.gz -> libical-3.0.1.tar.gz
+SRC_URI=https://github.com/libical/libical/archive/v3.0.3.tar.gz -> libical-3.0.3.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a70d9d02dac2ceab0ef75e170cd6d83
+_md5_=3b9246f9dae67b3fa9e1e288e2344363
diff --git a/metadata/md5-cache/dev-libs/libixion-0.13.0 b/metadata/md5-cache/dev-libs/libixion-0.13.0
index 6f5c16443047..63809db2ee83 100644
--- a/metadata/md5-cache/dev-libs/libixion-0.13.0
+++ b/metadata/md5-cache/dev-libs/libixion-0.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=General purpose formula parser & interpreter
 EAPI=6
 HOMEPAGE=https://gitlab.com/ixion/ixion
 IUSE=debug python static-libs +threads python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/ixion/src/libixion-0.13.0.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2a88f7c9c919edf5d747b8c9f100c521
+_md5_=6b0ebb399e2c71cb82b2d00a8b7a5dce
diff --git a/metadata/md5-cache/dev-libs/liborcus-0.13.4 b/metadata/md5-cache/dev-libs/liborcus-0.13.4
index 32a28b55c036..687b9b347780 100644
--- a/metadata/md5-cache/dev-libs/liborcus-0.13.4
+++ b/metadata/md5-cache/dev-libs/liborcus-0.13.4
@@ -4,11 +4,11 @@ DESCRIPTION=Standalone file import filter library for spreadsheet documents
 EAPI=6
 HOMEPAGE=https://gitlab.com/orcus/orcus/blob/master/README.md
 IUSE=python +spreadsheet-model static-libs tools python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:= python? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spreadsheet-model? ( >=dev-libs/libixion-0.13.0:= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0/0.13
 SRC_URI=https://kohei.us/files/orcus/src/liborcus-0.13.4.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d3913e9ac020073f402984db7d26def1
+_md5_=688dde91478898d0cabf5d21f37ad50a
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.10 b/metadata/md5-cache/dev-libs/libunistring-0.9.10
new file mode 100644
index 000000000000..40db67956829
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422
+DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/libunistring/
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3 GPL-3
+SLOT=0/2
+SRC_URI=mirror://gnu/libunistring/libunistring-0.9.10.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bfed2c71ee03688298ef5b58e30fb4ee
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.5 b/metadata/md5-cache/dev-libs/libunistring-0.9.5
deleted file mode 100644
index 668432da6c7c..000000000000
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libunistring/
-IUSE=doc static-libs
-KEYWORDS=amd64 arm x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-SLOT=0/2
-SRC_URI=mirror://gnu/libunistring/libunistring-0.9.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fb86bbbcd0c6ceaf0b8d1fffa5233ed9
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.6 b/metadata/md5-cache/dev-libs/libunistring-0.9.6
deleted file mode 100644
index 8aeb21ecd6bf..000000000000
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Library for manipulating Unicode and C strings according to Unicode standard
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libunistring/
-IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-SLOT=0/2
-SRC_URI=mirror://gnu/libunistring/libunistring-0.9.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=255e8b5cbeecf1966d903740cd11abef
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.8 b/metadata/md5-cache/dev-libs/libxml2-2.9.8
index 691ef1bf7e41..1e8172dc25a7 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.8
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=XML C parser and toolkit
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f846f94312bc3d969801508d3d24c37
+_md5_=ba0961e80d2a8d32a21b6e8ec0fb498b
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.13 b/metadata/md5-cache/dev-libs/vala-common-0.36.13
index 9836a2c4c40c..3fade5222286 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.36.13
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.13
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!<dev-lang/vala-0.10.4-r2 !<dev-lang/vala-0.12.1-r1:0.12 !<dev-lang/vala-0.14.2-r2:0.14 !<dev-lang/vala-0.16.1-r2:0.16 !<dev-lang/vala-0.17.5:0.18
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.13.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d71bf9da15956aedb6514fd7443d04fd
+_md5_=3b25385f2362b69df3e6e14847b9ba50
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 6f6b9d00b942..5cd21664779d 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.8 b/metadata/md5-cache/dev-lisp/sbcl-1.4.8
new file mode 100644
index 000000000000..b632d015bb7c
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-lisp/asdf-3.1:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/elfix )
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=6
+HOMEPAGE=http://sbcl.sourceforge.net/
+IUSE=debug doc source +threads +unicode pax_kernel zlib
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/1.4.8
+SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.8-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.8-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92360fdd65d6b5fb02534a6fbc996b7b
diff --git a/metadata/md5-cache/dev-python/Babel-2.5.3-r1 b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
index 776f5c18635c..0efacf2cc4e4 100644
--- a/metadata/md5-cache/dev-python/Babel-2.5.3-r1
+++ b/metadata/md5-cache/dev-python/Babel-2.5.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Collection of tools for internationalizing Python applications
 EAPI=6
 HOMEPAGE=http://babel.edgewall.org/ https://pypi.org/project/Babel/
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~x64-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 ~x64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Babel/Babel-2.5.3.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c748e511cab31c10eecbbcabb153e50
+_md5_=7944d2e522159fe6b8aad5ec37a762b3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 461157332842..a0d2b43051ee 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/betamax-0.8.0 b/metadata/md5-cache/dev-python/betamax-0.8.0
index 3ab47099d993..b3ada9cb368c 100644
--- a/metadata/md5-cache/dev-python/betamax-0.8.0
+++ b/metadata/md5-cache/dev-python/betamax-0.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=python-requests HTTP exchanges recorder
 EAPI=6
 HOMEPAGE=https://github.com/sigmavirus24/betamax
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/betamax/betamax-0.8.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c5cd88697006142b90ca7982887f1b94
+_md5_=fb9ae229d0a1e2097d82864acd8f3d5f
diff --git a/metadata/md5-cache/dev-python/freezegun-0.3.10 b/metadata/md5-cache/dev-python/freezegun-0.3.10
index 482c8b9b4d5e..6dad779b2a5f 100644
--- a/metadata/md5-cache/dev-python/freezegun-0.3.10
+++ b/metadata/md5-cache/dev-python/freezegun-0.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=Let your Python tests travel through time
 EAPI=6
 HOMEPAGE=https://github.com/spulec/freezegun
 IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/python-dateutil-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/freezegun/freezegun-0.3.10.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0765ea46eba8586959d338457fb22737
+_md5_=54f3d5421fbfe3fda6892e2903f29a30
diff --git a/metadata/md5-cache/dev-python/pandas-0.23.0 b/metadata/md5-cache/dev-python/pandas-0.23.0
index 698fdb53b564..ba27eeee689a 100644
--- a/metadata/md5-cache/dev-python/pandas-0.23.0
+++ b/metadata/md5-cache/dev-python/pandas-0.23.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=6
 HOMEPAGE=http://pandas.pydata.org/
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.23.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af62df52573ee2db8c6e70f10886949c
+_md5_=34ad8d4e574c6ff16d9885e37bfe6e69
diff --git a/metadata/md5-cache/dev-python/pandas-9999 b/metadata/md5-cache/dev-python/pandas-9999
index 5b67f9e65f35..4d8acb33602b 100644
--- a/metadata/md5-cache/dev-python/pandas-9999
+++ b/metadata/md5-cache/dev-python/pandas-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost app-text/pandoc dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nbsphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numexpr-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/boto[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/google-api-python-client-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlsxwriter[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/pytables-3.2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-gflags[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/statsmodels[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.8.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xarray[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] X? ( || ( dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psycopg:2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-misc/xclip x11-misc/xsel ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=6
 HOMEPAGE=http://pandas.pydata.org/
@@ -9,4 +9,4 @@ RDEPEND=>dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f13f64a1ba2913d3e4acbd8c26f01d3
+_md5_=d7eb8e8258ca01216847240c0b0c2846
diff --git a/metadata/md5-cache/dev-python/pyyaml-3.12 b/metadata/md5-cache/dev-python/pyyaml-3.12
index 5c925e8e7cca..3cc0a5dd3ea2 100644
--- a/metadata/md5-cache/dev-python/pyyaml-3.12
+++ b/metadata/md5-cache/dev-python/pyyaml-3.12
@@ -4,11 +4,11 @@ DESCRIPTION=YAML parser and emitter for Python
 EAPI=6
 HOMEPAGE=http://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/
 IUSE=examples libyaml python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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 ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=http://pyyaml.org/download/pyyaml/PyYAML-3.12.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc61ba8299c89833f75c6fab6dd8f48e
+_md5_=280c1786e35a57ca0472bc8ab273c55d
diff --git a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0 b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
index 20f5ea60ae0a..5afb0633fc4b 100644
--- a/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
+++ b/metadata/md5-cache/dev-python/requests-toolbelt-0.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=A utility belt for advanced users of python-requests
 EAPI=6
 HOMEPAGE=https://toolbelt.readthedocs.org/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=<dev-python/requests-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests-toolbelt/requests-toolbelt-0.8.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51fe703f074bc8d5e99693046f839e4b
+_md5_=b337bc62a810b55b4e86a32e8303ae47
diff --git a/metadata/md5-cache/dev-python/traits-4.6.0 b/metadata/md5-cache/dev-python/traits-4.6.0
index ce4f7608e6b1..09a6242bb542 100644
--- a/metadata/md5-cache/dev-python/traits-4.6.0
+++ b/metadata/md5-cache/dev-python/traits-4.6.0
@@ -4,11 +4,11 @@ DESCRIPTION=Enthought Tool Suite: Explicitly typed attributes for Python
 EAPI=6
 HOMEPAGE=http://docs.enthought.com/traits/ https://github.com/enthought/traits https://pypi.org/project/traits/
 IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/t/traits/traits-4.6.0.tar.gz
 _eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=153aac8350277389e5ff606c67688c94
+_md5_=103abe7a75da658577d932964a860eca
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index d7d56bfdb855..30d7fd1bde97 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/css_parser-1.6.0 b/metadata/md5-cache/dev-ruby/css_parser-1.6.0
index 7c497eb2670d..4286ae7c4cdb 100644
--- a/metadata/md5-cache/dev-ruby/css_parser-1.6.0
+++ b/metadata/md5-cache/dev-ruby/css_parser-1.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] virtual/ruby-ssl[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/maxitest[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Sass-based Stylesheet Framework
 EAPI=6
 HOMEPAGE=http://compass-style.org/ https://github.com/premailer/css_parser/
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] virtual/ruby-ssl[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/addressable[ruby_targets_ruby25] virtual/ruby-ssl[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/premailer/css_parser/archive/v1.6.0.tar.gz -> css_parser-1.6.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=10f7efe8cc0502151e2e898a7ff54d09
+_md5_=28186530a702fd001a2c28bf5b12a8b7
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.4.0 b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
deleted file mode 100644
index cd97bc7f17cc..000000000000
--- a/metadata/md5-cache/dev-ruby/maxitest-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Minitest + all the features you always wanted
-EAPI=5
-HOMEPAGE=https://github.com/grosser/maxitest
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1
-SRC_URI=https://github.com/grosser/maxitest/archive/v2.4.0.tar.gz -> maxitest-2.4.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ce2c89fc8b09bb6b25d52aaf2e8ed94e
diff --git a/metadata/md5-cache/dev-ruby/maxitest-3.1.0 b/metadata/md5-cache/dev-ruby/maxitest-3.1.0
new file mode 100644
index 000000000000..d832a7103eeb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/maxitest-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/bundler[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Minitest + all the features you always wanted
+EAPI=6
+HOMEPAGE=https://github.com/grosser/maxitest
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby23? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby24] ) ruby_targets_ruby25? ( <dev-ruby/minitest-5.12:5[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=1
+SRC_URI=https://github.com/grosser/maxitest/archive/v3.1.0.tar.gz -> maxitest-3.1.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=bc62c7dc762278e8d291f59a7912d15a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 6f6a1d442593..935eff215a9c 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/guile-www-2.35 b/metadata/md5-cache/dev-scheme/guile-www-2.35
index 547f97559c1e..0f5c43fed37f 100644
--- a/metadata/md5-cache/dev-scheme/guile-www-2.35
+++ b/metadata/md5-cache/dev-scheme/guile-www-2.35
@@ -3,10 +3,10 @@ DEPEND=dev-scheme/guile
 DESCRIPTION=Guile Scheme modules to facilitate HTTP, URL and CGI programming
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/guile-www/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-3
 RDEPEND=dev-scheme/guile
 SLOT=0
 SRC_URI=mirror://nongnu/guile-www/guile-www-2.35.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6bb3bc5364282022e7b3ea4f1a748a2e
+_md5_=52001368258b6f7c77a1d51d075e8465
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 15989de15c8f..702507135207 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/byacc-20180525 b/metadata/md5-cache/dev-util/byacc-20180525
new file mode 100644
index 000000000000..f9e551f7873f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/byacc-20180525
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=6
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20180525.tgz
+_md5_=c0a07ec3a549a4ba97a5d4d3f174c5c9
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.18.3 b/metadata/md5-cache/dev-util/checkbashisms-2.18.3
new file mode 100644
index 000000000000..fd807a479803
--- /dev/null
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.18.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
+EAPI=6
+HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.3.tar.xz
+_md5_=e699215e3a300f6440f6a125c805af82
diff --git a/metadata/md5-cache/dev-util/gengetopt-2.22.6 b/metadata/md5-cache/dev-util/gengetopt-2.22.6
index dd11c89b3204..fe5f97e51300 100644
--- a/metadata/md5-cache/dev-util/gengetopt-2.22.6
+++ b/metadata/md5-cache/dev-util/gengetopt-2.22.6
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=A tool to write command line option parsing code for C programs
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/gengetopt/
-KEYWORDS=amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
+KEYWORDS=amd64 ~arm x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gengetopt/gengetopt-2.22.6.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=08bc4d280f9f6b025a3ebd434a96c802
+_md5_=d4e4253a92278385d92733899392f87c
diff --git a/metadata/md5-cache/dev-util/glade-3.20.4 b/metadata/md5-cache/dev-util/glade-3.20.4
index af734553c230..9a84a820e9b0 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.4
+++ b/metadata/md5-cache/dev-util/glade-3.20.4
@@ -4,11 +4,11 @@ DESCRIPTION=A user interface designer for GTK+ and GNOME
 EAPI=6
 HOMEPAGE=https://glade.gnome.org/
 IUSE=debug +introspection python python_targets_python2_7 test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/atk[introspection?] >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2.4.0:2 x11-libs/cairo:= x11-libs/gdk-pixbuf:2[introspection?] >=x11-libs/gtk+-3.20.0:3[introspection?] x11-libs/pango[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.32:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=3.10/6
 SRC_URI=mirror://gnome/sources/glade/3.20/glade-3.20.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54dae2db8e3de19d069bcdda17a06d30
+_md5_=c0b1b5ba441da317a324a353c6cdf96c
diff --git a/metadata/md5-cache/dev-util/visualvm-1.4.1 b/metadata/md5-cache/dev-util/visualvm-1.4.1
new file mode 100644
index 000000000000..915ea5f1f945
--- /dev/null
+++ b/metadata/md5-cache/dev-util/visualvm-1.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
+EAPI=6
+HOMEPAGE=https://visualvm.github.io
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+SLOT=7
+SRC_URI=https://github.com/oracle/visualvm/archive/1.4.1.tar.gz -> visualvm-1.4.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a173975dde152d34574be872515ccb0b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index acf43dac91a7..16cbf20a5af8 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.4 b/metadata/md5-cache/dev-vcs/git-2.16.4
new file mode 100644
index 000000000000..353d3052d41d
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.16.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+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=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/git-2.16.4.tar.xz mirror://kernel/software/scm/git/git-manpages-2.16.4.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.16.4.tar.xz )
+_eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=646618fb87544f11191b7f65c567897e
diff --git a/metadata/md5-cache/dev-vcs/git-2.17.0 b/metadata/md5-cache/dev-vcs/git-2.17.1
similarity index 94%
rename from metadata/md5-cache/dev-vcs/git-2.17.0
rename to metadata/md5-cache/dev-vcs/git-2.17.1
index 905b87748474..57b9d37ab12c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.17.0
+++ b/metadata/md5-cache/dev-vcs/git-2.17.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/git-2.17.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.0.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/git-2.17.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.1.tar.xz )
 _eclasses_=bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3d7715ca99ec08a12c3406f2db80921d
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index dc96b662ea1b..032c5ea29301 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.32.2 b/metadata/md5-cache/gnome-base/gvfs-1.32.2
index ffead10439db..5eb07c8aa71d 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.32.2
+++ b/metadata/md5-cache/gnome-base/gvfs-1.32.2
@@ -4,7 +4,7 @@ DESCRIPTION=Virtual filesystem implementation for gio
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
 REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.2-patchset.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21797b21fac1fd83544fd0ff3454e9bf
+_md5_=aacae90d6eb99509210ea8067a4519b9
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 4e420a149a7a..c5a30e381240 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.43 b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
index 0b667db1ae9f..cb3097218f60 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.43
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.43
@@ -4,10 +4,10 @@ DESCRIPTION=The GNOME Structured File Library
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/gsf/
 IUSE=bzip2 gtk +introspection
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.43.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c04e49af277b431b86fbb429fdd0ffdc
+_md5_=4378a0b6e568c531db57524113b4d82f
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index f40e8b987b6d..9d9011a7a0da 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/couriersrs-0.1.2 b/metadata/md5-cache/mail-filter/couriersrs-0.1.2
index e8887f254482..2807bf4fd692 100644
--- a/metadata/md5-cache/mail-filter/couriersrs-0.1.2
+++ b/metadata/md5-cache/mail-filter/couriersrs-0.1.2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=prepare
 DEPEND=dev-libs/popt mail-filter/libsrs2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=SRS (Sender Rewriting Scheme) wrapper for the courier MTA
-EAPI=2
+EAPI=6
 HOMEPAGE=http://couriersrs.com/
 KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt mail-filter/libsrs2
 SLOT=0
 SRC_URI=http://couriersrs.com/download/couriersrs-0.1.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e773574e5a63c2cfeceac7fa0372d365
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=cd601603f9c823f0e73496099125147b
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index d59c3bb8585b..03d6aaa0889b 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/esmtp-1.2-r1 b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
index c99abf3fb872..8d8b9e188cb8 100644
--- a/metadata/md5-cache/mail-mta/esmtp-1.2-r1
+++ b/metadata/md5-cache/mail-mta/esmtp-1.2-r1
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libesmtp !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) !mail-mta/courier !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/ssmtp !mail-mta/opensmtpd
 SLOT=0
 SRC_URI=mirror://sourceforge/esmtp/esmtp-1.2.tar.bz2
-_md5_=dba273a6fe152f828e3c3ea1af108972
+_md5_=e24d44b19c1f53d88cccd8552f7afad0
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index bff7dd278806..1da158f329bb 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/alegreya-serif-2.007 b/metadata/md5-cache/media-fonts/alegreya-serif-2.007
new file mode 100644
index 000000000000..bc0f8ea84c50
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/alegreya-serif-2.007
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings )
+DESCRIPTION=Alegreya serif type family
+EAPI=6
+HOMEPAGE=https://www.huertatipografica.com/en/fonts/alegreya-ht-pro
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=OFL-1.1
+SLOT=0
+SRC_URI=https://github.com/huertatipografica/Alegreya/archive/v2.007.tar.gz -> alegreya-serif-2.007.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	font	82836641e7d4639329d8c195234ad0e3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e5a02ec03b8b439afbcb8a31bb477939
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 605e0fee5b80..8ee0e8f7af4e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/cellwriter-1.3.4 b/metadata/md5-cache/media-gfx/cellwriter-1.3.4
deleted file mode 100644
index 67df297c8d95..000000000000
--- a/metadata/md5-cache/media-gfx/cellwriter-1.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/libXtst >=x11-libs/gtk+-2.10:2 gnome? ( gnome-base/libgnome ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Grid-entry natural handwriting input panel
-EAPI=2
-HOMEPAGE=http://risujin.org/cellwriter/
-IUSE=gnome
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXtst >=x11-libs/gtk+-2.10:2 gnome? ( gnome-base/libgnome )
-SLOT=0
-SRC_URI=http://pub.risujin.org/cellwriter/cellwriter-1.3.4.tar.gz
-_md5_=f9802282e9453eb6972d611ef9128be3
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.26_p20171104 b/metadata/md5-cache/media-gfx/exiv2-0.26_p20171104
deleted file mode 100644
index 614fc4a48865..000000000000
--- a/metadata/md5-cache/media-gfx/exiv2-0.26_p20171104
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) app-doc/doxygen dev-libs/libxslt media-gfx/graphviz virtual/pkgconfig ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=EXIF, IPTC and XMP metadata C++ library and command line utility
-EAPI=6
-HOMEPAGE=http://www.exiv2.org/
-IUSE=doc examples nls png webready xmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webready? ( net-libs/libssh[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/26
-SRC_URI=https://github.com/Exiv2/exiv2/tarball/900d2417dbeb46e14cbf65fc2798ed1d043ab76d -> exiv2-0.26_p20171104.tar.gz
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd8401b50176880f80baacd9f2425522
diff --git a/metadata/md5-cache/media-gfx/fontforge-20170731-r4 b/metadata/md5-cache/media-gfx/fontforge-20170731-r4
index 56e2a9066844..7f7edfd41927 100644
--- a/metadata/md5-cache/media-gfx/fontforge-20170731-r4
+++ b/metadata/md5-cache/media-gfx/fontforge-20170731-r4
@@ -4,7 +4,7 @@ DESCRIPTION=postscript font editor and converter
 EAPI=6
 HOMEPAGE=http://fontforge.github.io/
 IUSE=cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=BSD GPL-3+
 RDEPEND=dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= cairo? ( >=x11-libs/cairo-1.6:0= x11-libs/pango:0= ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) gtk? ( x11-libs/gtk+:2= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) X? ( x11-libs/libX11:0= x11-libs/libXi:0= >=x11-libs/pango-1.10:0=[X] ) !media-gfx/pfaedit
 REQUIRED_USE=cairo? ( png ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) test? ( png python )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fontforge/fontforge/releases/download/20170731/fontforge-dist-20170731.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=369f71cc950dff21fb164c84800ea359
+_md5_=4060e2bd9ffb525a06d9402091f3569f
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.15 b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
index 14b69b30d4df..b206245437c5 100644
--- a/metadata/md5-cache/media-gfx/gphoto2-2.5.15
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.15
@@ -4,10 +4,10 @@ DESCRIPTION=Free, redistributable digital camera software application
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=aalib exif ncurses nls readline
-KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=alpha amd64 ~hppa ~ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/popt >=media-libs/libgphoto2-2.5.10:=[exif?] aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.15.tar.bz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d5f879a428556db31f6a6b6f782a1923
+_md5_=38a068b0cb02e866da13cb2440083c94
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
index 86ebf273b44e..c445102f9b45 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=6
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) !<=sci-chemistry/cluster-1.3.081231 java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=48d8f0e1c17fd1f0a9b24759714d9e7c
+_md5_=9a80a01ce54fb2de97c59396c386f1cb
diff --git a/metadata/md5-cache/media-gfx/jpegpixi-1.1.1 b/metadata/md5-cache/media-gfx/jpegpixi-1.1.1
index 0e4f163c8f00..5845d0f5e4fc 100644
--- a/metadata/md5-cache/media-gfx/jpegpixi-1.1.1
+++ b/metadata/md5-cache/media-gfx/jpegpixi-1.1.1
@@ -1,11 +1,10 @@
 DEFINED_PHASES=install
 DEPEND=virtual/jpeg
 DESCRIPTION=almost lossless JPEG pixel interpolator, for correcting digital camera defects
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.zero-based.org/software/jpegpixi/
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=virtual/jpeg
 SLOT=0
 SRC_URI=http://www.zero-based.org/software/jpegpixi/jpegpixi-1.1.1.tar.gz
-_md5_=98232569a3839af4b70624208257c179
+_md5_=e9a8d59f42112c488b3ab0f3a07988d7
diff --git a/metadata/md5-cache/media-gfx/jpegtoavi-1.5 b/metadata/md5-cache/media-gfx/jpegtoavi-1.5
index d19dd88cc40e..e453ca04be39 100644
--- a/metadata/md5-cache/media-gfx/jpegtoavi-1.5
+++ b/metadata/md5-cache/media-gfx/jpegtoavi-1.5
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=JPEG to AVI/MJPEG animation command-line conversion tool
-EAPI=2
+EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/jpegtoavi/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/jpegtoavi/jpegtoavi-1.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68f468b0bae8f45ac2b9ea5757fcfce4
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5d6eb5455341c3810b94a458ba82381e
diff --git a/metadata/md5-cache/media-gfx/yafaray-3.3.0 b/metadata/md5-cache/media-gfx/yafaray-3.3.0
new file mode 100644
index 000000000000..1733e3b9e856
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/yafaray-3.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype ) dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A free open-source montecarlo raytracing engine
+EAPI=6
+HOMEPAGE=http://www.yafaray.org
+IUSE=+blender +fastmath +fasttrig jpeg opencv openexr png +python tiff truetype python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost:= dev-libs/libxml2 sys-libs/zlib blender? ( media-gfx/blender ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-3.1.0:=[openexr?] ) openexr? ( >=media-libs/openexr-2.2.0:= ) png? ( media-libs/libpng:= ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )
+SLOT=0
+SRC_URI=https://github.com/YafaRay/Core/archive/v3.3.0.tar.gz -> yafaray-core-3.3.0.tar.gz https://github.com/YafaRay/Blender-Exporter/archive/v3.3.0.tar.gz -> yafaray-blender-exporter-3.3.0.tar.gz
+_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1e501e4bb95f9340302c82d7232ad6f0
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d7ba8f0ecc4c..9b43ce2998e0 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/celt-0.5.1.3 b/metadata/md5-cache/media-libs/celt-0.5.1.3
index 54f230849632..845daf9c7db3 100644
--- a/metadata/md5-cache/media-libs/celt-0.5.1.3
+++ b/metadata/md5-cache/media-libs/celt-0.5.1.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install
 DEPEND=ogg? ( media-libs/libogg )
 DESCRIPTION=CELT is a very low delay audio codec designed for high-quality communications
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.celt-codec.org/
 IUSE=ogg static-libs
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
@@ -9,4 +9,4 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0.5.1
 SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.5.1.3.tar.gz
-_md5_=71dc5aabb253c02fe3813725e95a4f8a
+_md5_=50851f4a2ac610fb0ebce81cdb1925d1
diff --git a/metadata/md5-cache/media-libs/dssi-1.1.1-r1 b/metadata/md5-cache/media-libs/dssi-1.1.1-r1
index 5bb8eab3d37e..a844b069b247 100644
--- a/metadata/md5-cache/media-libs/dssi-1.1.1-r1
+++ b/metadata/md5-cache/media-libs/dssi-1.1.1-r1
@@ -9,4 +9,4 @@ RDEPEND=media-libs/alsa-lib >=media-libs/liblo-0.12 virtual/jack >=media-libs/la
 SLOT=0
 SRC_URI=mirror://sourceforge/dssi/dssi-1.1.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fd6a6c39858a709f75e590b7eb795a6b
+_md5_=84a5f5bd6d6da015ae4b4d6cf1791528
diff --git a/metadata/md5-cache/media-libs/freetype-2.8 b/metadata/md5-cache/media-libs/freetype-2.8
new file mode 100644
index 000000000000..472a5e7b9020
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.8
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=A high-quality and portable font engine
+EAPI=6
+HOMEPAGE=https://www.freetype.org/
+IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=|| ( FTL GPL-2+ )
+PDEPEND=infinality? ( media-libs/fontconfig-infinality )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!bindist? ( bindist )
+SLOT=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.8.tar.bz2 mirror://nongnu/freetype/freetype-2.8.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.8.tar.bz2 mirror://nongnu/freetype/ft2demos-2.8.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.8.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.8.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9c148327244bf7ef72e4f7252f8a4c5a
diff --git a/metadata/md5-cache/media-libs/freetype-2.9 b/metadata/md5-cache/media-libs/freetype-2.9
new file mode 100644
index 000000000000..24a8fae34123
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freetype-2.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=A high-quality and portable font engine
+EAPI=6
+HOMEPAGE=https://www.freetype.org/
+IUSE=X +adobe-cff bindist bzip2 +cleartype_hinting debug doc fontforge harfbuzz infinality png static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=|| ( FTL GPL-2+ )
+PDEPEND=infinality? ( media-libs/fontconfig-infinality )
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) harfbuzz? ( >=media-libs/harfbuzz-0.9.19[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.2.51:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!bindist? ( bindist )
+SLOT=2
+SRC_URI=mirror://sourceforge/freetype/freetype-2.9.tar.bz2 mirror://nongnu/freetype/freetype-2.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.9.tar.bz2 mirror://nongnu/freetype/ft2demos-2.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.9.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.9.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=245616640066d8679709fd1576bdb6aa
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5 b/metadata/md5-cache/media-libs/gd-2.2.5
index d07ed358fd09..1c55f67866f3 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5
+++ b/metadata/md5-cache/media-libs/gd-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
 EAPI=6
 HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
 IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gd IJG HPND BSD
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz
 _eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0f89004ccda493c79d24976b464d3546
+_md5_=ece1911afc360e96a72b0ba0993255fa
diff --git a/metadata/md5-cache/media-libs/harfbuzz-1.7.6 b/metadata/md5-cache/media-libs/harfbuzz-1.7.6
index f0e34797f766..c1711627a6c8 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-1.7.6
+++ b/metadata/md5-cache/media-libs/harfbuzz-1.7.6
@@ -4,11 +4,11 @@ DESCRIPTION=An OpenType text shaping engine
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
 IUSE=+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) fontconfig? ( media-libs/fontconfig:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=309d17dd05772f3f9ff509154f46b797
+_md5_=0541714179ce16f913a458383c3a350d
diff --git a/metadata/md5-cache/media-libs/ilmbase-1.0.2 b/metadata/md5-cache/media-libs/ilmbase-1.0.2
index 7ac0a593a935..7e4bb2975514 100644
--- a/metadata/md5-cache/media-libs/ilmbase-1.0.2
+++ b/metadata/md5-cache/media-libs/ilmbase-1.0.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=!<media-libs/openexr-1.5.0 >=app-portage/elt-patches-20170422
 DESCRIPTION=OpenEXR ILM Base libraries
-EAPI=2
+EAPI=6
 HOMEPAGE=http://openexr.com/
 IUSE=static-libs
 KEYWORDS=amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!<media-libs/openexr-1.5.0
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/ilmbase-1.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=537a2bb0eb28e567dfa60d53e15274b6
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=74646530717d3f8a9b9e2c124fbfd151
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.2 b/metadata/md5-cache/media-libs/libepoxy-1.5.2
index 7cb5874552cc..1ad301a2f86c 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.2
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.2
@@ -1,12 +1,13 @@
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( dev-lang/python:3.6[xml(+)] dev-lang/python:3.5[xml(+)] dev-lang/python:3.4[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.44.0 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DEPEND=|| ( dev-lang/python:3.6[xml(+)] dev-lang/python:3.5[xml(+)] dev-lang/python:3.4[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.44.0 virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
 EAPI=6
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
+RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.2.tar.gz -> libepoxy-1.5.2.tar.gz
 _eclasses_=meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=df0aae54e9ace9bd191e84c6dce333b8
+_md5_=17a956cb3b4815acfa7255c4227b5983
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index a433f916f1fc..54a23d15ca08 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -1,10 +1,11 @@
 DEFINED_PHASES=compile configure install setup test unpack
-DEPEND=|| ( dev-lang/python:3.6[xml(+)] dev-lang/python:3.5[xml(+)] dev-lang/python:3.4[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.44.0 >=dev-vcs/git-1.8.2.1 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
+DEPEND=|| ( dev-lang/python:3.6[xml(+)] dev-lang/python:3.5[xml(+)] dev-lang/python:3.4[xml(+)] >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/meson-0.44.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
 DESCRIPTION=Epoxy is a library for handling OpenGL function pointer management for you
 EAPI=6
 HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=MIT
+RDEPEND=media-libs/mesa[egl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=git-r3	af51ccfceeb403ab80f1bf9209d372c8	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d8797c044a8b0da237b4d59ce876606b
+_md5_=02a9c0d2f3ccc8754dfd0a209662dfc2
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.16 b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
index 5550846db444..384bd4bd5333 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.16
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.16
@@ -4,10 +4,10 @@ DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.16.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78f653f21c944f2465ea7356b38d2c30
+_md5_=b52ba4a9943caa0a75eda083e89e07ee
diff --git a/metadata/md5-cache/media-libs/libwebp-1.0.0 b/metadata/md5-cache/media-libs/libwebp-1.0.0
index 796abf4d4360..be6d17d4aad6 100644
--- a/metadata/md5-cache/media-libs/libwebp-1.0.0
+++ b/metadata/md5-cache/media-libs/libwebp-1.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A lossy image compression format
 EAPI=6
 HOMEPAGE=https://developers.google.com/speed/webp/download
 IUSE=cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
 LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) opengl? ( media-libs/freeglut virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0/7
 SRC_URI=http://downloads.webmproject.org/releases/webp/libwebp-1.0.0.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=27824b5312c88810b23c99b0ae3a3bb5
+_md5_=93827dcba39f9c925192e17f1bc9086b
diff --git a/metadata/md5-cache/media-libs/tse3-0.3.1-r1 b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
index 5d1eb1a58f3b..4d6b37952cc3 100644
--- a/metadata/md5-cache/media-libs/tse3-0.3.1-r1
+++ b/metadata/md5-cache/media-libs/tse3-0.3.1-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare
 DEPEND=alsa? ( media-libs/alsa-lib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=TSE3 Sequencer library
-EAPI=2
+EAPI=6
 HOMEPAGE=http://TSE3.sourceforge.net
 IUSE=alsa oss
 KEYWORDS=amd64 ppc sparc x86
@@ -10,4 +10,4 @@ RDEPEND=alsa? ( media-libs/alsa-lib )
 SLOT=0
 SRC_URI=mirror://sourceforge/tse3/tse3-0.3.1.tar.gz mirror://gentoo/tse3-0.3.1-awe_voice.h.tbz2
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a249f4b41e8708e7b5007469fdbc374f
+_md5_=53b7c04c73d6409a91c37babf9b1626b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 8ed0133e24ba..a0ffc136f09d 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/mp32ogg-0.11-r6 b/metadata/md5-cache/media-sound/mp32ogg-0.11-r6
index 33e3b6034ca2..5abab26b1f98 100644
--- a/metadata/md5-cache/media-sound/mp32ogg-0.11-r6
+++ b/metadata/md5-cache/media-sound/mp32ogg-0.11-r6
@@ -1,11 +1,10 @@
-DEFINED_PHASES=install prepare unpack
+DEFINED_PHASES=install unpack
 DESCRIPTION=A perl script to convert MP3 files to Ogg Vorbis files
-EAPI=2
+EAPI=6
 HOMEPAGE=http://faceprint.com/code/
 KEYWORDS=amd64 x86
 LICENSE=Artistic
 RDEPEND=media-sound/mpg123 dev-perl/MP3-Info dev-perl/String-ShellQuote media-sound/vorbis-tools
 SLOT=0
 SRC_URI=ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3934f6d38011758d22dfe3ee08c5f473
+_md5_=6c273b20bb122af0140e24a6d66fec05
diff --git a/metadata/md5-cache/media-sound/ogg2mp3-0.6.1 b/metadata/md5-cache/media-sound/ogg2mp3-0.6.1
index 89523ad692c4..fea0943589d3 100644
--- a/metadata/md5-cache/media-sound/ogg2mp3-0.6.1
+++ b/metadata/md5-cache/media-sound/ogg2mp3-0.6.1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install
 DESCRIPTION=A perl script to convert Ogg Vorbis files to MP3 files
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.gitorious.org/ogg2mp3/pages/Home
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=media-sound/lame dev-perl/String-ShellQuote media-sound/vorbis-tools[ogg123]
 SLOT=0
 SRC_URI=http://www.jamesa.com/projects/ogg2mp3/releases/ogg2mp3-0.6.1.tar.bz2
-_md5_=9efc17e9f5f15acdcecfb137985fb005
+_md5_=d5699fc89e56a11bc86dc1fa3d714bb9
diff --git a/metadata/md5-cache/media-sound/ogmtools-1.5-r2 b/metadata/md5-cache/media-sound/ogmtools-1.5-r2
index 247914e15eef..ab986c913f5c 100644
--- a/metadata/md5-cache/media-sound/ogmtools-1.5-r2
+++ b/metadata/md5-cache/media-sound/ogmtools-1.5-r2
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install
 DEPEND=dvd? ( media-libs/libdvdread ) media-sound/vorbis-tools
 DESCRIPTION=Information, extraction or creation for OGG media streams
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.bunkus.org/videotools/ogmtools/
 IUSE=dvd
 KEYWORDS=amd64 ppc ppc64 sparc x86
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=dvd? ( media-libs/libdvdread ) media-sound/vorbis-tools
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/ogmtools/ogmtools-1.5.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8be1a6408acd7ae27f1e48b93b3d899e
+_md5_=30d327e10a855ca9131d32b9ae1408cb
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index fa87d78c635d..cfd567a114bf 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/vlc-3.0.1-r1 b/metadata/md5-cache/media-video/vlc-3.0.1-r1
deleted file mode 100644
index 8963d0b669da..000000000000
--- a/metadata/md5-cache/media-video/vlc-3.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare pretend test
-DEPEND=net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) microdns? ( >=net-libs/libmicrodns-0.0.9:= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( media-libs/libmpeg2:0 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi ) >=sys-devel/gettext-0.19.8:* virtual/pkgconfig:* amd64? ( dev-lang/yasm:* ) x86? ( dev-lang/yasm:* ) X? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Media player and framework with support for most multimedia files and streaming
-EAPI=6
-HOMEPAGE=https://www.videolan.org/vlc/
-IUSE=a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1 GPL-2
-RDEPEND=net-dns/libidn:0 sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) microdns? ( >=net-libs/libmicrodns-0.0.9:= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( media-libs/libmpeg2:0 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
-REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
-SLOT=0/5-9
-SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.1/vlc-3.0.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81981aa321e1ffda8e83b04ced6c5292
diff --git a/metadata/md5-cache/media-video/vlc-3.0.2 b/metadata/md5-cache/media-video/vlc-3.0.2
index 2437792e478c..b161cccad4cb 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.2
+++ b/metadata/md5-cache/media-video/vlc-3.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Media player and framework with support for most multimedia files an
 EAPI=6
 HOMEPAGE=https://www.videolan.org/vlc/
 IUSE=a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau vnc vorbis vpx wayland wma-fixed +X x264 x265 xml zeroconf zvbi cpu_flags_x86_mmx cpu_flags_x86_sse test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1 GPL-2
 RDEPEND=net-dns/libidn:= sys-libs/zlib:0[minizip] virtual/libintl:0 virtual/opengl a52? ( media-libs/a52dec:0 ) alsa? ( media-libs/alsa-lib:0 ) aom? ( media-libs/libaom:= ) archive? ( app-arch/libarchive:= ) bidi? ( dev-libs/fribidi:0 media-libs/freetype:2[harfbuzz] media-libs/harfbuzz virtual/ttf-fonts:0 ) bluray? ( media-libs/libbluray:0= ) cddb? ( media-libs/libcddb:0 ) chromaprint? ( media-libs/chromaprint:0= ) chromecast? ( >=dev-libs/protobuf-2.5.0:= ) dbus? ( sys-apps/dbus:0 ) dc1394? ( media-libs/libdc1394:2 sys-libs/libraw1394:0 ) dts? ( media-libs/libdca:0 ) dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:0= ) dvd? ( >=media-libs/libdvdnav-4.9:0 >=media-libs/libdvdread-4.9:0 ) faad? ( media-libs/faad2:0 ) fdk? ( media-libs/fdk-aac:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.1.3:0=[vaapi?,vdpau?] ) libav? ( >=media-video/libav-11.8:0=[vaapi?,vdpau?] ) ) flac? ( media-libs/flac:0 media-libs/libogg:0 ) fluidsynth? ( media-sound/fluidsynth:0 ) fontconfig? ( media-libs/fontconfig:1.0 ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error:0 ) gme? ( media-libs/game-music-emu:0 ) gnome-keyring? ( app-crypt/libsecret ) gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) ieee1394? ( sys-libs/libavc1394:0 sys-libs/libraw1394:0 ) jack? ( virtual/jack ) jpeg? ( virtual/jpeg:0 ) kate? ( media-libs/libkate:0 ) libass? ( media-libs/fontconfig:1.0 media-libs/libass:0= ) libcaca? ( media-libs/libcaca:0 ) libnotify? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify:0 ) libsamplerate? ( media-libs/libsamplerate:0 ) libtar? ( dev-libs/libtar:0 ) libtiger? ( media-libs/libtiger:0 ) linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc:0 ) live? ( media-plugins/live:0 ) lua? ( >=dev-lang/lua-5.1:0 ) matroska? ( dev-libs/libebml:0= media-libs/libmatroska:0= ) microdns? ( >=net-libs/libmicrodns-0.0.9:= ) modplug? ( media-libs/libmodplug:0 ) mp3? ( media-libs/libmad:0 ) mpeg? ( media-libs/libmpeg2:0 ) mtp? ( media-libs/libmtp:0= ) musepack? ( media-sound/musepack-tools:0 ) ncurses? ( sys-libs/ncurses:0=[unicode] ) nfs? ( >=net-fs/libnfs-0.10.0:= ) ogg? ( media-libs/libogg:0 ) opencv? ( media-libs/opencv:0= ) opus? ( >=media-libs/opus-1.0.3:0 ) png? ( media-libs/libpng:0= ) postproc? ( libav? ( media-libs/libpostproc:0= ) ) projectm? ( media-fonts/dejavu:0 media-libs/libprojectm:0 ) pulseaudio? ( media-sound/pulseaudio:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) ) rdp? ( >=net-misc/freerdp-2.0.0_rc0:0=[client] ) samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl-image? ( media-libs/sdl-image:0 ) sftp? ( net-libs/libssh2:0 ) shout? ( media-libs/libshout:0 ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext:0 x11-libs/libXinerama:0 x11-libs/libXpm:0 ) soxr? ( media-libs/soxr ) speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 ) srt? ( net-libs/srt ) ssl? ( net-libs/gnutls:0 ) svg? ( gnome-base/librsvg:2 x11-libs/cairo:0 ) taglib? ( >=media-libs/taglib-1.9:0 ) theora? ( media-libs/libtheora:0 ) tremor? ( media-libs/tremor:0 ) truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0 !fontconfig? ( media-fonts/dejavu:0 ) ) twolame? ( media-sound/twolame:0 ) udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:= ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0=[drm,wayland?,X?] ) vcd? ( >=dev-libs/libcdio-0.78.2:0 ) vdpau? ( x11-libs/libvdpau:0 ) vnc? ( net-libs/libvncserver:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0= ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-keysyms ) x264? ( media-libs/x264:0= ) x265? ( media-libs/x265:0= ) xml? ( dev-libs/libxml2:2 ) zeroconf? ( net-dns/avahi:0[dbus] ) zvbi? ( media-libs/zvbi )
 REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype ) libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) postproc? ( ffmpeg ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) vdpau? ( ffmpeg X )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.2/vlc-3.0.2.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d8eab047b123a9fe3c895a6654f87af
+_md5_=a23116b760fb5fbe886f4fb6ad321bd9
diff --git a/metadata/md5-cache/media-video/vobcopy-1.2.0 b/metadata/md5-cache/media-video/vobcopy-1.2.0
index ab80663f2b01..a0f83efe756b 100644
--- a/metadata/md5-cache/media-video/vobcopy-1.2.0
+++ b/metadata/md5-cache/media-video/vobcopy-1.2.0
@@ -1,12 +1,11 @@
 DEFINED_PHASES=configure install
 DEPEND=>=media-libs/libdvdread-0.9.4
 DESCRIPTION=copies DVD .vob files to harddisk, decrypting them on the way
-EAPI=2
+EAPI=6
 HOMEPAGE=http://lpn.rnbhq.org/
 KEYWORDS=amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libdvdread-0.9.4
 SLOT=0
 SRC_URI=http://lpn.rnbhq.org/download/vobcopy-1.2.0.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8a004e3ee4f00313c2b94b094b688104
+_md5_=70134c428fb56cabfb8d5613598577d0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 808852357835..dd96415de7d4 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1 b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
index 1862238c908b..3a0bb800e407 100644
--- a/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
+++ b/metadata/md5-cache/net-analyzer/tcpreplay-4.3.0_beta1
@@ -4,10 +4,10 @@ DESCRIPTION=utilities for editing and replaying previously captured network traf
 EAPI=6
 HOMEPAGE=http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay
 IUSE=debug pcapnav +tcpdump
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~sparc ~x86
 LICENSE=BSD GPL-3
 RDEPEND=>=sys-devel/autogen-5.18.4[libopts] dev-libs/libdnet >=net-libs/libpcap-0.9 tcpdump? ( net-analyzer/tcpdump ) pcapnav? ( net-libs/libpcapnav )
 SLOT=0
 SRC_URI=https://github.com/appneta/tcpreplay/releases/download/v4.3.0-beta1/tcpreplay-4.3.0-beta1.tar.xz -> tcpreplay-4.3.0_beta1.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1d628aa377fa7ece51ee7a46ba1da2c1
+_md5_=23c386d3a163c7d96472099bf118ed2a
diff --git a/metadata/md5-cache/net-analyzer/zmap-2.1.1 b/metadata/md5-cache/net-analyzer/zmap-2.1.1
index f0316cdeaa24..a94d7c94ff5b 100644
--- a/metadata/md5-cache/net-analyzer/zmap-2.1.1
+++ b/metadata/md5-cache/net-analyzer/zmap-2.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=Fast network scanner designed for Internet-wide network surveys
 EAPI=6
 HOMEPAGE=https://zmap.io/
 IUSE=json mongo redis +filecaps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )
 SLOT=0
 SRC_URI=https://github.com/zmap/zmap/archive/v2.1.1.tar.gz -> zmap-2.1.1.tar.gz
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad602cac8a88671e76d304be124f5e51
+_md5_=26e8b683b841ea7bbfbb247bb116bdd2
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 836dee07e41c..d35fafb1f3e9 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
index 4a74ccf6734f..61048b0382be 100644
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
+++ b/metadata/md5-cache/net-dns/dnssec-tools-2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
 EAPI=6
 HOMEPAGE=https://www.dnssec-tools.org/
 IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
 SLOT=0
 SRC_URI=https://www.dnssec-tools.org/download/dnssec-tools-2.2.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5427ef4eaba16dc08f092c3489b4b1b1
+_md5_=7dcf1b138206796c38e73751078291a1
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0e9c80743e80..65cf67feb48a 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.4.3.3 b/metadata/md5-cache/net-firewall/firewalld-0.4.3.3
deleted file mode 100644
index 0da7ea1beee6..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-0.4.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-libs/glib:2 >=dev-util/intltool-0.35 sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
-EAPI=5
-HOMEPAGE=http://www.firewalld.org/
-IUSE=gui python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/firewalld/firewalld-0.4.3.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a871b3a5afe94087d10e6386c3ea0dc
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2 b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
index fc7ba36d2a75..e36aefe08345 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
+++ b/metadata/md5-cache/net-firewall/firewalld-0.5.1-r2
@@ -4,7 +4,7 @@ DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=6
 HOMEPAGE=http://www.firewalld.org/
 IUSE=gui python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!net-firewall/gshield dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-slip-0.2.7[dbus,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-firewall/ebtables net-firewall/iptables[ipv6] net-firewall/ipset || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/firewalld/firewalld/archive/v0.5.1.tar.gz -> firewalld-0.5.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	7e76462890d7d19cad453151876b0ecf	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4041e30e22cda41681dba35d586f868
+_md5_=631d922a21970b1e96b040176ac4d736
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 57d6fc4a36d6..ac60a13d5571 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.5 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
index 5fc091ee982d..01563e537e14 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle UPnP IGD port mapping for GUPnP
 EAPI=6
 HOMEPAGE=http://gupnp.org
 IUSE=+introspection abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gssdp-0.14.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gupnp-0.20.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.5.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4528d0bc061f3ec61257f2225d92b04a
+_md5_=f9c2a4a7d85adc0e275d0041978a8748
diff --git a/metadata/md5-cache/net-libs/libmicrodns-0.0.9 b/metadata/md5-cache/net-libs/libmicrodns-0.0.9
index 33e12db27e16..b6b8d4cf3274 100644
--- a/metadata/md5-cache/net-libs/libmicrodns-0.0.9
+++ b/metadata/md5-cache/net-libs/libmicrodns-0.0.9
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >
 DESCRIPTION=Minimal mDNS resolver (and announcer) library
 EAPI=6
 HOMEPAGE=https://videolabs.io
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/videolabs/libmicrodns/archive/0.0.9.tar.gz -> libmicrodns-0.0.9.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=05aa9f850444fb6afb1134d90227df7c
+_md5_=04cbc90a6dd281b80ad18eee04c7e0de
diff --git a/metadata/md5-cache/net-libs/libpcapnav-0.8 b/metadata/md5-cache/net-libs/libpcapnav-0.8
index ab4e387dd8a1..fd3a8453d07b 100644
--- a/metadata/md5-cache/net-libs/libpcapnav-0.8
+++ b/metadata/md5-cache/net-libs/libpcapnav-0.8
@@ -4,11 +4,11 @@ DESCRIPTION=Libpcap wrapper library to navigate to arbitrary packets in a tcpdum
 EAPI=5
 HOMEPAGE=http://netdude.sourceforge.net/
 IUSE=doc static-libs
-KEYWORDS=amd64 ~sparc x86
+KEYWORDS=amd64 ~arm ~sparc x86
 LICENSE=BSD
 RDEPEND=net-libs/libpcap
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/netdude/libpcapnav-0.8.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=56e016cd4ecee6fab2762e48d35d0da3
+_md5_=bc8a4321ac3676bf3dc31acef284459a
diff --git a/metadata/md5-cache/net-libs/libssh2-1.8.0-r1 b/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
index c8ba966f6b84..b85b6d1ec293 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
+++ b/metadata/md5-cache/net-libs/libssh2-1.8.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library implementing the SSH2 protocol
 EAPI=6
 HOMEPAGE=https://www.libssh2.org
 IUSE=gcrypt libressl static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://www.libssh2.org/download/libssh2-1.8.0.tar.gz
 _eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=27219ace1eee20865c5457e3a1248187
+_md5_=f3528735f19f00be0757f1d0a95a09e6
diff --git a/metadata/md5-cache/net-libs/libyahoo2-1.0.1 b/metadata/md5-cache/net-libs/libyahoo2-1.0.1
index d0f2948e0909..1e408dc3510a 100644
--- a/metadata/md5-cache/net-libs/libyahoo2-1.0.1
+++ b/metadata/md5-cache/net-libs/libyahoo2-1.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 ssl? ( dev-libs/openssl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/glib:2 ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=interface to the new Yahoo! Messenger protocol
-EAPI=2
+EAPI=7
 HOMEPAGE=http://libyahoo2.sourceforge.net/
-IUSE=static-libs ssl
+IUSE=libressl ssl static-libs
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 ssl? ( dev-libs/openssl )
+RDEPEND=dev-libs/glib:2 ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/libyahoo2/libyahoo2-1.0.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cb50e4fe393445fac27679bb9d708ac
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d0982a6e724c31e9acf381c660a6a74f
diff --git a/metadata/md5-cache/net-libs/signon-oauth2-0.24 b/metadata/md5-cache/net-libs/signon-oauth2-0.24
new file mode 100644
index 000000000000..65c936afab60
--- /dev/null
+++ b/metadata/md5-cache/net-libs/signon-oauth2-0.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond test? ( dev-qt/qttest:5 )
+DESCRIPTION=OAuth2 plugin for Signon daemon
+EAPI=7
+HOMEPAGE=https://01.org/gsso/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] net-libs/signond
+SLOT=0
+SRC_URI=https://gitlab.com/accounts-sso/signon-plugin-oauth2/-/archive/VERSION_0.24/signon-plugin-oauth2-VERSION_0.24.tar.gz -> signon-oauth2-0.24.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9d5ccd04c1517b6db659c39f70b194c7
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index b4de1a85da67..82a787d70c07 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1 b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1
index a74ba2ab1383..14862459cb31 100644
--- a/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1
+++ b/metadata/md5-cache/net-mail/gnubiff-2.2.17-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A mail notification program
 EAPI=6
 HOMEPAGE=http://gnubiff.sourceforge.net/
 IUSE=debug fam nls password
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:* ) fam? ( virtual/fam ) x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
 SLOT=0
 SRC_URI=mirror://sourceforge/gnubiff/gnubiff-2.2.17.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2dd824b54e8287afbbf5d220a22816be
+_md5_=02b7041ccd942db602c51335e683fe22
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index d39ce438950a..ef216da46cb7 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.6.12 b/metadata/md5-cache/net-misc/modemmanager-1.6.12
index b674a2e5b3e9..080ad36ed8c1 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.6.12
+++ b/metadata/md5-cache/net-misc/modemmanager-1.6.12
@@ -4,11 +4,11 @@ DESCRIPTION=Modem and mobile broadband management libraries
 EAPI=6
 HOMEPAGE=https://cgit.freedesktop.org/ModemManager/ModemManager/
 IUSE=+introspection mbim policykit +qmi systemd vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=virtual/libgudev-230:= introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.14.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.16.0:= ) systemd? ( >=sys-apps/systemd-209 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.6.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=35d3f65edd27e8a043d1237c2697db77
+_md5_=580a14acb263935cd9af32d917b32802
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index c1c947bd8f0c..2696d6e3ad05 100644
Binary files a/metadata/md5-cache/net-nntp/Manifest.gz and b/metadata/md5-cache/net-nntp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nntp/slrn-1.0.3 b/metadata/md5-cache/net-nntp/slrn-1.0.3
index 9eb30fa20073..0af15277a414 100644
--- a/metadata/md5-cache/net-nntp/slrn-1.0.3
+++ b/metadata/md5-cache/net-nntp/slrn-1.0.3
@@ -4,9 +4,9 @@ DESCRIPTION=A s-lang based newsreader
 EAPI=6
 HOMEPAGE=http://slrn.sourceforge.net/
 IUSE=canlock libressl nls ssl uudeview
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=app-arch/sharutils >=sys-libs/slang-2.2.3 virtual/mta canlock? ( net-libs/canlock ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) uudeview? ( dev-libs/uulib )
 SLOT=0
 SRC_URI=https://jedsoft.org/releases/slrn/slrn-1.0.3a.tar.bz2
-_md5_=eaaaec690f0a51a9a9bbb5cb5b5270c6
+_md5_=4729831aa8602f05f6c87fafd8e35a91
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index dd9e019b909e..dde7540ced33 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/bluez-5.49-r1 b/metadata/md5-cache/net-wireless/bluez-5.49-r1
index f130119e44c5..e6ef05448070 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.49-r1
+++ b/metadata/md5-cache/net-wireless/bluez-5.49-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Bluetooth Tools and System Daemons for Linux
 EAPI=6
 HOMEPAGE=http://www.bluez.org
 IUSE=alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6:=[user-session=] >=sys-apps/hwids-20121202.2 alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups:= ) mesh? ( dev-libs/json-c:= sys-libs/readline:0= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:0= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) selinux? ( sec-policy/selinux-bluetooth ) test-programs? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=extra-tools? ( deprecated readline ) test? ( python_targets_python2_7 ) test-programs? ( python_targets_python2_7 ) user-session? ( systemd )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.49.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=f3d984c9a551e593944561ceea5ae3a4
+_md5_=07961e8e83385ad5f1eb42a3b4571202
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 2f1d04a66f31..331a62e5fe23 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	git-r3	af51ccfceeb403ab80f1bf9209d372c8	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c958b3cb5261112a89830ab4df52538a
+_md5_=4a1bd8b8dcbbde0e45c646a8262fd3ac
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 9f506a650d95..542ea2002b4e 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.0.1 b/metadata/md5-cache/sci-geosciences/qgis-3.0.1
deleted file mode 100644
index 6d8af33f5a4e..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5[ssl] >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=User friendly Geographic Information System
-EAPI=6
-HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5[ssl] >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.0.1.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2d932db5f095c3703e594800b1e1c13
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index bb58a92d1b09..5864658994e1 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2 b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
index 132135ec4677..c261f8d677a9 100644
--- a/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
+++ b/metadata/md5-cache/sci-visualization/gnuplot-5.2.2
@@ -4,10 +4,10 @@ DESCRIPTION=Command-line driven interactive plotting program
 EAPI=6
 HOMEPAGE=http://www.gnuplot.info/
 IUSE=aqua bitmap cairo compat doc examples +gd ggi latex libcaca libcerf lua qt5 readline regis svga wxwidgets X
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=gnuplot bitmap? ( free-noncomm )
 RDEPEND=cairo? ( x11-libs/cairo x11-libs/pango ) gd? ( >=media-libs/gd-2.0.35-r3:2=[png] ) ggi? ( media-libs/libggi ) latex? ( virtual/latex-base lua? ( dev-tex/pgf >=dev-texlive/texlive-latexrecommended-2008-r2 ) ) libcaca? ( media-libs/libcaca ) lua? ( dev-lang/lua:0 ) qt5? ( dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtprintsupport:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= ) readline? ( sys-libs/readline:0= ) libcerf? ( sci-libs/libcerf ) svga? ( media-libs/svgalib ) wxwidgets? ( x11-libs/wxGTK:3.0[X] x11-libs/cairo x11-libs/pango x11-libs/gtk+:2 ) X? ( x11-libs/libXaw )
 SLOT=0
 SRC_URI=mirror://sourceforge/gnuplot/gnuplot-5.2.2.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=edbd46a1b28383fb3489bf2e749165a4
+_md5_=66a92048d3ed5bc773e7f4e9c62b6cab
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index a7183d84c073..cdd6e5a2117c 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/busybox-1.28.1 b/metadata/md5-cache/sys-apps/busybox-1.28.4
similarity index 91%
rename from metadata/md5-cache/sys-apps/busybox-1.28.1
rename to metadata/md5-cache/sys-apps/busybox-1.28.4
index 5b47cbeea518..2c530b95c827 100644
--- a/metadata/md5-cache/sys-apps/busybox-1.28.1
+++ b/metadata/md5-cache/sys-apps/busybox-1.28.4
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
 DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
 DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.busybox.net/
 IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
@@ -10,6 +10,6 @@ RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev
 REQUIRED_USE=pam? ( !static )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://www.busybox.net/downloads/busybox-1.28.1.tar.bz2
+SRC_URI=https://www.busybox.net/downloads/busybox-1.28.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	savedconfig	e6948c872ff47e15a10e5ad1be15c18e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e947e12ce8994c7a1c495be352b01aea
+_md5_=bfbd4142e6c9b5e69528cd81cf3adb64
diff --git a/metadata/md5-cache/sys-apps/usbutils-009 b/metadata/md5-cache/sys-apps/usbutils-009
index 4cc5ceafec6e..6025a44249a5 100644
--- a/metadata/md5-cache/sys-apps/usbutils-009
+++ b/metadata/md5-cache/sys-apps/usbutils-009
@@ -4,11 +4,11 @@ DESCRIPTION=USB enumeration utilities
 EAPI=6
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
 IUSE=python python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/libusb:1= virtual/libudev:= sys-apps/hwids python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-009.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a00cafd0c61b00d594a30121b84919af
+_md5_=d518d8303b39940749d48a5239af07de
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 0ae313fe7ae1..d8e94a5aed29 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/elogind-235.4 b/metadata/md5-cache/sys-auth/elogind-235.4
new file mode 100644
index 000000000000..6ddbfb318281
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/elogind-235.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=The systemd project's logind, extracted to a standalone package
+EAPI=6
+HOMEPAGE=https://github.com/elogind/elogind
+IUSE=+acl debug doc +pam +policykit selinux
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=CC0-1.0 LGPL-2.1+ public-domain
+PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
+RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
+SLOT=0
+SRC_URI=https://github.com/elogind/elogind/archive/v235.4.tar.gz -> elogind-235.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	d91cac2c73b94629cad2daea66e0d182	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d3793e95d099923d7ccee2a60f62a985
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.13 b/metadata/md5-cache/sys-auth/nss-mdns-0.13
index bee429376f89..3465288ba834 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.13
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.13
@@ -4,10 +4,10 @@ DESCRIPTION=Name Service Switch module for Multicast DNS
 EAPI=6
 HOMEPAGE=https://github.com/lathiat/nss-mdns
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/lathiat/nss-mdns/releases/download/v0.13/nss-mdns-0.13.tar.gz
 _eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e39341f22835e172bd0d401ed9a7d2cc
+_md5_=44f3d2874b8d4f33b8979f36f216a908
diff --git a/metadata/md5-cache/sys-auth/pam_mysql-0.8.1 b/metadata/md5-cache/sys-auth/pam_mysql-0.8.1
index 05d086a2c7f4..d4b6f5feff42 100644
--- a/metadata/md5-cache/sys-auth/pam_mysql-0.8.1
+++ b/metadata/md5-cache/sys-auth/pam_mysql-0.8.1
@@ -4,10 +4,10 @@ DESCRIPTION=pam_mysql is a module for pam to authenticate users with mysql
 EAPI=6
 HOMEPAGE=https://github.com/NigelCunningham/pam-MySQL
 IUSE=openssl
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/pam-0.72:0= virtual/mysql:0= openssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/NigelCunningham/pam-MySQL/archive/v0.8.1.tar.gz -> pam_mysql-0.8.1.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5509f488802c2ae06c2bd1473d5ce56c
+_md5_=6e0248f8c91a95b48af3a5d87b3271be
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 797899a6efec..cdbc0934ae60 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/blktrace-1.0.3 b/metadata/md5-cache/sys-block/blktrace-1.0.3
deleted file mode 100644
index 40f4aed1cd89..000000000000
--- a/metadata/md5-cache/sys-block/blktrace-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=sys-kernel/linux-headers doc? ( virtual/latex-base || ( >=app-text/texlive-core-2014 app-text/dvipdfm ) ) dev-libs/libaio
-DESCRIPTION=btrace can show detailed info about what is happening on a block device io queue
-EAPI=2
-HOMEPAGE=http://git.kernel.dk/cgit/blktrace/
-IUSE=doc
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7439a5f56c17e17fb802619cee0db2a3
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index af058ccb2fdc..ecf65da7c8fa 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/unetbootin-661 b/metadata/md5-cache/sys-boot/unetbootin-661
new file mode 100644
index 000000000000..6c35dc851fdd
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/unetbootin-661
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+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/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
+SLOT=0
+SRC_URI=https://github.com/unetbootin/unetbootin/archive/661.tar.gz -> unetbootin-661.tar.gz https://dev.gentoo.org/~asturm/distfiles/unetbootin-661-qt5.patch.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6eb747ae21ea3baaa9f3e351f7d90cc0
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 6f263045c56f..1426b7b4d3f7 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1 b/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r2
similarity index 83%
rename from metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1
rename to metadata/md5-cache/sys-firmware/intel-microcode-20180426-r2
index 2bb69071cf19..e982859c56a9 100644
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r1
+++ b/metadata/md5-cache/sys-firmware/intel-microcode-20180426-r2
@@ -3,11 +3,11 @@ DEPEND=sys-apps/iucode_tool
 DESCRIPTION=Intel IA32/IA64 microcode update data
 EAPI=6
 HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=27776
-IUSE=initramfs +split-ucode vanilla
+IUSE=initramfs +minimal +split-ucode vanilla
 LICENSE=intel-ucode
-RDEPEND=!<sys-apps/microcode-ctl-1.17-r2
+RDEPEND=!<sys-apps/microcode-ctl-1.17-r2 minimal? ( sys-apps/iucode_tool )
 REQUIRED_USE=|| ( initramfs split-ucode )
 SLOT=0
 SRC_URI=https://downloadmirror.intel.com/27776/eng/microcode-20180425.tgz https://dev.gentoo.org/~whissi/dist/intel-microcode/intel-microcode-collection-20180426.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7a28f0f03a6e99c4443c4dd5093bc14c
+_md5_=bbf9798109722c2cb7ba4c2941d2d03e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f69cb25e6733..31a0d8635f3b 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
index fd9426819659..50269b175b8e 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=fuse nls static-libs elibc_FreeBSD
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint
 LICENSE=GPL-2 BSD
 RDEPEND=~sys-libs/e2fsprogs-libs-1.43.9 >=sys-apps/util-linux-2.16 fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-1.43.9.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bfa1505952bb1b44a2eeacbe8dacb83c
+_md5_=78fc306b82434a744058a9123f5f2620
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index dfac3b1ff05f..b27be34b47f2 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
index d1a2bf3f5e2c..6f47293df770 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.9
@@ -4,10 +4,10 @@ DESCRIPTION=e2fsprogs libraries (common error and subsystem)
 EAPI=6
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
 IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.43.9.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.9/e2fsprogs-libs-1.43.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cad9a180bf215d5e791d9e4747801fdd
+_md5_=022576527aa6a4d4d0521e9f13772605
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.3.3 b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
index be9c4162856b..15745df797a9 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.3.3
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.3.3
@@ -4,9 +4,9 @@ DESCRIPTION=high level interface to Linux seccomp filter
 EAPI=5
 HOMEPAGE=https://github.com/seccomp/libseccomp
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux
+KEYWORDS=-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.3.3/libseccomp-2.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=214cd5badb79dc78213172fdfdb13894
+_md5_=64eb6ca356c9aa005afd32025a926628
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 7c75d05c5b15..93e8fe5b686f 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/minit-0.10-r1 b/metadata/md5-cache/sys-process/minit-0.10-r1
index 338c9221080c..6b58a1ca208d 100644
--- a/metadata/md5-cache/sys-process/minit-0.10-r1
+++ b/metadata/md5-cache/sys-process/minit-0.10-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libowfat dev-libs/dietlibc
 DESCRIPTION=a small yet feature-complete init
 EAPI=6
 HOMEPAGE=http://www.fefe.de/minit/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libowfat dev-libs/dietlibc
 SLOT=0
 SRC_URI=http://dl.fefe.de/minit-0.10.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4895ea753dc38955c295aa8d648be9af
+_md5_=a1be9d6e6bc49b1109a7aac28e531cb4
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 294a9cae6fd3..65d3d001c197 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-68.0.3438.3 b/metadata/md5-cache/www-client/chromium-68.0.3438.3
new file mode 100644
index 000000000000..db2bf5732663
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-68.0.3438.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-68.0.3438.3.tar.xz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5bd62204b75ab6c2479b4687ad08b858
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.2.1 b/metadata/md5-cache/www-client/qutebrowser-1.3.1
similarity index 98%
rename from metadata/md5-cache/www-client/qutebrowser-1.2.1
rename to metadata/md5-cache/www-client/qutebrowser-1.3.1
index d85d0c6ea270..73db674d91d2 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.2.1
+++ b/metadata/md5-cache/www-client/qutebrowser-1.3.1
@@ -10,6 +10,6 @@ RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python
 REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.2.1/qutebrowser-1.2.1.tar.gz
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.3.1/qutebrowser-1.3.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c66af00ffb980e8eb1c961d5e63597fe	python-utils-r1	3b2e27bcad216823f5a67d01d28b53a4	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 45ac76218dcd..a533a49334ae 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/apache-2.4.33-r1 b/metadata/md5-cache/www-servers/apache-2.4.33-r1
index 22a4d3e19097..1d976748c65b 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.33-r1
+++ b/metadata/md5-cache/www-servers/apache-2.4.33-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.33
 RDEPEND=apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) >=dev-libs/apr-1.5.1:= !www-apache/mod_macro dev-lang/perl =dev-libs/apr-util-1*:=[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl ) apache2_modules_md? ( ssl ) apache2_
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.33.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.33-r1-20180529.tar.bz2
 _eclasses_=apache-2	398479a5211cd8e0fbeaf9bcca05e975	autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e4067197a8a6a1eb547c6ae15c888f84
+_md5_=d78f9b69ef2cdda7c72dc7ebeeb95dde
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index fbfdd3ff51ca..db44f7d47a32 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/agg-2.5-r3 b/metadata/md5-cache/x11-libs/agg-2.5-r3
index 35dd718ad150..e249dcf531b3 100644
--- a/metadata/md5-cache/x11-libs/agg-2.5-r3
+++ b/metadata/md5-cache/x11-libs/agg-2.5-r3
@@ -10,4 +10,4 @@ RDEPEND=sdl? ( >=media-libs/libsdl-1.2.0[X?] ) X? ( >=x11-libs/libX11-1.3.99.901
 SLOT=0
 SRC_URI=http://antigrain.com/agg-2.5.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=620e84ce1867a677080ff6c58d80266b
+_md5_=b9832c2813192234b8477b4606970d98
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
index a5d4dd24f356..a88e313b76e8 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.12
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~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=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz test? ( https://git.gnome.org/browse/gdk-pixbuf/plain/tests/bug753605-atsize.jpg?h=2.36.12 -> gdk-pixbuf-2.36.12-bug753605-atsize.jpg )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66532bf72cfec5839ff6794a1427221f
+_md5_=3608225437a8e2275c226de0df7bab97
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.29 b/metadata/md5-cache/x11-libs/gtk+-3.22.29
index 11197fff51ab..e4c8a3534223 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.22.29
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.29
@@ -4,7 +4,7 @@ DESCRIPTION=Gimp ToolKit +
 EAPI=6
 HOMEPAGE=https://www.gtk.org/
 IUSE=aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.49.4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.0[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.37.3[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info cloudprint? ( >=net-libs/rest-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/json-glib-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) wayland? ( >=dev-libs/wayland-1.9.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.9 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.5.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<gnome-base/gail-1000 !<x11-libs/vte-0.31.0:2.90
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.22/gtk+-3.22.29.tar.xz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0ca850c6fd3aa886e5dec191d0f4c71
+_md5_=5a1d14b9d550337e47c82428fdd5e79d
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.7 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
index dc168ee5c896..3d35bbcadcd0 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.7
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection vala test
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a3b354b11afa11f09427f2675090478
+_md5_=8d7501333f6cc7b8fa7a2011a5a35986
diff --git a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4 b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
index ed63ce767cdc..f93799e27e5a 100644
--- a/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
+++ b/metadata/md5-cache/x11-libs/libgksu-2.0.12-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A library for integration of su into applications
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/gksu/
 IUSE=nls static-libs
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/libX11 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2:2= nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 SLOT=2
 SRC_URI=https://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
 _eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ee9e17a6108d15fd497c9b4f8a76812
+_md5_=0a0ef9699fe5d101b6410b57d4129cfe
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index f7e91f7d0c7e..b17fb0e6ce95 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1 b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
index 6a705be9c96e..20b5cb6c379a 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
+++ b/metadata/md5-cache/x11-plugins/pidgin-extprefs-0.7-r1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=virtual/pkgconfig net-im/pidgin[gtk]
 DESCRIPTION=Extra preferences that are desired but are not worthy for Pidgin
-EAPI=2
+EAPI=6
 HOMEPAGE=http://gaim-extprefs.sourceforge.net
 KEYWORDS=amd64 hppa ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk]
 SLOT=0
 SRC_URI=mirror://sourceforge/gaim-extprefs/pidgin-extprefs-0.7.tar.gz
-_md5_=483302546187e6f33ecd18985082abfd
+_md5_=13bdffa945a1895edaa74ccef9b451bd
diff --git a/metadata/md5-cache/x11-plugins/pidgin-mpris-0.2.6 b/metadata/md5-cache/x11-plugins/pidgin-mpris-0.2.6
index 7305feb3d13d..7113e5bb1457 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-mpris-0.2.6
+++ b/metadata/md5-cache/x11-plugins/pidgin-mpris-0.2.6
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 sys-apps/dbus virtual/pkgconfig
 DESCRIPTION=Gets current song from MPRIS-aware media players
-EAPI=2
+EAPI=7
 HOMEPAGE=http://m0n5t3r.info/work/pidgin-mpris/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 sys-apps/dbus
 SLOT=0
 SRC_URI=http://m0n5t3r.info/stuff/pidgin-mpris//pidgin-mpris-0.2.6.tar.bz2
-_md5_=abdb06a1ec2cdd9bd7b07bf252d05fe6
+_md5_=09ba8afc968683ed6c2cd20a6c4c1ee9
diff --git a/metadata/md5-cache/x11-plugins/pidgin-rhythmbox-2.0 b/metadata/md5-cache/x11-plugins/pidgin-rhythmbox-2.0
index 55cac916f666..ac8b5ab31f43 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-rhythmbox-2.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-rhythmbox-2.0
@@ -1,11 +1,11 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=-
 DEPEND=net-im/pidgin media-sound/rhythmbox >=x11-libs/gtk+-2.4:2 dev-libs/dbus-glib
 DESCRIPTION=automatically update your pidgin profile with current info from Rhythmbox
-EAPI=2
+EAPI=6
 HOMEPAGE=http://jon.oberheide.org/pidgin-rhythmbox/
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin media-sound/rhythmbox >=x11-libs/gtk+-2.4:2 dev-libs/dbus-glib
 SLOT=0
 SRC_URI=http://jon.oberheide.org/pidgin-rhythmbox/downloads/pidgin-rhythmbox-2.0.tar.gz
-_md5_=e0adf51fbe40ac0a4e9a77ce5cf2bdd2
+_md5_=b27aef987a992be896676f9ed0aed8ca
diff --git a/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0 b/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0
index b17c1eb58986..973f01df2a55 100644
--- a/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0
+++ b/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=configure
 DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels
-EAPI=0
+EAPI=6
 HOMEPAGE=http://wmacpiload.tuxfamily.org/
 IUSE=debug
 KEYWORDS=~amd64 x86
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://wmacpiload.tuxfamily.org/download/wmacpiload-0.2.0.tar.bz2
-_md5_=00a0447759f1c637092379c4b8e15601
+_md5_=26c81eefb4896bfd141011d0a00a842e
diff --git a/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0-r1 b/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0-r1
index 20788c513b04..ec670292047c 100644
--- a/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0-r1
+++ b/metadata/md5-cache/x11-plugins/wmacpiload-ac-0.2.0-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare
+DEFINED_PHASES=configure
 DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels
-EAPI=2
+EAPI=7
 HOMEPAGE=http://wmacpiload.tuxfamily.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=http://wmacpiload.tuxfamily.org/download/wmacpiload-0.2.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=571aa1e6ac46af4ec86327502b073776
+_md5_=1d9a808e6441226378946e4f6f403abd
diff --git a/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1 b/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
index ff4aae784237..fa16ecd5049a 100644
--- a/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
+++ b/metadata/md5-cache/x11-plugins/wmacpimon-0.2.1
@@ -1,12 +1,11 @@
-DEFINED_PHASES=install postinst prepare
+DEFINED_PHASES=install postinst
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=DockApp monitors the temperature and Speedstep features in ACPI-based systems
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.vrlteam.org/wmacpimon/
 KEYWORDS=x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmacpimon/wmacpimon-0.2.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=959ee1866c25154b8456c4cf998bdf11
+_md5_=84156ed84c4df107d0e09b208145404c
diff --git a/metadata/md5-cache/x11-plugins/wmbio-1.02 b/metadata/md5-cache/x11-plugins/wmbio-1.02
index b96df22c684a..ac1fdb61c0f9 100644
--- a/metadata/md5-cache/x11-plugins/wmbio-1.02
+++ b/metadata/md5-cache/x11-plugins/wmbio-1.02
@@ -1,12 +1,11 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-base/xorg-proto
 DESCRIPTION=A Window Maker applet that shows your biorhythm
-EAPI=2
+EAPI=6
 HOMEPAGE=http://wmbio.sourceforge.net/
 KEYWORDS=~amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=mirror://sourceforge/wmbio/wmbio-1.02.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d02a8ac343d54c3edc6077c85d2b110c
+_md5_=83364bfa55d9232c5492d4abb15bd891
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 399d9d5eefc9..1a7ed6d74b8c 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1 b/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1
index 1c81db45389e..33b733f8583b 100644
--- a/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1
+++ b/metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1
@@ -1,7 +1,7 @@
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=configure postinst prepare
 DEPEND=>=x11-wm/fvwm-2.6.2 gnome? ( virtual/imagemagick-tools ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A configuration framework for the fvwm window manager
-EAPI=2
+EAPI=6
 HOMEPAGE=http://fvwm-themes.sourceforge.net/
 IUSE=gnome
 KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-wm/fvwm-2.6.2
 SLOT=0
 SRC_URI=mirror://sourceforge/fvwm-themes/fvwm-themes-0.7.0.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=faa0e2cb096d946c3babd5b0cbeeb32d
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ec8679ca26be12281a46b9ad1fe2f379
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 83f5241e5f2c..a372c2b0154f 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) plasma? ( >=kde-frameworks/frameworkintegration-5.43.0 >=kde-frameworks/karchive-5.43.0 >=kde-frameworks/kcompletion-5.43.0 >=kde-frameworks/kconfig-5.43.0 >=kde-frameworks/kconfigwidgets-5.43.0 >=kde-frameworks/kcoreaddons-5.43.0 >=kde-frameworks/kdelibs4support-5.43.0 >=kde-frameworks/kguiaddons-5.43.0 >=kde-frameworks/ki18n-5.43.0 >=kde-frameworks/kiconthemes-5.43.0 >=kde-frameworks/kio-5.43.0 >=kde-frameworks/kwidgetsaddons-5.43.0 >=kde-frameworks/kwindowsystem-5.43.0 >=kde-frameworks/kxmlgui-5.43.0 >=dev-qt/qtprintsupport-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1 dev-util/desktop-file-utils
+DEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.43.0 >=kde-frameworks/karchive-5.43.0 >=kde-frameworks/kcompletion-5.43.0 >=kde-frameworks/kconfig-5.43.0 >=kde-frameworks/kconfigwidgets-5.43.0 >=kde-frameworks/kcoreaddons-5.43.0 >=kde-frameworks/kdelibs4support-5.43.0 >=kde-frameworks/kguiaddons-5.43.0 >=kde-frameworks/ki18n-5.43.0 >=kde-frameworks/kiconthemes-5.43.0 >=kde-frameworks/kio-5.43.0 >=kde-frameworks/kwidgetsaddons-5.43.0 >=kde-frameworks/kwindowsystem-5.43.0 >=kde-frameworks/kxmlgui-5.43.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1 dev-util/desktop-file-utils
 DESCRIPTION=Widget styles for Qt and GTK2
 EAPI=6
 HOMEPAGE=https://cgit.kde.org/qtcurve.git
-IUSE=+X gtk nls plasma qt4 +qt5 test debug
+IUSE=+X gtk nls plasma +qt5 test debug
 LICENSE=LGPL-2+
-RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) plasma? ( >=kde-frameworks/frameworkintegration-5.43.0 >=kde-frameworks/karchive-5.43.0 >=kde-frameworks/kcompletion-5.43.0 >=kde-frameworks/kconfig-5.43.0 >=kde-frameworks/kconfigwidgets-5.43.0 >=kde-frameworks/kcoreaddons-5.43.0 >=kde-frameworks/kdelibs4support-5.43.0 >=kde-frameworks/kguiaddons-5.43.0 >=kde-frameworks/ki18n-5.43.0 >=kde-frameworks/kiconthemes-5.43.0 >=kde-frameworks/kio-5.43.0 >=kde-frameworks/kwidgetsaddons-5.43.0 >=kde-frameworks/kwindowsystem-5.43.0 >=kde-frameworks/kxmlgui-5.43.0 >=dev-qt/qtprintsupport-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
-REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) plasma? ( >=kde-frameworks/frameworkintegration-5.43.0 >=kde-frameworks/karchive-5.43.0 >=kde-frameworks/kcompletion-5.43.0 >=kde-frameworks/kconfig-5.43.0 >=kde-frameworks/kconfigwidgets-5.43.0 >=kde-frameworks/kcoreaddons-5.43.0 >=kde-frameworks/kdelibs4support-5.43.0 >=kde-frameworks/kguiaddons-5.43.0 >=kde-frameworks/ki18n-5.43.0 >=kde-frameworks/kiconthemes-5.43.0 >=kde-frameworks/kio-5.43.0 >=kde-frameworks/kwidgetsaddons-5.43.0 >=kde-frameworks/kwindowsystem-5.43.0 >=kde-frameworks/kxmlgui-5.43.0 >=dev-qt/qtprintsupport-5.9.4:5 ) qt5? ( >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
+REQUIRED_USE=gtk? ( X ) || ( gtk qt5 ) plasma? ( qt5 )
 SLOT=0
 _eclasses_=cmake-utils	49cd471f02483798c5068698836b7429	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	af51ccfceeb403ab80f1bf9209d372c8	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	0afda9a43e3d76e470f447753ad056af	kde5-functions	4ce79372b29a17b31866a72503108458	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90cda233d75fbd3cb07fe6946145f911
+_md5_=91aa4bb1c3060e9c7089dd951faf8a44
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a91b7b558ed1..1811ca45c688 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 29 May 2018 11:08:26 +0000
+Wed, 30 May 2018 05:38:29 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 71c0b44abcdd..ef2b3c815df4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue May 29 11:08:26 UTC 2018
+Wed May 30 05:38:28 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8c50b29780d8..b66b072b0cd9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 29 May 2018 11:30:01 +0000
+Wed, 30 May 2018 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5c42e03f279d..d2e385c93464 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0b46ab22421a778246a745e08e1169958e859b0d 1527590864 2018-05-29T10:47:44+00:00
+b2001a409b99c6130980bb8a129b68a50f1bfb64 1527655535 2018-05-30T04:45:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 99eec136ee45..539a780acf3e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1527591901 Tue 29 May 2018 11:05:01 AM UTC
+1527658501 Wed 30 May 2018 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a91b7b558ed1..6c7c9850bffe 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 29 May 2018 11:08:26 +0000
+Wed, 30 May 2018 05:38:28 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 182c077230bd..87d3f232e481 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
index 24946408748e..d9206da3d29c 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.3.0_beta1.ebuild
@@ -10,7 +10,7 @@ LICENSE="BSD GPL-3"
 SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE="debug pcapnav +tcpdump"
 
 DEPEND="
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild
index 0f401274207c..bab11e96bbfc 100644
--- a/net-analyzer/zmap/zmap-2.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="json mongo redis"
 
 RDEPEND="
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c1f5664344c0..2040c3f510cb 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
index 6b83d1c27fd7..f4c7cf6da527 100644
--- a/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
+++ b/net-dns/dnssec-tools/dnssec-tools-2.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dnssec-tools.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index e95358c02325..ed0fc3e2b3fb 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index f07683c26504..867d62e1570c 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,2 +1 @@
-DIST firewalld-0.4.3.3.tar.bz2 679617 BLAKE2B 37d3acda80f046e7e208f570688e9b554feb985c4b6c4d910236ed296113385bbc0c86fd4ae815538e0b68bef216154568b095023098d2b0620a1749af5cea4f SHA512 21cb91b9545263f6da4a6ff218c939b610c7fe5dba2ad509803673d9c01cf6fecb4ab32bacf1a04e3d579fd9699a03760475285f824a6641902037c81ad2243a
 DIST firewalld-0.5.1.tar.gz 1155989 BLAKE2B 8e5f67dc74738cec178715b0e3713afa7296be61b376a8d545b1ae1c01c0f0df78ec48222b6926bdce1d93c58f7d02fad14bc46c1ddd24840e8853e5e76b73ff SHA512 8c8ea1a07fc81b12f53fbc84112d18c65c4332e8f7b7d575dc1ccba8a12418c874f8503b0062b49990f8bcfdf5fdaa7c0e4e3ddc0e9b1d0a91f49eff284b22be
diff --git a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild b/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
deleted file mode 100644
index 566a084ed4b0..000000000000
--- a/net-firewall/firewalld/firewalld-0.4.3.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-#BACKPORTS=
-
-inherit autotools eutils gnome2-utils python-r1 systemd multilib bash-completion-r1
-
-DESCRIPTION="A firewall daemon with D-BUS interface providing a dynamic firewall"
-HOMEPAGE="http://www.firewalld.org/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2
-	${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="gui"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/python-slip-0.2.7[dbus,${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-firewall/ebtables
-	net-firewall/iptables[ipv6]
-	net-firewall/ipset
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	gui? (
-		x11-libs/gtk+:3
-		dev-python/PyQt4[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-src_prepare() {
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	python_setup
-
-	econf \
-		--enable-systemd \
-		--with-iptables="${EPREFIX}/sbin/iptables" \
-		--with-ip6tables="${EPREFIX}/sbin/ip6tables" \
-		--with-iptables_restore="${EPREFIX}/sbin/iptables-restore" \
-		--with-ip6tables_restore="${EPREFIX}/sbin/ip6tables-restore" \
-		--with-ebtables="${EPREFIX}/sbin/ebtables" \
-		--with-ebtables_restore="${EPREFIX}/sbin/ebtables-restore" \
-		"$(systemd_with_unitdir 'systemd-unitdir')" \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	# manually split up the installation to avoid "file already exists" errors
-	emake -C config DESTDIR="${D}" install
-	emake -C po DESTDIR="${D}" install
-	emake -C shell-completion DESTDIR="${D}" install
-	emake -C doc DESTDIR="${D}" install
-
-	install_python() {
-		emake -C src DESTDIR="${D}" pythondir="$(python_get_sitedir)" install
-		python_optimize
-	}
-	python_foreach_impl install_python
-
-	python_replicate_script "${D}"/usr/bin/firewall-{offline-cmd,cmd,applet,config}
-	python_replicate_script "${D}/usr/sbin/firewalld"
-
-	# Get rid of junk
-	rm -rf "${D}/etc/rc.d/"
-	rm -rf "${D}/etc/sysconfig/"
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart"
-		rm -f "${D}/usr/bin/firewall-applet"
-		rm -f "${D}/usr/bin/firewall-config"
-		rm -rf "${D}/usr/share/applications"
-		rm -rf "${D}/usr/share/icons"
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
index 40e93d003c6b..40994d87e221 100644
--- a/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
+++ b/net-firewall/firewalld/firewalld-0.5.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gui"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 932681885a5c..314b13ca2671 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
index a967b8444917..f825b004821b 100644
--- a/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
+++ b/net-libs/gupnp-igd/gupnp-igd-0.2.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://gupnp.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
index 1f0919ac552a..e1b060b08612 100644
--- a/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
+++ b/net-libs/libmicrodns/libmicrodns-0.0.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/videolabs/${PN}"
 else
 	SRC_URI="https://github.com/videolabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libpcapnav/libpcapnav-0.8.ebuild b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
index e489ebd83f27..ff67813df5aa 100644
--- a/net-libs/libpcapnav/libpcapnav-0.8.ebuild
+++ b/net-libs/libpcapnav/libpcapnav-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/netdude/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 IUSE="doc static-libs"
 
 DEPEND="net-libs/libpcap"
diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index f5f90f071a7e..f2bdf7807da5 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
 DEPEND="
diff --git a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
index b05190a02a71..4e0f1142cd52 100644
--- a/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
+++ b/net-libs/libyahoo2/files/libyahoo2-1.0.1-asneeded.patch
@@ -1,5 +1,5 @@
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -21,11 +21,9 @@
  noinst_PROGRAMS = yahoo autoresponder
  
diff --git a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
index 0cd41ed48213..66739a597faf 100644
--- a/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
+++ b/net-libs/libyahoo2/libyahoo2-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=7
+inherit autotools
 
 DESCRIPTION="interface to the new Yahoo! Messenger protocol"
 HOMEPAGE="http://libyahoo2.sourceforge.net/"
@@ -11,33 +11,40 @@ SRC_URI="mirror://sourceforge/libyahoo2/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs ssl"
+IUSE="libressl ssl static-libs"
 
 RDEPEND="dev-libs/glib:2
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	default
 	sed -i -e 's:-ansi -pedantic::' configure.ac || die #240912
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable ssl sample-client)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
 
 	if use ssl; then
-		dobin src/.libs/{autoresponder,yahoo} || die
+		dobin src/.libs/{autoresponder,yahoo}
 	fi
 
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README TODO
+	dodoc doc/*.txt
 
-	find "${D}" -name '*.la' -exec rm -f '{}' +
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/net-libs/signon-oauth2/Manifest b/net-libs/signon-oauth2/Manifest
index b3c3b8027648..57126546b876 100644
--- a/net-libs/signon-oauth2/Manifest
+++ b/net-libs/signon-oauth2/Manifest
@@ -1 +1,2 @@
 DIST signon-oauth2-0.21.tar.bz2 37819 BLAKE2B 5de9add1952ba94e12b776c7f4b462bfc31ce01c148d8819b6e159510c4b00f4d2fc915a62f585b1061d46efbeb92406e3c117452e4e7f5575404fea3ab20601 SHA512 b0f97353e87c08420c3132f3357522b526a7c48df807ab833e05297ebfc86e0e8f25d4d3aa94e8ebc4aa1d9bc77856d63c43e5b5e9f3e63628f7710b9a056fd0
+DIST signon-oauth2-0.24.tar.gz 39011 BLAKE2B 41b672d1f489321b2f93f245530da1e51867eb4f0d1675ba72240f59f5ab7d6d2a079899e1a6dbc63c82bc53e1fab467c6696f5171c98ab00243d5ec9ddd92f4 SHA512 8a1e5be7f34419ded7841cb4de62e03ab56556f39ae40e3e11b549d45c6c51edc6888d1aab254c0ba6746d6306bb8b92dd24e473387542d6a987208c20acf6d9
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch
new file mode 100644
index 000000000000..dd730e449773
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-disable-examples.patch
@@ -0,0 +1,14 @@
+Author: Diane Trout <diane@ghic.org>
+Description: Don't install the examples as they end up conflicting with
+ other packages.
+--- a/signon-oauth2.pro
++++ b/signon-oauth2.pro
+@@ -3,7 +3,7 @@
+ 
+ TEMPLATE  = subdirs
+ CONFIG   += ordered
+-SUBDIRS   = src tests example
++SUBDIRS   = src tests
+ 
+ include( common-installs-config.pri )
+ 
diff --git a/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch
new file mode 100644
index 000000000000..615bc8b562d2
--- /dev/null
+++ b/net-libs/signon-oauth2/files/signon-oauth2-0.24-dont-install-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/tests.pro	2018-05-29 22:51:43.766914590 +0200
++++ b/tests/tests.pro	2018-05-29 22:52:45.247259336 +0200
+@@ -32,8 +32,6 @@
+ target.path = $${INSTALL_PREFIX}/bin
+ testsuite.path = $${INSTALL_PREFIX}/share/$$TARGET
+ testsuite.files = tests.xml
+-INSTALLS += target \
+-    testsuite
+ 
+ check.depends = $$TARGET
+ check.commands = ./$$TARGET || :
diff --git a/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
new file mode 100644
index 000000000000..ea3dd0c41f71
--- /dev/null
+++ b/net-libs/signon-oauth2/signon-oauth2-0.24.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=signon-plugin-oauth2
+MY_PV=VERSION_${PV}
+inherit qmake-utils
+
+DESCRIPTION="OAuth2 plugin for Signon daemon"
+HOMEPAGE="https://01.org/gsso/"
+SRC_URI="https://gitlab.com/accounts-sso/${MY_PN}/-/archive/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	net-libs/signond
+"
+DEPEND="${RDEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-examples.patch"
+	"${FILESDIR}/${P}-dont-install-tests.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use test; then
+		sed -i -e '/^SUBDIRS/s/tests//' signon-oauth2.pro || die "Failed to disable tests"
+	fi
+}
+
+src_configure() {
+	eqmake5 \
+		LIBDIR=/usr/$(get_libdir)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9ff45c6848f6..4e6a180bbf2e 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild b/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
index 3312ee12e0a0..f2f1da676d1f 100644
--- a/net-mail/gnubiff/gnubiff-2.2.17-r1.ebuild
+++ b/net-mail/gnubiff/gnubiff-2.2.17-r1.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug fam nls password"
 
 RDEPEND="
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9610b1a41af6..46583cbce496 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/modemmanager/modemmanager-1.6.12.ebuild b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
index acdbe601c4bf..9e0baba934fd 100644
--- a/net-misc/modemmanager/modemmanager-1.6.12.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
 
 IUSE="+introspection mbim policykit +qmi systemd vala"
 REQUIRED_USE="
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index c8db420a81b4..c5eaecb190c5 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/slrn/slrn-1.0.3.ebuild b/net-nntp/slrn/slrn-1.0.3.ebuild
index 10dd1762c3c2..7416f325d327 100644
--- a/net-nntp/slrn/slrn-1.0.3.ebuild
+++ b/net-nntp/slrn/slrn-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://jedsoft.org/releases/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="canlock libressl nls ssl uudeview"
 
 RDEPEND="app-arch/sharutils
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 1aa26f01e12f..d9f437fb97ac 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild
index 843f66de1eb8..ed09b204db99 100644
--- a/net-wireless/bluez/bluez-5.49-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.49-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
new file mode 100644
index 000000000000..a86f66b4447c
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools.patch
@@ -0,0 +1,73 @@
+commit e31263b50acd960f7bb0c34c0396383319d7da30
+Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
+Date:   Tue Apr 24 11:38:17 2018 -0400
+
+    make setuptools respect DESTDIR
+    
+    thanks to mgorny for pointint it out
+
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 75c85da9..980c417a 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 
+ clean:
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index 23446edc..babc63f4 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ 	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+ 
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
+index 036541a0..fc660dfe 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ protobuf:
+ 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON2) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ 	$(PYTHON2) ./setup.py build
+ 	
+ install:
+-	$(PYTHON2) ./setup.py install
++	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ 
+ clean:
+ 	@-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 8005063ea995..2a6321ed5126 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,6 +67,7 @@ src_prepare() {
 	sed -i -e 's| -s||g' \
 		-e 's|@mangrp@|root|g' Makefile.in
 
+	epatch "${FILESDIR}"/fix-setuptools.patch
 	eapply_user
 	eautoreconf
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6f5143902e25..57f974eead6a 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 02c2012b8fbe..7e9b40c14595 100644
--- a/profiles/arch/amd64/no-multilib/use.mask
+++ b/profiles/arch/amd64/no-multilib/use.mask
@@ -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
 
 # USE flags masked because providing packages have ABI=x86
@@ -7,10 +7,6 @@
 # app-accessibility/mbrola is x86 only
 mbrola
 
-# 2007/08/24 Michael Marineau <marineam@gentoo.org>
-# Xen HVM support requires building 32-bit binaries.
-hvm
-
 # 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Mask multilib, since we cannot use it.
 multilib
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 836f150764ea..1babcac2ae19 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,11 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Markus Meier <maekke@gentoo.org> (30 May 2018)
+# unkeyworded deps for bug #621434
+net-analyzer/zmap mongo
+
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
-# net-libs/libmicrodns not yet keyworded for arm, bug #653800
 # projectm not yet keyworded, bug #314969
-media-video/vlc aom chromaprint microdns opencv projectm
+media-video/vlc aom chromaprint opencv projectm
 
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux.
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 7ee65d17d708..ebaa5fdd5e8c 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,15 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (29 May 2018)
+# sys-devel/clang, dev-libs/xapian, app-text/texlive not stable yet
+# USE=doc requires USE=latex
+app-doc/doxygen clang doxysearch latex doc
+
+# Mart Raudsepp <leio@gentoo.org> (29 May 2018)
+# virtual/opengl and media-libs/freeglut not stable yet
+media-libs/libwebp opengl
+
 # Mart Raudsepp <leio@gentoo.org> (06 May 2018)
 # No media-libs/freeglut and co stable yet
 media-libs/jasper opengl
@@ -17,7 +26,6 @@ dev-python/urllib3 test
 # Non-stable dependencies.
 app-admin/syslog-ng spoof-source
 app-portage/layman cvs subversion test
-app-text/asciidoc graphviz
 app-text/xmlto latex
 dev-libs/apr-util freetds odbc
 gnome-base/dconf test
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index f15af86c90f9..51ffb918bc86 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -11,7 +11,6 @@ cups
 # Michał Górny <mgorny@gentoo.org> (16 Apr 2018)
 # Not stable yet.
 vala
-webp
 
 # Mart Raudsepp <leio@gentoo.org> (02 Mar 2018)
 # Neither x11-libs/gtk+ SLOT marked stable yet
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 9b4563a8e284..051dd2a3ae48 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -3,8 +3,7 @@
 
 # Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
 # media-libs/libaom not yet keyworded
-# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
-media-video/vlc aom microdns
+media-video/vlc aom
 
 # Anthony G. Basile <blueness@gentoo.org> (14 Apr 2018)
 # net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0c8ef45efd9a..4ac5253c5612 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,12 +7,6 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
-# Andreas Sturmlechner <asturm@gentoo.org> (24 May 2018)
-# kdelibs4 is dead and going away. Bug #645558
-<app-office/libreoffice-6.0 kde
-<app-office/libreoffice-bin-6.0 kde
-<app-office/libreoffice-bin-debug-6.0 kde
-
 # Michał Górny <mgorny@gentoo.org> (16 May 2018)
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index e3f945f030f2..af6bf892de42 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018)
+# Depends on unstable media-libs/libaom, net-libs/srt
+media-video/vlc aom srt
+
 # Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018)
 # Depends on lots of unstable dependencies
 dev-python/s3fs test
diff --git a/profiles/package.mask b/profiles/package.mask
index cadd7cafe8f8..a08b1ee695b9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -169,7 +169,6 @@ games-misc/dont-starve
 games-puzzle/larry
 games-rpg/avadon
 games-rpg/penumbra-collection
-games-rpg/wasteland2
 
 # Michał Górny <mgorny@gentoo.org> (15 May 2018)
 # All current versions are unfetchable.  No maintainer activity
@@ -452,7 +451,7 @@ media-fonts/fontawesome:0/5
 
 # Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
 # Masked for testing
-=dev-libs/libical-3.0.1
+~dev-libs/libical-3.0.3
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Packages cannot depend
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 6da69138c011..31031bec61b8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1046,15 +1046,12 @@ app-office/kmymoney:quotes - Enable Online Stock Quote retrieval
 app-office/kmymoney:weboob - Enable import of online banking transactions extracted by www-client/weboob
 app-office/kraft:pim - Enable support for KDE PIM resources integration
 app-office/libreoffice:coinmp - Use sci-libs/coinor-mp as alternative solver
-app-office/libreoffice:collada - Enable Collada for rendering 3D models stored in *.dae and *.kmz format
-app-office/libreoffice:gltf - Use media-libs/libgltf for inserting 3D models in the glTF format into presentations
 app-office/libreoffice:googledrive - Enable support for remote files on Google Drive
 app-office/libreoffice:gtk2 - Enable legacy gtk2 frontend
 app-office/libreoffice:gtk3 - Enable experimental gtk3 frontend
 app-office/libreoffice:jemalloc - Use dev-libs/jemalloc for allocations
 app-office/libreoffice:odk - Build the Office Development Kit
 app-office/libreoffice:pdfimport - Enable PDF import via the Poppler library
-app-office/libreoffice:quickstarter - Build the system tray quickstarter
 app-office/libreoffice:vlc - Use media-video/vlc for video embedding
 app-office/libreoffice-l10n:offlinehelp - Install help files locally instead of using the LibreOffice Wiki
 app-office/lyx:aspell - Add support for aspell spellchecking
@@ -4063,6 +4060,10 @@ media-gfx/ufraw:fits - Enable support for the FITS image format through sci-libs
 media-gfx/ufraw:timezone - enable DST correction for file timestamps
 media-gfx/xpaint:pgf - Support for loading PGF images
 media-gfx/xsane:ocr - Enable support for Optical Character Recognition reader
+media-gfx/yafaray:blender - Install addon for media-gfx/blender
+media-gfx/yafaray:fastmath - Enable mathematic approximations to make code faster
+media-gfx/yafaray:fasttrig - Enable trigonometric approximations to make code faster
+media-gfx/yafaray:opencv - Use media-libs/opencv
 media-libs/a52dec:djbfft - Prefer D.J. Bernstein's library for fourier transforms
 media-libs/allegro:dumb - Enable media-libs/dumb module library support
 media-libs/allegro:physfs - Enable physfs support
@@ -8005,6 +8006,7 @@ sys-fabric/ofed:srp - Suport for userspace part for srp initiator
 sys-fabric/opensm:tools - Install ssld extra tool
 sys-firmware/edk2-ovmf:binary - Use pre-built binaries
 sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
+sys-firmware/intel-microcode:minimal - only install ucode(s) supported by currently available (=online) processor(s)
 sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
 sys-firmware/intel-microcode:split-ucode - install the split binary ucode files (used by the kernel directly)
 sys-firmware/intel-microcode:vanilla - install only microcode updates from Intel's official microcode tarball
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index a906febe180d..3433b21601ea 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 83c6586a07cf..d81dfa8c495f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
-DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
 DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1
 DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
deleted file mode 100644
index c07cd554dbf4..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-From f07389b421065d40abe9b5355c8e329229f792d9 Mon Sep 17 00:00:00 2001
-From: Denis Rouzaud <denis.rouzaud@gmail.com>
-Date: Sat, 24 Mar 2018 18:30:45 +0100
-Subject: [PATCH] fix constraints not checked when they should be (#6550)
- (#6599)
-
----
- python/gui/qgsattributeform.sip.in     | 15 ++++++++++++++-
- src/gui/attributetable/qgsdualview.cpp |  9 ++++++---
- src/gui/attributetable/qgsdualview.h   |  2 +-
- src/gui/qgsattributeform.cpp           | 21 +++++++++++++++------
- src/gui/qgsattributeform.h             | 14 +++++++++++++-
- tests/src/gui/testqgsattributeform.cpp | 14 +++++++-------
- 6 files changed, 56 insertions(+), 19 deletions(-)
-
-diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in
-index 8b489dd3089..45deba11a31 100644
---- a/python/gui/qgsattributeform.sip.in
-+++ b/python/gui/qgsattributeform.sip.in
-@@ -139,12 +139,25 @@ on all attribute widgets.
- 
-   signals:
- 
--    void attributeChanged( const QString &attribute, const QVariant &value );
-+ void attributeChanged( const QString &attribute, const QVariant &value );
- %Docstring
- Notifies about changes of attributes
- 
- :param attribute: The name of the attribute that changed.
- :param value:     The new value of the attribute.
-+
-+.. deprecated:: since 3.0
-+%End
-+
-+    void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
-+%Docstring
-+Notifies about changes of attributes
-+
-+:param attribute: The name of the attribute that changed.
-+:param value:     The new value of the attribute.
-+:param attributeChanged: If true, it corresponds to an actual change of the feature attribute
-+
-+.. versionadded:: 3.0.1
- %End
- 
- 
-diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
-index d7ccfa1a8a1..2c640036a02 100644
---- a/src/gui/attributetable/qgsdualview.cpp
-+++ b/src/gui/attributetable/qgsdualview.cpp
-@@ -98,7 +98,7 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg
-     mAttributeEditor->layout()->addWidget( mAttributeForm );
-   }
- 
--  connect( mAttributeForm, &QgsAttributeForm::attributeChanged, this, &QgsDualView::featureFormAttributeChanged );
-+  connect( mAttributeForm, &QgsAttributeForm::widgetValueChanged, this, &QgsDualView::featureFormAttributeChanged );
-   connect( mAttributeForm, &QgsAttributeForm::modeChanged, this, &QgsDualView::formModeChanged );
-   connect( mMasterModel, &QgsAttributeTableModel::modelChanged, mAttributeForm, &QgsAttributeForm::refreshFeature );
-   connect( mAttributeForm, &QgsAttributeForm::filterExpressionSet, this, &QgsDualView::filterExpressionSet );
-@@ -880,9 +880,12 @@ void QgsDualView::extentChanged()
-   emit filterChanged();
- }
- 
--void QgsDualView::featureFormAttributeChanged()
-+void QgsDualView::featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged )
- {
--  mFeatureList->setCurrentFeatureEdited( true );
-+  Q_UNUSED( attribute );
-+  Q_UNUSED( value );
-+  if ( attributeChanged )
-+    mFeatureList->setCurrentFeatureEdited( true );
- }
- 
- void QgsDualView::setFilteredFeatures( const QgsFeatureIds &filteredFeatures )
-diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
-index 73cb420f44b..264adbacb29 100644
---- a/src/gui/attributetable/qgsdualview.h
-+++ b/src/gui/attributetable/qgsdualview.h
-@@ -327,7 +327,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
-      * Will forward this signal to the feature list to visually represent
-      * that there has been an edit event.
-      */
--    void featureFormAttributeChanged();
-+    void featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
- 
-     /**
-      * Will be called periodically, when loading layers from slow data providers.
-diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
-index df1e98282f6..7a707c6fd7d 100644
---- a/src/gui/qgsattributeform.cpp
-+++ b/src/gui/qgsattributeform.cpp
-@@ -240,6 +240,7 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va
- 
- void QgsAttributeForm::setFeature( const QgsFeature &feature )
- {
-+  mIsSettingFeature = true;
-   mFeature = feature;
- 
-   switch ( mMode )
-@@ -266,6 +267,7 @@ void QgsAttributeForm::setFeature( const QgsFeature &feature )
-       break;
-     }
-   }
-+  mIsSettingFeature = false;
- }
- 
- bool QgsAttributeForm::saveEdits()
-@@ -692,11 +694,7 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
-   QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( sender() );
-   Q_ASSERT( eww );
- 
--  const QVariant oldValue = mFeature.attribute( eww->fieldIdx() );
--
--  // Safety check, if we receive the same value again, no reason to do anything
--  if ( oldValue == value && oldValue.isNull() == value.isNull() )
--    return;
-+  bool signalEmitted = false;
- 
-   if ( mValuesInitialized )
-     mDirty = true;
-@@ -707,7 +705,12 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
-     case IdentifyMode:
-     case AddFeatureMode:
-     {
-+      Q_NOWARN_DEPRECATED_PUSH
-       emit attributeChanged( eww->field().name(), value );
-+      Q_NOWARN_DEPRECATED_PUSH
-+      emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
-+
-+      signalEmitted = true;
- 
-       updateJoinedFields( *eww );
- 
-@@ -739,7 +742,13 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
- 
-   updateConstraints( eww );
- 
--  emit attributeChanged( eww->field().name(), value );
-+  if ( !signalEmitted )
-+  {
-+    Q_NOWARN_DEPRECATED_PUSH
-+    emit attributeChanged( eww->field().name(), value );
-+    Q_NOWARN_DEPRECATED_PUSH
-+    emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
-+  }
- }
- 
- void QgsAttributeForm::updateAllConstraints()
-diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h
-index 6102825b286..41f16cd8614 100644
---- a/src/gui/qgsattributeform.h
-+++ b/src/gui/qgsattributeform.h
-@@ -178,8 +178,19 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
-      *
-      * \param attribute The name of the attribute that changed.
-      * \param value     The new value of the attribute.
-+     * \deprecated since 3.0
-      */
--    void attributeChanged( const QString &attribute, const QVariant &value );
-+    Q_DECL_DEPRECATED void attributeChanged( const QString &attribute, const QVariant &value );
-+
-+    /**
-+     * Notifies about changes of attributes
-+     *
-+     * \param attribute The name of the attribute that changed.
-+     * \param value     The new value of the attribute.
-+     * \param attributeChanged If true, it corresponds to an actual change of the feature attribute
-+     * \since QGIS 3.0.1
-+     */
-+    void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
- 
-     /**
-      * Will be emitted before the feature is saved. Use this signal to perform sanity checks.
-@@ -367,6 +378,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
-     QMap<const QgsVectorLayerJoinInfo *, QgsFeature> mJoinedFeatures;
-     bool mValuesInitialized = false;
-     bool mDirty = false;
-+    bool mIsSettingFeature = false;
- 
-     struct ContainerInformation
-     {
-diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
-index d4629cb0762..9b6d5c46444 100644
---- a/tests/src/gui/testqgsattributeform.cpp
-+++ b/tests/src/gui/testqgsattributeform.cpp
-@@ -111,24 +111,24 @@ void TestQgsAttributeForm::testFieldConstraint()
-   // build a form for this feature
-   QgsAttributeForm form2( layer );
-   form2.setFeature( ft );
--  QSignalSpy spy( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
-+  QSignalSpy spy( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
-   ww = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[0] );
- 
-   // set value to 1
-   ww->setValue( 1 );
--  QCOMPARE( spy.count(), 2 );
-+  QCOMPARE( spy.count(), 1 );
-   QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
- 
-   // set value to null
-   spy.clear();
-   ww->setValue( QVariant() );
--  QCOMPARE( spy.count(), 2 );
-+  QCOMPARE( spy.count(), 1 );
-   QCOMPARE( constraintsLabel( &form2, ww )->text(), invalidLabel );
- 
-   // set value to 1
-   spy.clear();
-   ww->setValue( 1 );
--  QCOMPARE( spy.count(), 2 );
-+  QCOMPARE( spy.count(), 1 );
-   QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
- 
-   // set a soft constraint
-@@ -205,11 +205,11 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
-   ww1 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[1] );
-   ww2 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[2] );
-   ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[3] );
--  QSignalSpy spy2( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
-+  QSignalSpy spy2( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
- 
-   // change value
-   ww0->setValue( 2 ); // update col0
--  QCOMPARE( spy2.count(), 2 );
-+  QCOMPARE( spy2.count(), 1 );
- 
-   QCOMPARE( constraintsLabel( &form2, ww0 )->text(), inv ); // 2 < ( 1 + 2 )
-   QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
-@@ -219,7 +219,7 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
-   // change value
-   spy2.clear();
-   ww0->setValue( 1 ); // update col0
--  QCOMPARE( spy2.count(), 2 );
-+  QCOMPARE( spy2.count(), 1 );
- 
-   QCOMPARE( constraintsLabel( &form2, ww0 )->text(), val ); // 1 < ( 1 + 2 )
-   QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
deleted file mode 100644
index c78c0dec3bb0..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From 0a903118389029fd25fbf4eddd20f60c8856ab4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Wed, 28 Mar 2018 20:48:58 +0200
-Subject: [PATCH] Fix build with Qt-5.11 (missing headers)
-
----
- src/app/layout/qgslayoutpolylinewidget.cpp                | 2 ++
- src/app/layout/qgslayoutscalebarwidget.cpp                | 1 +
- src/app/layout/qgslayoutscalebarwidget.h                  | 2 ++
- src/app/qgslabelinggui.cpp                                | 2 ++
- src/app/qgsrulebasedlabelingwidget.cpp                    | 1 +
- src/gui/layout/qgslayoutitemwidget.cpp                    | 2 ++
- src/gui/layout/qgslayoutnewitempropertiesdialog.cpp       | 2 ++
- src/gui/qgscompoundcolorwidget.cpp                        | 1 +
- src/gui/qgsextentgroupbox.cpp                             | 1 +
- src/gui/qgsgradientcolorrampdialog.cpp                    | 1 +
- src/gui/qgsgroupwmsdatadialog.cpp                         | 1 +
- src/gui/qgstextformatwidget.cpp                           | 2 ++
- src/gui/symbology/qgssymbollayerwidget.cpp                | 1 +
- src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp | 1 +
- 14 files changed, 20 insertions(+)
-
-diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp
-index 178968917a..28d5d25a4d 100644
---- a/src/app/layout/qgslayoutpolylinewidget.cpp
-+++ b/src/app/layout/qgslayoutpolylinewidget.cpp
-@@ -21,6 +21,8 @@
- #include "qgslayoutitemregistry.h"
- #include "qgslayout.h"
- #include "qgslayoutundostack.h"
-+
-+#include <QButtonGroup>
- #include <QFileDialog>
- 
- QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline )
-diff --git a/src/app/layout/qgslayoutscalebarwidget.cpp b/src/app/layout/qgslayoutscalebarwidget.cpp
-index c1b8ad1509..569a4e0573 100644
---- a/src/app/layout/qgslayoutscalebarwidget.cpp
-+++ b/src/app/layout/qgslayoutscalebarwidget.cpp
-@@ -19,6 +19,7 @@
- #include "qgslayoutitemscalebar.h"
- #include "qgslayout.h"
- #include "qgsguiutils.h"
-+
- #include <QColorDialog>
- #include <QFontDialog>
- #include <QWidget>
-diff --git a/src/app/layout/qgslayoutscalebarwidget.h b/src/app/layout/qgslayoutscalebarwidget.h
-index a60b777bfa..ec7cc46cca 100644
---- a/src/app/layout/qgslayoutscalebarwidget.h
-+++ b/src/app/layout/qgslayoutscalebarwidget.h
-@@ -20,6 +20,8 @@
- #include "ui_qgslayoutscalebarwidgetbase.h"
- #include "qgslayoutitemwidget.h"
- 
-+#include <QButtonGroup>
-+
- class QgsLayoutItemScaleBar;
- 
- /**
-diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
-index e5cf8ff626..4d6a83700d 100644
---- a/src/app/qgslabelinggui.cpp
-+++ b/src/app/qgslabelinggui.cpp
-@@ -24,6 +24,8 @@
- #include "qgsauxiliarystorage.h"
- #include "qgsnewauxiliarylayerdialog.h"
- 
-+#include <QButtonGroup>
-+
- QgsExpressionContext QgsLabelingGui::createExpressionContext() const
- {
-   QgsExpressionContext expContext;
-diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
-index 6f1f77ef9a..57b7d34799 100644
---- a/src/app/qgsrulebasedlabelingwidget.cpp
-+++ b/src/app/qgsrulebasedlabelingwidget.cpp
-@@ -26,6 +26,7 @@
- #include "qgsvectorlayerlabeling.h"
- #include "qgslogger.h"
- 
-+#include <QAction>
- #include <QClipboard>
- #include <QMessageBox>
- 
-diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp
-index 1d3d4f8171..d68799234b 100644
---- a/src/gui/layout/qgslayoutitemwidget.cpp
-+++ b/src/gui/layout/qgslayoutitemwidget.cpp
-@@ -21,6 +21,8 @@
- #include "qgsprintlayout.h"
- #include "qgslayoutatlas.h"
- 
-+#include <QButtonGroup>
-+
- //
- // QgsLayoutConfigObject
- //
-diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-index 9fa5f98358..c53d002acb 100644
---- a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-+++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
-@@ -19,6 +19,8 @@
- #include "qgslayoutpagecollection.h"
- #include "qgsgui.h"
- 
-+#include <QButtonGroup>
-+
- QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags )
-   : QDialog( parent, flags )
- {
-diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp
-index a7dbb77501..48032a2456 100644
---- a/src/gui/qgscompoundcolorwidget.cpp
-+++ b/src/gui/qgscompoundcolorwidget.cpp
-@@ -20,6 +20,7 @@
- #include "qgsapplication.h"
- #include "qgssettings.h"
- 
-+#include <QHeaderView>
- #include <QPushButton>
- #include <QMenu>
- #include <QToolButton>
-diff --git a/src/gui/qgsextentgroupbox.cpp b/src/gui/qgsextentgroupbox.cpp
-index ffc8ab7195..d5d77db6a0 100644
---- a/src/gui/qgsextentgroupbox.cpp
-+++ b/src/gui/qgsextentgroupbox.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QMenu>
- #include <QAction>
-+#include <QDoubleValidator>
- 
- QgsExtentGroupBox::QgsExtentGroupBox( QWidget *parent )
-   : QgsCollapsibleGroupBox( parent )
-diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
-index fcc93d74fb..317f373423 100644
---- a/src/gui/qgsgradientcolorrampdialog.cpp
-+++ b/src/gui/qgsgradientcolorrampdialog.cpp
-@@ -22,6 +22,7 @@
- #include "qgssettings.h"
- 
- #include <QColorDialog>
-+#include <QHeaderView>
- #include <QInputDialog>
- #include <QPainter>
- #include <QTableWidget>
-diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp
-index 456c813f5f..f9bb15ab6d 100644
---- a/src/gui/qgsgroupwmsdatadialog.cpp
-+++ b/src/gui/qgsgroupwmsdatadialog.cpp
-@@ -16,6 +16,7 @@
- #include "qgsapplication.h"
- #include "qgsgroupwmsdatadialog.h"
- 
-+#include <QRegExpValidator>
- 
- QgsGroupWmsDataDialog::QgsGroupWmsDataDialog( QWidget *parent, Qt::WindowFlags fl )
-   : QDialog( parent, fl )
-diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
-index 8c3c67d8e9..9005a40081 100644
---- a/src/gui/qgstextformatwidget.cpp
-+++ b/src/gui/qgstextformatwidget.cpp
-@@ -29,6 +29,8 @@
- #include "qgseffectstack.h"
- #include "qgspainteffectregistry.h"
- 
-+#include <QButtonGroup>
-+
- QgsTextFormatWidget::QgsTextFormatWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent )
-   : QWidget( parent )
-   , mMapCanvas( mapCanvas )
-diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp
-index 3a5f3c5314..da599a27ae 100644
---- a/src/gui/symbology/qgssymbollayerwidget.cpp
-+++ b/src/gui/symbology/qgssymbollayerwidget.cpp
-@@ -43,6 +43,7 @@
- #include "qgsauxiliarystorage.h"
- 
- #include <QAbstractButton>
-+#include <QButtonGroup>
- #include <QColorDialog>
- #include <QCursor>
- #include <QDir>
-diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-index 4cc3e8b301..d377d718b7 100644
---- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-+++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
-@@ -29,6 +29,7 @@
- #include "qgssettings.h"
- #include "qgsmapcanvas.h"
- 
-+#include <QButtonGroup>
- #include <QListWidgetItem>
- #include <QMessageBox>
- #include <QFileDialog>
--- 
-2.16.3
-
diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
deleted file mode 100644
index 79614147766f..000000000000
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
-		examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
-	KEYWORDS="amd64 x86"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+),ssl]
-	>=dev-db/spatialite-4.2.0
-	dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/libzip:=
-	dev-libs/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	oracle? (
-		dev-db/oracle-instantclient:=
-		sci-libs/gdal:=[oracle]
-	)
-	polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
-	postgres? ( dev-db/postgresql:= )
-	python? ( ${PYTHON_DEPS}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		>=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# release-3_0 branch
-	"${FILESDIR}/${P}-check-constraints.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-DQGIS_LIB_SUBDIR=$(get_libdir)
-		-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-		-DQWT_INCLUDE_DIR=/usr/include/qwt6
-		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	insinto /usr/share/mime/packages
-	doins debian/qgis.xml
-
-	if use examples; then
-		docinto examples
-		dodoc -r "${WORKDIR}"/qgis_sample_data/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	if use grass; then
-		python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
-	fi
-}
-
-pkg_postinst() {
-	if use postgres; then
-		elog "If you don't intend to use an external PostGIS server"
-		elog "you should install:"
-		elog "   dev-db/postgis"
-	elif use python; then
-		elog "Support of PostgreSQL is disabled."
-		elog "But some installed python-plugins import the psycopg2 module."
-		elog "If you do not need these plugins just disable them"
-		elog "in the Plugins menu, else you need to set USE=\"postgres\""
-	fi
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 6acb74bdf3ef..f12498c8799d 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
index af8759f6cea6..5d97c48e24ef 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.2.ebuild
@@ -17,11 +17,11 @@ if [[ -z ${PV%%*9999} ]]; then
 	ECVS_CVS_OPTIONS="-dP"
 	MY_P="${PN}"
 	SRC_URI=""
-	KEYWORDS="alpha amd64 ia64 x86"
+	KEYWORDS="alpha amd64 arm ia64 x86"
 else
 	MY_P="${P/_/.}"
 	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="gnuplot bitmap? ( free-noncomm )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index cfc505dbe41b..0af42065a347 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 5573bd68092c..7217e409d15a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,3 +1,3 @@
 DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
-DIST busybox-1.28.1.tar.bz2 2260551 BLAKE2B 5dbe7d4fe63ff187bb1458368891c570016cd67406b7e1e4f675555d969c8655d258a0f6b3ba0ac26cc65739d65694f9042d00d9920ee610a6f79f62fb9bfb5d SHA512 c2d551eb70210d63d891614f4469ad3ec151dbd10fce96b2355dd1f2ea43a32ed08cc8f1d1ab361fb547199a19902d17a2935b839aeee2e1c3c8a1ed012db732
 DIST busybox-1.28.3.tar.bz2 2260586 BLAKE2B f2fec31ab1c6e6b865cea20a2819f58cb8e4c789051a8fdc8c8ca43367049fa9038e07f3fe806ba7abd90cb6a6aefdb0d095afb68119c11e94240647da6d48ce SHA512 0e87019d9d1179bc072a5ef9752d7342747e311db13c0b0dfa9f380a1e3ad1c265cca118d41f86829629ec5c8eb3e83985421c6f3ea6c8a9991b92ed301a4982
+DIST busybox-1.28.4.tar.bz2 2263342 BLAKE2B f35c81e67136d888a998f41b1418589e4bddaacde25d55eb509822a13ab93d351dcda6b147794a47e3c3c5c4141e9d8cc834ed239e0afba176f08bf3cb55b911 SHA512 92471617fcf3c1e28b468f3de2c83a1041f5ba5106580cc791e9c4cd602b7ccffabc51ce0807881ed734a89c3089113048265d6659a4d595528bd9150288d2ed
diff --git a/sys-apps/busybox/busybox-1.28.1.ebuild b/sys-apps/busybox/busybox-1.28.4.ebuild
similarity index 97%
rename from sys-apps/busybox/busybox-1.28.1.ebuild
rename to sys-apps/busybox/busybox-1.28.4.ebuild
index 68000bffa174..ea0b4ce81fb0 100644
--- a/sys-apps/busybox/busybox-1.28.1.ebuild
+++ b/sys-apps/busybox/busybox-1.28.4.ebuild
@@ -3,8 +3,9 @@
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+EAPI=6
+
+inherit flag-o-matic savedconfig toolchain-funcs
 
 DESCRIPTION="Utilities for rescue and embedded systems"
 HOMEPAGE="https://www.busybox.net/"
@@ -62,14 +63,18 @@ busybox_config_enabled() {
 	esac
 }
 
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
 src_prepare() {
+	default
 	unset KBUILD_OUTPUT #88088
 	append-flags -fno-strict-aliasing #310413
 	use ppc64 && append-flags -mminimal-toc #130943
 
-	# patches go here!
-	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
-#	epatch "${FILESDIR}"/${P}-*.patch
 	cp "${FILESDIR}"/ginit.c init/ || die
 
 	# flag cleanup
@@ -280,7 +285,8 @@ src_install() {
 	dodoc *.txt
 	docinto pod
 	dodoc *.pod
-	dohtml *.html
+	docinto html
+	dodoc *.html
 
 	cd ../examples
 	docinto examples
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 6f8799ca0b5c..477f9c5cdc05 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6046072b7e8c..cf9937102124 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index fb21f216ddfd..2000d7a9f85d 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,2 +1,3 @@
 DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
+DIST elogind-235.4.tar.gz 1019339 BLAKE2B 728e6707f57f43acf9a40e127fe2e53389cbcba1c96b79f96b23dc7d2ffdc3c84efdd55905a22cbeae0442d9278fd1e9371904c2da8aa29c00f79b879522b2c6 SHA512 43a4a25219c234214b1541f17c4aec65847e62ebbeeb223c7890f6648a2ffadc8388e4c526ab49df9ff1f216160810c601c7609098b9b2955bc63142f684b16e
 DIST elogind-236.1.tar.gz 1050387 BLAKE2B d0d295210eb07374cae738f55b472d9410f68c9e7f318dd736b5fcb5c0409c3da144988d8042b1e3b103d34d7a02471b4e316a924c9b1640c605fc73972de3da SHA512 ab4989f4467ef001bb8b837035bee870beaf5ec5fa2389649bdcad2fe7bbf82691bfd3176cf9a3bf3b5c232c77210f431f2d38ebdbfd09f5a7868cd50e476c59
diff --git a/sys-auth/elogind/elogind-235.4.ebuild b/sys-auth/elogind/elogind-235.4.ebuild
new file mode 100644
index 000000000000..c2dbf0ad0277
--- /dev/null
+++ b/sys-auth/elogind/elogind-235.4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info meson pam udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+acl debug doc +pam +policykit selinux"
+
+COMMON_DEPEND="
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( virtual/pam )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	dev-util/intltool
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-235.2-docs.patch"
+	"${FILESDIR}/${PN}-235.2-drop-logintest.patch" # bug 645156
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
+	local cgroupmode="legacy"
+
+	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
+		cgroupmode="hybrid"
+	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
+		cgroupmode="unified"
+	fi
+
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dpamlibdir=$(getpam_mod_dir)
+		-Dudevrulesdir="$(get_udevdir)"/rules.d
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		-Drootlibdir="${EPREFIX}"/$(get_libdir)
+		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
+		-Drootprefix="${EPREFIX}/"
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
+		-Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl true false)
+		-Ddebug=$(usex debug elogind false)
+		--buildtype $(usex debug debug release)
+		-Dhtml=$(usex doc auto false)
+		-Dpam=$(usex pam true false)
+		-Dselinux=$(usex selinux true false)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+	meson_src_install
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
+		elog "elogind is currently started from boot runlevel."
+	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		ewarn "elogind is currently not started from any runlevel."
+		ewarn "You may add it to the boot runlevel by:"
+		ewarn "# rc-update add elogind boot"
+	fi
+}
diff --git a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
index 290b9b38b6db..71be0028179c 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/lathiat/nss-mdns/releases/download/v${PV}/${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc x86"
 IUSE="test"
 
 RDEPEND=">=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}]"
diff --git a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild b/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
index 06b48b8ead62..2df38e72d0d1 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.8.1.ebuild
@@ -17,7 +17,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE="openssl"
 S="${WORKDIR}/pam-MySQL-${PV}"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 50ea625ab049..be4ffbb7bbb9 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index 9180af75b9a7..4dc678b6a055 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,3 +1,2 @@
-DIST blktrace-1.0.3.tar.bz2 359325 BLAKE2B c776fe0445eadbb2d077435626e6ffdd330ba2f49d053bfd247ed7f421b9bd588d38acd32133ebac69e0fc63f165fe0e6b3324bf8313a14000cf02e3a5e735cf SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5
 DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
 DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82 SHA512 ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86
diff --git a/sys-block/blktrace/blktrace-1.0.3.ebuild b/sys-block/blktrace/blktrace-1.0.3.ebuild
deleted file mode 100644
index d5464fbb9187..000000000000
--- a/sys-block/blktrace/blktrace-1.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic linux-info
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue"
-HOMEPAGE="http://git.kernel.dk/cgit/blktrace/"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		doc? (
-			virtual/latex-base
-			|| ( >=app-text/texlive-core-2014 app-text/dvipdfm )
-		)
-		dev-libs/libaio"
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="~BLK_DEV_IO_TRACE"
-WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if you want to gather traces from this machine"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch
-}
-
-src_compile() {
-	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
-	dodoc README
-	use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
-}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 09bd453f7cbb..b883fc53d96f 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index b88b338d6af7..17aef8fed7e2 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1 +1,3 @@
 DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
+DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
+DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
diff --git a/sys-boot/unetbootin/unetbootin-661.ebuild b/sys-boot/unetbootin/unetbootin-661.ebuild
new file mode 100644
index 000000000000..7f9aafaf7b26
--- /dev/null
+++ b/sys-boot/unetbootin/unetbootin-661.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PATCHSET="${P}-qt5.patch.tar.xz"
+inherit desktop qmake-utils
+
+DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
+HOMEPAGE="https://github.com/unetbootin/unetbootin"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+UNBI_LINGUAS="
+	am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
+	ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
+	zh_CN zh_TW
+"
+
+for lingua in ${UNBI_LINGUAS}; do
+	IUSE="${IUSE} l10n_${lingua/_/-}"
+done
+
+S=${WORKDIR}/${P}/src/${PN}
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/p7zip
+	sys-boot/syslinux
+	sys-fs/mtools
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-581-desktop.patch"
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+)
+
+src_prepare() {
+	default
+
+	# QA check in case linguas are added or removed
+	enum() {
+		echo ${#}
+	}
+	[[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
+		|| die "Numbers of recorded and actual linguas do not match"
+	unset enum
+
+	# Remove localisations
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if ! use l10n_${lingua/_/-}; then
+			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
+			rm ${PN}_${lingua}.ts || die
+		fi
+	done
+}
+
+src_configure() {
+	sed -i -e '/^RESOURCES/d' unetbootin.pro || die
+
+	UNBN_QTPATH="$(qt5_get_bindir)/"
+	"${UNBN_QTPATH}"lrelease ${PN}.pro || die
+
+	eqmake5 ${PN}.pro || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	domenu ${PN}.desktop
+
+	for file in ${PN}*.png; do
+		size="${file/${PN}_}"
+		size="${size/.png}x${size/.png}"
+		insinto /usr/share/icons/hicolor/${size}/apps
+		newins ${file} ${PN}.png
+	done
+
+	local lingua
+	for lingua in ${UNBI_LINGUAS}; do
+		if use l10n_${lingua/_/-}; then
+			insinto /usr/share/${PN}
+			doins ${PN}_${lingua}.qm
+		fi
+	done
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 71a2008d3c5a..e68661954c1c 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20180426-r2.ebuild
similarity index 70%
rename from sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild
rename to sys-firmware/intel-microcode/intel-microcode-20180426-r2.ebuild
index 29a6958681db..decbae0ff43f 100644
--- a/sys-firmware/intel-microcode/intel-microcode-20180426-r1.ebuild
+++ b/sys-firmware/intel-microcode/intel-microcode-20180426-r2.ebuild
@@ -19,11 +19,14 @@ SRC_URI="https://downloadmirror.intel.com/${NUM}/eng/microcode-${INTEL_SNAPSHOT}
 LICENSE="intel-ucode"
 SLOT="0"
 KEYWORDS=""
-IUSE="initramfs +split-ucode vanilla"
+IUSE="initramfs +minimal +split-ucode vanilla"
 REQUIRED_USE="|| ( initramfs split-ucode )"
 
 DEPEND="sys-apps/iucode_tool"
-RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586
+
+# !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586
+RDEPEND="!<sys-apps/microcode-ctl-1.17-r2
+	minimal? ( sys-apps/iucode_tool )"
 
 S=${WORKDIR}
 
@@ -96,8 +99,9 @@ src_install() {
 	# The earlyfw cpio needs to be in /boot because it must be loaded before
 	# rootfs is mounted.
 	use initramfs && dodir /boot && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
-	# split location:
-	use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+	# split location (we use a temporary location so that we are able
+	# to re-run iucode_tool in pkg_preinst):
+	dodir /tmp/intel-ucode && opts+=( --write-firmware="${ED%/}"/tmp/intel-ucode )
 
 	iucode_tool \
 		"${opts[@]}" \
@@ -109,6 +113,45 @@ src_install() {
 
 pkg_preinst() {
 	use initramfs && mount-boot_pkg_preinst
+
+	if use minimal; then
+		einfo "Removing ucode(s) not supported by any currently available (=online) processor(s) due to USE=minimal ..."
+		opts=(
+			--scan-system
+			# be strict about what we are doing
+			--overwrite
+			--strict-checks
+			--no-ignore-broken
+			# we want to install latest version
+			--no-downgrade
+			# show everything we find
+			--list-all
+			# show what we selected
+			--list
+		)
+
+		# The earlyfw cpio needs to be in /boot because it must be loaded before
+		# rootfs is mounted.
+		use initramfs && opts+=( --write-earlyfw="${ED%/}"/boot/intel-uc.img )
+		# split location:
+		use split-ucode && dodir /lib/firmware/intel-ucode && opts+=( --write-firmware="${ED%/}"/lib/firmware/intel-ucode )
+
+		iucode_tool \
+			"${opts[@]}" \
+			"${ED%/}"/tmp/intel-ucode \
+			|| die "iucode_tool ${opts[@]} ${ED%/}/tmp/intel-ucode"
+
+	else
+		if use split-ucode; then
+			# Temporary /tmp/intel-ucode will become final /lib/firmware/intel-ucode ...
+			dodir /lib/firmware/intel-ucode
+			mv "${ED%/}"/tmp/intel-ucode "${ED%/}"/lib/firmware/intel-ucode || die "Failed to install splitted ucodes!"
+		fi
+	fi
+
+	# Cleanup any temporary leftovers so that we don't merge any
+	# unneeded files on disk
+	rm -r "${ED%/}"/tmp || die "Failed to cleanup '${ED%/}/tmp'"
 }
 
 pkg_prerm() {
@@ -122,6 +165,13 @@ pkg_postrm() {
 pkg_postinst() {
 	use initramfs && mount-boot_pkg_postinst
 
+	if use minimal; then
+		elog "You only installed ucodes for all currently available (=online)"
+		elog "processor(s). Remember to re-emerge this package whenever you"
+		elog "change the system's processor model."
+		elog ""
+	fi
+
 	# We cannot give detailed information if user is affected or not:
 	# If MICROCODE_BLACKLIST wasn't modified, user can still use MICROCODE_SIGNATURES
 	# to to force a specific, otherwise blacklisted, microcode. So we
diff --git a/sys-firmware/intel-microcode/metadata.xml b/sys-firmware/intel-microcode/metadata.xml
index 2d96b231657b..593b3a921234 100644
--- a/sys-firmware/intel-microcode/metadata.xml
+++ b/sys-firmware/intel-microcode/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
+	<flag name="minimal">only install ucode(s) supported by currently available (=online) processor(s)</flag>
 	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
 	<flag name="split-ucode">install the split binary ucode files (used by the kernel directly)</flag>
 	<flag name="vanilla">install only microcode updates from Intel's official microcode tarball</flag>
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0c59446b1864..3a0dc72cc0de 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
index 45aa9b9ace6d..ee9eb962a0cb 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 53e0c3a6e495..8f5ab7eee53c 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
index 985969c9aa31..8ba0cbeaafc1 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
index 0ad765f69e53..753da391f6e6 100644
--- a/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux"
+KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 # We need newer kernel headers; we don't keep strict control of the exact
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index c21e28c5a863..5611edb44416 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/minit/minit-0.10-r1.ebuild b/sys-process/minit/minit-0.10-r1.ebuild
index b5e5a674cca0..ce5816b6454a 100644
--- a/sys-process/minit/minit-0.10-r1.ebuild
+++ b/sys-process/minit/minit-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND="
 	dev-libs/libowfat
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index c588d93b7847..f6edec89e8b5 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0ed6fefab6d0..6b551df3a316 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,3 +3,4 @@ DIST chromium-66.0.3359.181.tar.xz 583985908 BLAKE2B 22794b379591da9e4bfb1ea38ae
 DIST chromium-67.0.3396.40.tar.xz 589878296 BLAKE2B e02d8980cb882fb67eb6e048dfa8534fb423259af257040cdda8198aac9433a221d6218873a8e5623ae3cfb8e081f22bfc40444e53be38b17a0ebff77537263d SHA512 1d4986d444076a4a48bf9ad7061dbb424f520e46f2f58f8f84dfee2fefea05a3b019ef27acda553efb9a75db9731acbc0c80f5dfb39a9137e9e27336306d5981
 DIST chromium-67.0.3396.56.tar.xz 589901992 BLAKE2B e5207de67db589d65dbaf7af493308a60e3951993f439218c025d10fecd331052a3dfd0f196f3c7e078cda79af3d248a94550a6ffb8c0da7842592e48de20313 SHA512 a7397ebcff54e184ad510fcc7d7958a4adafcf53c88a7ad951fc361366439b01c4e1a77dfcfadbf1f96d92e9ea503287862e7cd2521be696919cf3ee0f1d0816
 DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8
+DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2
diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3438.3.ebuild
new file mode 100644
index 000000000000..eb64c40b42e9
--- /dev/null
+++ b/www-client/chromium/chromium-68.0.3438.3.ebuild
@@ -0,0 +1,686 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/clang-5
+	virtual/pkgconfig
+	dev-vcs/git
+"
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r2.patch"
+	"${FILESDIR}/chromium-compiler-r2.patch"
+	#"${FILESDIR}/chromium-ffmpeg-build-r0.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-math.h-r0.patch"
+	"${FILESDIR}/chromium-stdint.patch"
+	"${FILESDIR}/chromium-ffmpeg-r1.patch"
+	"${FILESDIR}/chromium-gn-bootstrap-r24.patch"
+)
+
+pre_build_checks() {
+	#if [[ ${MERGE_TYPE} != binary ]]; then
+	#	local -x CPP="$(tc-getCXX) -E"
+	#	if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+	#		# bugs: #601654
+	#		die "At least clang 3.9.1 is required"
+	#	fi
+	#	if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+	#		# bugs: #535730, #525374, #518668, #600288, #627356
+	#		die "At least gcc 5.0 is required"
+	#	fi
+	#fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/http2
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/spdy
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/third_party/glslang
+		third_party/angle/third_party/spirv-headers
+		third_party/angle/third_party/spirv-tools
+		third_party/angle/third_party/vulkan-validation-layers
+		third_party/apple_apsl
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4
+		third_party/catapult/third_party/html5lib-python
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/unrar
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/antlr4
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if ! tc-is-clang; then
+		# Force clang since gcc is pretty broken at the moment.
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# https://bugs.gentoo.org/588596
+	#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-compiler-r2.patch b/www-client/chromium/files/chromium-compiler-r2.patch
new file mode 100644
index 000000000000..3ac2eb81f4cb
--- /dev/null
+++ b/www-client/chromium/files/chromium-compiler-r2.patch
@@ -0,0 +1,168 @@
+From 4310db462fab74bf14066f2a6f7cf250ecba0cf1 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 25 Apr 2018 13:22:49 -0400
+Subject: [PATCH] Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
+ 1 file changed, 18 insertions(+), 43 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 83337d52e4b9..f2c192fc31ca 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -228,8 +228,6 @@ config("compiler") {
+ 
+   configs += [
+     # See the definitions below.
+-    ":clang_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+   ]
+ 
+@@ -488,18 +486,6 @@ config("compiler") {
+     }
+   }
+ 
+-  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
+-      target_os != "chromeos") {
+-    cflags += [
+-      # TODO(hans): Remove this once Clang generates better optimized debug info
+-      # by default. https://crbug.com/765793
+-      "-Xclang",
+-      "-mllvm",
+-      "-Xclang",
+-      "-instcombine-lower-dbg-declare=0",
+-    ]
+-  }
+-
+   # Print absolute paths in diagnostics. There is no precedent for doing this
+   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
+   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
+@@ -1415,10 +1401,6 @@ config("default_warnings") {
+ 
+         # TODO(hans): https://crbug.com/766891
+         "-Wno-null-pointer-arithmetic",
+-
+-        # Ignore warnings about MSVC optimization pragmas.
+-        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
+-        "-Wno-ignored-pragma-optimize",
+       ]
+     } else if (use_xcode_clang) {
+       cflags += [
+@@ -1462,22 +1444,6 @@ config("chromium_code") {
+       "__STDC_FORMAT_MACROS",
+     ]
+ 
+-    if (!is_debug && !using_sanitizer &&
+-        (!is_linux || !is_clang || is_official_build) &&
+-        current_cpu != "s390x" && current_cpu != "s390" &&
+-        current_cpu != "ppc64" && current_cpu != "ppc64" &&
+-        current_cpu != "mips" && current_cpu != "mips64") {
+-      # _FORTIFY_SOURCE isn't really supported by Clang now, see
+-      # http://llvm.org/bugs/show_bug.cgi?id=16821.
+-      # It seems to work fine with Ubuntu 12 headers though, so use it in
+-      # official builds.
+-      #
+-      # Non-chromium code is not guaranteed to compile cleanly with
+-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
+-      # disabled, so only do that for Release build.
+-      defines += [ "_FORTIFY_SOURCE=2" ]
+-    }
+-
+     if (is_mac || is_ios) {
+       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
+       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
+@@ -1807,7 +1773,8 @@ config("default_stack_frames") {
+ }
+ 
+ # Default "optimization on" config.
+-config("optimize") {
++config("optimize") { }
++config("xoptimize") {
+   if (is_win) {
+     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
+     if (is_official_build && full_wpo_on_official && !is_clang) {
+@@ -1841,7 +1808,8 @@ config("optimize") {
+ }
+ 
+ # Same config as 'optimize' but without the WPO flag.
+-config("optimize_no_wpo") {
++config("optimize_no_wpo") { }
++config("xoptimize_no_wpo") {
+   if (is_win) {
+     # Favor size over speed, /O1 must be before the common flags. The GYP
+     # build also specifies /Os and /GF but these are implied by /O1.
+@@ -1864,7 +1832,8 @@ config("optimize_no_wpo") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = [
+       "/Od",  # Disable optimization.
+@@ -1888,7 +1857,8 @@ config("no_optimize") {
+ # Turns up the optimization level. On Windows, this implies whole program
+ # optimization and link-time code generation which is very expensive and should
+ # be used sparingly.
+-config("optimize_max") {
++config("optimize_max") { }
++config("xoptimize_max") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -1935,7 +1905,8 @@ config("optimize_max") {
+ #
+ # TODO(crbug.com/621335) - rework how all of these configs are related
+ # so that we don't need this disclaimer.
+-config("optimize_speed") {
++config("optimize_speed") { }
++config("xoptimize_speed") {
+   if (is_nacl && is_nacl_irt) {
+     # The NaCl IRT is a special case and always wants its own config.
+     # Various components do:
+@@ -1973,7 +1944,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags = [ "-O1" ] + common_optimize_on_cflags
+   ldflags = common_optimize_on_ldflags
+   visibility = [ ":default_optimization" ]
+@@ -2057,7 +2029,8 @@ config("afdo") {
+ #   configs += [ "//build/config/compiler:symbols" ]
+ 
+ # Full symbols.
+-config("symbols") {
++config("symbols") { }
++config("xsymbols") {
+   if (is_win) {
+     if (use_goma || is_clang) {
+       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
+@@ -2155,7 +2128,8 @@ config("symbols") {
+ # Minimal symbols.
+ # This config guarantees to hold symbol for stack trace which are shown to user
+ # when crash happens in unittests running on buildbot.
+-config("minimal_symbols") {
++config("minimal_symbols") { }
++config("xminimal_symbols") {
+   if (is_win) {
+     # Linker symbols for backtraces only.
+     cflags = []
+@@ -2186,7 +2160,8 @@ config("minimal_symbols") {
+ }
+ 
+ # No symbols.
+-config("no_symbols") {
++config("no_symbols") { }
++config("xno_symbols") {
+   if (!is_win) {
+     cflags = [ "-g0" ]
+     asmflags = cflags
+-- 
+2.17.0
+
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
new file mode 100644
index 000000000000..0577dd4cf73b
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
@@ -0,0 +1,31 @@
+From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Thu, 24 May 2018 22:39:20 +0000
+Subject: [PATCH] Fix gn bootstrap
+
+R=dpranke
+
+Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44
+Reviewed-on: https://chromium-review.googlesource.com/1072740
+Reviewed-by: Dirk Pranke <dpranke@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#561663}
+---
+ tools/gn/bootstrap/bootstrap.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 0d5f42a1d4a8..300abacdbca0 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain):
+       'base/trace_event/memory_peak_detector.cc',
+       'base/trace_event/memory_usage_estimator.cc',
+       'base/trace_event/process_memory_dump.cc',
+-      'base/trace_event/sharded_allocation_register.cc',
+       'base/trace_event/trace_buffer.cc',
+       'base/trace_event/trace_config.cc',
+       'base/trace_event/trace_config_category_filter.cc',
+-- 
+2.17.0
+
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 9f811dae59ad..353450e1207c 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
-DIST qutebrowser-1.2.1.tar.gz 3626806 BLAKE2B 462c1ed29a4a1cbf16af6996bf2201e6d1d693ba0afa4d0abc3f231ace0388ab134a6dc052cbe393e3945e0e8a068ac232ee61a3a1f94f09f31fb7d8267ec901 SHA512 798eef2efe74fbe1bbd1b93f8f36645a98be37fc74f23349acc62c21f5a317f44df1767d915caf5a18c92444b19c3b6ce9fb3b9ecaf52bb2af2fe2ee36049f5f
 DIST qutebrowser-1.3.0.tar.gz 3659104 BLAKE2B b4d7cb1ea24adad10c49babd61a7189baaae5f362304128046a3cc580748b2c23ddf03cf9902515b577e36de7b105edd23a75a78559ec5a27ec4e924bdcb08f2 SHA512 4c696aa21e848c02ec2718619c314e51104995ebec81ec7a7ddb5224643dbf3ef0487cbfd7cc3aaebcbf583c1cbc6ae6e2824645138d64c1d2e5eddbce830f1c
+DIST qutebrowser-1.3.1.tar.gz 3533949 BLAKE2B 49055673406acf89f76132c256105e898d7fe3fad797bc919407df4a6174445b459dd74946d7fa9532b301f6421e16e98e947bb407c2d940a753d803ee57dedb SHA512 59cba56a8d0d2813c679841ad835c2badbbde6b27d623288ed4d81e869b52dceaabddd3cb8560b9b7785bdf5759ad841f3c717235d1698d995b19a63333cbb18
diff --git a/www-client/qutebrowser/qutebrowser-1.2.1.ebuild b/www-client/qutebrowser/qutebrowser-1.3.1.ebuild
similarity index 100%
rename from www-client/qutebrowser/qutebrowser-1.2.1.ebuild
rename to www-client/qutebrowser/qutebrowser-1.3.1.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 8b7a087687c9..1f72467b6e78 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/apache-2.4.33-r1.ebuild b/www-servers/apache/apache-2.4.33-r1.ebuild
index f954a9c2836c..2bc6438ce835 100644
--- a/www-servers/apache/apache-2.4.33-r1.ebuild
+++ b/www-servers/apache/apache-2.4.33-r1.ebuild
@@ -130,7 +130,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
 IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index af728ec3d417..fed8bfa3d029 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/agg/agg-2.5-r3.ebuild b/x11-libs/agg/agg-2.5-r3.ebuild
index de2db3f9f25a..0925c837a906 100644
--- a/x11-libs/agg/agg-2.5-r3.ebuild
+++ b/x11-libs/agg/agg-2.5-r3.ebuild
@@ -32,7 +32,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${P}-sdl-m4.patch
 	"${FILESDIR}"/${P}-sdl-automagic.patch
-	"${FILESDIR}"/${PV}
+	"${FILESDIR}"/${PVR}
 )
 
 src_prepare() {
diff --git a/x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch b/x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
rename to x11-libs/agg/files/2.5-r3/0001-Fix-non-terminating-loop-conditions-when-len-1.patch
diff --git a/x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch b/x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
rename to x11-libs/agg/files/2.5-r3/0002-Cure-recursion-by-aborting-if-the-co-ordinates-are-t.patch
diff --git a/x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch b/x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
rename to x11-libs/agg/files/2.5-r3/0003-Get-coordinates-from-previous-vertex-if-last-command.patch
diff --git a/x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch b/x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
rename to x11-libs/agg/files/2.5-r3/0004-Make-rasterizer_outline_aa-ignore-close_polygon-when.patch
diff --git a/x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch b/x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0005-Remove-VC-6-workaround.patch
rename to x11-libs/agg/files/2.5-r3/0005-Remove-VC-6-workaround.patch
diff --git a/x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0006-Implement-grain-merge-blending-mode-GIMP.patch
rename to x11-libs/agg/files/2.5-r3/0006-Implement-grain-merge-blending-mode-GIMP.patch
diff --git a/x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch b/x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0007-Implement-grain-extract-blending-mode-GIMP.patch
rename to x11-libs/agg/files/2.5-r3/0007-Implement-grain-extract-blending-mode-GIMP.patch
diff --git a/x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch b/x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0008-Declare-multiplication-and-division-operators-as-con.patch
rename to x11-libs/agg/files/2.5-r3/0008-Declare-multiplication-and-division-operators-as-con.patch
diff --git a/x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch b/x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0009-Add-a-static-identity-transformation.patch
rename to x11-libs/agg/files/2.5-r3/0009-Add-a-static-identity-transformation.patch
diff --git a/x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch b/x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0010-Add-renderer_scanline_aa_alpha.patch
rename to x11-libs/agg/files/2.5-r3/0010-Add-renderer_scanline_aa_alpha.patch
diff --git a/x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch b/x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0011-Avoid-division-by-zero-in-color-burn-mode.patch
rename to x11-libs/agg/files/2.5-r3/0011-Avoid-division-by-zero-in-color-burn-mode.patch
diff --git a/x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch b/x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0012-Avoid-pixel-artifacts-when-compositing.patch
rename to x11-libs/agg/files/2.5-r3/0012-Avoid-pixel-artifacts-when-compositing.patch
diff --git a/x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch b/x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
rename to x11-libs/agg/files/2.5-r3/0013-Modify-agg-conv-classes-to-allow-access-to-the-origi.patch
diff --git a/x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch b/x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
rename to x11-libs/agg/files/2.5-r3/0014-Avoid-potential-zero-division-resulting-in-nan-in-ag.patch
diff --git a/x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch b/x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
similarity index 100%
rename from x11-libs/agg/files/2.5/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
rename to x11-libs/agg/files/2.5-r3/0015-Ensure-first-value-in-the-gamma-table-is-always-zero.patch
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
index 40eaaff31720..8b38831cc276 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~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="X debug +introspection jpeg jpeg2k tiff test"
 
 # Remove SRC_URI when gnome bug #795069 is fixed
diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
index 4ace496e1e8a..41f1969b357f 100644
--- a/x11-libs/gtk+/gtk+-3.22.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
index 6657c3ed1294..b9429159e023 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.7.ebuild
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
index 9fda7eb99527..2db92390db5d 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 COMMON_DEPEND="
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e2db44bf082a..7c11c5ad6427 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
index b291a7b8d448..cc4b162c7c60 100644
--- a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="Extra preferences that are desired but are not worthy for Pidgin"
 HOMEPAGE="http://gaim-extprefs.sourceforge.net"
@@ -16,7 +16,3 @@ RDEPEND="net-im/pidgin[gtk]"
 DEPEND="
 	virtual/pkgconfig
 	${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
index 9276957bcdd5..3d72a02de6db 100644
--- a/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
+++ b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 DESCRIPTION="Gets current song from MPRIS-aware media players"
 HOMEPAGE="http://m0n5t3r.info/work/pidgin-mpris/"
@@ -18,8 +18,3 @@ RDEPEND="net-im/pidgin[gtk]
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
-	dodoc INSTALL README TODO
-}
diff --git a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
index 215239d48b94..242ddbd16662 100644
--- a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
+++ b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="automatically update your pidgin profile with current info from Rhythmbox"
 HOMEPAGE="http://jon.oberheide.org/pidgin-rhythmbox/"
@@ -17,8 +17,3 @@ RDEPEND="net-im/pidgin
 	>=x11-libs/gtk+-2.4:2
 	dev-libs/dbus-glib"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
index 6bf6179e7fc6..d0eabc166377 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
@@ -1,5 +1,5 @@
---- wmacpiload-0.2.0/src/battery.c	2012-10-18 15:42:04.000000000 +0200
-+++ wmacpiload-0.2.0.new/src/battery.c	2012-10-18 15:43:33.000000000 +0200
+--- a/src/battery.c	2012-10-18 15:42:04.000000000 +0200
++++ b/src/battery.c	2012-10-18 15:43:33.000000000 +0200
 @@ -42,7 +42,8 @@
   ************************************************************************/
  
@@ -27,4 +27,4 @@
 +            if (strcmp(endptr, CAPACITY_UNIT1) == 0 || strcmp(endptr, CAPACITY_UNIT2) == 0)
                  bat->percentage = (int) ((remain * 100.0) / bat->capacity);
              else
-                 bat->percentage = -1;
\ No newline at end of file
+                 bat->percentage = -1;
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
index 15f8e05579a2..2f43cd358b70 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_acpi.h
---- wmacpiload-0.2.0/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
-+++ wmacpiload-0.2.0.new//include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
+diff -ru a/include/lib_acpi.h b/include/lib_acpi.h
+--- a/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
++++ b/include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
 @@ -32,7 +32,7 @@
   * Macros
   ************************************************************************/
@@ -10,13 +10,13 @@ diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_a
  
    /* use ? */
  #  ifndef ACPI_32_BIT_SUPPORT
-diff -ru wmacpiload-0.2.0/src/dockapp.c wmacpiload-0.2.0.new//src/dockapp.c
---- wmacpiload-0.2.0/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
+diff -ru a/src/dockapp.c b/src/dockapp.c
+--- a/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
++++ b/src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
 @@ -431,5 +431,6 @@
  void
  dockapp_cleanup(void)
  {
 +  if (display != NULL)
      XCloseDisplay(display);
- }
\ No newline at end of file
+ }
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
index 69857717daeb..7fb8586ed1ee 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
---- wmacpiload-0.2.0/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
+diff -ru a/src/lib_acpi.c b/src/lib_acpi.c
+--- a/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
++++ b/src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
 @@ -83,7 +83,7 @@
          if (!k->ac)
              fprintf(stderr, "%s : no AC adapter detected\n", PACKAGE);
@@ -23,9 +23,9 @@ diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
                  char *src;
                  char *end;
                  size_t len;
-diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
---- wmacpiload-0.2.0/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/thermal.c	2011-06-29 00:18:24.851904854 -0400
+diff -ru a/src/thermal.c b/src/thermal.c
+--- a/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
++++ b/src/thermal.c	2011-06-29 00:18:24.851904854 -0400
 @@ -30,12 +30,17 @@
  #endif
  
@@ -118,4 +118,4 @@ diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
 +        tz->temp = temp / 1000;
      }
  }
- 
\ No newline at end of file
+ 
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 5336ef10ddd1..05c5ee785dea 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=7
 
 MY_P=${P/-ac}
+
 DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
 HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
@@ -25,21 +24,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-acpi-segfault.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" || die "epatch failed"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-acpi-segfault.patch"
+	"${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch"
+	"${FILESDIR}/${PN}-acpi-fix-battery-unit.patch"
+)
 
 src_configure() {
 	econf $(use_enable debug)
 }
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
index ca8e850f9a53..5dd7b6116524 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 MY_P=${P/-ac}
+
 DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
 HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
@@ -22,12 +23,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_configure() {
 	econf $(use_enable debug)
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/x11-plugins/wmacpimon/files/Makefile.patch b/x11-plugins/wmacpimon/files/Makefile.patch
index aab28fc89392..73646d10fa93 100644
--- a/x11-plugins/wmacpimon/files/Makefile.patch
+++ b/x11-plugins/wmacpimon/files/Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2010-09-06 11:33:16.000000000 +0200
-+++ Makefile.new	2010-09-06 11:36:28.000000000 +0200
+--- a/Makefile	2010-09-06 11:33:16.000000000 +0200
++++ b/Makefile	2010-09-06 11:36:28.000000000 +0200
 @@ -1,8 +1,5 @@
 -OPT	= -O3 -DACPI
 -
diff --git a/x11-plugins/wmacpimon/files/wmacpimon.c.patch b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
index 001c1d8c96be..adc03ce3fd0c 100644
--- a/x11-plugins/wmacpimon/files/wmacpimon.c.patch
+++ b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
@@ -1,5 +1,5 @@
---- wmacpimon.c	2004-07-08 14:16:22.184359328 +0200
-+++ wmacpimon.c	2004-07-08 14:15:59.677780848 +0200
+--- a/wmacpimon.c	2004-07-08 14:16:22.184359328 +0200
++++ b/wmacpimon.c	2004-07-08 14:15:59.677780848 +0200
 @@ -314,7 +314,7 @@
      acpinfo = calloc(1, sizeof(ACPInfo));
      dockapp->blink = OFF;
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index d902e3de4a33..ffc03d2648bb 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="DockApp monitors the temperature and Speedstep features in ACPI-based systems"
 HOMEPAGE="http://www.vrlteam.org/wmacpimon/"
@@ -19,18 +18,18 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
+PATCHES=(
 	# patch wmacpimon.c file to set default path for
 	# wmacpimon.prc to /var/tmp/
-	epatch "${FILESDIR}"/wmacpimon.c.patch
+	"${FILESDIR}/wmacpimon.c.patch"
 
 	# fix LDFLAGS ordering. See bug #248618.
 	# fix LDFLAGS ordering again and other stuff. See bug #336091.
-	epatch "${FILESDIR}"/Makefile.patch
-}
+	"${FILESDIR}/Makefile.patch"
+)
 
 src_install() {
-	dobin wmacpimond wmacpimon || die "dobin failed."
+	dobin wmacpimond wmacpimon
 	dodoc AUTHORS ChangeLog README
 	newinitd "${FILESDIR}"/wmacpimon.initscript wmacpimon
 }
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index b6fcce6d4152..b2be120eed9c 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A Window Maker applet that shows your biorhythm"
 HOMEPAGE="http://wmbio.sourceforge.net/"
@@ -22,18 +21,15 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}/src
 
 src_prepare() {
+	default
 	# Honour Gentoo CFLAGS
-	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile
+	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die "sed for CFLAGS failed"
 
 	# Honour Gentoo LDFLAGS
-	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
+	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die "sed for LDFLAGS failed"
 }
 
 src_install () {
-	dobin wmbio || die "dobin failed"
-	dodoc ../{AUTHORS,Changelog,NEWS,README} || die
+	dobin wmbio
+	dodoc ../{AUTHORS,Changelog,NEWS,README}
 }
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4a52ddd91398..6dcbc8f762c3 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
index 5fdf7e5f3bb3..bb377f86f296 100644
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.am~	2002-12-06 03:01:37.000000000 +0100
-+++ Makefile.am	2003-04-15 20:14:34.000000000 +0200
+--- a/Makefile.am	2002-12-06 03:01:37.000000000 +0100
++++ b/Makefile.am	2003-04-15 20:14:34.000000000 +0200
 @@ -32,24 +32,7 @@
  		$(DESTDIR)$(SETTINGS_FILE) > $(DESTDIR)$(SETTINGS_FILE).tmp && \
  	mv -f $(DESTDIR)$(SETTINGS_FILE).tmp $(DESTDIR)$(SETTINGS_FILE)
diff --git a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
index 3974f95c5c51..a68ea6303c8b 100644
--- a/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
+++ b/x11-themes/fvwm-themes/files/fvwm-themes-0.7.0-posix-sort.patch
@@ -1,5 +1,5 @@
---- fvwm-themes-0.7.0/configure.in
-+++ fvwm-themes-0.7.0/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -195,7 +195,7 @@
  
  # Hopefully this "sort" is portable (after many tries using awk and expr)
diff --git a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
index 8ed5ccc37dce..45ae2d79b317 100644
--- a/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
+++ b/x11-themes/fvwm-themes/fvwm-themes-0.7.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit autotools eutils
+EAPI=6
+inherit autotools
 
 DESCRIPTION="A configuration framework for the fvwm window manager"
 HOMEPAGE="http://fvwm-themes.sourceforge.net/"
@@ -17,11 +17,14 @@ RDEPEND=">=x11-wm/fvwm-2.6.2"
 DEPEND="${RDEPEND}
 	gnome? ( virtual/imagemagick-tools )"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-posix-sort.patch
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.patch"
+	"${FILESDIR}/${P}-posix-sort.patch"
+)
 
+src_prepare() {
+	default
+	mv configure.in configure.ac || die "moving configure.in failed"
 	eautoreconf
 }
 
@@ -29,11 +32,6 @@ src_configure() {
 	econf $(use_enable gnome gnome-icons)
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
 pkg_postinst() {
 	fvwm-themes-config --site --reset
 	fvwm-themes-menuapp --site --build-menus --remove-popup
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index f201fa6e79a4..0c90108fce51 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://cgit.kde.org/qtcurve.git"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-IUSE="+X gtk nls plasma qt4 +qt5 test"
+IUSE="+X gtk nls plasma +qt5 test"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
@@ -20,25 +20,12 @@ if [[ "${PV}" != 9999 ]] ; then
 fi
 
 REQUIRED_USE="gtk? ( X )
-	|| ( gtk qt4 qt5 )
+	|| ( gtk qt5 )
 	plasma? ( qt5 )
 "
 
 COMMON_DEPEND="
 	gtk? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-	)
-	qt5? (
-		$(add_qt_dep qtdbus)
-		$(add_qt_dep qtgui)
-		$(add_qt_dep qtsvg)
-		$(add_qt_dep qtwidgets)
-		$(add_qt_dep qtx11extras)
-	)
 	plasma? (
 		$(add_frameworks_dep frameworkintegration)
 		$(add_frameworks_dep karchive)
@@ -56,6 +43,13 @@ COMMON_DEPEND="
 		$(add_frameworks_dep kxmlgui)
 		$(add_qt_dep qtprintsupport)
 	)
+	qt5? (
+		$(add_qt_dep qtdbus)
+		$(add_qt_dep qtgui)
+		$(add_qt_dep qtsvg)
+		$(add_qt_dep qtwidgets)
+		$(add_qt_dep qtx11extras)
+	)
 	X? (
 		x11-libs/libX11
 		x11-libs/libxcb
@@ -78,11 +72,11 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md )
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="$(get_libdir)"
+		-DENABLE_QT4=OFF
 		-DQTC_QT4_ENABLE_KDE=OFF
 		-DQTC_QT4_ENABLE_KWIN=OFF
 		-DQTC_KDE4_DEFAULT_HOME=ON
 		-DENABLE_GTK2="$(usex gtk)"
-		-DENABLE_QT4="$(usex qt4)"
 		-DENABLE_QT5="$(usex qt5)"
 		-DENABLE_TEST="$(usex test)"
 		-DQTC_ENABLE_X11="$(usex X)"