diff --git a/Manifest.files.gz b/Manifest.files.gz
index 97e813250ae1..02445176b34a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e3f78aa7415f..14e6825dc387 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
index 6e367c852a5c..ac9604b0ef63 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bec0a607fe82..98b16a6ccfc0 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/jetring/Manifest b/app-crypt/jetring/Manifest
index 3510b7fdd2eb..02ee98a4f84a 100644
--- a/app-crypt/jetring/Manifest
+++ b/app-crypt/jetring/Manifest
@@ -1 +1,2 @@
 DIST jetring_0.25.tar.xz 208944 BLAKE2B 417565c1590f677542f81b6f457482ff1c8219317b90d12666a8b497608f5ee16466c03f68d8c4424c4bb92a0713fefb243dc621eee9cd10f7cf3495590143bd SHA512 aa9de0c7c034093789bf74c75533e678b0822cf0d1261d1b906fd5ef2decb41654bf2facc5c06b469367bb1a0fea4c862c0836fd00635779a2e8dd4f3c08ff46
+DIST jetring_0.27.tar.xz 209376 BLAKE2B 08081611d42f63dbfd0d8c44c67932ae6428ce244f9f2c01466bae0baef54e4ccaa67f78825004a0292bc619efd44b247b7982669cf5b29b366c4c20f776984a SHA512 707f480d6b5ef2943fcd54776631d2290ec892bcccb0a3099f28262e4660d844d1db135fa4070538ffcf1ddeda00c09dd258707857e0f1af0fcadb407cca383a
diff --git a/app-crypt/jetring/jetring-0.25.ebuild b/app-crypt/jetring/jetring-0.25.ebuild
index 04664bb5eb51..1e93e84f2d90 100644
--- a/app-crypt/jetring/jetring-0.25.ebuild
+++ b/app-crypt/jetring/jetring-0.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -24,6 +24,11 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.21-parallel.patch
 }
 
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
 src_install() {
 	default
 
diff --git a/app-crypt/jetring/jetring-0.27.ebuild b/app-crypt/jetring/jetring-0.27.ebuild
new file mode 100644
index 000000000000..fe2d14100c31
--- /dev/null
+++ b/app-crypt/jetring/jetring-0.27.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GPG keyring maintenance using changesets"
+HOMEPAGE="http://joeyh.name/code/jetring/"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="app-crypt/gnupg"
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	"
+
+S="${WORKDIR}"/${PN}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.21-parallel.patch
+	eapply_user
+}
+
+src_compile() {
+	addpredict "/run/user/$(id -u)/gnupg/"
+	default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/${PN}/
+	doins -r example
+
+	doman ${PN}*.[0-9]
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 54486c405748..b5327f9303e5 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elicense/elicense-1.0.1.ebuild b/app-portage/elicense/elicense-1.0.1.ebuild
index bbba9eea7ef6..b6b7af167598 100644
--- a/app-portage/elicense/elicense-1.0.1.ebuild
+++ b/app-portage/elicense/elicense-1.0.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 1f8505f18933..6dd4a0e28815 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index aa87362f6be9..aa6c2c3b93e8 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b2057642608b..590787b57b51 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
index 2117666652ca..059a6224249e 100644
--- a/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://0pointer.de/public/${P}.tar.xz
 
 LICENSE="LGPL-2.1"
 SLOT="0/4"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libudev:="
diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
index fe6fcbcaf303..4eb1aa6c4305 100644
--- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
+++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/libstemmer_c"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 
 # This could be used to package both libstemmer_c and libstemmer_java together.
 IUSE="static-libs"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2bd61cb7dcd8..794b4e452182 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/barby/Manifest b/dev-ruby/barby/Manifest
index db5bdb4d0943..6cc3ae38460e 100644
--- a/dev-ruby/barby/Manifest
+++ b/dev-ruby/barby/Manifest
@@ -1 +1,2 @@
 DIST barby-0.6.6.tar.gz 95120 BLAKE2B e46f261eb11eb2f5b17061e6cbe04419df81d4248a9bed8a5f8f90cba9329915cacf3fa48cc922f4eac14ca7eada87e5be526d9b0d2e0bd1f443daf09af89088 SHA512 5b0a00861b9cecee153c5e1f4e1564d99021b3f7f6005efc48d666f8b4255e91f18792d19b9ae635d40f72dbb38de8db215a252b553138be737a52a8ba85c728
+DIST barby-0.6.7.tar.gz 95199 BLAKE2B b1729e361a41deee248a3c74c56d072fe0eeb3463ff4730744736e1a523f2844e877d63b058ec02e4cdad1f77620bcd476e823864428aff78b462cf29b20909a SHA512 29ba52612b2390ebd2a9e0acc0eec4a4c119ca305662f47e6656cb63727956877970d14f9b924466fad6e9e927e23f74c2614b41e09ca6b068bdabbaae21f93f
diff --git a/dev-ruby/barby/barby-0.6.7.ebuild b/dev-ruby/barby/barby-0.6.7.ebuild
new file mode 100644
index 000000000000..b0e8897fd519
--- /dev/null
+++ b/dev-ruby/barby/barby-0.6.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
+HOMEPAGE="http://toreto.re/barby/"
+
+GITHUB_USER="toretore"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test qrcode rmagick prawn png cairo"
+
+ruby_add_rdepend "
+	rmagick? ( dev-ruby/rmagick )
+	cairo? ( dev-ruby/rcairo )"
+
+ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
+	png? ( dev-ruby/chunky_png )
+	prawn? ( dev-ruby/prawn:* )"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+# testing requires imagemagick capable of png output
+DEPEND+=" test? ( media-gfx/imagemagick[png] )"
+
+# prawn breaks tests for some reasons, needs to be investigated; code
+# still works though.
+RESTRICT="prawn? ( test )"
+
+all_ruby_prepare() {
+	sed -i -e 's/README/README.md/' Rakefile || die
+
+	sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
+
+	if use qrcode; then
+		sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/barcode/qr_code.rb \
+			test/qr_code_test.rb
+	fi
+
+	if use rmagick; then
+		sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/rmagick_outputter.rb \
+			test/outputter/rmagick_outputter_test.rb
+	fi
+
+	if use prawn; then
+		sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/prawn_outputter.rb \
+			test/outputter/prawn_outputter_test.rb
+	fi
+
+	if use png; then
+		sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/png_outputter.rb \
+			test/outputter/png_outputter_test.rb
+	fi
+
+	if use cairo; then
+		sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
+	else
+		rm \
+			lib/barby/outputter/cairo_outputter.rb \
+			test/outputter/cairo_outputter_test.rb
+	fi
+
+	rm -f \
+		lib/barby/barcode/data_matrix.rb \
+		test/data_matrix_test.rb \
+		lib/barby/outputter/pdfwriter_outputter.rb \
+		test/outputter/pdfwriter_outputter_test.rb || die
+
+	sed -i \
+		-e '/semacode/d' \
+		-e '/pdf-writer/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 5c5faffddb27..b22add4d380b 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1 +1,2 @@
 DIST patron-0.13.1.gem 64512 BLAKE2B 14f691cb0fd1c863a1ef634ba8aee94751095138e940f13bf09860e9e0061872fe14fa33416f59f82d4adc53963721d653936a3f058b27654ea7593d6068d0b7 SHA512 7b082ff7442c2635c38b37132cd61f6cd18d4792d41cbf3bed1201fb7371b75bb628a295f4e3dd173c23e086d3c1f54f0217df3f7d1a30c1031fcca86269e1e7
+DIST patron-0.13.3.gem 65024 BLAKE2B 87aa69aab49978d14a80ed9e09d74d7853da3512875cc3aecd3f387d1523b85c84625b57a5826e5f5f999cec4feaae58c1aaae96582144a5c9dc537c9d5a4224 SHA512 afbbbd9570e338a5d1b97b4ebeda76ac95a22c29d908629723d345a47400183c2ccee67ebcaf5b6f9ecb032eb3b847e70ec9eebff75b33045a3665c215abfbd0
diff --git a/dev-ruby/patron/patron-0.13.3.ebuild b/dev-ruby/patron/patron-0.13.3.ebuild
new file mode 100644
index 000000000000..cedf0130468e
--- /dev/null
+++ b/dev-ruby/patron/patron-0.13.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://toland.github.com/patron/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+ruby_add_bdepend "test? ( www-servers/puma )"
+
+all_ruby_prepare() {
+	# Fix Rakefile
+	sed -i -e 's:rake/rdoctask:rdoc/task:' \
+		-e 's/README.txt/README.md/' \
+		-e '/bundler/I s:^:#:' \
+		-e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^end/ s:^:#:' \
+		Rakefile || die
+
+	# Avoid specs with failures. We were not running any specs before.
+	rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/patron extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/patron V=1
+	cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to cp shared object file"
+}
diff --git a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
index 6dff83c2e598..1e51b2fb94b3 100644
--- a/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
+++ b/dev-ruby/pygments_rb/pygments_rb-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 PYTHON_COMPAT=( python2_7 )
 
 RUBY_FAKEGEM_NAME="pygments.rb"
diff --git a/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
index 9189aae50b5c..dbabb18b825a 100644
--- a/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-6.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 # Skip integration tests since they require additional unpackaged
 # dependencies and running daemons.
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index 8edfdd0ccf2c..a1cdb65cd09c 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,2 +1,3 @@
 DIST rbpdf-1.19.6.tar.gz 12026339 BLAKE2B 8ec388e65f110773b9a7c160a9bccbb1beb6f3ad0bbe2393a7b91087e1d2b3cbdfb03284737f6763cee6cfa947d68532cde8f4b684b004dfc92f300510a1f5c0 SHA512 192dae84ef2a44cfc7bde38e776ade1aab95e812f55ba1848c20be4a2e65231c97330859cf14b1d3bfd7aa158a1ea561602723e9e96e275ecc771ca781901271
 DIST rbpdf-1.19.7.tar.gz 12026440 BLAKE2B be785f7f810c11c64efcc2ef896486dcc3d13b506badc3527abe18065c82ff32a025eda3fd925c9ac0da5c99d0300f2d76fbcf52d444bec46ebdf533b0180234 SHA512 6d4f01760511f117f2ddda87cde26ddd0e47c6245692d80fe84a9ff5cde9759b7803dcfbd328ff9af9e59f6bca9f210d8bcb66f66f288acb512f58920fb5e7d8
+DIST rbpdf-1.19.8.tar.gz 12026547 BLAKE2B 4989bee6f35d74a703539c6d209c14730e2674d94454b1794172f147dd01af20bdea5c4ed3e68a047f7ddad17083d74ea061dc5b0c28e66acdbf56ab1e335dd3 SHA512 e3015e80b26f9de2727ebd1a97ff5fd3937b7e133d9d39c2e1b3e9fe326354ca66ef569fa35bdf4c8b495b40df1ceec26d043e6f86be8ce741068a2c28ff8a28
diff --git a/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
new file mode 100644
index 000000000000..cec0aa03e682
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.19.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails RBPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
+ruby_add_rdepend "
+	dev-ruby/htmlentities
+	=dev-ruby/rbpdf-font-1.19*"
+
+all_ruby_prepare() {
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+
+	# Loosen very restrictive htmlentities dependency
+	sed -i -e '/htmlentities/ s/=/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	local cmd='gem "test-unit", ">= 3.0"'
+	cmd+=' and '
+	cmd+='require "test/unit"'
+	cmd+=' and '
+	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 5f91871d84af..28ea4559c6ad 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,2 +1,3 @@
 DIST recog-2.1.31.gem 236032 BLAKE2B 5e6b4ffe163985ff437c2fbaf203e1d07796ead0c20b233703fcb66bfed45930463dc1b7b2bc0c6c9ec1089730589cf996b59382ad4fd63d4913b118035fc852 SHA512 eeabae2684d4fb616d7ea272dd9c4fda0b1a2ea7776cd664fa237989b68e277943642267359a2671ee180e1a5f0cda8f0be24bfa2b4d7729b469664700955ada
 DIST recog-2.1.46.gem 246784 BLAKE2B 1b151fb6944371d186154ecc28eb74f6727b92394bf3686fb7230603e64a37438dc63293929b63025794ae053304ced7f74da4d530d24f77a6274ffe69cfff7d SHA512 aae48fc9a91e7f750944a97e562789efde14474b42d063dcb2dacd038e78fd20222719e0f17d66c8a13b7261e2e58567bad4db0a84893724a5c04504d35efbc0
+DIST recog-2.3.2.gem 259584 BLAKE2B 035cdcb23fa837798fd256d00eb3cfa11b6ebeefd218c3c00a0f68ad1311efc6ce62a3db537cdc7a692d77e10b45c63f7c391314b05ca93c9afc269e67e7ba24 SHA512 0deb0e2354bab3ae190b0b71d370755de802d679a37a2d907fcc6503a12120e27d607bd3f31db62f678e4488228977132f3816a4586e5e85ba37f7ff6cd27733
diff --git a/dev-ruby/recog/recog-2.3.2.ebuild b/dev-ruby/recog/recog-2.3.2.ebuild
new file mode 100644
index 000000000000..e041a3e28841
--- /dev/null
+++ b/dev-ruby/recog/recog-2.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="xml"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser:0
+	dev-ruby/rspec:3
+	dev-util/aruba
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
index e9781606fb8f..061c75e89e37 100644
--- a/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
diff --git a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
index 1ac91d731a63..ac87d48570e1 100644
--- a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
+++ b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild b/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
index 01837135779e..4ab72064dbb4 100644
--- a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
+++ b/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # Specs are not provided in the gem
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild b/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
index e00da4173939..4ae9822adb15 100644
--- a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
+++ b/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild b/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
index 219d91961f4c..776b98e5c24c 100644
--- a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
+++ b/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_BINWRAP=""
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 231c7939ce3b..3332ea3983c0 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 9f13cfa7eb16..3762b82de4bc 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,4 @@
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 DIST strace-5.0.tar.xz 1468752 BLAKE2B 3626697ec340728f2703cd5d8a4e8f274184a6b8ef76b1d239ba7a2ec8c76d7dd7e47e6cde6f5edc8e14ae0322e82a6425fb8586d0f1aba709c4d2208a503027 SHA512 cba3280ada27ef434eda54d0e150f04ab89ad227d67b29bd0993f9ac7747eb32b0e49af8cc493b92eab99c0848ec8dc6bbd9b1db423abd53f19129dacbddf265
+DIST strace-5.1.tar.xz 1493868 BLAKE2B 1a513fbcb30a61af60013c779a6ca8c842aa20a6f359c29cf16bd5357dd26428855ebb8b097c137f8351d87b776d9674c7e41fb2789185439b70fd6d50c904e9 SHA512 dfbfa97650f0c42d088a3c5ff9715a05a31e579742fb2874c225b6e3c26b0d49c2427489080e971ee2cabb0fe744ff2464b3524c5adae0b3d5843583018de074
diff --git a/dev-util/strace/strace-5.1.ebuild b/dev-util/strace/strace-5.1.ebuild
new file mode 100644
index 000000000000..db378889c0d5
--- /dev/null
+++ b/dev-util/strace/strace-5.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index e4f979cf0519..db378889c0d5 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
@@ -78,7 +78,7 @@ src_configure() {
 }
 
 src_test() {
-	if has usersandbox $FEATURES ; then
+	if has usersandbox ${FEATURES} ; then
 		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
 		return 0
 	fi
@@ -88,6 +88,8 @@ src_test() {
 
 src_install() {
 	default
-	use perl || rm "${ED%/}"/usr/bin/strace-graph
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
 	dodoc CREDITS
 }
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 19f897fcbcec..4a39e2b858e1 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index e644551c904a..f79208e9c8b7 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,2 +1,3 @@
 DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc
+DIST eternal-lands-1.9.5.3.tar.gz 2814562 BLAKE2B ccb3dd78d12817912293f8babbd5f5dde6f0e3ea0cb34526edd7a3f0371f5313f94ff2d6b22cf472442869dfcf9893c19ec72d7ccf879b0e6a3dbfa05249c38f SHA512 bf0da70080377a76c66d6201da6032aae2967051e23f8aa433d450ec845bcd91145b965632fa63f66feebc15eaa9a65ff8f33884cc1b7c3605125f1536d91563
 DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
new file mode 100644
index 000000000000..772635913942
--- /dev/null
+++ b/games-rpg/eternal-lands/eternal-lands-1.9.5.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop toolchain-funcs xdg
+
+DESCRIPTION="A 3D fantasy MMORPG written in C and SDL"
+HOMEPAGE="http://www.eternal-lands.com"
+SRC_URI="https://github.com/raduprv/Eternal-Lands/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="eternal_lands"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/unzip
+	dev-libs/libxml2
+	media-libs/cal3d[-16bit-indices]
+	media-libs/freealut
+	media-libs/libpng:0=
+	media-libs/libsdl[X,opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/sdl-image
+	media-libs/sdl-net
+	sys-libs/zlib[minizip]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	app-eselect/eselect-opengl
+	media-libs/glew"
+BDEPEND="${DEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)"
+
+S="${WORKDIR}/Eternal-Lands-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.5.3-build.patch"
+	"${FILESDIR}/${PN}-1.9.5.3-minizip.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i "s/FEATURES/EL_FEATURES/g" make.defaults || die
+	sed -i "s/FEATURES/EL_FEATURES/g" Makefile.linux || die
+
+	# Remove bundled minizip
+	rm io/{crypt,ioapi,unzip,zip}.h || die
+	rm io/{ioapi,unzip,zip}.c || die
+
+	cp Makefile.linux Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	use doc && emake docs
+}
+
+src_install() {
+	dobin el.linux.bin
+	newbin "${FILESDIR}"/el-wrapper el
+	newicon -s 48 elc.png ${PN}.png
+	make_desktop_entry el "Eternal Lands"
+
+	dodoc CHANGES TODO
+	use doc && dodoc -r docs/html/
+}
diff --git a/games-rpg/eternal-lands/files/el-wrapper b/games-rpg/eternal-lands/files/el-wrapper
new file mode 100644
index 000000000000..ab392d334207
--- /dev/null
+++ b/games-rpg/eternal-lands/files/el-wrapper
@@ -0,0 +1,53 @@
+#!/bin/bash -e
+
+elc=~/.elc
+datadir=$elc/el_data
+browser=xdg-open
+
+if [[ ! -e $elc ]] || [[ ! -e $datadir ]] || [[ ! -e $elc/servers.lst ]] ||
+   [[ ! -e $elc/el.ini ]]; then
+
+	[[ -e $elc ]] || mkdir -p $elc
+
+	if [[ ! -e $datadir ]]; then
+		echo
+		echo "The \"Eternal Lands\" launcher is downloading the game data..."
+		echo "It is only needed before the first start."
+		echo "The default data location is ~/.elc/el_data"
+		echo
+
+		tmpdir="`mktemp -d /tmp/eternal-lands.XXXXXXXXXX`"
+		trap "rm -r $tmpdir" EXIT
+		wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/el_195_1_data_files.zip -P $tmpdir
+		unzip $tmpdir/el_195_1_data_files.zip -d $elc
+
+		echo
+		echo "The game sound and music are optional, you can download \
+them now or any time later from the official website and unpack into \
+~/.elc/el_data/sound and ~/.elc/el_data/music"
+		while true; do
+			read -r -n 1 -p "Download the game sound and music now? (y/n) " yn
+			case $yn in
+				[Yy]) break;;
+				[Nn]) break;;
+				*) echo -e "\nPlease answer Yes or No.";;
+			esac
+		done
+		echo
+
+		if [[ $yn == [Yy] ]]; then
+			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/eternallands-sound_1.9.4.zip -P $tmpdir
+			wget https://github.com/raduprv/Eternal-Lands/releases/download/1.9.5.2/music_full.zip -P $tmpdir
+			unzip $tmpdir/eternallands-sound_1.9.4.zip -d $datadir
+			mkdir $datadir/music
+			unzip $tmpdir/music_full.zip -d $datadir/music
+		fi
+
+		rm -r $tmpdir
+	fi
+
+	[[ -e $elc/servers.lst ]] || cp $datadir/servers.lst $elc/
+	[[ -e $elc/el.ini ]] || cp $datadir/el.ini $elc/
+fi
+
+exec /usr/bin/el.linux.bin -dir="$datadir" -b="$browser" "$@"
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
new file mode 100644
index 000000000000..28f4ab0da542
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-build.patch
@@ -0,0 +1,70 @@
+From ef13ae006609e51eaddbcdf0495f44cfde797e26 Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Tue, 14 May 2019 20:34:47 +0300
+Subject: [PATCH 1/2] Respect {C,CXX,LD}FLAGS
+
+Upstream-Status: Inappropriate [Gentoo-specific]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ Makefile.linux | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index c57aeeeb..a0839c5c 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+ 	$(shell pkg-config vorbisfile --cflags) \
+ 	$(shell pkg-config zlib --cflags)
+ 
+-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+ 
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+ 
+-LDFLAGS=$(shell pkg-config sdl --libs) \
++LDFLAGS += $(shell pkg-config sdl --libs) \
+ 	$(shell pkg-config libxml-2.0 --libs) \
+ 	$(shell pkg-config SDL_net --libs) \
+ 	$(shell pkg-config SDL_image --libs) \
+@@ -111,7 +111,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
+ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
+ #(shell echo $OBJ |sed s/\.o/\.P/))
+ 
+-EXE=el.x86.linux.bin
++EXE=el.linux.bin
+ 
+ ifndef CC
+ CC=gcc
+@@ -127,8 +127,8 @@ all: $(EXE)
+ 
+ # the compile targets
+ $(EXE): $(OBJS)
+-	@echo "  LINK $(EXE)"
+-	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
++	@echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)"
++	@$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
+ 
+ #recompile on Makefile or conf change
+ #.depend $(OBJS): Makefile.linux make.conf
+@@ -136,14 +136,14 @@ $(EXE): $(OBJS)
+ DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
+ 
+ $(COBJS): %.o: %.c Makefile.linux make.conf
+-	@echo "  CC   $@"
++	@echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
+ 	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+ 	fi
+ 
+ $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
+-	@echo "  CXX  $@"
++	@echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
+ 	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
+ 		mv ".deps/$@.pp" ".deps/$@.P"; \
+ 	else rm -f ".deps/$@.pp"; exit 1; \
+-- 
+2.21.0
+
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch
new file mode 100644
index 000000000000..c1eb35fdc849
--- /dev/null
+++ b/games-rpg/eternal-lands/files/eternal-lands-1.9.5.3-minizip.patch
@@ -0,0 +1,90 @@
+From 7df2f0a47ff2d25898063dc2fb30ba3d80d63afb Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Thu, 16 May 2019 05:31:16 +0300
+Subject: [PATCH 2/2] Unbundle minizip
+
+Original patch by Julian Ospald <hasufell@gentoo.org>.
+Bug: https://bugs.gentoo.org/423327
+
+Upstream-Status: Pending
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ Makefile.linux     | 4 +++-
+ io/elfilewrapper.c | 2 +-
+ io/ziputil.h       | 4 ++--
+ new_update.c       | 4 ++--
+ 4 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.linux b/Makefile.linux
+index a0839c5c..d29ac912 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -12,6 +12,7 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
+ 	$(shell pkg-config cal3d --cflags) \
+ 	$(shell pkg-config gl --cflags) \
+ 	$(shell pkg-config glu --cflags) \
++	$(shell pkg-config minizip --cflags) \
+ 	$(shell pkg-config openal --cflags) \
+ 	$(shell pkg-config vorbis --cflags) \
+ 	$(shell pkg-config vorbisfile --cflags) \
+@@ -28,6 +29,7 @@ LDFLAGS += $(shell pkg-config sdl --libs) \
+ 	$(shell pkg-config cal3d --libs) \
+ 	$(shell pkg-config gl --libs) \
+ 	$(shell pkg-config glu --libs) \
++	$(shell pkg-config minizip --libs) \
+ 	$(shell pkg-config openal --libs) \
+ 	$(shell pkg-config vorbis --libs) \
+ 	$(shell pkg-config vorbisfile --libs) \
+@@ -64,7 +66,7 @@ COBJS=2d_objects.o 3d_objects.o \
+ 	hud.o hud_misc_window.o hud_quickbar_window.o hud_statsbar_window.o hud_quickspells_window.o	\
+ 	help.o highlight.o ignore.o image_loading.o init.o interface.o items.o io/fileutil.o	\
+ 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
+-	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
++	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
+ 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
+ 	main.o manufacture.o map.o mapwin.o	\
+ 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\
+diff --git a/io/elfilewrapper.c b/io/elfilewrapper.c
+index fad99d62..5dee9a37 100644
+--- a/io/elfilewrapper.c
++++ b/io/elfilewrapper.c
+@@ -1,5 +1,5 @@
+ #include "elfilewrapper.h"
+-#include "unzip.h"
++#include <unzip.h>
+ #include "elpathwrapper.h"
+ #include "fileutil.h"
+ #include <sys/stat.h>
+diff --git a/io/ziputil.h b/io/ziputil.h
+index 86128315..51fa232b 100644
+--- a/io/ziputil.h
++++ b/io/ziputil.h
+@@ -8,8 +8,8 @@
+ 
+ #include <SDL.h>
+ #include "../md5.h"
+-#include "zip.h"
+-#include "unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ 
+ #ifdef __cplusplus
+ extern "C"
+diff --git a/new_update.c b/new_update.c
+index febd10ae..ec039f6c 100644
+--- a/new_update.c
++++ b/new_update.c
+@@ -5,8 +5,8 @@
+ #include <string.h>
+ #include "md5.h"
+ #include "elc_private.h"
+-#include "io/zip.h"
+-#include "io/unzip.h"
++#include <zip.h>
++#include <unzip.h>
+ #include "io/ziputil.h"
+ #include "io/fileutil.h"
+ #include "io/elfilewrapper.h"
+-- 
+2.21.0
+
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
index 3a16e77fe8ea..3b426abd6bc5 100644
--- a/games-rpg/eternal-lands/metadata.xml
+++ b/games-rpg/eternal-lands/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Richard Freeman</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
+		Eternal Lands is a free 3D fantasy MMORPG (massively multiplayer online role playing game)
 	</longdescription>
 </pkgmetadata>
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index bc7745ba9ad1..ece8359f3f1f 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 73972e54497c..50994922bae6 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/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
index cf4b4bd28513..c0f27a7d8712 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.25.9:2"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 66b0e77d0032..654bac9eb890 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
index 1365950c7e60..a9ad79512962 100644
--- a/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
+++ b/media-libs/bio2jack/bio2jack-0.9-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A library for porting blocked I/O OSS/ALSA audio applications to JACK"
@@ -13,20 +14,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
-RDEPEND="media-libs/libsamplerate
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libsamplerate
 	virtual/jack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	eapply_user
+	default
 
 	# upstream does not provide a real release, it releases a tarball
 	# with a _prebuilt_ copy of bio2jack. Drop all of the built stuff
 	# and recreate autotools from scratch, then build.
-	rm -rf *.a *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 stamp || die
+	rm -r *.o *.la *.lo .libs .deps Makefile config.{log,status} stamp-h1 || die
 
 	eautoreconf
 }
@@ -38,8 +42,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 	dobin bio2jack-config
-	dodoc AUTHORS ChangeLog NEWS README
-	rm -f "${ED}"usr/lib*/lib*.la
+	rm -f "${ED}"/usr/lib*/lib*.la || die
 }
diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild
index 85ac5b69d1b6..de40c4624571 100644
--- a/media-libs/exempi/exempi-2.4.5-r1.ebuild
+++ b/media-libs/exempi/exempi-2.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="2/3"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="examples static-libs test"
 
 RDEPEND="
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index b82e65a292f3..c9cf2f6ea763 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/media-libs/libcue/libcue-1.4.0.ebuild b/media-libs/libcue/libcue-1.4.0.ebuild
index 0c80188e0d62..45e7b06937de 100644
--- a/media-libs/libcue/libcue-1.4.0.ebuild
+++ b/media-libs/libcue/libcue-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libexif/libexif-0.6.21-r3.ebuild b/media-libs/libexif/libexif-0.6.21-r3.ebuild
index 77ed7b4ce609..4c5b6bc9155b 100644
--- a/media-libs/libexif/libexif-0.6.21-r3.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
index 5169a9e48f51..575825e620b6 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="doc examples nls python"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
diff --git a/media-libs/lilv/lilv-0.24.4.ebuild b/media-libs/lilv/lilv-0.24.4-r1.ebuild
similarity index 84%
rename from media-libs/lilv/lilv-0.24.4.ebuild
rename to media-libs/lilv/lilv-0.24.4-r1.ebuild
index 19de278eb55a..ff7ce65ebeb2 100644
--- a/media-libs/lilv/lilv-0.24.4.ebuild
+++ b/media-libs/lilv/lilv-0.24.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
@@ -17,21 +17,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc +dyn-manifest static-libs test"
 
-RDEPEND=">=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
-	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+RDEPEND="
 	>=dev-libs/serd-0.28.0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]"
+	>=dev-libs/sord-0.16.0-r1[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	>=media-libs/lv2-1.14.0-r1[${MULTILIB_USEDEP}]
+	>=media-libs/sratom-0.6.0-r1[${MULTILIB_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	doc? ( app-doc/doxygen )
-	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
 
-DOCS=( "AUTHORS" "NEWS" "README" )
+PATCHES=( "${FILESDIR}/includedir.patch" )
 
 src_prepare() {
-	eapply "${FILESDIR}/includedir.patch"
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	multilib_copy_sources
 }
 
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 27a3ae24528f..e5494adcfb08 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/hexter/Manifest b/media-plugins/hexter/Manifest
index db54a74271dd..764a892d43d1 100644
--- a/media-plugins/hexter/Manifest
+++ b/media-plugins/hexter/Manifest
@@ -1,2 +1,2 @@
 DIST hexter-1.0.2.tar.gz 517532 BLAKE2B 78adb77a386a3ec79b951078645084965f9f8cb26f6a362342aea1fa2191fd8cf73d313977cd2542990095a2163c77f4f0602b92793507caccfd7ff2f65823b1 SHA512 5ae765004f319dba8b7c881736e6abd2c794e2b2a43d708dbe0ee791e63d004c4612927b4ff23854367ca3ff49e5efc0a936939d4805d48fe1339a802cccae27
-DIST hexter-1.0.3.tar.bz2 447364 BLAKE2B c038348fb643108616df3f7dffebd8252dbf1b2ee3ff1737a5a946d407f0d6fd013c4cda978f74d1c7e6a5219cf27c9940b9b9eb0b09a7e2cdd3e4143a825595 SHA512 2f9257b08ad493d45386bdb35fa8ead7532223db6cb54065e5809e7bfbdbc71f43425b08e9f9a8ed68a8a7a81804b007cd4f34abbedc1b4fc41be8ffca52b749
+DIST hexter-1.1.0.tar.bz2 737430 BLAKE2B 9c79da379a69bc4ceceab11dc725d965bb923384e060e24eb7e7d1f65650d5c77206a79d02403e7a952c2eb3c46262b5905e5b07872fb5b060525ed0f275cbc4 SHA512 8d433fae44b0620c3866c9a3b2445271a039c8ac3ad12c71ca34d667a85b95b9bddd7e04c4eaa2c27299c66b9cce16d104b5fbb376dd3cdc85f7e4d6c9b28529
diff --git a/media-plugins/hexter/hexter-1.0.3.ebuild b/media-plugins/hexter/hexter-1.1.0.ebuild
similarity index 52%
rename from media-plugins/hexter/hexter-1.0.3.ebuild
rename to media-plugins/hexter/hexter-1.1.0.ebuild
index 48ef4696f122..868f59e31325 100644
--- a/media-plugins/hexter/hexter-1.0.3.ebuild
+++ b/media-plugins/hexter/hexter-1.1.0.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Yamaha DX7 modeling DSSI plugin"
-HOMEPAGE="http://dssi.sourceforge.net/hexter.html"
-SRC_URI="mirror://sourceforge/dssi/${P}.tar.bz2"
+HOMEPAGE="http://smbolton.com/hexter.html"
+SRC_URI="https://github.com/smbolton/${PN}/releases/download/version_${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk2 readline"
 
-RDEPEND="media-libs/alsa-lib
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	media-libs/alsa-lib
 	>=media-libs/dssi-0.4
 	>=media-libs/liblo-0.12
 	gtk2? ( x11-libs/gtk+:2 )
-	readline? ( sys-libs/readline:0
-		sys-libs/ncurses )"
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
 DEPEND="${RDEPEND}
 	media-libs/ladspa-sdk
-	virtual/pkgconfig"
+"
 
 src_configure() {
+	PKG_CONFIG=pkg-config \
 	econf $(use_with gtk2) \
 		$(use_with readline textui)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index dcb6c70240f9..8e2bb57877f3 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
similarity index 87%
rename from media-sound/audicle/audicle-1.0.0.7-r1.ebuild
rename to media-sound/audicle/audicle-1.0.0.7-r2.ebuild
index b09d488baa5f..7ea60ba2f27f 100644
--- a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
+++ b/media-sound/audicle/audicle-1.0.0.7-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
 HOMEPAGE="http://audicle.cs.princeton.edu/"
@@ -13,24 +14,31 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+alsa jack oss truetype"
 
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+DEPEND="
+	app-eselect/eselect-audicle
 	media-libs/freeglut
+	media-libs/libsndfile
 	virtual/opengl
 	virtual/glu
 	x11-libs/gtk+:2
-	truetype? ( media-libs/ftgl
-		media-fonts/corefonts )
-	app-eselect/eselect-audicle"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	jack? ( virtual/jack )
+	truetype? (
+		media-fonts/corefonts
+		media-libs/ftgl
+	)
+"
+rDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( alsa jack oss )"
 
 DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
+
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
 	"${FILESDIR}/${P}-hid-smc.patch"
@@ -39,7 +47,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
+	default
 
 	sed -i \
 		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
@@ -48,8 +56,6 @@ src_prepare() {
 		-e 's/-O3 -c/-c $(CFLAGS)/' \
 		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
 		src/makefile.{alsa,jack,oss} || die "sed failed"
-
-	epatch_user
 }
 
 compile_backend() {
diff --git a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
similarity index 65%
rename from media-sound/bitmeter/bitmeter-1.2-r1.ebuild
rename to media-sound/bitmeter/bitmeter-1.2-r2.ebuild
index 35b1faaa6ff9..4ee1222e4afe 100644
--- a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
+++ b/media-sound/bitmeter/bitmeter-1.2-r2.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="Diagnosis tool for JACK audio software"
-HOMEPAGE="http://devel.tlrmx.org/audio/"
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
+HOMEPAGE="https://devel.tlrmx.org/audio/"
+SRC_URI="https://devel.tlrmx.org/audio/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	virtual/jack
+	x11-libs/gtk+:2
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2-fix-build-system.patch
diff --git a/media-sound/bristol/bristol-0.60.11-r1.ebuild b/media-sound/bristol/bristol-0.60.11-r1.ebuild
index 0cb211ac2850..01ee6cb806e3 100644
--- a/media-sound/bristol/bristol-0.60.11-r1.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,15 +17,16 @@ IUSE="alsa oss static-libs"
 # jack: fails to build if disabled
 # pulseaudio: not fully supported
 
+BDEPEND="
+	virtual/pkgconfig
+"
 RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
+	virtual/jack
 	x11-libs/libX11
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 "
 # osc? ( >=media-libs/liblo-0.22 )
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index 5c205ce75718..c0dbb7ac747e 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,9 +13,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0"
+RDEPEND="
+	media-libs/alsa-lib
+	sci-libs/fftw:3.0
+	virtual/jack"
 DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-ld.patch )
diff --git a/media-sound/fmit/fmit-1.0.15-r1.ebuild b/media-sound/fmit/fmit-1.0.15-r2.ebuild
similarity index 85%
rename from media-sound/fmit/fmit-1.0.15-r1.ebuild
rename to media-sound/fmit/fmit-1.0.15-r2.ebuild
index d7e9c9594e38..163fafa5f86d 100644
--- a/media-sound/fmit/fmit-1.0.15-r1.ebuild
+++ b/media-sound/fmit/fmit-1.0.15-r2.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils
 
 DESCRIPTION="Free Music Instrument Tuner"
 HOMEPAGE="https://gillesdegottex.github.io/fmit"
-SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz \
-							-> ${P}.tar.gz"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa jack oss portaudio"
 
-RDEPEND=">=sci-libs/fftw-3.3.4:3.0=
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
 	dev-qt/qtmultimedia:5
 	dev-qt/qtopengl:5
 	dev-qt/qtsvg:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[-gles2]
+	dev-qt/qtwidgets:5
+	>=sci-libs/fftw-3.3.4:3.0=
+	virtual/opengl
 	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	portaudio? ( media-libs/portaudio )"
-
+	jack? ( virtual/jack )
+	portaudio? ( media-libs/portaudio )
+"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+"
 
 src_prepare() {
 	# Fix the path to readme file to prevent errors on start up
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b489f27b5e09..52b941c2fe0f 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 9f3cd35d78db..75f291d14b05 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2019 15:08:51 +0000
+Thu, 23 May 2019 06:08:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9f3cd35d78db..75f291d14b05 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2019 15:08:51 +0000
+Thu, 23 May 2019 06:08:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7d6be6a3ff5d..acada5981952 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 388e5a775deb..34a7c74519cc 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/gnome-autoar-0.2.3 b/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
index 568002b6a4cf..07fd428ca81d 100644
--- a/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
+++ b/metadata/md5-cache/app-arch/gnome-autoar-0.2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Automatic archives creating and extracting library
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-autoar
 IUSE=gtk +introspection vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-arch/libarchive-3.2.0 >=dev-libs/glib-2.35.6:2 gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.3.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=3bdf7ad86e6a18c5527f9483f9857514
+_md5_=d49c65bf591f0e2c30fd1bf4748aa6b9
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index fb8a6ddfb78a..8d30c8f4346c 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/jetring-0.25 b/metadata/md5-cache/app-crypt/jetring-0.25
index 29a3f1569bff..e6e44063588e 100644
--- a/metadata/md5-cache/app-crypt/jetring-0.25
+++ b/metadata/md5-cache/app-crypt/jetring-0.25
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install prepare
 DEPEND=app-crypt/gnupg
 DESCRIPTION=GPG keyring maintenance using changesets
 EAPI=5
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/gnupg dev-lang/perl
 SLOT=0
 SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.25.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b44891adeda657cf64ec8895c97f9d2d
+_md5_=9069b77a055ff6cea97bbfdccd5ddb0a
diff --git a/metadata/md5-cache/app-crypt/jetring-0.27 b/metadata/md5-cache/app-crypt/jetring-0.27
new file mode 100644
index 000000000000..8c389df48b12
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/jetring-0.27
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-crypt/gnupg
+DESCRIPTION=GPG keyring maintenance using changesets
+EAPI=7
+HOMEPAGE=http://joeyh.name/code/jetring/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-crypt/gnupg dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/j/jetring/jetring_0.27.tar.xz
+_md5_=e86ebe617105979acd30d7ad8482f3f1
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index aa28fda003c9..0926743da77c 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/elicense-1.0.1 b/metadata/md5-cache/app-portage/elicense-1.0.1
index 2706bfe9d544..dfa57189164a 100644
--- a/metadata/md5-cache/app-portage/elicense-1.0.1
+++ b/metadata/md5-cache/app-portage/elicense-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to find installed packages in Gentoo with non-accepted license(
 EAPI=7
 HOMEPAGE=https://github.com/Whissi/elicense
 IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.3.62[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://github.com/Whissi/elicense/archive/v1.0.1.tar.gz -> elicense-1.0.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=436839d9454fd25e60b442a762afb5c7
+_md5_=10d93a3058aa3c68d7441da1fcb99f84
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index fa1e91b0ba78..703cacb1d76b 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/libgxps-0.3.1 b/metadata/md5-cache/app-text/libgxps-0.3.1
index 8da57b90d51d..dc5427bddd34 100644
--- a/metadata/md5-cache/app-text/libgxps-0.3.1
+++ b/metadata/md5-cache/app-text/libgxps-0.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for handling and rendering XPS documents
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
 IUSE=gtk-doc +introspection jpeg lcms tiff
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=867eb60b29aeaa784536ca1b451eada3
+_md5_=5111a3ca3b5dc19b3e400e0cf8d6faf9
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index efc959be39e3..f7b38e8078c8 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/libatasmart-0.19-r2 b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
index a4818b1cd8cd..6cca240cd529 100644
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
 EAPI=6
 HOMEPAGE=http://0pointer.de/blog/projects/being-smart.html
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=virtual/libudev:=
 SLOT=0/4
 SRC_URI=http://0pointer.de/public/libatasmart-0.19.tar.xz mirror://debian/pool/main/liba/libatasmart/libatasmart_0.19-2.debian.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a29cab96d1d93df82127ce30a6dda4d8
+_md5_=2079556fcc4542f39a22f227fa0af4ca
diff --git a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325 b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
index b44309d7a0c3..8e4ed10417b2 100644
--- a/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
+++ b/metadata/md5-cache/dev-libs/snowball-stemmer-0.20140325
@@ -3,9 +3,9 @@ DESCRIPTION=All you need to include the snowball stemming algorithms into a C pr
 EAPI=5
 HOMEPAGE=https://snowballstem.org/
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/libstemmer_c-20140325.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=cae01ad1084e00699fe1eba4913890cf
+_md5_=f4075186dc009df6f8ad505ce9e5c4cb
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2667fca5f613..c3beaf55029c 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/barby-0.6.7 b/metadata/md5-cache/dev-ruby/barby-0.6.7
new file mode 100644
index 000000000000..ac7bec08a011
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/barby-0.6.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ) test? ( ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) test? ( media-gfx/imagemagick[png] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Ruby barcode generator that doesn't rely on 3rd party libraries
+EAPI=6
+HOMEPAGE=http://toreto.re/barby/
+IUSE=test qrcode rmagick prawn png cairo test test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby24] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( rmagick? ( dev-ruby/rmagick[ruby_targets_ruby25] ) cairo? ( dev-ruby/rcairo[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby24] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby24] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( qrcode? ( dev-ruby/rqrcode[ruby_targets_ruby25] ) png? ( dev-ruby/chunky_png[ruby_targets_ruby25] ) prawn? ( dev-ruby/prawn:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RESTRICT=prawn? ( test )
+SLOT=0
+SRC_URI=https://github.com/toretore/barby/archive/v0.6.7.tar.gz -> barby-0.6.7.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=5803d623956648eb2b897df8a7b77ab1
diff --git a/metadata/md5-cache/dev-ruby/patron-0.13.3 b/metadata/md5-cache/dev-ruby/patron-0.13.3
new file mode 100644
index 000000000000..fa5ad9ab632e
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/patron-0.13.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=net-misc/curl ruby_targets_ruby24? ( test? ( www-servers/puma[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( www-servers/puma[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( www-servers/puma[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Patron is a Ruby HTTP client library based on libcurl
+EAPI=6
+HOMEPAGE=https://toland.github.com/patron/
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=net-misc/curl ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=mirror://rubygems/patron-0.13.3.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=190f8600c0d8652b797474cd88dea240
diff --git a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1 b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
index b9cab333d1d0..cba8e6a91cb0 100644
--- a/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
+++ b/metadata/md5-cache/dev-ruby/pygments_rb-1.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( 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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-ruby/rake-compiler[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake-compiler[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake-compiler[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Pygments syntax highlighting in ruby
 EAPI=6
 HOMEPAGE=https://github.com/tmm1/pygments.rb
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test python_targets_python2_7
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test python_targets_python2_7
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.2.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ruby_targets_ruby24? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby25] ) ruby_targets_ruby26? ( >=dev-ruby/multi_json-1.0.0[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=python_targets_python2_7 || ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/pygments.rb-1.2.1.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=8a57738c10ddebe8e8f52199ca91da7d
+_md5_=b405841f60e50018cf7f32a033f24204
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.0.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
index efb3d7fd2ad8..c953fa441c6c 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/actionpack[ruby_targets_ruby24] dev-ruby/activesupport[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/actionpack[ruby_targets_ruby25] dev-ruby/activesupport[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/actionpack[ruby_targets_ruby26] dev-ruby/activesupport[ruby_targets_ruby26] dev-ruby/rack-test[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A DSL for blocking & throttling abusive clients
 EAPI=6
 HOMEPAGE=https://github.com/kickstarter/rack-attack
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rack:*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rack:*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=6
 SRC_URI=mirror://rubygems/rack-attack-6.0.0.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=822cb6d2113bbffe0f10ebdd2afa6c53
+_md5_=1df78447a2403034accefb94ff28e26f
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.19.8 b/metadata/md5-cache/dev-ruby/rbpdf-1.19.8
new file mode 100644
index 000000000000..8f67bcd2350c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.19.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/test-unit-3[ruby_targets_ruby26] ) ) test? ( ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Ruby on Rails RBPDF plugin
+EAPI=6
+HOMEPAGE=https://github.com/naitoh/rbpdf
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/htmlentities[ruby_targets_ruby24] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/htmlentities[ruby_targets_ruby25] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/htmlentities[ruby_targets_ruby26] =dev-ruby/rbpdf-font-1.19*[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/naitoh/rbpdf/archive/1.19.8.tar.gz -> rbpdf-1.19.8.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=16dfb2b8ae3bd344e339438135e06c4b
diff --git a/metadata/md5-cache/dev-ruby/recog-2.3.2 b/metadata/md5-cache/dev-ruby/recog-2.3.2
new file mode 100644
index 000000000000..9e00410f4268
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/recog-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/nokogiri[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby24] dev-ruby/rspec:3[ruby_targets_ruby24] dev-util/aruba[ruby_targets_ruby24] dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby25] dev-ruby/rspec:3[ruby_targets_ruby25] dev-util/aruba[ruby_targets_ruby25] dev-util/cucumber[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/regexp_parser:0[ruby_targets_ruby26] dev-ruby/rspec:3[ruby_targets_ruby26] dev-util/aruba[ruby_targets_ruby26] dev-util/cucumber[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Pattern recognition for hosts, services, and content
+EAPI=6
+HOMEPAGE=https://github.com/rapid7/recog
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/nokogiri[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/nokogiri[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/nokogiri[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=2
+SRC_URI=mirror://rubygems/recog-2.3.2.gem
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=74755f9364d956de4c38a2327d50f46c
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
index 6fd959fa2814..c6334f13a34a 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND==dev-util/ragel-6* ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND==dev-util/ragel-6* ruby_targets_ruby24? ( dev-ruby/rake[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rake[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=A library for tokenizing, lexing, and parsing Ruby regular expressions
 EAPI=6
 HOMEPAGE=https://github.com/ammar/regexp_parser
-IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v0.5.0.tar.gz -> regexp_parser-0.5.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=48d2f23e426242fc96ea39cc5c0402f5
+_md5_=e9d67365e1806de7bfcb2ca8ee891763
diff --git a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6 b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
index 74662ac53168..e310cf5bccaf 100644
--- a/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
+++ b/metadata/md5-cache/dev-ruby/rex-bin_tools-0.1.6
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-struct2[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=suite of tools for analyzing executables to find specific chunks of code
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-bin_tools
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-struct2[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-struct2[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-bin_tools-0.1.6.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=6389ddc8b0a749b3b6bf6d997a4b4dbc
+_md5_=d65c20004900d87f01879e0bc77616bf
diff --git a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4 b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
index 346fd99cabff..826fc8263dc9 100644
--- a/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
+++ b/metadata/md5-cache/dev-ruby/rex-encoder-0.1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=provides the basis for all of the polymorphic encoders that Metasploit uses
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-encoder
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-encoder-0.1.4.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=4d08e1c902396ab8cde3532b2d7596f5
+_md5_=a64e16f0c994ca76dabc6a25fafe0a25
diff --git a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20 b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
index f6fad64b4910..7c01c901fdf2 100644
--- a/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
+++ b/metadata/md5-cache/dev-ruby/rex-exploitation-0.1.20
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/jsobfu:*[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-encoder[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=various helper mechanisms for creating exploits
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-exploitation
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/jsobfu:*[ruby_targets_ruby25] dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-arch[ruby_targets_ruby25] dev-ruby/rex-encoder[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/jsobfu:*[ruby_targets_ruby26] dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-arch[ruby_targets_ruby26] dev-ruby/rex-encoder[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 SLOT=0
 SRC_URI=mirror://rubygems/rex-exploitation-0.1.20.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=5577915cbe25dcb37661e5165413efe8
+_md5_=175e75dc0e245e432fbc30c80d1c551a
diff --git a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3 b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
index 12fc6c798167..4df7f55b9961 100644
--- a/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
+++ b/metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DEPEND=test? ( ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
 DESCRIPTION=Ruby Exploitation(Rex) Library for building ROP chains
 EAPI=6
 HOMEPAGE=https://rubygems.org/gems/rex-rop_builder
-IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+RDEPEND=ruby_targets_ruby24? ( dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] ) ruby_targets_ruby25? ( dev-ruby/metasm:*[ruby_targets_ruby25] dev-ruby/rex-core[ruby_targets_ruby25] dev-ruby/rex-text[ruby_targets_ruby25] ) ruby_targets_ruby26? ( dev-ruby/metasm:*[ruby_targets_ruby26] dev-ruby/rex-core[ruby_targets_ruby26] dev-ruby/rex-text[ruby_targets_ruby26] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/rex-rop_builder-0.1.3.gem
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	java-utils-2	dd352559d0e143500ec878acc74da909	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	4044516b167f460104703fee4a3c7f5f	ruby-ng	fc1f9a4afc07d0afa5c83bfd16b7c4ae	ruby-utils	10cec86289e60f4b0d731b2e4b545e5d	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=58dcd78369b1a8a747832b63a4e83c47
+_md5_=4fc347fb6bee45000f4690c06c7f38d4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index eb35c9ba36db..1d00ab7bf8a9 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/strace-5.1 b/metadata/md5-cache/dev-util/strace-5.1
new file mode 100644
index 000000000000..140d346b1a07
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.1/strace-5.1.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=14ef7503d004a615127a0e0e6731b05e
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index e3c68d30b9b2..db8c40a70ecf 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<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
 DEFINED_PHASES=configure install prepare test unpack
-DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<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=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
 DESCRIPTION=A useful diagnostic, instructional, and debugging tool
-EAPI=6
+EAPI=7
 HOMEPAGE=https://strace.io/
 IUSE=aio perl static unwind elfutils
 LICENSE=BSD
 RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) ) perl? ( dev-lang/perl )
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee6b1b4c59b99ac7335a0c0f7b50b4c3
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=14ef7503d004a615127a0e0e6731b05e
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 679a9c283eda..8f799b7bd0cd 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.3 b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.3
new file mode 100644
index 000000000000..ac35e551331c
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/eternal-lands-1.9.5.3
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext app-eselect/eselect-opengl media-libs/glew virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext app-eselect/eselect-opengl media-libs/glew dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A 3D fantasy MMORPG written in C and SDL
+EAPI=7
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=eternal_lands
+RDEPEND=app-arch/unzip dev-libs/libxml2 media-libs/cal3d[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl[X,opengl,video] media-libs/libvorbis media-libs/openal media-libs/sdl-image media-libs/sdl-net sys-libs/zlib[minizip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext
+SLOT=0
+SRC_URI=https://github.com/raduprv/Eternal-Lands/archive/1.9.5.3.tar.gz -> eternal-lands-1.9.5.3.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f218403626fc67762f7254305cb5c72c
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index f428ef4d7c46..dec90fa2b308 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 f2dac0c48f63..5b4351312e37 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	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ef1a1f7a54c179c6272e6291ff58e478
+_md5_=8085ef87afc965a4a3e750bd75ca6e64
diff --git a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6 b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
index 97fdc9a8e447..355eefc5d70b 100644
--- a/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
+++ b/metadata/md5-cache/gnome-extra/nautilus-sendto-3.8.6
@@ -4,10 +4,10 @@ DESCRIPTION=A nautilus extension for sending files to locations
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
 IUSE=debug
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.25.9:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.6.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	e53acc5913e5581a8a71be22731d8f36	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=1678bef31adaf7bfd8541949a40a4645
+_md5_=083160bca37758b8abfd2dd221674792
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3abf050bb1dc..a492be6f3b25 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/bio2jack-0.9-r2 b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
index b9b15df182da..f5b3e1f95a18 100644
--- a/metadata/md5-cache/media-libs/bio2jack-0.9-r2
+++ b/metadata/md5-cache/media-libs/bio2jack-0.9-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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
 DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsamplerate virtual/jack virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=media-libs/libsamplerate virtual/jack
 DESCRIPTION=A library for porting blocked I/O OSS/ALSA audio applications to JACK
-EAPI=6
+EAPI=7
 HOMEPAGE=http://bio2jack.sourceforge.net/
 IUSE=static-libs
 KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
@@ -10,4 +11,4 @@ RDEPEND=media-libs/libsamplerate virtual/jack
 SLOT=0
 SRC_URI=mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=74784198a7f99433d50a797346c9ff14
+_md5_=3c9c14f18bb94f68e8e0b8e6f1121cec
diff --git a/metadata/md5-cache/media-libs/exempi-2.4.5-r1 b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
index 65e11ea1c730..9d3af0e33dc6 100644
--- a/metadata/md5-cache/media-libs/exempi-2.4.5-r1
+++ b/metadata/md5-cache/media-libs/exempi-2.4.5-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Port of the Adobe XMP SDK to work on UNIX
 EAPI=7
 HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
 IUSE=examples static-libs test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-libs/expat-2:= sys-libs/zlib virtual/libiconv
 SLOT=2/3
 SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.4.5.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=b517ec4cdcf2522f3acbdb8c0a4e8ce3
+_md5_=d29f9ec03e0faa46e979d005a9471dbb
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
index c37231c46022..acac99740115 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 IUSE=gtk-doc +introspection python static-libs test +vala python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.10.tar.xz
 _eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	meson	e53acc5913e5581a8a71be22731d8f36	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d15df72fe2b3a7163f6d75c71f53f3c1
+_md5_=921dcd84c8a07486d326f19905d3d0fe
diff --git a/metadata/md5-cache/media-libs/libcue-1.4.0 b/metadata/md5-cache/media-libs/libcue-1.4.0
index a62c5f46a635..7e7256048d6f 100644
--- a/metadata/md5-cache/media-libs/libcue-1.4.0
+++ b/metadata/md5-cache/media-libs/libcue-1.4.0
@@ -4,8 +4,8 @@ DESCRIPTION=CUE Sheet Parser Library
 EAPI=4
 HOMEPAGE=http://libcue.sourceforge.net
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/libcue/libcue-1.4.0.tar.bz2
-_md5_=dc9bd455d3483cb591439e07eb1f76f5
+_md5_=7134435a4ffeb79d4a77239e03020d89
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r3 b/metadata/md5-cache/media-libs/libexif-0.6.21-r3
index 221f2dee1c54..3a9755ca7ae9 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r3
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Library for parsing, editing, and saving EXIF data
 EAPI=7
 HOMEPAGE=https://libexif.github.io/
 IUSE=doc nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 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-macos ~x64-solaris ~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 ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
 _eclasses_=libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ed4e9de1c65913f205020dc6af7e9830
+_md5_=5a5c131acd95c0a7c8ae568ed040a222
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
index 7b5b34d3fbc9..986f3d5e9a20 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=library for manipulating the International Press Telecommunications
 EAPI=5
 HOMEPAGE=http://libiptcdata.sourceforge.net
 IUSE=doc examples nls python python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2
 RDEPEND=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_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) nls? ( virtual/libintl )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eea8198ef4075551586c1ad0bd864cdb
+_md5_=8e019846942212ddcf75acefac413452
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4 b/metadata/md5-cache/media-libs/lilv-0.24.4
deleted file mode 100644
index 38ac7bcbef4c..000000000000
--- a/metadata/md5-cache/media-libs/lilv-0.24.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
-EAPI=6
-HOMEPAGE=http://drobilla.net/software/lilv/
-IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
-LICENSE=ISC
-RDEPEND=>=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
-_md5_=2e8147d40db9457266312451ef3379ff
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.4-r1 b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
new file mode 100644
index 000000000000..417ffa558d08
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lilv-0.24.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=Library to make the use of LV2 plugins as simple as possible for applications
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/lilv/
+IUSE=doc +dyn-manifest static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/serd-0.28.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/sord-0.16.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile >=media-libs/lv2-1.14.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/sratom-0.6.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=0
+SRC_URI=http://download.drobilla.net/lilv-0.24.4.tar.bz2
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	waf-utils	1fab5379519d4b71bff5790435a71986
+_md5_=297b17c2bac59835e155b571fb20fbf3
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index c99d98e2c250..8329548021bb 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/hexter-1.0.3 b/metadata/md5-cache/media-plugins/hexter-1.0.3
deleted file mode 100644
index 9fe22799cc03..000000000000
--- a/metadata/md5-cache/media-plugins/hexter-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/readline:0 sys-libs/ncurses ) media-libs/ladspa-sdk virtual/pkgconfig
-DESCRIPTION=Yamaha DX7 modeling DSSI plugin
-EAPI=5
-HOMEPAGE=http://dssi.sourceforge.net/hexter.html
-IUSE=gtk2 readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/readline:0 sys-libs/ncurses )
-SLOT=0
-SRC_URI=mirror://sourceforge/dssi/hexter-1.0.3.tar.bz2
-_md5_=2d95540021e772a7015f535562e26300
diff --git a/metadata/md5-cache/media-plugins/hexter-1.1.0 b/metadata/md5-cache/media-plugins/hexter-1.1.0
new file mode 100644
index 000000000000..b6590a25ca83
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/hexter-1.1.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure
+DEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) media-libs/ladspa-sdk
+DESCRIPTION=Yamaha DX7 modeling DSSI plugin
+EAPI=7
+HOMEPAGE=http://smbolton.com/hexter.html
+IUSE=gtk2 readline
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib >=media-libs/dssi-0.4 >=media-libs/liblo-0.12 gtk2? ( x11-libs/gtk+:2 ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= )
+SLOT=0
+SRC_URI=https://github.com/smbolton/hexter/releases/download/version_1.1.0/hexter-1.1.0.tar.bz2
+_md5_=6de339b3735d477e1e15cfb1ff16672f
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 74172d991acb..633cb6ec9b96 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/audicle-1.0.0.7-r1 b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1
deleted file mode 100644
index e6c4d2508009..000000000000
--- a/metadata/md5-cache/media-sound/audicle-1.0.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-eselect/eselect-audicle sys-devel/bison sys-devel/flex virtual/pkgconfig
-DESCRIPTION=A Context-sensitive, On-the-fly Audio Programming Environ/mentality
-EAPI=5
-HOMEPAGE=http://audicle.cs.princeton.edu/
-IUSE=+alsa jack oss truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=jack? ( media-sound/jack-audio-connection-kit ) alsa? ( >=media-libs/alsa-lib-0.9 ) media-libs/libsndfile media-libs/freeglut virtual/opengl virtual/glu x11-libs/gtk+:2 truetype? ( media-libs/ftgl media-fonts/corefonts ) app-eselect/eselect-audicle
-REQUIRED_USE=|| ( alsa jack oss )
-SLOT=0
-SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45c7f0fac5b8132e1a1b1688a7c7b3c2
diff --git a/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2 b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
new file mode 100644
index 000000000000..25bf3f148500
--- /dev/null
+++ b/metadata/md5-cache/media-sound/audicle-1.0.0.7-r2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-eselect/eselect-audicle media-libs/freeglut media-libs/libsndfile virtual/opengl virtual/glu x11-libs/gtk+:2 alsa? ( >=media-libs/alsa-lib-0.9 ) jack? ( virtual/jack ) truetype? ( media-fonts/corefonts media-libs/ftgl )
+DESCRIPTION=A Context-sensitive, On-the-fly Audio Programming Environ/mentality
+EAPI=7
+HOMEPAGE=http://audicle.cs.princeton.edu/
+IUSE=+alsa jack oss truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=|| ( alsa jack oss )
+SLOT=0
+SRC_URI=http://audicle.cs.princeton.edu/release/files/audicle-1.0.0.7.tgz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=cfba311df0a0a4fb0ae18e1ada221827
diff --git a/metadata/md5-cache/media-sound/bitmeter-1.2-r1 b/metadata/md5-cache/media-sound/bitmeter-1.2-r1
deleted file mode 100644
index c0522b270c8a..000000000000
--- a/metadata/md5-cache/media-sound/bitmeter-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 media-sound/jack-audio-connection-kit virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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=Diagnosis tool for JACK audio software
-EAPI=6
-HOMEPAGE=http://devel.tlrmx.org/audio/
-IUSE=doc
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-sound/jack-audio-connection-kit
-SLOT=0
-SRC_URI=http://devel.tlrmx.org/audio/source/bitmeter-1.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=8052abf04d5b8d58becdb1a5a5ff8bb5
diff --git a/metadata/md5-cache/media-sound/bitmeter-1.2-r2 b/metadata/md5-cache/media-sound/bitmeter-1.2-r2
new file mode 100644
index 000000000000..5cbe4c87c377
--- /dev/null
+++ b/metadata/md5-cache/media-sound/bitmeter-1.2-r2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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
+DEFINED_PHASES=install prepare
+DEPEND=virtual/jack x11-libs/gtk+:2
+DESCRIPTION=Diagnosis tool for JACK audio software
+EAPI=7
+HOMEPAGE=https://devel.tlrmx.org/audio/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jack x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://devel.tlrmx.org/audio/source/bitmeter-1.2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8c747f868f845fc225742433dd119a27
diff --git a/metadata/md5-cache/media-sound/bristol-0.60.11-r1 b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
index 5dcd31c67ee4..cf6cfbbdbca7 100644
--- a/metadata/md5-cache/media-sound/bristol-0.60.11-r1
+++ b/metadata/md5-cache/media-sound/bristol-0.60.11-r1
@@ -1,14 +1,14 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<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
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<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
 DEFINED_PHASES=configure install prepare
-DEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+DEPEND=virtual/jack x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 ) x11-base/xorg-proto
 DESCRIPTION=Synthesizer keyboard emulation package: Moog, Hammond and others
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/bristol
 IUSE=alsa oss static-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-sound/jack-audio-connection-kit-0.109.2 x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
+RDEPEND=virtual/jack x11-libs/libX11 alsa? ( >=media-libs/alsa-lib-1.0.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/bristol/bristol-0.60.11.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=521180e07d929f6c43036dd88592b726
+_md5_=6ddd5df0dcd12b98f1f9906a6799a7a3
diff --git a/metadata/md5-cache/media-sound/brutefir-1.0k-r2 b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
index bb606ef6a50e..94bca1482729 100644
--- a/metadata/md5-cache/media-sound/brutefir-1.0k-r2
+++ b/metadata/md5-cache/media-sound/brutefir-1.0k-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sci-libs/fftw:3.0
+DEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 DESCRIPTION=Software convolution engine for applying long FIR filters
 EAPI=7
 HOMEPAGE=https://www.ludd.ltu.se/~torger/brutefir.html
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib media-sound/jack-audio-connection-kit sci-libs/fftw:3.0
+RDEPEND=media-libs/alsa-lib sci-libs/fftw:3.0 virtual/jack
 SLOT=0
 SRC_URI=https://www.ludd.ltu.se/~torger/files/brutefir-1.0k.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=63b3fd6a33b3fc5510a65244d531adbe
+_md5_=cb315dfc2f5d847afe092c90b3cae245
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15-r1 b/metadata/md5-cache/media-sound/fmit-1.0.15-r1
deleted file mode 100644
index db4ea00f24fc..000000000000
--- a/metadata/md5-cache/media-sound/fmit-1.0.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=sci-libs/fftw-3.3.4:3.0= dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) dev-qt/linguist-tools:5
-DESCRIPTION=Free Music Instrument Tuner
-EAPI=6
-HOMEPAGE=https://gillesdegottex.github.io/fmit
-IUSE=alsa jack oss portaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2.1
-RDEPEND=>=sci-libs/fftw-3.3.4:3.0= dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio )
-SLOT=0
-SRC_URI=https://github.com/gillesdegottex/fmit/archive/v1.0.15.tar.gz -> fmit-1.0.15.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=afdbe864c6aa81e9055dfc4e5c01ac0b
diff --git a/metadata/md5-cache/media-sound/fmit-1.0.15-r2 b/metadata/md5-cache/media-sound/fmit-1.0.15-r2
new file mode 100644
index 000000000000..b0e4e8cf18ca
--- /dev/null
+++ b/metadata/md5-cache/media-sound/fmit-1.0.15-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/fftw-3.3.4:3.0= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio ) dev-qt/linguist-tools:5
+DESCRIPTION=Free Music Instrument Tuner
+EAPI=7
+HOMEPAGE=https://gillesdegottex.github.io/fmit
+IUSE=alsa jack oss portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2.1
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2] dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sci-libs/fftw-3.3.4:3.0= virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio )
+SLOT=0
+SRC_URI=https://github.com/gillesdegottex/fmit/archive/v1.0.15.tar.gz -> fmit-1.0.15.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=197f4d606245eb403474ecca455227d7
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index faa1b76d2f6c..4ca45214bd72 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/libgrss-0.7.0 b/metadata/md5-cache/net-libs/libgrss-0.7.0
index 54f00c9a94a6..7d1c6148a251 100644
--- a/metadata/md5-cache/net-libs/libgrss-0.7.0
+++ b/metadata/md5-cache/net-libs/libgrss-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=LibGRSS is a library for easy management of RSS/Atom/Pie feeds
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgrss
 IUSE=+introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.42.1:2 >=dev-libs/libxml2-2.9.2:2 >=net-libs/libsoup-2.48:2.4 introspection? ( >=dev-libs/gobject-introspection-1.42 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgrss/0.7/libgrss-0.7.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=2abed46792fb947c1700b2d79cc8ada0
+_md5_=291ce7247041df48c28faeb8ea8719ff
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.3-r1 b/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
index eacf7a55a3be..75f1f6512b12 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=C library implementing the OAuth secure authentication protocol
 EAPI=7
 HOMEPAGE=http://liboauth.sourceforge.net/
 IUSE=bindist curl doc libressl +nss
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=curl? ( net-misc/curl ) nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) )
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.3.tar.gz
-_md5_=8f178785035a2f222862df2d02402af0
+_md5_=5e0692fa1aa06a773e3aa47e4cf627a4
diff --git a/metadata/md5-cache/net-libs/uhttpmock-0.5.1 b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
index 7e2f27011580..e923f53b4b3c 100644
--- a/metadata/md5-cache/net-libs/uhttpmock-0.5.1
+++ b/metadata/md5-cache/net-libs/uhttpmock-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=HTTP web service mocking library
 EAPI=5
 HOMEPAGE=https://gitlab.com/uhttpmock/uhttpmock
 IUSE=+introspection vala debug
-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+
 RDEPEND=>=dev-libs/glib-2.36.0:2 >=net-libs/libsoup-2.37.91:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=http://tecnocode.co.uk/downloads/uhttpmock/uhttpmock-0.5.1.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=79273a9ec55ca727af4bbbdb5e5a2a47
+_md5_=769dc0d2c03274a1a939a8b14ea52da1
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b5c787963283..1e56291f0a20 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/rdesktop-1.8.5-r1 b/metadata/md5-cache/net-misc/rdesktop-1.8.6
similarity index 95%
rename from metadata/md5-cache/net-misc/rdesktop-1.8.5-r1
rename to metadata/md5-cache/net-misc/rdesktop-1.8.6
index cd0bb042ebed..c03dd76680f0 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.8.5-r1
+++ b/metadata/md5-cache/net-misc/rdesktop-1.8.6
@@ -9,6 +9,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) kerberos? ( virtual/krb5 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
-SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.5/rdesktop-1.8.5.tar.gz
+SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.8.6/rdesktop-1.8.6.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=18d177f78c875a5b9dd1730a6051a5d3
+_md5_=b16fa3e2a8f56a1efd20a8b8e64a873d
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 805278bc557c..cfd302d06a2f 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/bubblewrap-0.3.1-r1 b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
index c584f625da1d..0ed1b9a35c49 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solutio
 EAPI=7
 HOMEPAGE=https://github.com/projectatomic/bubblewrap
 IUSE=selinux +suid kernel_linux
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/projectatomic/bubblewrap/releases/download/v0.3.1/bubblewrap-0.3.1.tar.xz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=2c769bb6f1da9901e28eda055ff79b05
+_md5_=30d170a6b1af7890b8975ef7e86df19e
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20190218 b/metadata/md5-cache/sys-apps/osinfo-db-20190218
index 10d0ce6a6286..c47b0bb2f837 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-20190218
+++ b/metadata/md5-cache/sys-apps/osinfo-db-20190218
@@ -3,8 +3,8 @@ DEPEND=sys-apps/osinfo-db-tools
 DESCRIPTION=osinfo database files
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20190218.tar.xz
-_md5_=0e7d3dea6daf66491fb23197cdda6ff3
+_md5_=f4a3aaadcd2b9575c10d4137118d4be9
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
index 1dfc0c37849e..a475088891e2 100644
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
+++ b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.3.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0
 DESCRIPTION=Tools for managing the osinfo database
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6.0 >=app-arch/libarchive-3.0.0:= dev-libs/json-glib !<sys-libs/libosinfo-1.0.0
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9fa504adc2f46cfd10ba0296d32aa54b
+_md5_=6f6374f2f35d506e54897d4b5cf338b4
diff --git a/metadata/md5-cache/sys-apps/ucspi-proxy-1.1 b/metadata/md5-cache/sys-apps/ucspi-proxy-1.1
new file mode 100644
index 000000000000..480ff5e6ecba
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ucspi-proxy-1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/bglibs-2.04
+DESCRIPTION=Proxy program for two connections set up by a UCSPI server and a UCSPI client
+EAPI=7
+HOMEPAGE=https://untroubled.org/ucspi-proxy/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/bglibs-2.04
+SLOT=0
+SRC_URI=https://untroubled.org/ucspi-proxy/archive/ucspi-proxy-1.1.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=f3913293233c45ae6cc94fc39d9af731
diff --git a/metadata/md5-cache/sys-apps/ucspi-unix-1.0 b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
new file mode 100644
index 000000000000..56fcd26fc599
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/ucspi-unix-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/bglibs-2.04
+DESCRIPTION=A UCSPI implementation for Unix domain sockets
+EAPI=7
+HOMEPAGE=https://untroubled.org/ucspi-unix/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=!net-analyzer/mk-livestatus
+SLOT=0
+SRC_URI=https://untroubled.org/ucspi-unix/archive/ucspi-unix-1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1a8a7cf5ac257498f2916ed502aa1f7c
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 1f08060e8aba..1d66ab7c240b 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/bison-3.3.1 b/metadata/md5-cache/sys-devel/bison-3.3.1
deleted file mode 100644
index 3c7a2cd230f3..000000000000
--- a/metadata/md5-cache/sys-devel/bison-3.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex examples? ( dev-lang/perl ) nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
-DESCRIPTION=A general-purpose (yacc-compatible) parser generator
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/bison/
-IUSE=examples nls static test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.16
-SLOT=0
-SRC_URI=mirror://gnu/bison/bison-3.3.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.3-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.3-patches-01.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70a5c49d407474a7642c150210d7bd92
diff --git a/metadata/md5-cache/sys-devel/bison-3.4.1 b/metadata/md5-cache/sys-devel/bison-3.4.1
new file mode 100644
index 000000000000..f35c3930b7b3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/bison-3.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-devel/m4-1.4.16 sys-devel/flex examples? ( dev-lang/perl ) nls? ( sys-devel/gettext ) test? ( dev-lang/perl )
+DESCRIPTION=A general-purpose (yacc-compatible) parser generator
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/bison/
+IUSE=examples nls static test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/m4-1.4.16
+SLOT=0
+SRC_URI=mirror://gnu/bison/bison-3.4.1.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.4.1-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/bison/bison-3.4.1-patches-01.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1fa293efcf36960640675fab1456b331
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 19461d755338..0546db7e8a74 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/udisks-2.8.1 b/metadata/md5-cache/sys-fs/udisks-2.8.1
index 70375296b681..b7d04bfc9801 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
 IUSE=acl debug elogind +introspection lvm nls selinux systemd vdo kernel_linux
-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.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.30 >=sys-block/parted-3 virtual/eject selinux? ( sec-policy/selinux-devicekit )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=2
 SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.1/udisks-2.8.1.tar.bz2
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fe581a444d10f756de57439609954d0e
+_md5_=bd5144c5422501f9932bb49504e7b645
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index ba8991d9067e..7c1d8795487b 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18
new file mode 100644
index 000000000000..b5da2bada4c8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.0.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.0 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.0.18
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz mirror://gentoo/genpatches-5.0-19.base.tar.xz mirror://gentoo/genpatches-5.0-19.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.0-19.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=5637d03b85f8ecd7a586223116f774e9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.4
new file mode 100644
index 000000000000..3f1db1992e3f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.1 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.1.4
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/genpatches-5.1-5.base.tar.xz mirror://gentoo/genpatches-5.1-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-5.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=1675e685969c62ddba49ba50522a7cc3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.45
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.45
index 3d5a0aa357eb..2bd9449bbf66 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.44
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.45
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=4.19.44
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.44.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.45
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.45.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.18
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.0.18
index adbb312cd938..e8e3864777da 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.17
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.0.18
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.0.17
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.0.17.xz mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
+SLOT=5.0.18
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.0.18.xz mirror://kernel/linux/kernel/v5.x/linux-5.0.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.4
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.1.4
index 467bbed29e18..a6cbe278c065 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.1.4
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
 RESTRICT=binchecks strip
-SLOT=5.1.3
-SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.3.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
+SLOT=5.1.4
+SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.1.4.xz mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz
 _eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	b2fdd65b5edb72d87dedaa82df19553c	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=9e988693886cf9427c6bc538c9613582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 6f14e5f3def3..41ff221966c0 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/libosinfo-1.3.0 b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
index dff256cfa068..c576aa21ca2a 100644
--- a/metadata/md5-cache/sys-libs/libosinfo-1.3.0
+++ b/metadata/md5-cache/sys-libs/libosinfo-1.3.0
@@ -4,11 +4,11 @@ DESCRIPTION=GObject library for managing information about real and virtual OSes
 EAPI=6
 HOMEPAGE=https://libosinfo.org/
 IUSE=+introspection +vala test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwids[pci,usb] sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.3.0.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	vala	cfb1d97eac9fead928d3240c8636b9ae	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=678e434820ce1b5f51e1f2f65e08e346
+_md5_=769384496a265ce806896c462994c23c
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 4fe9a19dccdf..22d2f59c21a0 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/upower-0.99.9-r1 b/metadata/md5-cache/sys-power/upower-0.99.9-r1
index 1d4e077718d0..4f797e87d4b1 100644
--- a/metadata/md5-cache/sys-power/upower-0.99.9-r1
+++ b/metadata/md5-cache/sys-power/upower-0.99.9-r1
@@ -5,10 +5,10 @@ DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history an
 EAPI=7
 HOMEPAGE=https://upower.freedesktop.org/
 IUSE=doc +introspection ios kernel_FreeBSD kernel_linux selinux
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.34:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( virtual/libusb:1 virtual/libgudev:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-1:= ) ) selinux? ( sec-policy/selinux-devicekit )
 SLOT=0/3
 SRC_URI=https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=1c366c7694f5f7058b0dcb67eb20388a
+_md5_=b1f7acb472cd3a8ce15b0c80b81a00c1
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index c5313dbbe429..1dc482142f7b 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/nmon-16f b/metadata/md5-cache/sys-process/nmon-16f
deleted file mode 100644
index 444b44056e16..000000000000
--- a/metadata/md5-cache/sys-process/nmon-16f
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install unpack
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
-EAPI=6
-HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/nmon/lmon16f.c
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13e2dfd083affe2d0626f709a869db59
diff --git a/metadata/md5-cache/sys-process/nmon-16g b/metadata/md5-cache/sys-process/nmon-16g
index eaaddfd398e8..7d7600043129 100644
--- a/metadata/md5-cache/sys-process/nmon-16g
+++ b/metadata/md5-cache/sys-process/nmon-16g
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
 DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
 EAPI=6
 HOMEPAGE=http://nmon.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc64 x86
 LICENSE=GPL-3
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/nmon/lmon16g.c
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c117bddc5000ba0f25ea1edfbb46b13
+_md5_=5cb2dd4ff96fce8e8e3f0b1fcd9399f6
diff --git a/metadata/md5-cache/sys-process/nmon-16j b/metadata/md5-cache/sys-process/nmon-16j
new file mode 100644
index 000000000000..c99cf0e5fca4
--- /dev/null
+++ b/metadata/md5-cache/sys-process/nmon-16j
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install unpack
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Nigel's performance MONitor for CPU, memory, network, disks, etc...
+EAPI=7
+HOMEPAGE=http://nmon.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/nmon/lmon16j.c
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8672e1243dc0ee7c7881827743c9d446
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 8193b9db045c..c72de04f5144 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/eject-0-r1 b/metadata/md5-cache/virtual/eject-0-r1
index d6420ed21df1..2d459652e405 100644
--- a/metadata/md5-cache/virtual/eject-0-r1
+++ b/metadata/md5-cache/virtual/eject-0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the eject command
 EAPI=6
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 RDEPEND=|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )
 SLOT=0
-_md5_=feb40dd642f05bd1f36ab04839ff3f31
+_md5_=60274252004a6bbe67c0a5c9264d6532
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 492f0c95276f..4c56b5c64548 100644
Binary files a/metadata/md5-cache/www-apache/Manifest.gz and b/metadata/md5-cache/www-apache/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apache/mod_h2-1.15.0 b/metadata/md5-cache/www-apache/mod_h2-1.15.0
new file mode 100644
index 000000000000..0e66b21abc44
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_h2-1.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4* >=app-portage/elt-patches-20170815 !<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=HTTP/2 module for Apache
+EAPI=6
+HOMEPAGE=https://github.com/icing/mod_h2
+IUSE=ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/nghttp2-1.0 >=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?] =www-servers/apache-2.4*
+SLOT=0
+SRC_URI=https://github.com/icing/mod_h2/releases/download/v1.15.0/mod_http2-1.15.0.tar.gz
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	1bf086cdd7356f5c9a4acd9727bd2065	depend.apache	05ca915dc22ea60059f85d8d9a34d3de	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=e7c83c81726c8543ff5006cc73350d01
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index c6640526e851..c8710000c3bc 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/gkrellm-plugins-2.0 b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
index b0248f317421..33be93dff6a1 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
+++ b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
@@ -5,6 +5,6 @@ HOMEPAGE=http://gkrellm.srcbox.net/
 IUSE=wifi
 KEYWORDS=~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 x11-plugins/gkrellflynn >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons
+RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons
 SLOT=0
-_md5_=9df60983e54ef61c2a5d3ffb0c71b351
+_md5_=19a4127881d6c569b49cd7f1e238717d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9f3cd35d78db..75f291d14b05 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2019 15:08:51 +0000
+Thu, 23 May 2019 06:08:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a1e3769f969d..21f1d92fe320 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 22 15:08:51 UTC 2019
+Thu May 23 06:08:52 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index bcbe8e66304f..90b08c183e55 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2019 15:30:01 +0000
+Thu, 23 May 2019 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 4d54cea530bb..378b19acae4e 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d4823b4f764a905fc5cab7d8bac5a340ee1a79e7 1558537376 2019-05-22T15:02:56+00:00
+92d7cba079d45b74fd54c6a7224b539eeeb58bcc 1558589933 2019-05-23T05:38:53+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 991bb9f1a15a..566e0c2d3f2f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1558537501 Wed 22 May 2019 03:05:01 PM UTC
+1558591501 Thu 23 May 2019 06:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9f3cd35d78db..75f291d14b05 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2019 15:08:51 +0000
+Thu, 23 May 2019 06:08:52 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 03a668c48c38..7d1d61d5bc4a 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libgrss/libgrss-0.7.0.ebuild b/net-libs/libgrss/libgrss-0.7.0.ebuild
index 03098268a1b6..379a157032d7 100644
--- a/net-libs/libgrss/libgrss-0.7.0.ebuild
+++ b/net-libs/libgrss/libgrss-0.7.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgrss"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index fda29af61178..3540e299a28d 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="bindist curl doc libressl +nss"
 
 REQUIRED_USE="bindist? ( nss )"
diff --git a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
index d53316cc2f2e..d2c4f91cfe88 100644
--- a/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
+++ b/net-libs/uhttpmock/uhttpmock-0.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5b0057fe4d1a..effac5719341 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index fc25ab926b0a..f7712845f43c 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,2 +1,2 @@
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
-DIST rdesktop-1.8.5.tar.gz 322452 BLAKE2B 186f4379a61d8e71dec3f3541deefef2c350b968fcb0e882e1d52e74c7fa47e110d5d5bf2968ee4ce2dbfab0e2a564a0e54e2d550f6dcc230fbb70c97dfcf351 SHA512 e905a0805854c16cd305635087e2fe206f4b0aee1825e3b52c6d3fea3b0b0cfc1463b74c7b07a6a2ff961717741a5b85079a5734d86f0ed2dd645ae69e6129a9
+DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
diff --git a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
similarity index 97%
rename from net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
rename to net-misc/rdesktop/rdesktop-1.8.6.ebuild
index 8a54a1e507b3..b47bffbf7f4e 100644
--- a/net-misc/rdesktop/rdesktop-1.8.5-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -39,7 +39,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
 	"${FILESDIR}"/${PN}-1.8.4-libressl.patch
-	"${FILESDIR}"/${P}-use_standard_gssapi.patch
+	"${FILESDIR}"/${PN}-1.8.5-use_standard_gssapi.patch
 )
 
 DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 471371d90d98..d656a18394fb 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index b91816e79561..8c7701e8fc77 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,21 @@
 
 #--- END OF EXAMPLES ---
 
+# Stefan Strogin <steils@gentoo.org> (22 May 2019)
+# Depends on >=dev-libs/bglibs-2.04. Bug #678928.
+>=sys-apps/ucspi-proxy-1.1
+>=sys-apps/ucspi-unix-1.0
+
+# Jonas Stein <jstein@gentoo.org> (22 May 2019)
+# Masked for removal after 2019-06-23. (bug #686260)
+# Wrong license, ships non-GPL image, maintainer needed.
+x11-plugins/gkrellflynn
+
+# Sebastian Pipping <sping@gentoo.org> (22 May 2019)
+# Masked for removal in 30 days (bug #686562)
+# Unfixed bug, dead upstream, not relevant enough
+sys-fs/pytagsfs
+
 # Lars Wendler <polynomial-c@gentoo.org> (21 May 2019)
 # Masked for testing
 =sys-libs/ncurses-6.1_p20181020
@@ -380,14 +395,6 @@ net-mail/bincimap
 # Removal in 30 days.  Bug #629450.
 mail-filter/mimedefang
 
-# Richard Freeman <rich0@gentoo.org> (24 Apr 2019)
-# Masked for removal in 30 days.  Likely does not work
-# and is essentially unmainted.  Please comment in 
-# bug 548926 if you want to give this some care.
-games-rpg/eternal-lands
-games-rpg/eternal-lands-bloodsucker
-games-rpg/eternal-lands-data
-
 # Michał Górny <mgorny@gentoo.org> (24 Apr 2019)
 # Unmaintained.  Vulnerable init.d script.  Missing dependencies causing
 # build failures (#514136).  Last bumped in 2011, pending bump since
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fa71eee80cc0..e81d98dab4f0 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
index 6b58b7d6d3c7..dbd69baa2f6d 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
index 9dd1c75e8cb7..0850c1e52e71 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Blocker on old libosinfo as osinfo-db-validate was part of it before
 RDEPEND="
diff --git a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
index 2c81e1a380c7..e74d64604535 100644
--- a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/ucspi-proxy/Manifest b/sys-apps/ucspi-proxy/Manifest
index 551628427ffa..39f73ef21ea0 100644
--- a/sys-apps/ucspi-proxy/Manifest
+++ b/sys-apps/ucspi-proxy/Manifest
@@ -1 +1,2 @@
 DIST ucspi-proxy-0.99.tar.gz 35537 BLAKE2B 0b3f809b027dae6d83a39aa7b83d0747e2046409b97ba2de678d49a3611ea08f82ea9f30f13a3cd67dbc06de881551d282b14aba67addcf294e64156d2d6d5bc SHA512 5bed82bd0db2501c3de8b38e23a07c39bf9937b9ce95166cf1822a6bd5551aec945dc01d6ba716d7ce35f4aa7f2a126d860d31f7df2d807f1f4eb5e355e93164
+DIST ucspi-proxy-1.1.tar.gz 38351 BLAKE2B 395dc3d154665c8c65c2d35f6e666543f5f919497fed441aca7223dee4983fe165911e8bf1571aa11fa10ba6adb480b4da853773b5a2be556ae59ad6d1708328 SHA512 c9e6f98a73bf6868341b0d5c1653d0b9107aa92c21e8fe96c47a9ca0ae41b247aa10bccd819d84bdcf4e8d5902c1955bfbe9e4e3256d5303578cd3337220139c
diff --git a/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
new file mode 100644
index 000000000000..efbc87c02090
--- /dev/null
+++ b/sys-apps/ucspi-proxy/ucspi-proxy-1.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Proxy program for two connections set up by a UCSPI server and a UCSPI client"
+HOMEPAGE="https://untroubled.org/ucspi-proxy/"
+SRC_URI="https://untroubled.org/ucspi-proxy/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/bglibs-2.04"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+	echo "${ED}/usr/bin" > conf-bin || die
+	echo "${ED}/usr/share/man" > conf-man || die
+}
diff --git a/sys-apps/ucspi-unix/Manifest b/sys-apps/ucspi-unix/Manifest
index cd6441e797d2..074cc8a27cef 100644
--- a/sys-apps/ucspi-unix/Manifest
+++ b/sys-apps/ucspi-unix/Manifest
@@ -1 +1,2 @@
 DIST ucspi-unix-0.36.tar.gz 14175 BLAKE2B 609de0e75825ee458823bd34b41ad1d2072851cd006f6fd603c5082c69b48bc7018242a4b6bf7d2584bf43d79273f223352a3af4868575ee8574c9fc9ba4d819 SHA512 56fc5145315ff43629f455996874d6434ebee16e9fccf78ce3dcdd6312daafc508e2dce0984ca9ea73b9ff0da5d2171fc678c8e200641e1c0be02e7863bc5633
+DIST ucspi-unix-1.0.tar.gz 17391 BLAKE2B 0605c770a5e898ff9fbe9eb1a50fddbe2fcb25b37168f7b6a2fed18a632504d0f80f5f0b39b812de7d4bd6845039e143eab8706429392f7b4178bbbe59713630 SHA512 dc79515908e34cd3bcc8c66f360fe3f4662a5be35c9876b07c609fac0f90e0f498d306d1796ebbade902c7affceece7d18f8acd178a850e42d6d6820d53c1d11
diff --git a/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
new file mode 100644
index 000000000000..dd48c88398ce
--- /dev/null
+++ b/sys-apps/ucspi-unix/ucspi-unix-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A UCSPI implementation for Unix domain sockets"
+HOMEPAGE="https://untroubled.org/ucspi-unix/"
+SRC_URI="https://untroubled.org/ucspi-unix/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# We statically link bglibs.
+DEPEND=">=dev-libs/bglibs-2.04"
+# Block other unixcat installers. #480546
+RDEPEND="!net-analyzer/mk-livestatus"
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} -D_GNU_SOURCE" > conf-cc || die
+	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_install() {
+	dobin unixserver unixclient unixcat
+	doman unixserver.1 unixclient.1
+	dodoc ANNOUNCEMENT ChangeLog NEWS PROTOCOL README TODO
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0c8fa001ce12..cefdc3200960 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest
index 68022917cefb..b6bc21a9d364 100644
--- a/sys-devel/bison/Manifest
+++ b/sys-devel/bison/Manifest
@@ -3,5 +3,6 @@ DIST bison-3.1.tar.xz 1990536 BLAKE2B 6223642f2934927ca118410e2655f7c677bb1d3d98
 DIST bison-3.2.3-patches-01.tar.xz 9460 BLAKE2B 3e9f3e636d774d005c861c4f5fe121a862cbfc38f5efd5bb7ac7d2944f71e80eabd6621f3f5507d9f78727f22b574581c9b694457c63b5181a8cc1a0ac69d294 SHA512 6c599583b67f8999c8e2c8492a19ad0b43bbadef1d9c062c752e7c1cc3d178c2106262c70c998a0588bc6255ec27b2623a90267e0858e2d776ac2f4cf6cb688f
 DIST bison-3.2.4.tar.xz 2094568 BLAKE2B 9b7617b25f1b151c3b86a5f57e733543160fb40f992ff968eaadfc91d8f1a67f56d0afeafbed5003ea1a5e0c861b12ef4cc27065d1b6cbc1d0845710164d84e2 SHA512 652b54fdee969bbc17eeb04d05d65f143e8e0e1b46ac2574e3a76687b9bd916c9a0c97658b4f8357958d64e87fe2a6a2a98a6c312970f0e74fb4445962e9daae
 DIST bison-3.3-patches-01.tar.xz 10768 BLAKE2B 6b4df80d0cf6ff3445019bbc66063b794731d2c9869b20b0ace3ed9500e7ea4a30685a4084717871a68838b31392a90d2e1b52ef01eb2f62ea420e513268652c SHA512 32accc5a9e7b18b8dd98c73e5da50018be68effed9b69ed4d30604c7e7ba4495eef54b7882c3fe32bdeffb9278165ac2b5f3164b7c122e2001e4dd60ac2f4d1a
-DIST bison-3.3.1.tar.xz 2106048 BLAKE2B 998ab8cd014e0dde5a9a709ec8505e51ac5a85f3f88eb5c1a8dda7d2f1a8d82fbe6bd75b06b7a8ca3c67072f1ad09997c559a7584c443174165408f6200276ab SHA512 8901a97adda0d6d62c06e85d12645b35fa624c9f05e40250c1bb387d5524ac52c2b7de0402ab970f6ccfaf99c9bb5356873daa20cdd0c37d73b4a6ed7b98c44f
 DIST bison-3.3.2.tar.xz 2108612 BLAKE2B 84cf59c02ff4ba34c052ef2539cde8d5932145ab21b63c879eeb32d183cadba6cb6209278090e38f3f03085e58ad1fff71248e5729513d8dffdcc14e8f924dfc SHA512 63c67291ea1bd00f4412fc589ffb891ede3e2577253016a9a185e00fb2d702371f3862486639a8f52f8a887f340a639575ff3b7ba93c152170cbfd8c9585c1dc
+DIST bison-3.4.1-patches-01.tar.xz 10812 BLAKE2B 81311c4de0e70e5ca5861e36918be138d14b52872634e85f7e80e2290dc925154faac0d97b8a7c5b2e3cab973ab2a82627057fc4a078517e393174e3b2fda4fb SHA512 5a0fe975982a307bbdb4197441bc48231f3621a59cc97a896789b2976f80bc87e906dd71e5c81ffa75da2932e2f80fa52c894dc005007b7b319379a824fffcf9
+DIST bison-3.4.1.tar.xz 2198020 BLAKE2B 03369f92959061fd780fcde38d62e81f433ec7c0e6632ddf27bfb48607fdd510aa8e2e9fefd7e130b84972e168ff0762a7bed4f7a817be36c848ec6562357d2d SHA512 544d66bf11c55a69fad613bea429667c587fb0c3774f6894df81cb3c7931a554f79e6b71d6a6e9109e164e524c632127c967877f71328cd0b69a683d29ed128d
diff --git a/sys-devel/bison/bison-3.3.1.ebuild b/sys-devel/bison/bison-3.4.1.ebuild
similarity index 75%
rename from sys-devel/bison/bison-3.3.1.ebuild
rename to sys-devel/bison/bison-3.4.1.ebuild
index ca879edb2437..db1dd26f8961 100644
--- a/sys-devel/bison/bison-3.3.1.ebuild
+++ b/sys-devel/bison/bison-3.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic
 
-PATCHES="${PN}-3.3-patches-01.tar.xz"
+PATCHES="${PN}-3.4.1-patches-01.tar.xz"
 
 DESCRIPTION="A general-purpose (yacc-compatible) parser generator"
 HOMEPAGE="https://www.gnu.org/software/bison/"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
@@ -29,7 +29,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) # ChangeLog-2012 ChangeLog-19
 
 PATCHES=(
 	"${WORKDIR}"/patches/${PN}-3.1-optional-perl.patch #538300
-	"${WORKDIR}"/patches/${PN}-3.3-avoid_autoreconf.patch
+	"${WORKDIR}"/patches/${PN}-3.4.1-avoid_autoreconf.patch
 )
 
 src_prepare() {
@@ -66,18 +66,15 @@ src_install() {
 	default
 
 	# This one is installed by dev-util/yacc
-	mv "${ED%/}"/usr/bin/yacc{,.bison} || die
-	mv "${ED%/}"/usr/share/man/man1/yacc{,.bison}.1 || die
+	mv "${ED}"/usr/bin/yacc{,.bison} || die
+	mv "${ED}"/usr/share/man/man1/yacc{,.bison}.1 || die
 
 	# We do not need liby.a
-	rm -r "${ED%/}"/usr/lib* || die
-
-	# Move to documentation directory and leave compressing for EAPI>=4
-	mv "${ED%/}"/usr/share/${PN}/README "${ED%/}"/usr/share/doc/${PF}/README.data
+	rm -r "${ED}"/usr/lib* || die
 }
 
 pkg_postinst() {
-	local f="${EROOT%/}/usr/bin/yacc"
+	local f="${EROOT}/usr/bin/yacc"
 	if [[ ! -e ${f} ]] ; then
 		ln -s yacc.bison "${f}"
 	fi
@@ -85,7 +82,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# clean up the dead symlink when we get unmerged #377469
-	local f="${EROOT%/}/usr/bin/yacc"
+	local f="${EROOT}/usr/bin/yacc"
 	if [[ -L ${f} && ! -e ${f} ]] ; then
 		rm -f "${f}"
 	fi
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a42c3f3eca01..7ba67d6a90ec 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.1.ebuild
index ad43058e4b97..39172881d7dc 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a8cd014f3772..d3866f4d2287 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index ac78f99f5e75..55f2bd67ad67 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -52,9 +52,15 @@ DIST genpatches-4.9-183.extras.tar.xz 17368 BLAKE2B b96629fef9107202f7d493cd12cb
 DIST genpatches-5.0-18.base.tar.xz 529328 BLAKE2B 7180f31d9d286d43de08aec505ea79df741d56c2b08cc441941755d811b6410f7bca279343b2b8cf9389a9865a7575cc502e44f18330d66e4793c9c77cc0005f SHA512 4897fe00787e5136df302bbd4b0abe030199744ca10b2c9a23e229c5c5d54e6d2a5995d8b410bdd3c07f9736f338da480737b4c16de719d3d1d4e87b13484305
 DIST genpatches-5.0-18.experimental.tar.xz 5812 BLAKE2B 3d34ef9c257fc4902ee0a08c920b57b62cba8e9f93fcd48c0331f6d9d67b9cc9b230c10ef62c4a6bd6dd476f95a985307ef962ece782fef3ec564b9e08954913 SHA512 7ce3400126ad97e90fae510dc29bb0e330cedb97ff56696b0df0a77c1f49be7522de0e9e2aac084bde182001bcb74872c0ed6bab1c05d469fe5a0d66defb5958
 DIST genpatches-5.0-18.extras.tar.xz 1724 BLAKE2B 6751d1b8374d3c5781de3d47d6645263c71625ea665343483a79c1b824b3667dcf56923aeeb974d3f0c7cf802e45fb9931a627815e2fe7bc6d5855a3632ba865 SHA512 c63c44eab24600e44ccf96bf8a81eaa77561b61447d30085da0fe1ff8a6adac0ad6acd9a573b407e5abe5777961faa940c2e4e8c06de77afeeb8a8fed69d70a2
+DIST genpatches-5.0-19.base.tar.xz 567088 BLAKE2B a3ae20fedf2ed3426f76b614531fc0330a4b7dfa7f571cedbcdce58b6c353224536de48f2eee5ad5123fc8aa2f7922c8e3e4f0ee0ce197865e7b1d7b8bd551af SHA512 646a2b008e4125dab3f4865ec5d62d2f1e5f3d79814632cba2ebcde77b2703f47e0772f95d5f13810912cda3a223cc9bf76794759f3517a776fb17aa098a0c32
+DIST genpatches-5.0-19.experimental.tar.xz 5812 BLAKE2B 3afed008bb5ca28c15cbd5dc82fb3de85ee74010e961a91ccc0256b10b4b3a48a62e00a6f235f48b77ab34d718bb42f7cb2c8e3acd05a4040ddbd72156a295fd SHA512 49f8bb57f9ffe1d15c2efcd1b8da201b3485a1da88bb20eeb094df5f6c95afefaadb6b4ba0a8babd53aee1ba0fbac1f0c1958f16d9f224a7728925730b0e65e7
+DIST genpatches-5.0-19.extras.tar.xz 1724 BLAKE2B 828c1a07c12968740283e1cff5229775cdcd67bbbc9b8f7a8dc91683cdea7f3b1ddb69b6f33dff9241997d7b28b97a4d2297967dd89817db76db76eb60d70c56 SHA512 3e49100d492cda536a271d802948d5d81ce25ae7fcbf716275a6310e2d173f1b751fc5bf40753ef2c9864bb721c65db0fac11c70a9760ab609ade6a02644f9b3
 DIST genpatches-5.1-4.base.tar.xz 61560 BLAKE2B 2f11e7ae6eb04bb908921f60f2e053607b705237897dea5a79a2246ce1ed9a40150b0d2c270c1de73679f113865ad1e456b1217b4ca73092fa910616c14a03f9 SHA512 e7a1dcb0b3085c44ad8638220af0cac16cd19c57c524ad62d4284ea0daec81740971717b1a5795203352a2c5b0dcbc51f379ef44963050358930899eed8809a8
 DIST genpatches-5.1-4.experimental.tar.xz 5804 BLAKE2B 535934b0a7d4a681ce8406534352ec2db164c33b7464233e266593e89df3a2b74f0a4bdf0b522bff6e083705a71c3189d5cb1caa639eed8ebb28923bf4985d2a SHA512 2a7873795807657205c29194f9865f539811035626be5cf7e8ee5a7351d0a32d590c813088c9704521e0c57adfce0bf4f160ee4429cf52be457e38af021141bf
 DIST genpatches-5.1-4.extras.tar.xz 1720 BLAKE2B a35ab24710007868bc6dd27507dd1f3388e790d9e7262ab08678f33311c52342812f87ca14b1495078ab44267b3441070a7b2c7831f880438659d71c0b9b5772 SHA512 fd70df8093f7686125948dc901cb7423aad5b82b9db97e95eb54ff4c409fcff785ae56f9639605546523a11b8671e36d40bd7719c3bd246b0c5f5a3d087a2ad2
+DIST genpatches-5.1-5.base.tar.xz 107136 BLAKE2B 92a1d85804c6889fd4d4063a9d63bbbf09c9300e113c4dd8e6f194e5900e0e55108769bbf291e97db62563ab3f58480621e0f9b24c47a59f20c000daacacfa16 SHA512 65d6c6c353ed1327fb826f2164486189f6e81e6ec230e1a8a090babb4420824a9edcc15d1dec13c5d953f359d94436009dd311928aa9ff06c1303262165c4759
+DIST genpatches-5.1-5.experimental.tar.xz 5804 BLAKE2B b66b8de828501c170029ae389efd5a8ca77509238e209a717344aba350d471ab28cae52f57ee74428d1d77569872432ec746aa5d5da2f755d12d9d29f9194fd0 SHA512 17d302ee7ee99997a57a3007c131ead32177aca7b3dab5c1dc9668f41e436a85b79dab4e81510b84d388cc3066a1ab2691ac298d9bb5147d47e9528e2006a303
+DIST genpatches-5.1-5.extras.tar.xz 1720 BLAKE2B ebf7957e46b5b2ffff502fb5ca13c022b5b0b23ec434f3fce105ff639aadf8cd355106ce5653e4934ca23190e69c700ab61d31615d7ccbe8469434403b3001d3 SHA512 3027e9d692c021e2478dad6d40e9729ef9b8a4c012da163c2a4ec4bcd57a67286fd53951131223c1d7801a492c69e7399947b24789b14d62fd37ccf7410589f2
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.0.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.0.18.ebuild
new file mode 100644
index 000000000000..cc4746854d59
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.0.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="19"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.1.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.1.4.ebuild
new file mode 100644
index 000000000000..133e9c460165
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="5"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 3db79a409809..5d9e62c19116 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,8 +7,8 @@ DIST linux-5.0.tar.xz 105235152 BLAKE2B 59635c87a4123c90ab8598c9ea5167096aa6bc76
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST patch-3.16.67.xz 2401404 BLAKE2B 7741144b101d8c4d50e6caf002543a76ae83fa6c5d43cbdb0cd6183eddd744fa03a08f77568689d0083968ff3a6cc4da731e894552fb703dc6a52a365e225504 SHA512 defcc7a303434b9cbd374336f9ce4842d41351c305495200b1f3dadf533f328a01179cb4c7e0d2294de10ff0e42bc68555f5abb650211e81574b74953acd5aa1
 DIST patch-4.14.121.xz 2560376 BLAKE2B f756ab490724f0f0749e3f21f46b9aafbc2d6420b2f651b076973e801cc3598cfdd90b62e9cc2384db55e31909662dd99f78136e992f84fbb810e6058a14828d SHA512 358302570cad582167118c3880ecd91dac32c9480997ee36dc3a3652b1e6f1d2f4f94ab59a2d234aa5dc09e205da5f89a1c99f088e75dca72f3e34da85fe6e93
-DIST patch-4.19.44.xz 1216956 BLAKE2B ddd1b02e562971a1ec888dadc7005b66e891714bae8ea8d37b0de4d6391707a3641781fb24abda410fcec2e4548968162d5ff0e77e8979e6503258339da450dd SHA512 1ad33fbb9939c0c537354ab310e0ca5d292cdd58b5126f5a2df661602b5c6ed8aeff001c3e3c6b6e7c45e0e33af1aa803bc1b51b61ec42ab644aad7479f98ad7
+DIST patch-4.19.45.xz 1240820 BLAKE2B 9c9503be52b18518b073810a4edf9f8170fe69bb59cad83804de8a347d1e7c188ee9817187970476971c53df880f8b029c56dace8c607db0a697628bd3574c1b SHA512 2edd0e467a5eab51706375974868dc1671b349d7ab33957653036d2c2d4681b05ba9f825d6edad5c3175063e3bcef620bc349526178a53a81b8e0b51756945c2
 DIST patch-4.4.180.xz 2544176 BLAKE2B d79d67e185d232d39b114e63a8c9682ecaa552264a1a2dfb3d325b83c80a0167030fd10c009609e06dfe7edbe1f694fd867c834051c8b5c4f0b63e0a8612935e SHA512 3218f5caa9b305eb6c9268f630a80e9f69f0477c14976c5902d27df570c199a7eda922f80ddae3814736ff16cdf03db4b6bda64119e5b24473ff8f887a907824
 DIST patch-4.9.178.xz 2768588 BLAKE2B 11c73d5674d87b52b78b70c456bb49df4a6122dc0703ef67f6fa9e7463dc34df739ff4df3d000da9ead7de27814de5b2e952be4545b2fe78b8c3d42545a56a47 SHA512 0e7c1e5a30164845f469a8c48db02729568f092ec590c20abf53481f20f4eed75ad21611e544b302baaec157c981cab47aa4dad03470eff3065a35ba994601d9
-DIST patch-5.0.17.xz 511416 BLAKE2B a1c3a81e696b246c5baed79cf82a237a080e00c5cf8a1a581ac01f278add2ee963d9eac2e7567b89fb62a35dea742dbc16102c65dc1505f6b52bac23efec1ca8 SHA512 08e294728bb65358d4e2e819a395effdeeec1df1f0d005906deaa48a7b27dc9795e905209394fcf60fed22092ad3db66b45bb327cab823bd6326efcaefddf31e
-DIST patch-5.1.3.xz 57928 BLAKE2B 129acfc548113160ece28398db20fa4f458a2b40557ea382c6a6cce0fa436bfb30e1a39a2e8ef8926d4682e9e8399d2fb5183c604bb3282687a9b9808079909a SHA512 5f7d13a9ded815dac613c133de9272f7ce7e8e4385e29db0f7125750d0e66c84205ac0c1412afd5beaf1b33f59a3f9ec11d41f2d0b4eda898af3c5b6c059c61e
+DIST patch-5.0.18.xz 546604 BLAKE2B d403f4d7a4a027002bcff0a7aa95402224712ba9e36e19dd073f803a0c7a39ba3ab2617d076f29adc810549849c94f4109f5376424fab5345cdd81f8cb182d74 SHA512 ebf25715e1874a07a240f30c45094228a1c108738d568d3900fcf8826637e474596975ccfb91e0d3cb7a9df9daf346a70e2817e05f75829da273929b051e8bc0
+DIST patch-5.1.4.xz 102440 BLAKE2B 70c2cf5f4846aaad9aedf856e69709c8608f15fa7b7267b15aa34876a4fe6394a8895171dc5362495f2201243b0b29eabccbef2edaacc7df0e721bfe2291212d SHA512 0206b5c977147a04331882c53533fb418669afc8c2b2ec0ba298d041e9bfafa8e93c6fff665676c4473dc408fcd8772fb7addd99967e0798496fdb6e019a025c
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.44.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.45.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.44.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.45.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.0.17.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.0.18.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.0.17.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.0.18.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.1.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.1.4.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.1.3.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.1.4.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 4d02158463ec..2dbe401611b2 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
index 2e2afe76c62b..064e8e0d469b 100644
--- a/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-1.3.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="+introspection +vala test"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Unsure about osinfo-db-tools rdep, but at least fedora does it too
 RDEPEND="
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index ecd33c2d3d2a..6f6603954998 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
index ff6119f7893d..70d4b2d6f155 100644
--- a/sys-power/upower/upower-0.99.9-r1.ebuild
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 4ed535f2ef3e..f5f6ba086c3e 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/nmon/Manifest b/sys-process/nmon/Manifest
index fa304a4040f0..23ccea695739 100644
--- a/sys-process/nmon/Manifest
+++ b/sys-process/nmon/Manifest
@@ -1,3 +1,3 @@
-DIST lmon16f.c 271123 BLAKE2B d0ac71e061fdeadc59f0c07d46ed711570d439f8058b1fe30fd137cb648129f844c6d8b750783543eeddb3bd99f26e07e83ba63cdc55ace83d0f2fc77ab19c43 SHA512 04d22b4678932067d42158f1bc794f79b5a321e10ba7163632be3b930e28176d0d057cd652ef7cd342167741aafdc00a16e612a99522bfe75072e67cf8d0a66b
 DIST lmon16g.c 267681 BLAKE2B ff7484b7853418e679720fcc76257fb7fe0208f8cf43806c76f5d189c370f995313c325d6e9821b686fa3917cc552af9e9b94ce9f9aed6efe98d2d07032d7c31 SHA512 87287183db48338a281438efc7a8b74249cf88c0a0799e826a9a89b0eb39835b0ba223c7ea6decc217848179f4991909b3cf307aa7eec8a3a4604ebf8a4e8ebe
 DIST lmon16i.c 269804 BLAKE2B 9ff75d7f9f54d6ea3d4c9bec611343c2a28f2cff44d0e2a972bce61326befd4ae455941dba406d052c4cdd820ffeae48894131c8d8b746eedbd1bb58582594d8 SHA512 7c2d60b1558c01cfbcfe040eb68652d3a6c5717efb5495563f774ff20384a6cc4532e756d49b8634a022e4681503b7738998a5dbd77e4ca37c114a94a03893cb
+DIST lmon16j.c 268464 BLAKE2B bec697a4db2f16958b8505fafa0d215a41e2149a16a033ccc361f797cec954b43cf0856fb5b670b4741cafeada1dd2ac07df95d6bd5466ee805be406e79f6560 SHA512 e3a5be0e56f634f2e054a0ab39c92c2ca4e345017da976f891a5ece8cf67d57eb3b749f529394163f8269db829af56f394db5c666151b6c1e6a5505a6235869c
diff --git a/sys-process/nmon/nmon-16g.ebuild b/sys-process/nmon/nmon-16g.ebuild
index 918ae4569cc1..fad46aabe826 100644
--- a/sys-process/nmon/nmon-16g.ebuild
+++ b/sys-process/nmon/nmon-16g.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}
diff --git a/sys-process/nmon/nmon-16f.ebuild b/sys-process/nmon/nmon-16j.ebuild
similarity index 73%
rename from sys-process/nmon/nmon-16f.ebuild
rename to sys-process/nmon/nmon-16j.ebuild
index e416c50b8747..4cc52ae9c054 100644
--- a/sys-process/nmon/nmon-16f.ebuild
+++ b/sys-process/nmon/nmon-16j.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -13,17 +13,16 @@ LICENSE="GPL-3"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.c"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"
 
 src_unpack() {
-	cp -v -f "${DISTDIR}"/${MY_P}.c "${S}"/${PN}.c || die
+	cp "${DISTDIR}"/${MY_P}.c "${S}"/${PN}.c || die
 }
 
 src_configure() {
@@ -41,11 +40,11 @@ src_configure() {
 		$(usex ppc64 -DPOWER '')
 	)
 	append-cflags "${cflags[@]}"
-	export LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses ) -lm"
+	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses) -lm"
 }
 
 src_compile() {
-	emake ${PN}
+	emake ${PN} LDLIBS="${LIBS}"
 }
 
 src_install() {
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 84d0d6dd1760..164a58ed36e9 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/eject/eject-0-r1.ebuild b/virtual/eject/eject-0-r1.ebuild
index 4b11168509ac..a9663a7022ce 100644
--- a/virtual/eject/eject-0-r1.ebuild
+++ b/virtual/eject/eject-0-r1.ebuild
@@ -5,6 +5,6 @@ EAPI=6
 
 DESCRIPTION="Virtual for the eject command"
 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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( >=sys-apps/util-linux-2.22 sys-block/eject-bsd )"
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 32c2420c0531..c36a18e1fe60 100644
Binary files a/www-apache/Manifest.gz and b/www-apache/Manifest.gz differ
diff --git a/www-apache/mod_h2/Manifest b/www-apache/mod_h2/Manifest
index 9aa643dc638d..b3f5032a9add 100644
--- a/www-apache/mod_h2/Manifest
+++ b/www-apache/mod_h2/Manifest
@@ -6,3 +6,4 @@ DIST mod_http2-1.13.0.tar.gz 1037382 BLAKE2B 8df02fe48d65c08504adf8fad9f328a525c
 DIST mod_http2-1.13.1.tar.gz 1031498 BLAKE2B 53716d7973e5996d48a85cc96c2634d40d6908f15529cf1e17b94ffe23e171de63914c862ab6dcb968cd74a9ca042778f8004b3bfdb2461f3dd30314dd1ef1ad SHA512 e14fe9d1910e5f4a48e3c0f94b2aa7ac73380ee8417b74c6a3e38360fe5bffaa16f59f48b7a0d0d7f9f50f933273b6b96e7530699e2bfd3ea485f34752a55a5b
 DIST mod_http2-1.14.0.tar.gz 1034167 BLAKE2B f29d3937339562f0b8e21ab5eeaca8ff1cab26ce15c692fceffe8e6a1609a49ff6f7488cae4cc30b4fe0e97fe787e077ff771906d7d897afc5b47cc347d74b8f SHA512 dba17eb48af5c22dca3fcd75b4ecd5838dff72c9829bcf9475d8edabb0d2ce4ed2f55249ab1051c1a37e9f2f5a5a7f08f5aa47170f9c39c3b9c404c4ec6547ac
 DIST mod_http2-1.14.1.tar.gz 1032989 BLAKE2B 15359369f8332d9f9d35cb43468b2cd0d98529155d360176c41ac38c24a94824510b518aaa367cff10672bfdd3c7a24269cca4552d993bf7d63f28f857a1ae78 SHA512 04298f0fd9379ae22ba87f5dc95791091ff95cc90c2e898334cc33a0c5115905ec6cbc93676b3a28786436f351c8971721b2786e70cd498fd73ec64b5f46e611
+DIST mod_http2-1.15.0.tar.gz 1036567 BLAKE2B 1ed9fdd7bf13c8ec7ac14b2cd0a109f0cd6e6d1eb8047e1cf6cd107143e23ebb6d9f9ef753942d44ec4d2168e0783dd23dd66b338d8631c504d4cd81b0287b83 SHA512 c3541c930ceee81dfbd688ea155561b6e06aa8ef486830a95e6cfa621f3589aa9c9e15661a4b81463cbe716d02dd28a574e3a74894a74d7c751c88894d378858
diff --git a/www-apache/mod_h2/mod_h2-1.15.0.ebuild b/www-apache/mod_h2/mod_h2-1.15.0.ebuild
new file mode 100644
index 000000000000..3e6d435d3f82
--- /dev/null
+++ b/www-apache/mod_h2/mod_h2-1.15.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+MY_P="${PN/h2/http2}-${PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/icing/mod_h2.git"
+	inherit git-r3
+else
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/icing/mod_h2/releases/download/v${PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="HTTP/2 module for Apache"
+HOMEPAGE="https://github.com/icing/mod_h2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND=">=net-libs/nghttp2-1.0
+	>=www-servers/apache-2.4.20[-apache2_modules_http2,ssl?]"
+DEPEND="${RDEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	APACHE2_MOD_DEFINE="HTTP2"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins "${FILESDIR}/mod_http2.conf" "41_mod_http2.conf"
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 227d32aaead2..0b7c7b0afa65 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
index fc1bb55b84e2..5bc906f72683 100644
--- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,6 @@ IUSE="wifi"
 
 RDEPEND="!<app-admin/gkrellm-2
 	>=x11-plugins/gkrellaclock-0.3.2
-	x11-plugins/gkrellflynn
 	>=x11-plugins/gkrellkam-2.0.0
 	>=x11-plugins/gkrellm-leds-0.8.0
 	>=x11-plugins/gkrellm-volume-2.1.4