diff --git a/Manifest b/Manifest
index 2d7427b969fa..d988d5ba1edd 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29309 BLAKE2B 93e5c0f726d44f2af0f11f8adc8df95e6663b3d846360d3f9f97aa81d5dee0340413c8ea3871b8aa82c9c33e0305f5ee2c518db3d0420a1c018dbc8a7423fa85 SHA512 d66e0ed3b6dc723418835ea2e0511f18cacfa61a03265f61ac512a8a4c78518c89e03602dc798d1d49c9c07c4f22fd7857df894a66a5bfe00b447c2dd92f2eee
-TIMESTAMP 2019-06-12T19:38:50Z
+MANIFEST Manifest.files.gz 29333 BLAKE2B afc4cd8de4efc8be6a35addbd8919fdc4b4742a5800354a7913fa93fe7bc2960429c1021e6aa1e46d0b7f3aac5f9144dc1f4f672701e6f090d9a74ba19505f8e SHA512 559a795823034a552ea7eb822828c8edb338ba23f87de8e7cc078e9bcd3279eb0287a76ece942e99dfe584ea56978a1aa7c5e4ca3ecfe75d168ff5165c1be840
+TIMESTAMP 2019-06-13T05:08:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0BVMpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0B2mVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBijA/9HQbLBv/eMpmSxz22b/hOPdEH7UIpVrzhn74/NnwnxUoNzBv1cgEou1S+
-nzWLSBpZ7ZSMP3eXoaCwpZEK3/CNKAPAh3DBcRFhYcObZ2dkkh+kSVC2JtWQBOHy
-sLcxcb9GRQaXXxolPjV2uR20cvTl1hI4GGsVoZKRxgk4Dija2fPRjAA0cv11K5UA
-B60RBWuWrMhchf0lsRsTLeLvZBT7jfcEnnkaQS2TsG3GrgYdTt3ICMdf8ovQDJK0
-KPnpdP/3/75tgQ18PcJTnWf7geuBlB7BgC7F3P7Zl2NTHkzUv9aY0NxTObFDL8mR
-Gv/NKxnOoE21q6VJF96JGEsBfWWTyUrSM2VDmrpAZxcKCx1gtsmrkYoGnXGyWNLf
-O4N0JDAi/nCzrB8pfVABnbx0yfntXADzyaQHHaGzbZpBR/P9RdYJwxAZgcqsTK4G
-DSYfPjWUS29zrKCaNaz/uyiptDJJmqnqdu0nGCgJzqnis8Pttekuh71ZlocfIgFz
-MW9Fdj0iBo06K174eVqvRm8X1xyukHsVk1MFa0c2iEBXKxvwJSFKPKftz5HdQtha
-aiwKFlT2+u+QE67RjlpbjYid30yRX0J8BwMjFeYZkl+mzScR5LVGmO82oFJxSjnl
-gZevmaxPfwmxmVSL16nLDNBPWYPuHmHo6ybx/cJPG41Cm0GFjjo=
-=cNDW
+klDieg//djjG3W+4++QRTY0zrtIOYL31C/4wf2O2AKNGQmPfznoiZyMF7O+Z44nz
+LQAG92wWQLl+q7DzS8/TWfY5/mpiiKD9UITJ6nNS7l5tVn+cMvJrzpi+KMSMrqj4
+ZoUzODHeRw4dE/YsJFS5rerjqF/iRPkNHmv5MV4Ja0Ulyn4rmETZu9KfFkvW20q5
+LXcR175cBe5h0wGxQbzWYrLLoHKO8/VtzzV2WhstdNXVc3N2LFNDQCURk+73cdk1
+qYfv8nyLFYAQNmFLwjpYJkaj24lPsqgPwF2yAbMVfsBcebt8mAbLAruE4w8eYJcY
+E7K1vBCdzF+r0kx4lMsJFUnsKExO/OJxApmc4WznuTy/SwD2/myxcKaE8RdVzcyw
+GydqRwu0ixM1Uuvr3vnZYPtH3zfBPxRz3eVbt9y4SIl2Ll6jQpXwLbTVcZoGJHCr
++OcFE7V4kvXRrS0Am6lsI+zEYz55NJGWK53Bu0QcAAO9oEFi+NxWTo5sLWiQ62YY
+MYGaJjozxa8r50tfVH5Ja+dGHJAhP8aKpGRcINSMzCWI6ZurCvEEDr9csJqLGUeM
+ujfGPGqWrJyNmeKOFjbq4zjbU/2k46kie9AkgPzjF+0WuGMYtJoohEi2g3Qml6Po
+kPnP9Gf+Zj4PBlzgpSr68Rl1B40OSmTLEqryszlpbxbrDntxZ28=
+=p5/n
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 65f959d9cbc4..ffec689a17a6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 2c28e986196a..dfdc9ddd564d 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress/Manifest b/app-benchmarks/stress/Manifest
index 8fc1ed8ffd54..eb03c6930a6d 100644
--- a/app-benchmarks/stress/Manifest
+++ b/app-benchmarks/stress/Manifest
@@ -1,4 +1,4 @@
 DIST stress-1.0.4-r1.tar.gz 191800 BLAKE2B 560065d963823e734bb706840908998a58c07c82b21ab579f7a0fd5163e7a8591ca0f6abe430bba058bafd9a2dac1fcf33f011663cd6c3d2fdefb221a49e5e8f SHA512 623a7d9585828bed4b7673e19fb0cfdda904552cd56353d74106047b64249299d5f8da892ec135f1781ec3984c7d5835dcc6c0d8e659e06c8a1e4fb2af9fd9c4
 EBUILD stress-1.0.4-r1.ebuild 542 BLAKE2B 867de86ee7552edb9f50a7336ee3b38d0fad5c2e054107f65b71369b75fa13a7794f54d32349211e2c029eb9e03a89edba8ff0f11781870f23b119f7bbb9f48c SHA512 cb552d5cd8c52dc75fbfd365c17d784fe6d8b8318c077e4c9d909431b226f8beb2ad40ad62d0e86eb0104acf088098e342afb39cd980fd699cc8ba692056f1b7
-EBUILD stress-1.0.4-r2.ebuild 511 BLAKE2B ecad920f0e16fa81f373189824578d93ff0e8254d8d14bbb099a7b1ea98f79322b13cdd023f99a6569cb846948caa367f7cae0388e9556eaaa162edd649a4c9e SHA512 b44d1c719b37d3dfa8fe77c58e2e02858dbf164057fc1d964528288c2021624eb978bdf1d64314e4905290198b6d97fc41f240af1fc5d85c3216149608a52807
+EBUILD stress-1.0.4-r2.ebuild 510 BLAKE2B 18bba376b45331590ea482d9fb10aa434ffac26e62a5ee3d8a0350a002a9126f243ece62fbaeb991db929aa19475970209f215dae24c5e031e06af8115982be2 SHA512 9d93425d466e7a2a2cf5afa9e7a0b6aa81fc037c455d780284657483ffe318d578b9cc686111c166c5e5a3468c1e3a9bedf5903dc4d10b4abc0f7bb99a6cc05b
 MISC metadata.xml 567 BLAKE2B aff13e629db6c40334669bda3e24cdbf9bf5d67d5954322caeec389d4b324a17eec66a4846febf6bfc2d21f2d2eca8989c37980aeb6d35ca744fbea1bdc29a58 SHA512 3a9699c915e68449c06fe72b084722e367b920f6ef29715f04757e0e4613383bd7a58f815d81fe2917ee7da74ec1df907e48ec74a0794a6ce3203278b20c72cc
diff --git a/app-benchmarks/stress/stress-1.0.4-r2.ebuild b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
index 9312b2f8abb6..0ccec3030783 100644
--- a/app-benchmarks/stress/stress-1.0.4-r2.ebuild
+++ b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.seas.harvard.edu/~apw/${PN}/${P}.tar.gz -> ${P}-r1.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 src_configure() {
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6a7c9e5e9867..e878f965664f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 5e9f6c5f9b6e..30f6d42d145c 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,4 +1,4 @@
 AUX jitterentropy-2.1.1-destdir-fix.patch 1542 BLAKE2B c9ad6221194de1076d14a7c4885d18520383cbb155ff13c3e19e453c7a87b30145950cbc07475d4cdc2a3c7be8710009719820c7634e25b5a53a9dab49616d8d SHA512 25113f85ecc3f2e010906b23a6e70ff616053256ff1a1ce91b9e7210d88bc0938d34696dfce884e381eb7a8993b4787bad6048361b851150c65198bfb8772d80
-DIST jitterentropy-2.1.1.tar.gz 23804 BLAKE2B e208c87b414939485c16c6e94460020164e77089d5ac69f8627f8f1dfb38f211ff985c7fa5d32f647f1b06f065f86dc9070aea9b481e8251ecdecbfb4724ce08 SHA512 fb1b76278e03f425be06c8b66532e3997a07f91645393317f42681b1113bd31dfdf348bd18c92d0dfc153c85b75f8f968fe070e988f1a02e4ef4e09435b6cef8
-EBUILD jitterentropy-2.1.1.ebuild 949 BLAKE2B 99ca327ca1bcfadbae60c43c7c97fbc4ae15586dfe60ceb019760ccf57109c82ac1947e705dd43c8158039b9f4c62fdef72685a496cf2f1939486c3a5aec1484 SHA512 fd5729d9bb41c5b78651a1922791e21de461500f98632df4b55e638c665756ff7c47720751be352641578c1331cdd499fb261f8afaccbc9fc2b8a278b2d67e12
+DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
+EBUILD jitterentropy-2.1.2.ebuild 960 BLAKE2B a923f83e46c9d6e5b93edd1756a4fff995de18a9fa75e6685cca2632b7d2171e25cc0e10766f2c916bf00589b9c79b306714268d70bb9bb4a52af49b28c58500 SHA512 fe416e73c28054218b59b6e29c17967d6eddf9232262d3aa9f505ccaba425f0167185b093b457d51f22d83e41293522466b160500263ef86c6b25144e3c51127
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
similarity index 66%
rename from app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
rename to app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index 70e643f40806..d33b497f97d7 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.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=7
@@ -7,15 +7,12 @@ inherit toolchain-funcs
 
 DESCRIPTION="Hardware RNG based on CPU timing jitter"
 HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
-SRC_URI="https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.1-destdir-fix.patch
-)
+IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
 
@@ -29,13 +26,13 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
 }
 
 src_install() {
+	dodir /usr/include # See: https://github.com/smuellerDD/jitterentropy-library/pull/9
 	emake PREFIX="${EPREFIX}/usr" \
 		  LIBDIR="$(get_libdir)" \
 		  DESTDIR="${D}" install
-	dosym lib${PN}.so.${PV} "/usr/$(get_libdir)"/lib${PN}.so
-	doheader ${PN}.h ${PN}-base-user.h
+	use static-libs && dolib.a lib${PN}.a
 }
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4f345c7be3d1..0f5f55df2023 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 6a826368282e..645ece0f1fe1 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,10 +3,12 @@ DIST neovim-0.3.1.tar.gz 8937900 BLAKE2B 05de31d194a69b9cecd34210ecfe7460968f425
 DIST neovim-0.3.2.tar.gz 9230960 BLAKE2B c9d0ee2f679f411c3ece2aa186e31d0143479f6ec19d4d54c34cd4be519a92e9f213fc821b347a0e3af6817b6ce745cdff523af41d5b558940b76d9df726253b SHA512 1192d9330da3ab543dcb39bdff517637c7a52be558ad07a60de27bbf051432064edc230b46ddd9cdcae006ba1340550128e4d4ced7105f1aab57b13c2c4479ae
 DIST neovim-0.3.3.tar.gz 9231632 BLAKE2B 96bffabcc7c7c2edca79f64e51348954b550910d71c55d00dd3d91d9c51a75742e5a4b919701c24c00de1d372a4269b491028e61afcce45375360dc35f3b943e SHA512 2e2910e0dafdff69d2d9f54376c6d7c64e0f172bda02f85281fe6e694e7d81365e682793e454a0ca6f6c1b8a4ed9120bbfe574afa1fd0e6368e06af743d7d147
 DIST neovim-0.3.4.tar.gz 9231575 BLAKE2B 92e727264442794ae27642451c90381262f9882e26d9865a2ff6c1bc4060b070ab49cd11194c3a88dafecda5bc1909963b2cc8b382198dc7c117ba056b7a4ebe SHA512 fbf22ccffbb36c082bfe9a66b3d0180a78581102732a44ab7a5417aef517c88b69406491854613a1cf347ddab6fc6e277f959887556d2c0068cf181e4d88c36b
+DIST neovim-0.3.7.tar.gz 9231661 BLAKE2B 6eade77f8654bc95170f4c052c5700a6ad42aff920889bf4036e6ff931cdeeabb908aeedb44e68efca3500beb797cf2361e09d85456a2c17431e005a64bafff4 SHA512 1d770a4643a44da65f0a03c90e18e89f337b16ec3eca20dbffa21bcab10c836062ef82974437b64bd766f7b07317cd3dc8e3e72b9d5d0911b1d4f2c528cd20c2
 EBUILD neovim-0.3.1-r1.ebuild 2007 BLAKE2B d6262beec656c799ce6e4b8288d1eace55300f039a3985ad3db60b3fe3e4dfab45673dafb78ad71f73beedd42504028b42f4d9646ca729208c07d92f95ae6c87 SHA512 d5356d986f204cd21aff004fd6df855cb350e0721b15536fea4f04175f41694b33249c4b660ee02769502767bb921a5af5170cd88e446a1a3dff7be80f40ea09
 EBUILD neovim-0.3.2.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8
 EBUILD neovim-0.3.3.ebuild 2007 BLAKE2B dd3749e9464be6acfb02dd3359ce9f1ea5e18c9f0164f6fce135f2ee1d2ed0333ea4434d8a07f01e6779bfc038fb3a4769fa1c2cdb9edfa1b4eb75f4cb09ad0f SHA512 d24a4080f31ce6f61a0cc2120cef02c4ccaed5d8527e9089be1c60899040003a42a479f712153dadbcbc7f5c505f2efa04cd590c8ebb7f3a0edadeb8deb1e1e8
 EBUILD neovim-0.3.4-r1.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
 EBUILD neovim-0.3.4.ebuild 1986 BLAKE2B cc5c1ac7fb5a6540035f708068b9a7c0011c74e4a96ae279b26864d87481012763314b85e9b9c93f0582500438b37b1dd6e59000dfdd41b28d2bc0e544f6c620 SHA512 d557deaceffa99fe4ce79a23678ffa2690fb7f5ea5c3be7c7bc80916cf2bf16f8e870a4e59514e9531e9fe60f4c44b2cb973f015775e278ffcd495b6b6fd396c
+EBUILD neovim-0.3.7.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
 EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef
 MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/neovim-0.3.7.ebuild b/app-editors/neovim/neovim-0.3.7.ebuild
new file mode 100644
index 000000000000..c3e917afd7fe
--- /dev/null
+++ b/app-editors/neovim/neovim-0.3.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Vim-fork focused on extensibility and agility."
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
+
+CDEPEND="
+	dev-libs/libuv:0=
+	dev-libs/msgpack:0=
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? (
+		dev-lang/lua:=
+		dev-lua/LuaBitOp
+	)
+	tui? (
+		dev-libs/libtermkey
+		>=dev-libs/unibilium-2.0.0:0=
+	)
+	dev-libs/libvterm
+	dev-lua/lpeg[luajit=]
+	dev-lua/mpack[luajit=]
+	jemalloc? ( dev-libs/jemalloc )
+	net-libs/libnsl"
+
+DEPEND="
+	${CDEPEND}
+	dev-util/gperf
+	virtual/libintl
+	virtual/libiconv
+	app-eselect/eselect-vi"
+
+RDEPEND="
+	${CDEPEND}
+	python? ( dev-python/neovim-python-client )
+	ruby? ( dev-ruby/neovim-ruby-client )
+	remote? ( dev-python/neovim-remote )
+	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/globals.h || die
+
+	# add eclass to bash filetypes
+	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFEAT_TUI=$(usex tui)
+		-DENABLE_JEMALLOC=$(usex jemalloc)
+		-DPREFER_LUA=$(usex luajit no yes)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index d64a74f7ef96..dd9a8f92dd00 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-metasploit/Manifest b/app-eselect/eselect-metasploit/Manifest
index 451ee4544a99..112cb3ea4d5e 100644
--- a/app-eselect/eselect-metasploit/Manifest
+++ b/app-eselect/eselect-metasploit/Manifest
@@ -1,7 +1,9 @@
 AUX 91metasploit 301 BLAKE2B b5dc4ea9b50299ee88135f4aac951f4407da990faa6f1bff796fcd16d7a15a114dfbea1082f63e5b869d1f66eb869b55ce5c33ea1816282852b5da72870037a8 SHA512 60c1633dba13a5614649f51e9c4b79dde9944bac3c81dba26b5e97d3589985ba66d05c73093b68bef2af150932d534fc3d17c223de1c68a13b266ba219c55f9b
 AUX metasploit.eselect-0.13 5200 BLAKE2B 1b58496e503e6a877e1314b6ed5092a43886bb015f74cbb6d980dd2b8140ecc7871ac33fbb150f55b62014cc9d1187e6c0fb1464b92817254ac1a123baad4d59 SHA512 73d94d02995f3328a61e566d9d6da58c062393a4b8ae48f57c4fa09fe2e3d06e4b9a5dd069c6504cb77a0dcd924e4a13c83857bb8a640d0d7568c99ae0e6655c
+AUX metasploit.eselect-0.17 5010 BLAKE2B bc78d7182d1413371b1975e27cf36e3be66b77085580f0ab34a49921b13236472fda97d4b0ba05fc1bcca1af63c523daca4ca6318f9b62af5439e7af54400e0c SHA512 71b4379e8ab80a163ff8c05757439ce7d3b9d4f4f09c7492d34dc6c059aaba5bf363cbc3143865194a79c95999eb1424c7bbe5b617cc8307a59edef9255c2be5
 AUX msfloader-0.16 1157 BLAKE2B 0a9efd17e5a76a707b1b534aa52574e731f01d4de09f587bb19313833fe87a5973297be4cb97935a730b02df45c5d4c6f649a7935d365104e4caeb1238ac84ef SHA512 d228374e861e81e4f3371a6479c20b683a55e51e1d0249721ef5c465138e36c4dd205866d057c027c3ca6fcb1c79d3ff75790b73ed47d1e6af3b9d9186472386
 AUX msfrpcd.confd 370 BLAKE2B b692c006e181927c4dba7f159f4fcf85e316004ad09a4ffc107189d186837924b3ad64ad614e9e45742dedcf53a046e36096e5fb6bc60b99ad2104a96c1a4371 SHA512 88a52427233bc82dc36d8f627edee84ba6675cddcc4539bb3a28cfe6fd7fba673875d62a150dfa5314756f11a6b1a95453966b31a2ae1f9820c6ef936d463f90
 AUX msfrpcd.initd 470 BLAKE2B 760f4d87365c1cc4c23a305710eaa96447a8c3ac87a4c02133542b4a051f4b669f828f5cdeecbfac7e29f3a6f41febfe35296264804ffd4ce111a1d8bb63d2d5 SHA512 315eff30ff8826f87243d100f9a7fa28e7e4689bb4593bdc4fa0a4f8fa1216556e8921f39c912bb544c7304c84a6421e6289f8aca177ae401989f35e2b8fe441
 EBUILD eselect-metasploit-0.16.ebuild 910 BLAKE2B b41839cff3fb9f5f1c296940c93da292092eecead5caf0683d4c163a7e771d3df6761e834a186099f87b7c19dd35637fe557d5f149f2d48931a5b7875f187127 SHA512 b1b63d1193fbfc64e592251559df1ecd238e36fd89b8bb2fa9e1081a183b32b738516e80da668014bd7e7b9f5a69411120c1a5e2f0a5c197b875ad02bc9f55c8
+EBUILD eselect-metasploit-0.17.ebuild 909 BLAKE2B 8fb92539d1ccb308987fc8cab8383f0582af10d1ccdd639f635d3c522700e21cfe9382e740f3009ff999fdfa2d3c17a931e79a5730a11ac9f0cd57723e84b2fd SHA512 e61383392bef398a80dc3c002a4dfd905606facbb7fa728ce8107e0b0fb33672114a8084692e7cf4272be0b3804d5639292b79d1b0aa2e9cc6ee21c7582da63c
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/app-eselect/eselect-metasploit/eselect-metasploit-0.17.ebuild b/app-eselect/eselect-metasploit/eselect-metasploit-0.17.ebuild
new file mode 100644
index 000000000000..1d5193b54601
--- /dev/null
+++ b/app-eselect/eselect-metasploit/eselect-metasploit-0.17.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="eselect module for metasploit"
+HOMEPAGE="https://www.pentoo.ch/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="app-admin/eselect
+	!<net-analyzer/metasploit-4.6"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+	#force to use the outdated bundled version of metasm
+	doenvd "${FILESDIR}"/91metasploit
+
+	newinitd "${FILESDIR}"/msfrpcd.initd msfrpcd
+	newconfd "${FILESDIR}"/msfrpcd.confd msfrpcd
+
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}/metasploit.eselect-0.17" metasploit.eselect
+
+	newbin "${FILESDIR}"/msfloader-0.16 msfloader
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/eselect metasploit set --use-old 1
+	elog "To switch between installed slots, execute as root:"
+	elog " # eselect metasploit set [slot number]"
+}
diff --git a/app-eselect/eselect-metasploit/files/metasploit.eselect-0.17 b/app-eselect/eselect-metasploit/files/metasploit.eselect-0.17
new file mode 100644
index 000000000000..f27023354b54
--- /dev/null
+++ b/app-eselect/eselect-metasploit/files/metasploit.eselect-0.17
@@ -0,0 +1,197 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2005-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2 or later
+# $
+
+DESCRIPTION="Control which metaploit version is active"
+MAINTAINER="zerochaos@pentoo.ch"
+
+###WARNING: don't even think of using this insanity for a reference (but it works,mostly)
+#base idea from kernel.eselect with --use-old from opencl.eselect
+#all modified randomly until it worked, entropy is wonderful
+###/WARNING
+
+
+MSFPATH="/usr/lib/metasploit"
+
+# find a list of metasploit symlink targets and sort them
+find_targets() {
+	local f
+	for f in "${EROOT}${MSFPATH}"[[:digit:]]*; do
+		[[ -d ${f} ]] && basename "${f}"
+	done | LC_ALL=C sort
+}
+
+# remove the metasploit symlink
+remove_symlink() {
+	for i in $(qlist metasploit | grep $(canonicalise "${EROOT}${MSFPATH}")/msf)
+	do
+		if [ -L /usr/bin/$(echo ${i} | awk -F'/' '{print $5}') ]; then
+			unlink /usr/bin/$(echo ${i} | awk -F'/' '{print $5}') || die -q "failed to unlink ${i}"
+		fi
+	done
+	if [ -L ${EROOT}${MSFPATH} ]; then
+		unlink "${EROOT}${MSFPATH}" || die -q "failed to unlink ${EROOT}${MSFPATH}"
+	elif [ -e ${EROOT}${MSFPATH} ]; then
+		die -q "${EROOT}${MSFPATH} exists but is not a symlink"
+	fi
+}
+
+# set the metasploit symlink
+set_symlink() {
+	local target=$1
+
+	if is_number "${target}"; then
+		local targets=( $(find_targets) )
+		target=${targets[target-1]}
+	fi
+
+	if [[ -z ${target} ]]; then
+		die -q "Target \"$1\" doesn't appear to be valid!"
+	elif [[ -d ${EROOT}/usr/lib/${target} ]]; then
+		ln -s "${target}" "${EROOT}${MSFPATH}"
+		for i in $(qlist metasploit | grep /usr/lib/${target}/msf)
+		do
+			ln -s /usr/bin/msfloader /usr/bin/$(echo ${i} | awk -F'/' '{print $5}')
+		done
+	#this elif looks like it is trying to support setting by slot only,
+	#but that isn't supported by the rest of the script... fix or remove?
+	elif [[ -d ${EROOT}${MSFPATH}${target} ]]; then
+		ln -s "metasploit${target}" "${EROOT}${MSFPATH}"
+		for i in $(qlist metasploit | grep /usr/lib/${target}/msf)
+		do
+			ln -s /usr/bin/msfloader /usr/bin/$(echo ${i} | awk -F'/' '{print $5}')
+		done
+	else
+		die -q "Target \"$1\" doesn't appear to be valid!"
+	fi
+}
+
+# wrapper to safely set the symlink
+set_symlink_safe() {
+	if [[ -L ${EROOT}${MSFPATH} ]]; then
+		# existing symlink
+		remove_symlink || die -q "Couldn't remove existing symlink"
+		set_symlink "$1" || die -q "Couldn't set a new symlink"
+		#um, why is there an env-update here?
+		env-update
+	elif [[ -e ${EROOT}${MSFPATH} ]]; then
+		# we have something strange
+		die -q "${EROOT}${MSFPATH} exists but is not a symlink"
+	else
+		set_symlink "$1" || die -q "Couldn't set a new symlink"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current metasploit symlink"
+}
+
+do_show() {
+	write_list_start "Current metasploit symlink:"
+	if [[ -L ${EROOT}${MSFPATH} ]]; then
+		local metasploit=$(canonicalise "${EROOT}${MSFPATH}")
+		write_kv_list_entry "${metasploit%/}" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available metasploit symlink targets"
+}
+
+do_list() {
+	local i targets=( $(find_targets) )
+
+	write_list_start "Available metasploit symlink targets:"
+	for (( i = 0; i < ${#targets[@]}; i++ )); do
+		[[ ${targets[i]} = \
+			$(basename "$(canonicalise "${EROOT}${MSFPATH}")") ]] \
+			&& targets[i]=$(highlight_marker "${targets[i]}")
+	done
+	write_numbered_list -m "(none found)" "${targets[@]}"
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new metasploit symlink target"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+describe_set_options() {
+	echo "<target> : Target name or number (from 'list' action)"
+	echo "--use-old : If an implementation is already set, use that one instead"
+}
+
+do_set() {
+	local action="error"
+	local current=$(basename "$(canonicalise "${EROOT}${MSFPATH}")")
+	local available=( $(find_targets) )
+	local new
+	local opt
+
+	while [[ ${#@} -gt 0 ]] ; do
+		opt=$1
+		shift
+		case ${opt} in
+			--use-old)
+				if [[ -n "${current}" ]] && has "${current}" "${available[@]}"; then
+					action="old-implementation"
+				fi
+			;;
+			metasploit*)
+				if [[ "${action}" != "old-implementation" ]] ; then
+					action="set-implementation"
+				fi
+
+				if has ${opt} ${available[@]}; then
+					new="${opt}"
+				else
+					echo "You need to emerge ${opt} before you try to eselect it"
+				fi
+			;;
+			*)
+				if [[ "${action}" != "old-implementation" ]] ; then
+					action="set-implementation"
+				fi
+
+				if is_number ${opt} ; then
+					#targets=( $(get_implementations) )
+					new=${available[opt - 1]}
+					if [[ -z ${new} ]] ; then
+						die -q "Unrecognized option: ${opt}"
+					fi
+				else
+					die -q "Unrecognized option: ${opt}"
+				fi
+			;;
+		esac
+	done
+
+	case ${action} in
+		old-implementation)
+			set_symlink_safe ${current}
+			return $?
+		;;
+		set-implementation)
+			if [[ -n ${new} ]] ; then
+				set_symlink_safe ${new}
+				return $?
+			else
+				die -q "Please specify an implementation to set"
+			fi
+		;;
+		*)
+			die -q "Invalid usage of set action."
+		;;
+	esac
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2a6200c87fcc..34bcdee1ea31 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 94b6c2fc2712..2b8cef9f1da1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,6 +8,6 @@ DIST poppler-0.76.1.tar.xz 1531548 BLAKE2B edbd9c1be99aadf4f14608a1e0dc58a2fed35
 DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
 EBUILD poppler-0.76.1.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
-EBUILD poppler-0.77.0.ebuild 3519 BLAKE2B 0d9289963fc6ec0764aa0dd8c6eb93d9d4d9c8826acc175c3226fbf62cffdc2b813f17e728bc564ec173ba95b635c2cbc15c0313b48f4e38983541113b526105 SHA512 7931c211781905107fe9ef759d77bdcf21ebc9cbdc1ff5c35eb53ce89b78ad659b23e32e7bcc2cbf06c9fb1d46b6ca6220ab34e6a1ae8eab4c4b60a74ba9d88c
+EBUILD poppler-0.77.0.ebuild 3518 BLAKE2B 86a3846b3d8747b98d0130fd3bc35d682fa56dde93cd2fb4ea7f77f87d83b3d1ce363f3b387d3089293f6be56cc5d2cbcdff66f89180e7818aa0f545c787f135 SHA512 ce28bf1df2125c5006d2d78bb1437b6e704cb38eb89d232211790f74919b12fa3f555361fe126250bf25d33bc3f017a1b4ae98271f0c60c774de23b05fcd1ac3
 EBUILD poppler-9999.ebuild 3526 BLAKE2B abeb81a635d4e399510cf828cc31235c4c2b9b6e843b88ceed22d8645da9a21aea27ff362bb9931c6245bc0152bdc48fa9b23c931ba202c22c3715699b740456 SHA512 3cf4680cc0774ca4ae267485d7a0ee904b209686b307bfcba6dcaa47064ef4aa30fef74d3ed22b46069698bf1ea0a3f24760a224086314259115f919fe7abf13
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.77.0.ebuild
index 9afaa8a5e85e..536da32181f9 100644
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ b/app-text/poppler/poppler-0.77.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ecd41d35a97a..05cfe234b16a 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 475d62b15ad5..22e00f65288d 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -4,5 +4,5 @@ DIST libxslt-1.1.32.tar.gz 3440715 BLAKE2B 8d5dead5788d8d09ab121d6e33397ee8ed883
 DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
 EBUILD libxslt-1.1.32.ebuild 3275 BLAKE2B 8c62899c0f9744559d7aac7be6f73ae599303b848699eb89f9276ab8e72a038024773a5754c5ba08f223ceab334a5a22c91137343b0c89a5b3bebd56d59739c6 SHA512 7fc90253308d84200aac763dce0e4fea507c0d43ab36b07d55bd40bcbf4a2365c496977ff963200b68966b892646b05680138c1e94e790def07f3fb5d4f4ac95
-EBUILD libxslt-1.1.33-r1.ebuild 3471 BLAKE2B 3b1eb800ee740ed89a497609adcfc17a0f0f8e9d866b5b2b632f2c426b37314bed63b8f173eb4b2d3c6e1d48a2b487ab0055b1fadedd4cf03021d012bd149e82 SHA512 d1b3d59957c9af85c0b8328859d9655691ae2bceb678b922ed681861cdcffbf1846e27d7c2a303ea0dfdc62c5b7b5a9e9e01178ac2518ad4df4cbb6c7fda2e9f
+EBUILD libxslt-1.1.33-r1.ebuild 3470 BLAKE2B 1d617d336bd6657a95ee899959d4c82bb4bf69f35572a9a12ac5fd1e436575ff68e914b0187e16a7d05f54d34162507bf59de8fd2de44a8e4f3a22e2924326a1 SHA512 f2bda537dc764809da2a96030067d74df3af87dfdd80c4dbe2dd1cbe22cf1c48812a50058251961198dfd4e9b800f885a088bdc624b294e48d8fa6efbe55c958
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
index fbfb9cfe0d7b..7e819007b152 100644
--- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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="crypt debug examples python static-libs elibc_Darwin"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index 81d8a1fda88f..bd8b40661767 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -3,6 +3,8 @@ AUX msgpack-1.0.0-static.patch 1324 BLAKE2B eb133b5bd2a344b5029dc1ed6a6ec1654e6f
 AUX msgpack-1.1.0-gcc6.patch 900 BLAKE2B 770cce3486efe6b402a5d8a54c317cc31e603a34ece09bc10182e12d8970e34f06d03b94e744be5607ba9b09c5ae9873e0ead71eae87c761344bd041bbb4ecaf SHA512 be88e6f2119ded151af8334315c40027967603240158f0a1ab0aadbfdd0e8a04df13aecc9ed26135d6684a0f40f627727635c032722108bb4a63a68d8eed789b
 DIST msgpack-1.1.0.tar.gz 493551 BLAKE2B 3ee162fcba5ae61c7c69945a567ac4d39526e7941f42cc2ed55bc5885b823af84eea212c4e75e8e8583e8ea8a5e12f75e969409193c5e7273430e2e02d33a02c SHA512 6823fab090c2146f871a45736c29b8f81434f0d72c597ebea2e947e4a9a17554e163bc88fbbc3dd0805b2ef0df029b10ca30c09dfbd1111252b9861a1e373901
 DIST msgpack-3.1.1.tar.gz 495858 BLAKE2B a99b7edb2a6de80e018d5c4084ea199518e34045a6293c622c8690147ae353abdb63856eb031962a02ce20903d4443ec2b01a3c033e756c339f8674ff801d4c3 SHA512 cc634ef38b3844bf994159024441fe72d99055c42b0a4d81245b0629fd1f3147587eb36537cfb85e4cae2edc1dc23d7fa400022efa5a10dca295f9a6acd38346
+DIST msgpack-3.2.0.tar.gz 499188 BLAKE2B 6e5fd59a96ca726d3429b173b3db4c74163eaf6d314b289845237b6ace6208478dbbbb60397c630d515f6f6eed344b74f76225d1a4ca143b91ebb9b3a1369c14 SHA512 f3d011adfaa71b3c5d5f3eb43f0addbd461ae82b8ac22f367ddba7ef762d3bea500477501cf394d1770f0c47809bc363fc1088819ecfdfa668e93529885f4b88
 EBUILD msgpack-1.1.0.ebuild 1038 BLAKE2B a5b595b557661b2f40b0f71d7281edaedafda8b1e7fa7364e65c2944cb7088cf4bc459cd982e337e3a5f5437552f250deb67036d0f08fdb8c95542af22eae7f2 SHA512 f8a2cd1e834721bd20fbd37460cec314b23f7ac0d9b506f1a77efe7bbcedb62cfee0fa59308d10272906eb9c36a6aeb43abf5c030f0b05ad6626c283ed8a00e3
 EBUILD msgpack-3.1.1.ebuild 1700 BLAKE2B 77629aa7b803c62713ec0291f6501628432ea52800aadeffea6443f0466abb372703842a2cac930a69233f241c61ad0a3f6152ea8bdd108f3f8da7f2150eb309 SHA512 5d5c958915bd61df6d8177af5f0ec5b3f708688c98c9b95381248a14efb86805efb1eb58f705439e5662aefc67d67ab248d31addd3822a7582011d1733d3d26e
+EBUILD msgpack-3.2.0.ebuild 1700 BLAKE2B 64ebbcd3d4e712b7e0ecc05c12eace9fa9677c84d00008952719607cb70f18fc24c8bffb48337fc92ae11b6ab26fcacf13b45ead7405d3d58090c00d4655e829 SHA512 423593fddfb9209789253d54082eb72ead50ceeba2c6c7a672e4007d78d9af3323bf7b18fb26d59b62754fc4bf5964fb48a8e9c7a9f6eccfb58090bdc3486fdb
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.2.0.ebuild b/dev-libs/msgpack/msgpack-3.2.0.ebuild
new file mode 100644
index 000000000000..a4bf98c62275
--- /dev/null
+++ b/dev-libs/msgpack/msgpack-3.2.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
+HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/"
+
+LICENSE="Boost-1.0"
+SLOT="0/2"
+IUSE="boost +cxx doc examples static-libs test"
+
+RDEPEND="boost? ( dev-libs/boost[context,${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+	doc? ( app-doc/doxygen[dot] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMSGPACK_BOOST="$(usex boost)"
+		-DMSGPACK_ENABLE_CXX="$(usex cxx)"
+		-DMSGPACK_ENABLE_STATIC="$(usex static-libs)"
+		-DMSGPACK_BUILD_TESTS="$(usex test)"
+		# don't build the examples
+		-DMSGPACK_BUILD_EXAMPLES=OFF
+		# enable C++11 by default
+		-DMSGPACK_CXX11=ON
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		cmake-utils_src_make doxygen
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use doc; then
+			local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+			mkdir docs || die
+			mv doc_c/html docs/c || die
+
+			use cxx && mv doc_cpp/html docs/cpp || die
+		fi
+
+		if use examples; then
+			docinto examples
+
+			dodoc -r "${WORKDIR}/${P}/example/."
+
+			docompress -x /usr/share/doc/${PF}/examples
+		fi
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 1af04e854ac8..0d2233db894d 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 0fee4f5eaec3..c7c242bd369c 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -1,4 +1,7 @@
 AUX lpeg-0.12.1-makefile.patch 820 BLAKE2B 8706c3ee0588efc0c3d072d713cf1a8b0ca7653c6701eafe9ec9b3e5284a2ff8b7f989fb65425840da0513e719fe5fa820deb4814d3e838dd5b33651eb4e3c4e SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6
+AUX lpeg-1.0.2-makefile.patch 671 BLAKE2B 4ed03dc08e737fe6cc45f4fe9c53657a71341cac69a3ec6fa52d124dbf5c3b58bcf1077d255598f98952eb2329905a25b45e4c031ab9fb82700d919d7f264452 SHA512 0d17351cda382ddb5574f7d14bc6479439cc703ac0c360b2b0f043288427beda9aea1f229fd2e0ea8b604bd935bce2fc959a2410804bfd82bb2c2e128ab501ac
 DIST lpeg-1.0.1.tar.gz 71527 BLAKE2B 5f19d308572f2d7a5ff11d7aa33f437ec682994d0a396a322764cf12a4cb659c66ce6ffaf0c76f6a250a7d767b6545478dd3bb760150b9f88be41fac9dafde0d SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
+DIST lpeg-1.0.2.tar.gz 71840 BLAKE2B e0d8fb4e9d17c9018f0b206cd3f7c9c0e21398c119600b5b0705c8df19e0956347bea795c7c3ded8e62e0c09802dd8eab931a5e3769fcacf44c35aa2b17fa8d6 SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
 EBUILD lpeg-1.0.1.ebuild 1246 BLAKE2B 3bd53964f81605c56758395984aaaf815a50bef2e03346a5dc658ac46d98d76c16f18df8af7a2224995206d49397cff0281b750a6b1aabc90a8e40ae2497cc06 SHA512 5a364050082fba5a1e1aa598d0892cbbe915b540981d99807b461346f98671ad8707286467243cc1f1f04014d455df747891dc23376e4ecabd13fc4408e6d0b5
+EBUILD lpeg-1.0.2.ebuild 1241 BLAKE2B 8ca6008090465d46fb8946c2d0d8d1e122014683afa756dccd4d16cbc4ea4455f3da24708598126e9bc4955274b18be200e01e4ae93ff5e98ffed15dbf30fc45 SHA512 b253d69d8ab5919e05f501194897ab4f78609bed58764953c31d32b69854445254099b00446461ba888acbe599a24a011722d1c70ce6e21b80554e9934c26b52
 MISC metadata.xml 257 BLAKE2B fd30d59ebbc18529dbfe65cbec91247e5ad57a53f834d3abc85cbc18af964033e42dda00052b47281a9a85964b190a83c2c8a6eb30f4a9d38894de51d41d9de8 SHA512 06c87d68775d3b524abb426701b16341156bd54f2553b7a0f14a62ca5492c20bf9ff1719084e225ae5fc44c5b518a71258e1138e19551bfcfe828a11dffb12c4
diff --git a/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch b/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch
new file mode 100644
index 000000000000..ec8150443da4
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-1.0.2-makefile.patch
@@ -0,0 +1,31 @@
+Respect user CFLAGS and LDFLAGS.
+
+--- lpeg-1.0.2/makefile
++++ lpeg-1.0.2/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2 -DNDEBUG
++COPT = -DNDEBUG
+ # COPT = -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,7 +22,7 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+@@ -36,7 +36,7 @@
+ 	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-1.0.2.ebuild b/dev-lua/lpeg/lpeg-1.0.2.ebuild
new file mode 100644
index 000000000000..5596fb03b62e
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug doc luajit"
+
+RDEPEND="
+	!luajit? ( >=dev-lang/lua-5.1:= )
+	luajit? ( dev-lang/luajit:2= )"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
+
+src_prepare() {
+	default
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		LUADIR="$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+}
+
+src_test() {
+	$(usex luajit 'luajit' 'lua') test.lua || die
+}
+
+src_install() {
+	local instdir
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	exeinto "${instdir#${EPREFIX}}"
+	doexe lpeg.so
+	instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit 'luajit' 'lua'))"
+	insinto "${instdir#${EPREFIX}}"
+	doins re.lua
+
+	use doc && einstalldocs
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8022d198ba25..5097eace31f2 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 4a89504c8d3e..20a236da67a0 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -11,7 +11,7 @@ EBUILD cython-0.25.2.ebuild 2136 BLAKE2B 9e80d1abbe44ecf401f9fa6f2c013e02373c294
 EBUILD cython-0.26.1.ebuild 2080 BLAKE2B 0d61c28232f347c0646c5585b3d868f0cd490affaafe70b3e3cefe14ca64dd734d36c4e74745acfe49eeb3f28ad8cf215c3059229c5e7059bf0fa5ef63600abe SHA512 1c1a079f24d7245201a069b757e1b490c7ffc8108cf72ae00cae8b128953a5b910aee4be6c1e78750dfab809b0c3a76214a21dd81785655453aba68f9298af40
 EBUILD cython-0.28.4.ebuild 2196 BLAKE2B 05f6e26da211e42cb46b6a182bc017077bd1e632b4c963cb4a0c48a64dde5926866a47195f235ddbf0143fdd35a588d4651181c1ab9443c67975a4abc0bab5ac SHA512 979bfda159eb6dc89cd7a790166926201f0e74ce8ac3f887a5a40a6ee023e5cf4e2fc9d803cc5e563fb32ba3f7ba9d4447fe47e38c5b7ce6f3292653d9f0f9fe
 EBUILD cython-0.29.10.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
-EBUILD cython-0.29.4.ebuild 2161 BLAKE2B bd401482f673e2f5716df9e00ab869e8eef08c19ab6912ab7f191f3fec639df1fe5de3d57ffea996e739ed76f8940145608b7dd3e9344463e57b896cb660b117 SHA512 fce83a785749a9feb7e890e689157f82401aad06c00c428c6bb741846875af1762a888fe4dbfd7a87e2cd447a58bd15691fbf731a47c7d6edee0dabee9a1daf9
+EBUILD cython-0.29.4.ebuild 2160 BLAKE2B 4a854e80cde14979e6a35131b7002a68745978eeda2d370b46f1d816a424296e61b43894e7e488ed7cfe238f2c0a8078639172ecbd9534326965e658b2fd3672 SHA512 b1b9f03ea3addd10e61ae1b855c28a495055a13a859df06ff3869cf3c917101dbe7c0259525103fdc3123c23c5f5c2c5804f7cefd073cb80a0248ea90097e4a2
 EBUILD cython-0.29.7.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 EBUILD cython-0.29.9.ebuild 2216 BLAKE2B 7d396720d35fc932ec076178ecd9a62048964d57c8c7970d00c7127034634af38ffeb78c1c26b8885430bf909f358a85ed3aa3856c19e0fbedb009eb0ecfc74c SHA512 f0ae926aea3cf131deb3f7051cb4c1b89dd7b62837c58c625eb3776a43a81048716deb51670221e11a463f33e014d5ba2ee522675f16fd46197b3d6549f911cd
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.4.ebuild b/dev-python/cython/cython-0.29.4.ebuild
index 9f214ed72d86..e828c36daa42 100644
--- a/dev-python/cython/cython-0.29.4.ebuild
+++ b/dev-python/cython/cython-0.29.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 emacs test"
 
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index d8000a09a937..edf003fd43b5 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -4,5 +4,5 @@ DIST PyYAML-3.13.tar.gz 270607 BLAKE2B f365f63587b911234497426c9796f98b85f5de052
 DIST PyYAML-5.1.tar.gz 274244 BLAKE2B ea8cc4b56b9fc70bc7b01f8c654ceb8b73c82dcc936c939cba3c3654df04fe32fc46c7df322a38869d28ad5a58f6134b35cbe43924df3b4d5f3e54e33700dc73 SHA512 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd
 EBUILD pyyaml-3.12.ebuild 1068 BLAKE2B 75d565e4f368a85bcdc8f7a0b505c0969edaa8835480d09acd58e3a714c9502b085f419851d5bd15bc773f359a355101179fdedeee4d8468dc4adb0c5d5ca2c0 SHA512 7c839298eeca6ac9ca443cfa7e15e6cb1151789985391eb6b0eb81ec40c0e48dacd5c1ab0c7aef541f96312efb67b48e7cbb201c68278fb38a84dd7c272ce661
 EBUILD pyyaml-3.13.ebuild 1070 BLAKE2B bf3e7dbc8fcfbbf12bb5282ee012c9c1c83197f5573351181965efdc75a022f5b065181b975680240016b6c84f6259528e7010dd6645152b6f9b35bf66ea17fd SHA512 803c12130e4996bb868d71d8fef7819ae1f6f4aa44818bc68d6599c0e7a49b551c368d62370544811535c9bbe2126f3f190e1974148a727dad3a5adb52aaf79c
-EBUILD pyyaml-5.1.ebuild 1155 BLAKE2B 13f052887f359d7fea7d493fa87327637170f5d13d1ba69b80835afe684ec201c27281f4ece65072dc40dfbd9ff36655dd8fcc432d31371b6020ceb7281789cb SHA512 22a4490594842c6a424d4552cfa6ce006a658416c7649de11e2342206f893c8fc29202558bddc7dbde786243fc5ea063632d8dff3527297bc186e67dab0367f9
+EBUILD pyyaml-5.1.ebuild 1154 BLAKE2B 152e2e8677396e2d0965673554235220340e799d7493b5f8aece279a1315989f9d10c0c57fa9118bd9084af44c058ecc9c3d9b2abdaa6d848f8699cc6376395c SHA512 9c141447253eead297c8926c98676ce61154d216ef70d37edc60ddc83dffd554f4481a8dfcfbc972e5754ff11f98374991439a41d78fd2ea8ff755af81610c7e
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.1.ebuild b/dev-python/pyyaml/pyyaml-5.1.ebuild
index dfc468fac980..08dbaad19784 100644
--- a/dev-python/pyyaml/pyyaml-5.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index d354cdc12c97..9c0d74981430 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 463f15ed3519..32ef72018420 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -25,5 +25,5 @@ DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B d5966a27f980a2ceb31293d92049a6691a0826
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.91-r2.ebuild 13173 BLAKE2B f7ee40c7dbab94fd499c9fae38e385b2a937805ec340ec511c57d0e00e74f5075b0ced2ed35700af35e40702042612127155360b42529f5377eaee09da7c8fdb SHA512 5bc34da80791d5f5a482f31bdb425299a0201fc6e0d13076c63e92be678569bedab1356618662d7b463e96810b8d34de6462243eecc7c637d43bf7a5f1b0b7a3
 EBUILD exim-4.92-r1.ebuild 13253 BLAKE2B 55a0f2a3c2343af757b9fe2251767efb7bd03dce9f09e9cfdc4a5ffcb6157963e88cf32e016967c256aea298e8d58160a8dad714f189973ce5df508608503787 SHA512 0fd5dc14950613d3e6cf3679951033db40f5b3fcc2f05bdbc334fea34c2a19f7d0c7089cba0f53f06c3e6ae58e67da339031c4203e104538dd4098dceed1a048
-EBUILD exim-4.92.ebuild 13174 BLAKE2B e6ec1de47ec6090cd1737c70ab26209863bc3d341578a173928d5359282da4905f8a11dc43cd65be8f1397fdc511ee5cbb7a796db2a33433c528d19886705aba SHA512 0a1b4a6a87e0fef94a250a94fea5f7e3f1d18026e6a5fc490c1f837b628f2327e6925b1f57161d6cf08607e4a0aed2ab901734e6319c990523da17308c0d6850
+EBUILD exim-4.92.ebuild 13173 BLAKE2B 7f02d58105608c8acb1e352cda7f6e11d67e9732f0649b720007f6185c20efa3c72c24b683d50fad531d1b12a2d19e6b742c8120f4affc973b307e17575eb29a SHA512 5c1348eb5cb722b05528eb4cdaef9f1deb6db25fd3dbeb9fb21d412527e14a9bfa3059d79987b44428d6be15b15741d066ce863d0ccf3613556dbb2347660c61
 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f
diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 8b41a7ee534e..a68f1b942033 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	( >=sys-libs/db-3.2:= <sys-libs/db-6:= )
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4537737c0410..6e4ccaaf73dd 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/jbig2dec/Manifest b/media-libs/jbig2dec/Manifest
index 2116f7080d92..59442f6ca093 100644
--- a/media-libs/jbig2dec/Manifest
+++ b/media-libs/jbig2dec/Manifest
@@ -3,5 +3,5 @@ DIST jbig2dec-0.13-patchset.tar.bz2 8452 BLAKE2B 473a338b460c8a66991fb50e110f438
 DIST jbig2dec-0.13.tar.gz 442571 BLAKE2B 6a973f91502d8effc00cd49b68bb2f853edd41286fdc5cb159460607db8627c2c959ba1c96e65b2ef1df3d4072c9993ce66c06bc5dc1837c89f87c6da0025550 SHA512 ef64a65c54bec65f61602de7130dc9594aae58aaea7958f7cc987f25d0794511e15a423e86501ace4f40c0364796fb97ceab72edb0b69232926767ba16c1b05d
 DIST jbig2dec-0.14.tar.gz 463572 BLAKE2B 91351a3879bd1906fabe2620cf5379fbbc32eaae808a8c2754c661d6dc592d3c9da13c558c8f7ced30c48b73fbd9ed4631f2817298f959b59ad4dff5fce9ac1a SHA512 066bd880ac0665fc1e42b0ae0e481008b125aab6e173b7f82d61a2a30e72c90085cbded9b2a68c6836f92dea3d8d8d5c2228dba76e0d99c79c922197d215705b
 EBUILD jbig2dec-0.13-r4.ebuild 1473 BLAKE2B acad9053091c1be3d6b7c72ed249cdbb90a92f2c532c250ae863deff76c5142d67d27ab77b6e05b42b74087d223e861b9d71278ccd007931d588c1bc3802b315 SHA512 035196ce25a11ac4c73ee2f8cf2dadd2c1d869d9f5625cbd894f50807af7cb85438b4b7783f775655059ef108d367fc084c1123aabc674d275216831c15fce47
-EBUILD jbig2dec-0.14.ebuild 1167 BLAKE2B c2643abd084b782b5eaddfb44c215ace9c284314db48cc9d0dd0742ffb88bee633523637b9cf15946662df0c7f5ccaf25c3949427b50d998da5d28f626895202 SHA512 5f252bc5018a3e62cc5f49a31525b07820ecbf59724a5dcaf62ded16dcf87a0abbc801a1071cf448e59bc76feb35784437c27a02bfb382e780a4fa102f2f3f65
+EBUILD jbig2dec-0.14.ebuild 1166 BLAKE2B 2d4218f2e736a1d856c1b39374812e4edd895c563f245543c0f411d5a26a9b071d153b64d86cb1f0444c4f0eebf4e1ce9176b46df622f7dbd1420e705b4a6483 SHA512 21a825a0e922ad0119b6a7526818f236ebc932edf2a061cb9cfc6b65fb72add7a20dca5fd60be9c2baf98464e1efa461030076313616a731f0ac6e3ec5269b03
 MISC metadata.xml 473 BLAKE2B 6d374023a106375c7f5500968ed4ea2f4dd5584fb0db8f85b042844d08afb6196b7d7c019ae69b35917f43e496c9a25212aec328f0c3cf78aaa94b963de65c15 SHA512 501077ac27f5c6f8a616fa32cec23d28cb16dc0e0c19ce933cbc067494117c9c55fc3e00dfc21270892d57478a9e268f99215c8d074d6cc4114916f55a571a6f
diff --git a/media-libs/jbig2dec/jbig2dec-0.14.ebuild b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
index 8e3906758dae..fa1e83c53fa8 100644
--- a/media-libs/jbig2dec/jbig2dec-0.14.ebuild
+++ b/media-libs/jbig2dec/jbig2dec-0.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ghostscript.com/public/${PN}/${P}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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="png static-libs test"
 
 RDEPEND="png? ( media-libs/libpng:0= )"
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index b1aacbf93d52..ae2f161473ac 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,5 +8,5 @@ DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a9
 DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507
 EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
 EBUILD openjpeg-2.3.0-r1.ebuild 4215 BLAKE2B 17350556cee3baf31e26d9f1bddf7a42879b088c84cf8fccad099b1316d3eb5fe469b3b7edb6d2828da3171105d873cf5f89285e2d04ea6b4c94bcde356a3b61 SHA512 3007c71e7ae8117f2ca934d0fc022646718d1f39a95fcaed671afe57092ecf40919c3f6fe913128ffee0b195c0f4d946ea319ab33485cae7fe099e21a9c2f12b
-EBUILD openjpeg-2.3.1.ebuild 4180 BLAKE2B c8da4c75908fdd9c12fdb8dfd2707deddbb3ff57e7a45f0d63b3f469ad734b01355dd1483517b4c98bb220dc72df60dc02ed635bc535fc607fac52cb5e3b1344 SHA512 98122dd8b6e6ed0a8475bb53b6db7400985756f8fa3dab84e8e8fc5a21130b13bdc30ab9f273b353d600383e381ba4caef9cd30716398c6757d38e2dead15e71
+EBUILD openjpeg-2.3.1.ebuild 4179 BLAKE2B c8bdad295327a9b93199e95f97a1f2b7f4c32b39aa50d1539bb57c1a21ba5fb135b8daf88cf0464e34bbe2573e5b961bc669a4008ff267af57a8a09c45e6fc41 SHA512 adcca346c12980dc37697586d5da9fb2f8c704a1f4947a3a8437f2f46a286a544c8ab694495fd2b73ccd6a2e07102d892eb039319ef725898aa0394d5facc711
 MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
index b7f686a688a9..50a879f60f20 100644
--- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/media-libs/urt/Manifest b/media-libs/urt/Manifest
index 682f2e05c2b0..9f6b3d6ab15b 100644
--- a/media-libs/urt/Manifest
+++ b/media-libs/urt/Manifest
@@ -10,5 +10,5 @@ AUX urt-3.1b-solaris.patch 281 BLAKE2B 55cc8b4824624c5b9f6db6ff6e62c841950c22298
 AUX urt-3.1b-tempfile.patch 597 BLAKE2B 9f032e0b4dab232d4540a5e7043ff73ace2e6fcdc69e0b2ba1ecedc7f2b62902e0dfadaa78a2e1cddf6f0c173767afe36ee20af0a586072472c77d8f7d81212a SHA512 83784725f216d387771698b0f29c6d5b2bd5e79e5f6deb091905bbb87839824314217641df760cfb18ce87c9d58196860a4c9d12f08da6020fc80a2e7d40347f
 DIST urt-3.1b.tar.Z 1016405 BLAKE2B 68742773591e2ae28702efb4286939c4000d32edd93110548abc25ab62bfa85e36354f20de6aa74c805ea1c4c8dfa23219c9e6fb08e1c73d90d2625404583aa1 SHA512 6c9070cd106f1d696d22f862cc1c4e10325fafc7bae51e8bb1fb98f6bf8babe21a133e21b3acc0c11cf1b28a23123c8ee7bb064c9d86301b14a1c217fbe1a12d
 EBUILD urt-3.1b-r1.ebuild 2048 BLAKE2B ebc3ba7771fc3d28fa320bb582a0633967b0f66ddd338894fa2b8cf47094e8b1b445bcb761bd0fff7620c280f45b821f9915a5dabbde8bd9636c542a0a0de3be SHA512 aac4efadbcc839df66b3538fb43c0dd0659bc8f8b3c362a358763a2a911c538993fb7ab7f05eeaf96e2d325df0b977a2271202cb9aa798dfee70924538e05e2a
-EBUILD urt-3.1b-r3.ebuild 2382 BLAKE2B fe5cfbefee4f10ffb4a23f0a1e2d768237cb9709fdc94dda0efdd199b8cce3503460cc240cc75a8c3f1d88fce97e56af237173b3c0d7056a4d0d78f790756bc1 SHA512 da5e6ff6fa96c2e2f4f5840df9c49ed0e87cecf1af78810b045f371cfc911a9ad2734c59e226e648edab621231d8ed724772646a978637507c5718d42f8f2624
+EBUILD urt-3.1b-r3.ebuild 2381 BLAKE2B 66b8a88be20f1e3e9d3503b752389c4492d4d27dd8574c9538a611d25c3ea6961f1dd2e3abc0b5a8c32a6f3b734dc9d0b5fac6628122531fc7d4fa4f8fca020d SHA512 004deb4647104d3ea53ced1bae6443e6bb693a8c086363f8df2b3b002bfc037b904fdf52edf590a227697c81fad1505762b5b78b08213ff0b5238e9f7e762e67
 MISC metadata.xml 308 BLAKE2B 6006038e97bc7af97fd7e4c95f87d19d2458452da5ba066df88aff58fd10bf0f29daef641aaf39ec14a102f4e23a0b3be30006a6aed3830322e2f148a13dc5b7 SHA512 1056a163d7f6c3f2e540e6f1b315ea23aa4e9664c14ba51d094e33ab8ac4e3888fc9b049b91e3f2596e9458efe6041a7e2c5c40979171f7fd473fa6994862ffd
diff --git a/media-libs/urt/urt-3.1b-r3.ebuild b/media-libs/urt/urt-3.1b-r3.ebuild
index 688cf52b1eee..c3e32304cf6a 100644
--- a/media-libs/urt/urt-3.1b-r3.ebuild
+++ b/media-libs/urt/urt-3.1b-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.iastate.edu/pub/utah-raster/${P}.tar.Z"
 
 LICENSE="URT gif? ( free-noncomm )"
 SLOT="0/3.1b-r2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="gif postscript static-libs tiff tools X"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bc2efb2d921e..446f9ce7c0a5 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 1c3a6eb2ac71..f0c6ebedcd0c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Jun 2019 19:38:45 +0000
+Thu, 13 Jun 2019 05:08:48 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 967ef0899db1..da939ce05c00 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 442968 BLAKE2B 0e3056acaaa1238904402db3f7b9e5da9aa5a9653669d2d7ce6f23bca37fa04e6d2464868f79b589adb4a48dae4f38f6a27f145e60e4ed4a75c40ec11b1eba6c SHA512 4b7e5da9d352bb5de232fbbf053c3a1aaed9d07615188794445787743dcee0fee452db8b05004310c60b1d29787734050729e72ec84bf2e6f7a8c0bec2b2b9e1
-TIMESTAMP 2019-06-12T19:38:49Z
+TIMESTAMP 2019-06-13T05:08:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0BVMlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0B2mRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAoGBAAtT8rkoN57YQ0ayzoY6Lkn2u352EGhQGdWm91cSV5gg+Xr4Fcej3SQ9m3
-sR3WYTmOwrXZ9duEuYP2QK+0SxSGNi/4mfnO0OZhVOoDicd4g4ERLLE+faVtIHXD
-dnUyH8Y/Z3pI1xC35Jhy8fTg92EmcHTh+AaggZXBZo6Dj9l0JdgK3U+3cXSGXOIL
-/+iG921++YWmnLma3S6pZN6afK8n82LhdQ9a+n7/BwBzI2aHq9hmg2Zmv3PjBZ8a
-zrB1YClOEawbBnthDZLuQyh26Hi/FelgZowwFR0Z++LcQtGXkaFpuitk0+BzSggV
-rMI8DC7+5ftHByOWMW8ASPOMOHSZlAPOjp/OnxLI0pxgGmcCWvVlKcXA0xs1KEsl
-9RsgTLCI7eUDgLz+p1cpkkyzTQWMCQuy+4fyMCV4Pcq7++3KazOcvBD9lHvzL7Ti
-EpFb4OpjfTO7iVf3+RVT1IK7pXqkX3Afwwmda7gLB2RYW2aiaV4KQTbwpui2dgkX
-9NueR8nzAJLfyOttZIL8UQjhzK2cwHnU05W0HawwKHycFALNZS0QKRL4QEJCgUeP
-jGrVEoz7/g748wqrpwsvNdKGFnvkiA9mY+NOUL+ESoJ+I6tHp1k6PQT7Dj5/HBh2
-CeCr2dNonqEwY+Ynl1SqOdVKmswniSykiipISgmE2xRdmyfBabs=
-=j/BY
+klBtJRAAg2NMlWpGDGbycHBsfMNZ8Q4ijd8B+Buur1lSSw17LhwNqObFnKrt36k2
+2oezre2MecO0z76fYZdO2y9DJTbMGCoDs6dPDiWoYeehxy6GSNGITn9vGoOqY3HD
+qTI41iczZbtfR++SZKUuMRNrrf9446+I6FHaGjI/qxXLIRwQJXl8QfMhpYdezJkS
+/TG0LfePSBeTr6Op5EjhvHn1uuiTC9XHPwGhu2y4mYCpdaaOrzoqIYQe+LfesCh2
+cBrj3D7AzDWy/1Q12544mKSNXq32yvT4NHezPMAjo1/3ymNHRrZp6xJr95tR1+Zm
+lXiHWPZaaVZJ6AYKy06MOnqb3FQZzfQOkG9iWo//xkHWQ8lZwQG+VdP8CmuwRWoV
+j1Fpaat+3fpXIpKjm80dplcwvCjuQ2Qi2shzJ66t8X6/TV9P+dc+T8AFKQfHzVwG
+gt6UM6QXcHsJOGUnVXmrEz9hBYB2U6o3a/zfpcNKID8N5NaUjrIWs0kuFPjMOx9A
+eHCE+BFmOTVo42GSFiSaAxVsQ1dQU7bK8cDAndARGjE9QgNTUfgQWGDRvnFnvLA9
+tp9hjMkhJrapu/yJaywhqkz7ZJB8a60xau1Jd4fGvK/T8xuhjeTr3sk514bCGs+C
+d2IfNOvmn4x/9k+1r6UXZwJaw5PaIGjUp2gHv2BlekGUspzTrjE=
+=lmhn
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1c3a6eb2ac71..f0c6ebedcd0c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Jun 2019 19:38:45 +0000
+Thu, 13 Jun 2019 05:08:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6d3ccf957d20..bd6a1fd5bec2 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index c1e97253679f..c9505fd8168a 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2 b/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
index a0e10d41a66f..a6429d2022ce 100644
--- a/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
+++ b/metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
@@ -3,8 +3,8 @@ DESCRIPTION=A deliberately simple workload generator for POSIX systems
 EAPI=7
 HOMEPAGE=https://people.seas.harvard.edu/~apw/stress
 IUSE=static
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://people.seas.harvard.edu/~apw/stress/stress-1.0.4.tar.gz -> stress-1.0.4-r1.tar.gz
-_md5_=6a298743bb0c74af0b1ad4cdd9e5ab98
+_md5_=4517f9e55e6a4ad8099bacba35c17e44
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 89f08b265976..429cbc8e23b2 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/jitterentropy-2.1.1 b/metadata/md5-cache/app-crypt/jitterentropy-2.1.2
similarity index 63%
rename from metadata/md5-cache/app-crypt/jitterentropy-2.1.1
rename to metadata/md5-cache/app-crypt/jitterentropy-2.1.2
index 6f04744be5de..9005ec712c65 100644
--- a/metadata/md5-cache/app-crypt/jitterentropy-2.1.1
+++ b/metadata/md5-cache/app-crypt/jitterentropy-2.1.2
@@ -2,9 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Hardware RNG based on CPU timing jitter
 EAPI=7
 HOMEPAGE=https://github.com/smuellerDD/jitterentropy-library
+IUSE=static-libs
 KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
-SRC_URI=https://github.com/gktrk/jitterentropy-library/archive/v2.1.1.tar.gz -> jitterentropy-2.1.1.tar.gz
+SRC_URI=https://github.com/smuellerDD/jitterentropy-library/archive/v2.1.2.tar.gz -> jitterentropy-2.1.2.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c7731779a74436f6d6e515e20036d761
+_md5_=d7fb0ed2811d540b81f4de698be625ef
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 8e44c80740c0..77d4359529c9 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/neovim-0.3.7 b/metadata/md5-cache/app-editors/neovim-0.3.7
new file mode 100644
index 000000000000..71c698d14d3c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.3.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libuv:0= dev-libs/msgpack:0= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl dev-util/gperf virtual/libintl virtual/libiconv app-eselect/eselect-vi
+DESCRIPTION=Vim-fork focused on extensibility and agility.
+EAPI=7
+HOMEPAGE=https://neovim.io
+IUSE=+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=dev-libs/libuv:0= dev-libs/msgpack:0= luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( dev-libs/libtermkey >=dev-libs/unibilium-2.0.0:0= ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) net-libs/libnsl python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+SLOT=0
+SRC_URI=https://github.com/neovim/neovim/archive/v0.3.7.tar.gz -> neovim-0.3.7.tar.gz
+_eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=2cab05eee5e53520da780123560bb2cd
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 860f3fc31ae9..ae052ff8dc74 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-metasploit-0.17 b/metadata/md5-cache/app-eselect/eselect-metasploit-0.17
new file mode 100644
index 000000000000..9ed2b34d765e
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-metasploit-0.17
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
+DESCRIPTION=eselect module for metasploit
+EAPI=6
+HOMEPAGE=https://www.pentoo.ch/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=app-admin/eselect !<net-analyzer/metasploit-4.6
+SLOT=0
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=bf16969d523bb467e208bac88cc7bee8
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 1d6f1dbe332d..97c81f65fb2e 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/poppler-0.77.0 b/metadata/md5-cache/app-text/poppler-0.77.0
index 75afb99d0387..02d74d109e90 100644
--- a/metadata/md5-cache/app-text/poppler-0.77.0
+++ b/metadata/md5-cache/app-text/poppler-0.77.0
@@ -5,11 +5,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=7
 HOMEPAGE=https://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=media-libs/fontconfig media-libs/freetype sys-libs/zlib cairo? ( dev-libs/glib:2 x11-libs/cairo introspection? ( dev-libs/gobject-introspection:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( app-text/poppler-data )
 RESTRICT=test
 SLOT=0/88
 SRC_URI=https://poppler.freedesktop.org/poppler-0.77.0.tar.xz
 _eclasses_=cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=47aa4725a6bd4df475d531e4f013b971
+_md5_=07ea52c124a5d142254b0b9a3c4d11db
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bf2b96c51617..d3ac92d02350 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/libxslt-1.1.33-r1 b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
index 8a9510bbcbe4..878b49741184 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
@@ -4,11 +4,11 @@ DESCRIPTION=XSLT libraries and tools
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=crypt debug examples python static-libs elibc_Darwin python_targets_python2_7 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 ~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
+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=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[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(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.33.tar.gz https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch -> libxslt-1.1.33-CVE-2019-11068.patch
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=c9e3d53e813e175cdeca1bd203f60514
+_md5_=82b1a03fb313a8b245623540e9556f05
diff --git a/metadata/md5-cache/dev-libs/msgpack-3.2.0 b/metadata/md5-cache/dev-libs/msgpack-3.2.0
new file mode 100644
index 000000000000..f0c34f7fdd15
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/msgpack-3.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=boost? ( dev-libs/boost[context,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(-)?] ) test? ( >=dev-cpp/gtest-1.6.0-r2[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(-)?] sys-libs/zlib[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(-)?] ) doc? ( app-doc/doxygen[dot] )
+DESCRIPTION=MessagePack is a binary-based efficient data interchange format
+EAPI=7
+HOMEPAGE=https://msgpack.org/ https://github.com/msgpack/msgpack-c/
+IUSE=boost +cxx doc examples 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=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=boost? ( dev-libs/boost[context,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/2
+SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-3.2.0/msgpack-3.2.0.tar.gz
+_eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ee851abf9b4546ad16513b9507e8fef0
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index caf9d6b3cdb0..ad9f166f3ffb 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/lpeg-1.0.2 b/metadata/md5-cache/dev-lua/lpeg-1.0.2
new file mode 100644
index 000000000000..311d7440a18f
--- /dev/null
+++ b/metadata/md5-cache/dev-lua/lpeg-1.0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= ) virtual/pkgconfig
+DESCRIPTION=Parsing Expression Grammars for Lua
+EAPI=7
+HOMEPAGE=http://www.inf.puc-rio.br/~roberto/lpeg/
+IUSE=debug doc luajit
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=!luajit? ( >=dev-lang/lua-5.1:= ) luajit? ( dev-lang/luajit:2= )
+SLOT=0
+SRC_URI=http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=05f9cd2382544ecca75272fd3c016dcc
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ce992f8cc645..5620a5bbe97d 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/cython-0.29.4 b/metadata/md5-cache/dev-python/cython-0.29.4
index 6bb5313c532a..aaa7cd38b08f 100644
--- a/metadata/md5-cache/dev-python/cython-0.29.4
+++ b/metadata/md5-cache/dev-python/cython-0.29.4
@@ -5,11 +5,11 @@ DESCRIPTION=A Python to C compiler
 EAPI=7
 HOMEPAGE=https://cython.org https://pypi.org/project/Cython/
 IUSE=doc emacs test 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 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=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) >=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=mirror://pypi/C/Cython/Cython-0.29.4.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	elisp-common	23f47b2e1de7abf387105eddd1318738	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=0e6b4a9e3dc5a73b17f17fcdf8c25cd7
+_md5_=93fc9c1ae1f3e62891cc0d9bc25fd756
diff --git a/metadata/md5-cache/dev-python/pyyaml-5.1 b/metadata/md5-cache/dev-python/pyyaml-5.1
index 984324c46b06..61b072520b6d 100644
--- a/metadata/md5-cache/dev-python/pyyaml-5.1
+++ b/metadata/md5-cache/dev-python/pyyaml-5.1
@@ -5,11 +5,11 @@ DESCRIPTION=YAML parser and emitter for Python
 EAPI=7
 HOMEPAGE=https://pyyaml.org/wiki/PyYAML https://pypi.org/project/PyYAML/
 IUSE=examples libyaml python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=libyaml? ( dev-libs/libyaml ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=https://pyyaml.org/download/pyyaml/PyYAML-5.1.tar.gz
 _eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ce3a5badf3863af749eeeeaa48c3ab25
+_md5_=576d9cbf558331356476970c97f08cc1
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 0154b08a195e..8c8d7cdeb5c9 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/exim-4.92 b/metadata/md5-cache/mail-mta/exim-4.92
index 97ccc9799337..acd431efd962 100644
--- a/metadata/md5-cache/mail-mta/exim-4.92
+++ b/metadata/md5-cache/mail-mta/exim-4.92
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=6
 HOMEPAGE=http://www.exim.org/
 IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) dev-libs/libpcre idn? ( net-dns/libidn:= net-dns/libidn2:= ) perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls:0=[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl !gnutls ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
 SRC_URI=https://downloads.exim.org/exim4/exim-4.92.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.92.tar.xz )
 _eclasses_=db-use	501a5d0963e0d17f30260023f292ae8e	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pam	69b1cf8e80a877ad42a03042aaa66a5e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7ad11887e5a7a1f316ec6b1c6e8ec96
+_md5_=fbe796d44767031eed294bed2564d382
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7e4a61fdfa47..43c09b996281 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/jbig2dec-0.14 b/metadata/md5-cache/media-libs/jbig2dec-0.14
index 831d3dd2bfe7..464f04682f22 100644
--- a/metadata/md5-cache/media-libs/jbig2dec-0.14
+++ b/metadata/md5-cache/media-libs/jbig2dec-0.14
@@ -4,10 +4,10 @@ DESCRIPTION=A decoder implementation of the JBIG2 image compression format
 EAPI=6
 HOMEPAGE=http://ghostscript.com/jbig2dec.html
 IUSE=png static-libs test
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~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=AGPL-3
 RDEPEND=png? ( media-libs/libpng:0= )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-0.14.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
-_md5_=604e67020662ccbc9ede5b6b7fae00b1
+_md5_=d08021acc44601d9b5b37bc679d52ffb
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.1 b/metadata/md5-cache/media-libs/openjpeg-2.3.1
index db644c4918cc..bc49cd0c12f6 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=Open-source JPEG 2000 library
 EAPI=7
 HOMEPAGE=https://www.openjpeg.org
 IUSE=doc 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 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2 media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz -> openjpeg-2.3.1.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/25632d6deca2e567d30ef476b4abe63916c36f6e.tar.gz -> openjpeg-data_20180620.tar.gz )
 _eclasses_=cmake-multilib	9400794da450ca9e38faef6eefbb3957	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=99d827a0580224870473fae00b793caa
+_md5_=9ff46d12b60ce1c884a52bd58ea939ef
diff --git a/metadata/md5-cache/media-libs/urt-3.1b-r3 b/metadata/md5-cache/media-libs/urt-3.1b-r3
index b26639a7fbeb..b1e6288bcb94 100644
--- a/metadata/md5-cache/media-libs/urt-3.1b-r3
+++ b/metadata/md5-cache/media-libs/urt-3.1b-r3
@@ -4,10 +4,10 @@ DESCRIPTION=the Utah Raster Toolkit is a library for dealing with raster images
 EAPI=6
 HOMEPAGE=http://www.cs.utah.edu/gdc/projects/urt/
 IUSE=gif postscript static-libs tiff tools X
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=URT gif? ( free-noncomm )
 RDEPEND=X? ( x11-libs/libXext ) gif? ( media-libs/giflib ) postscript? ( app-text/ghostscript-gpl ) tiff? ( media-libs/tiff:= )
 SLOT=0/3.1b-r2
 SRC_URI=ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z
 _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_=79025ef0cec0928b113cde225809f150
+_md5_=94f20316de8b5f92747512b423ae7eae
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 3b324176bfc3..cc0a63efa820 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/curl-7.65.0 b/metadata/md5-cache/net-misc/curl-7.65.0
index 571bb7b49489..c76d340fb4d7 100644
--- a/metadata/md5-cache/net-misc/curl-7.65.0
+++ b/metadata/md5-cache/net-misc/curl-7.65.0
@@ -5,7 +5,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~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
+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=MIT
 RDEPEND=ldap? ( net-nds/openldap[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(-)?] ) brotli? ( app-arch/brotli:=[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(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle:0=[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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) sys-libs/zlib[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(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.65.0.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=f9180665ea4b53af1da38bd19bbf9340
+_md5_=e0afd98d385fa866116bf5a99f14658a
diff --git a/metadata/md5-cache/net-misc/stunnel-5.50-r1 b/metadata/md5-cache/net-misc/stunnel-5.50-r1
index 0804160997d5..fc50787e266e 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.50-r1
+++ b/metadata/md5-cache/net-misc/stunnel-5.50-r1
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=6
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.50.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.50.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.50.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.50.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.50.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.50.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.50.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	ssl-cert	a1a4daed6b2479901759d6fe367c4c29	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073
-_md5_=79f6ee13ab88ae49dffcbe1983178e30
+_md5_=0abb8d4c77f4d02228a5d5ecbee3e3eb
diff --git a/metadata/md5-cache/net-misc/whois-5.4.1 b/metadata/md5-cache/net-misc/whois-5.4.3
similarity index 71%
rename from metadata/md5-cache/net-misc/whois-5.4.1
rename to metadata/md5-cache/net-misc/whois-5.4.3
index 3847f665eda4..5a8e92ce7785 100644
--- a/metadata/md5-cache/net-misc/whois-5.4.1
+++ b/metadata/md5-cache/net-misc/whois-5.4.3
@@ -1,7 +1,8 @@
+BDEPEND=app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile configure install prepare
-DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) app-arch/xz-utils >=dev-lang/perl-5 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
 DESCRIPTION=improved Whois Client
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.linux.it/~md/software/
 IUSE=iconv idn nls
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
@@ -9,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=iconv? ( virtual/libiconv ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl )
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://debian/pool/main/w/whois/whois_5.4.1.tar.xz
+SRC_URI=mirror://debian/pool/main/w/whois/whois_5.4.3.tar.xz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=802fee63fde3e5c76dd927faa6764f18
+_md5_=3dfa7b258021b4a05af247270a645cf4
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 4990898cfb53..45736c0cd41e 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-2.2.11 b/metadata/md5-cache/net-print/cups-2.2.11
index 94d1e337788e..1faca4ecd86b 100644
--- a/metadata/md5-cache/net-print/cups-2.2.11
+++ b/metadata/md5-cache/net-print/cups-2.2.11
@@ -5,7 +5,7 @@ DESCRIPTION=The Common Unix Printing System
 EAPI=7
 HOMEPAGE=https://www.cups.org/
 IUSE=acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf kernel_linux 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 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint
 LICENSE=GPL-2
 PDEPEND=>=net-print/cups-filters-1.0.43
 RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) java? ( >=virtual/jre-1.6:* ) kerberos? ( >=virtual/krb5-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(-)?] ) !lprng-compat? ( !net-print/lprng ) pam? ( virtual/pam ) 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(+)] ) ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sec-policy/selinux-cups ) java? ( >=dev-java/java-config-2.2.0-r3 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.2.11/cups-2.2.11-source.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	dd352559d0e143500ec878acc74da909	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pam	69b1cf8e80a877ad42a03042aaa66a5e	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b6a9acb713e0eb3f6f66ea87614d92d3
+_md5_=ca70eaf651d2f70185b25f8e978d058c
diff --git a/metadata/md5-cache/net-print/cups-filters-1.25.0 b/metadata/md5-cache/net-print/cups-filters-1.25.0
index 428d0cfacf9f..5a92ae88cfe3 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.25.0
+++ b/metadata/md5-cache/net-print/cups-filters-1.25.0
@@ -10,4 +10,4 @@ RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.25.0.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b81fd3dc332844e9484e46f3a77e15cf
+_md5_=7e09a793f38198be444083bef2dca5c5
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index fe9d162d8b4c..5bba61498583 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -8,4 +8,4 @@ LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.3.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 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	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b81fd3dc332844e9484e46f3a77e15cf
+_md5_=7e09a793f38198be444083bef2dca5c5
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 4ee836348afc..a36a290a0618 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/kismet-9999 b/metadata/md5-cache/net-wireless/kismet-9999
index 51de8497d8ad..4c8069e4cbd6 100644
--- a/metadata/md5-cache/net-wireless/kismet-9999
+++ b/metadata/md5-cache/net-wireless/kismet-9999
@@ -9,4 +9,4 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 RESTRICT=strip
 SLOT=0/9999
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	8bd74731cafdcdad8f7a63637302e073	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=beebf07a9cf2f1df0c39065c12814f2e
+_md5_=79982edf84d33e91ceba6952cfefcda9
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 105896c1c375..272a0236f6ea 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.5 b/metadata/md5-cache/sci-chemistry/gromacs-2016.5
deleted file mode 100644
index bc80492a8e85..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.5
-SRC_URI=ftp://ftp.gromacs.org/pub/gromacs/gromacs-2016.5.tar.gz test? ( http://gerrit.gromacs.org/download/regressiontests-2016.5.tar.gz )
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=21301ea6a0ed7596eae23f7c523ea8d4
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
deleted file mode 100644
index 05a094e6b3d7..000000000000
--- a/metadata/md5-cache/sci-chemistry/gromacs-2016.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi ) virtual/pkgconfig doc? ( app-doc/doxygen dev-texlive/texlive-latex dev-texlive/texlive-latexextra media-gfx/imagemagick ) dev-libs/tinyxml2 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=The ultimate molecular dynamics simulation package
-EAPI=6
-HOMEPAGE=http://www.gromacs.org/
-IUSE=X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2
-LICENSE=LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) blas? ( virtual/blas ) cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 ) fftw? ( sci-libs/fftw:3.0 ) hwloc? ( <sys-apps/hwloc-2 ) lapack? ( virtual/lapack ) mkl? ( sci-libs/mkl ) mpi? ( virtual/mpi )
-REQUIRED_USE=|| ( single-precision double-precision ) cuda? ( single-precision ) mkl? ( !blas !fftw !lapack )
-SLOT=0/2016.9999
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	git-r3	0d4635eeb5a96cd5315597a47eba25c9	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=973213b4a1e1283b88193b373b2633c4
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index eccd6d35e507..7f943dd658f7 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/hwloc-1.11.10 b/metadata/md5-cache/sys-apps/hwloc-1.11.10
new file mode 100644
index 000000000000..e99c426a35f9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwloc-1.11.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-libs/ncurses-5.9-r3:0[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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,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(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[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(-)?] >=x11-libs/libpciaccess-0.13.1-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(-)?] ) plugins? ( dev-libs/libltdl:0[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(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) >=virtual/pkgconfig-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(-)?] >=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=displays the hardware topology in convenient formats
+EAPI=6
+HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
+IUSE=cairo cuda debug gl +numa +pci plugins svg static-libs xml X 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.9-r3:0[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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,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(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) pci? ( >=sys-apps/pciutils-3.3.0-r2[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(-)?] >=x11-libs/libpciaccess-0.13.1-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(-)?] ) plugins? ( dev-libs/libltdl:0[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(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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/5
+SRC_URI=http://www.open-mpi.org/software/hwloc/v1.11/downloads/hwloc-1.11.10.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	cuda	bb861e5221b7272ac90c2f12791c1e66	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
+_md5_=f3ba9bdea64317d83aa566924e21567b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index be93fe31f9b0..f854b5c97f47 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229 b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
similarity index 97%
rename from metadata/md5-cache/sys-boot/vboot-utils-72_p20181229
rename to metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
index afdddd32689a..3792bc507613 100644
--- a/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229
+++ b/metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
@@ -10,4 +10,4 @@ RDEPEND=!static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libre
 SLOT=0
 SRC_URI=mirror://gentoo/vboot-utils-72_p20181229.tar.xz https://dev.gentoo.org/~zmedico/dist/vboot-utils-72_p20181229.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_=7ede5ec2be8044786f7bd9f484800c14
+_md5_=bc7ba62c596a450ccca658335cb33a52
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d5baad58875a..e6d6cff58f81 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/ceph-13.2.6 b/metadata/md5-cache/sys-cluster/ceph-13.2.6
new file mode 100644
index 000000000000..1e59d2a2092a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ceph-13.2.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,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(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) app-arch/cpio dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx dev-util/cunit dev-util/gperf dev-util/valgrind sys-apps/which sys-devel/bc virtual/pkgconfig test? ( dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv[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(-)] sys-apps/grep[pcre] sys-fs/btrfs-progs )
+DESCRIPTION=Ceph distributed filesystem
+EAPI=7
+HOMEPAGE=https://ceph.com/
+IUSE=babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc test xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT
+RDEPEND=virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] app-arch/snappy:=[static-libs?] app-arch/zstd:=[static-libs?] app-misc/jq:=[static-libs?] dev-libs/crypto++:=[static-libs?] dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] dev-libs/libaio:=[static-libs?] dev-libs/libxml2:=[static-libs?] dev-libs/nss:= sys-auth/oath-toolkit:= sys-apps/keyutils:=[static-libs?] sys-apps/util-linux:=[static-libs?] sys-libs/zlib:=[static-libs?] babeltrace? ( dev-util/babeltrace ) ldap? ( net-nds/openldap:=[static-libs?] ) lttng? ( dev-util/lttng-ust:= ) fuse? ( sys-fs/fuse:0=[static-libs?] ) numa? ( sys-process/numactl:=[static-libs?] ) ssl? ( !libressl? ( dev-libs/openssl:=[static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] ) ) xfs? ( sys-fs/xfsprogs:=[static-libs?] ) zfs? ( sys-fs/zfs:=[static-libs?] ) radosgw? ( dev-libs/expat:=[static-libs?] !libressl? ( dev-libs/openssl:=[static-libs?] net-misc/curl:=[curl_ssl_openssl,static-libs?] ) libressl? ( dev-libs/libressl:=[static-libs?] net-misc/curl:=[curl_ssl_libressl,static-libs?] ) ) system-boost? ( >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,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(-)] ) jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) 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(-)] net-misc/socat sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup sys-fs/lvm2[-device-mapper-only(-)] !<sys-apps/openrc-0.26.3 dev-python/bcrypt[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cherrypy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pecan[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/werkzeug[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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python3_5 python_targets_python3_6 ) ?? ( jemalloc tcmalloc )
+RESTRICT=test? ( userpriv ) test
+SLOT=0
+SRC_URI=https://download.ceph.com/tarballs/ceph-13.2.6.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	959a7fda0dce63de9a4e73a22294d6ec	distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	a09389deba2c0a7108b581e02c7cecbf	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	udev	7752f306eec7b286d00bdb47b763e7ac	user	8bd74731cafdcdad8f7a63637302e073	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=e4ea78824e0ce1a8756659e73715776b
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index edc94b4f3458..a5b5208d306f 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1 b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
index 12460bcbc5cd..d6495086dcf6 100644
--- a/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+++ b/metadata/md5-cache/x11-misc/xdotool-3.20160805.1
@@ -4,11 +4,11 @@ DESCRIPTION=Simulate keyboard input and mouse activity, move and resize windows
 EAPI=6
 HOMEPAGE=https://www.semicomplete.com/projects/xdotool/
 IUSE=examples
-KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=x11-libs/libXtst x11-libs/libX11 x11-libs/libXinerama x11-libs/libxkbcommon
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jordansissel/xdotool/releases/download/v3.20160805.1/xdotool-3.20160805.1.tar.gz
 _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_=16d4da258737870c8fb2dc18a8be83ac
+_md5_=a313e774f523b5cee146ef19957a813b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1fa02921a58d..f6fa6790a785 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 11866 BLAKE2B f23bc74aa78c3a8573f47feacf2e5cc14f70bf31dba9eb6bba372431df427cf98b4316a4d1656a092d484f4cbaa8b06d94f7c624e8c976d1874619bcf0fd26ed SHA512 7cc5cfddda8eabcceabfdc97b1fcc9f794240a08288a5eb4cd91d0ddc9f8278dc119c2ae6d3712515aa16ed39855c9566a005818a70d5770fdc1d6d497e0558b
-TIMESTAMP 2019-06-12T19:38:49Z
+TIMESTAMP 2019-06-13T05:08:52Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0BVMlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl0B2mRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAlBg//WBesLIiu5lol6/2s5MQC7GNqx8kZAAlCE/xAvJDRs57/03ulgdP4qqM0
-Io+WsKvugwMzhhmWjJCB/NLyk8Ln9Pu1lmq9RYuAxJeBANJ4Ee6SESKroS1QIile
-onRbCVa9Kf3RWAtB7LRtrt3fZ2mDwTIRIt5y0URQ6jXNOjEJhXM+oQmJZkQptlcw
-Q6DNMJeZNYrmueq36g39uqPsC/727P9peUPxoRIFgQ0ULT54MnyR5JK6zawdUFxY
-kLlgZY4bbgNac4XOhM8RVf3HA5uRGFxpoDY14kgu/l9KKsg1GauHL9zm34hOKFFR
-pIT8QrGA8dQ24W+E1kehuVxxA+5k34LbZc+zJxgP/JXQg34CRa2pY+2OK0XyjkeT
-tXncWHgSldxwoAgJRgdiIOAcWPAn6uKRQbFyVKQdxf4HGBktROD3bLt6P+AhEQb6
-+yKZIz5pRtRPb69Or0xVbZGok1UjSk3dHxQlHubi2dy1PNZck0lPVwmy9uiVAfCK
-GE3eEtNVPyenLCNkx9M3AhwhABMj/LE/6E8cChBJFGJ5JtL6mx7vJdkqWepEcmkm
-r2WhtEo5kUXsxGJ6cZ65ptRTgZHpDSgTy1dan4ZNBZCMzJiiAuhAhxjhp2HuMKVI
-dH0vnRKnB8ZkGErrzLdNXz7Xwl+Ib1poZyU9C47tY+VsQ6OTd/4=
-=MqVC
+klBZWxAApo1V9E+0oeQzivKC/iwtQRCzHS1vgxSCgNlQcq3HkuFjNjBHdniJxdMg
+AR3C8iPIsVQZa0zAU7aoDEKlSeOGDBY8DyhqGlSq2tgqE5w4aoG4u9PKlOA1CVNw
+cRzrrMCmPVJo3YA/xabyFoPEu6jVzr6iMj+OHB7kNB+S3N3OB7ZRWcHK4bEk87Vq
+VjTHzlI/rugDHfh0zzg4zX0mtCyo8LEq5/vYSjtVHi1DdStwCm/x+55YTDeGpml0
+846LHsZnmxqCogvLoIrOvu7HVh7ytelrQwKG0Hkw21jO7zrDZbI3A4ZH6V3GioVy
+RF4kjJix0rCPCrqlz1YtHX9L1PBXIKvdyFHBizV2IK5eSjCsG0/n4XSxPzJ39mAS
+sX6OlZhjcZy1rAIzn5b+8qmXo7H5P6CTCHBAc+dncCn2PRidk6Jc6UR358EA5Bec
+B1Aj9mSq24yA7yqXyFTsGQtr6rpw/WeMMo1M/MWGorFiubfyHXR5n4u2qhVIy7Or
+6XZc4ULX+cZ7doyW0zX/ShIFyTuWlsFnLMLdIYAIcN2PU0ZxBQuUxYuwAD7w9bpt
+2K33yOUERcQEZM2kOMcBwgF/n00lC86AA30KhFmRpuIw+xVHjxCOU59es4tjWSDC
+pchZdPfFs7Ski+4GvJ7USruhZkw9DMNdjyAeKgp4q3S1Quwhj30=
+=yOlb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2911b478b096..f0c6ebedcd0c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Jun 2019 19:38:46 +0000
+Thu, 13 Jun 2019 05:08:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 42a8c9f4d900..e3d7c60da35c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jun 12 19:38:45 UTC 2019
+Thu Jun 13 05:08:48 UTC 2019
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 91def127baf5..0e2263c3eecf 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -4267,7 +4267,7 @@
 1808310239 ./app-crypt/gcr/gcr-3.20.0.ebuild
 1905231609 ./app-crypt/gcr/gcr-3.28.1.ebuild
 1809280333 ./app-crypt/pdfcrack/pdfcrack-0.16.ebuild
-1807070139 ./app-crypt/jitterentropy/jitterentropy-2.1.1.ebuild
+1906130209 ./app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
 1702282250 ./app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
 1901131939 ./app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
 1702282250 ./app-crypt/ckpass/ckpass-0.2-r1.ebuild
@@ -6522,7 +6522,7 @@
 1702282250 ./x11-misc/ktsuss/ktsuss-2.1.ebuild
 1712161139 ./x11-misc/spnavcfg/spnavcfg-0.3.ebuild
 1904250709 ./x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
-1905191909 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+1906130809 ./x11-misc/xdotool/xdotool-3.20160805.1.ebuild
 1704211007 ./x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
 1705192005 ./x11-misc/xplanetFX/xplanetFX-2.6.13.ebuild
 1802231708 ./x11-misc/xplanetFX/xplanetFX-2.6.14.ebuild
@@ -7845,7 +7845,7 @@
 1801051439 ./dev-libs/unibilium/unibilium-1.2.1.ebuild
 1702282250 ./dev-libs/unibilium/unibilium-1.1.4.ebuild
 1905042209 ./dev-libs/libxslt/libxslt-1.1.32.ebuild
-1906042209 ./dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
+1906130739 ./dev-libs/libxslt/libxslt-1.1.33-r1.ebuild
 1702282250 ./dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
 1812050109 ./dev-libs/libpfm/libpfm-4.4.0.ebuild
 1904130639 ./dev-libs/libpfm/libpfm-4.8.0.ebuild
@@ -7990,6 +7990,7 @@
 1804142308 ./dev-libs/libmowgli/libmowgli-2.1.3.ebuild
 1801140209 ./dev-libs/libmowgli/libmowgli-9999.ebuild
 1801140209 ./dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
+1906130539 ./dev-libs/msgpack/msgpack-3.2.0.ebuild
 1812290039 ./dev-libs/msgpack/msgpack-3.1.1.ebuild
 1904202209 ./dev-libs/msgpack/msgpack-1.1.0.ebuild
 1804061438 ./dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -8263,10 +8264,8 @@
 1902052209 ./sci-chemistry/cns/cns-1.2.1-r8.ebuild
 1906031039 ./sci-chemistry/gromacs/gromacs-9999.ebuild
 1906031039 ./sci-chemistry/gromacs/gromacs-2018.9999.ebuild
-1906031039 ./sci-chemistry/gromacs/gromacs-2016.9999.ebuild
 1906092339 ./sci-chemistry/gromacs/gromacs-2019.2.ebuild
 1906031039 ./sci-chemistry/gromacs/gromacs-2018.3.ebuild
-1906031039 ./sci-chemistry/gromacs/gromacs-2016.5.ebuild
 1906031039 ./sci-chemistry/gromacs/gromacs-2019.9999.ebuild
 1906051110 ./sci-chemistry/gromacs/gromacs-2018.7.ebuild
 1712020209 ./sci-chemistry/suitename/suitename-0.3.070628.ebuild
@@ -9495,6 +9494,7 @@
 1902042339 ./dev-lua/lua-zlib/lua-zlib-1.1.ebuild
 1702282250 ./dev-lua/lua_cliargs/lua_cliargs-2.5_p5.ebuild
 1905250209 ./dev-lua/lua_cliargs/lua_cliargs-3.0_p1.ebuild
+1906130539 ./dev-lua/lpeg/lpeg-1.0.2.ebuild
 1803290009 ./dev-lua/lpeg/lpeg-1.0.1.ebuild
 1902161709 ./dev-lua/lutok/lutok-0.4-r1.ebuild
 1702282250 ./dev-lua/luacov/luacov-0.8.ebuild
@@ -10978,6 +10978,7 @@
 1803220108 ./app-editors/hteditor/hteditor-2.1.0.ebuild
 1803220108 ./app-editors/hteditor/hteditor-2.1.0-r1.ebuild
 1901131409 ./app-editors/neovim/neovim-0.3.3.ebuild
+1906130539 ./app-editors/neovim/neovim-0.3.7.ebuild
 1901100039 ./app-editors/neovim/neovim-0.3.2.ebuild
 1903291239 ./app-editors/neovim/neovim-9999.ebuild
 1812290039 ./app-editors/neovim/neovim-0.3.1-r1.ebuild
@@ -13660,7 +13661,7 @@
 1904171112 ./dev-python/sexpdata/sexpdata-0.0.3-r1.ebuild
 1905042239 ./dev-python/cython/cython-0.29.7.ebuild
 1904171112 ./dev-python/cython/cython-0.25.2.ebuild
-1906082139 ./dev-python/cython/cython-0.29.4.ebuild
+1906130809 ./dev-python/cython/cython-0.29.4.ebuild
 1906030539 ./dev-python/cython/cython-0.29.10.ebuild
 1905301509 ./dev-python/cython/cython-0.29.9.ebuild
 1904171112 ./dev-python/cython/cython-0.26.1.ebuild
@@ -15054,7 +15055,7 @@
 1904171112 ./dev-python/aadict/aadict-0.2.3.ebuild
 1904171112 ./dev-python/pyyaml/pyyaml-3.13.ebuild
 1904171112 ./dev-python/pyyaml/pyyaml-3.12.ebuild
-1906051639 ./dev-python/pyyaml/pyyaml-5.1.ebuild
+1906130739 ./dev-python/pyyaml/pyyaml-5.1.ebuild
 1806031709 ./dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
 1807010639 ./dev-python/backports-lzma/backports-lzma-0.0.12.ebuild
 1812271139 ./dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -17912,7 +17913,7 @@
 1905071709 ./net-wireless/blueman/blueman-9999.ebuild
 1906100609 ./net-wireless/blueman/blueman-2.1.ebuild
 1709031109 ./net-wireless/bluez-tools/bluez-tools-0_p20161212.ebuild
-1905302109 ./net-wireless/kismet/kismet-9999.ebuild
+1906130609 ./net-wireless/kismet/kismet-9999.ebuild
 1812031940 ./net-wireless/kismet/kismet-2016.07.1-r2.ebuild
 1905302109 ./net-wireless/kismet/kismet-2019.05.1.ebuild
 1806281939 ./net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
@@ -18749,7 +18750,7 @@
 1809192139 ./app-text/libebook/libebook-0.1.3.ebuild
 1702282250 ./app-text/pdf2html/pdf2html-1.4.ebuild
 1902201639 ./app-text/llpp/llpp-30.ebuild
-1906092239 ./app-text/poppler/poppler-0.77.0.ebuild
+1906130739 ./app-text/poppler/poppler-0.77.0.ebuild
 1905011409 ./app-text/poppler/poppler-0.76.1.ebuild
 1905261239 ./app-text/poppler/poppler-9999.ebuild
 1903022309 ./app-text/poppler/poppler-0.74.0.ebuild
@@ -23169,7 +23170,7 @@
 1906061009 ./mail-mta/postfix/postfix-3.3.4.ebuild
 1906111139 ./mail-mta/exim/exim-4.92-r1.ebuild
 1901141039 ./mail-mta/exim/exim-4.91-r2.ebuild
-1906082139 ./mail-mta/exim/exim-4.92.ebuild
+1906130739 ./mail-mta/exim/exim-4.92.ebuild
 1810302209 ./mail-mta/opensmtpd/opensmtpd-6.4.0_p1.ebuild
 1901022239 ./mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r1.ebuild
 1905061839 ./mail-mta/courier/courier-1.0.5.ebuild
@@ -24564,7 +24565,7 @@
 1702282250 ./sys-boot/netboot/netboot-0.10.2.ebuild
 1805012209 ./sys-boot/colo/colo-1.22.ebuild
 1901040309 ./sys-boot/vboot-utils/vboot-utils-59_p20170413.ebuild
-1901050439 ./sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
+1906130509 ./sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
 1904290139 ./x11-drivers/nvidia-drivers/nvidia-drivers-410.104-r2.ebuild
 1905181039 ./x11-drivers/nvidia-drivers/nvidia-drivers-430.14.ebuild
 1904290139 ./x11-drivers/nvidia-drivers/nvidia-drivers-415.27-r2.ebuild
@@ -26953,6 +26954,7 @@
 1904300209 ./sys-cluster/ceph/ceph-12.2.12-r2.ebuild
 1904300209 ./sys-cluster/ceph/ceph-14.2.1.ebuild
 1904171112 ./sys-cluster/ceph/ceph-12.2.11.ebuild
+1906130509 ./sys-cluster/ceph/ceph-13.2.6.ebuild
 1905151639 ./sys-cluster/ceph/ceph-13.2.5-r4.ebuild
 1904091539 ./sys-cluster/teleport/teleport-3.1.8.ebuild
 1904091539 ./sys-cluster/teleport/teleport-3.2.0.ebuild
@@ -27303,7 +27305,7 @@
 1702282250 ./net-print/poster/poster-20060221-r3.ebuild
 1702282250 ./net-print/poster/poster-20060221-r2.ebuild
 1702282250 ./net-print/fax4cups/fax4cups-1.29-r1.ebuild
-1906092239 ./net-print/cups/cups-2.2.11.ebuild
+1906130739 ./net-print/cups/cups-2.2.11.ebuild
 1903240109 ./net-print/cups/cups-9999.ebuild
 1812081539 ./net-print/cups/cups-2.2.10.ebuild
 1905180439 ./net-print/cups/cups-2.2.7.ebuild
@@ -27316,9 +27318,9 @@
 1812301909 ./net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild
 1904080909 ./net-print/hplip-plugin/hplip-plugin-3.19.3.ebuild
 1801132309 ./net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
-1906121209 ./net-print/cups-filters/cups-filters-1.25.0.ebuild
+1906130039 ./net-print/cups-filters/cups-filters-1.25.0.ebuild
 1905180439 ./net-print/cups-filters/cups-filters-1.21.6.ebuild
-1903162309 ./net-print/cups-filters/cups-filters-9999.ebuild
+1906130039 ./net-print/cups-filters/cups-filters-9999.ebuild
 1905171209 ./net-print/cups-filters/cups-filters-1.23.0.ebuild
 1905171209 ./net-print/cups-filters/cups-filters-1.22.6.ebuild
 1806031709 ./net-print/cups-pdf/cups-pdf-3.0.0.ebuild
@@ -27854,7 +27856,7 @@
 1807111209 ./app-benchmarks/geekbench/geekbench-2.4.3.ebuild
 1903031509 ./app-benchmarks/geekbench/geekbench-4.3.3.ebuild
 1702282250 ./app-benchmarks/acovea-gtk/acovea-gtk-1.0.1.ebuild
-1905191909 ./app-benchmarks/stress/stress-1.0.4-r2.ebuild
+1906130809 ./app-benchmarks/stress/stress-1.0.4-r2.ebuild
 1805212238 ./app-benchmarks/stress/stress-1.0.4-r1.ebuild
 1702282250 ./app-benchmarks/tiobench/tiobench-0.4.2.ebuild
 1702282250 ./app-benchmarks/acovea/acovea-5.1.1.ebuild
@@ -30954,7 +30956,7 @@
 1904171112 ./net-misc/streamlink/streamlink-0.14.2-r1.ebuild
 1904171112 ./net-misc/streamlink/streamlink-1.0.0.ebuild
 1811292109 ./net-misc/whois/whois-5.3.2.ebuild
-1901281209 ./net-misc/whois/whois-5.4.1.ebuild
+1906130209 ./net-misc/whois/whois-5.4.3.ebuild
 1903281209 ./net-misc/whois/whois-5.4.2.ebuild
 1904171112 ./net-misc/crossbar/crossbar-17.9.1.ebuild
 1904171112 ./net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -31203,7 +31205,7 @@
 1804061408 ./net-misc/bird/bird-1.6.3-r1.ebuild
 1702282250 ./net-misc/ssh-chain/ssh-chain-20131217.ebuild
 1801270409 ./net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
-1905130409 ./net-misc/stunnel/stunnel-5.50-r1.ebuild
+1906130809 ./net-misc/stunnel/stunnel-5.50-r1.ebuild
 1905220909 ./net-misc/stunnel/stunnel-5.54.ebuild
 1904240809 ./net-misc/stunnel/stunnel-5.51-r1.ebuild
 1901130239 ./net-misc/stunnel/stunnel-5.43.ebuild
@@ -31231,7 +31233,7 @@
 1906060109 ./net-misc/curl/curl-7.65.1.ebuild
 1905042309 ./net-misc/curl/curl-7.64.1.ebuild
 1902131509 ./net-misc/curl/curl-7.64.0.ebuild
-1906061009 ./net-misc/curl/curl-7.65.0.ebuild
+1906130739 ./net-misc/curl/curl-7.65.0.ebuild
 1902010039 ./net-misc/gerbera/gerbera-9999.ebuild
 1901012239 ./net-misc/gerbera/gerbera-1.2.0-r1.ebuild
 1904042239 ./net-misc/gerbera/gerbera-1.3.1.ebuild
@@ -31831,6 +31833,7 @@
 1702282250 ./sys-apps/daisydog/daisydog-2014.05.30.ebuild
 1906122139 ./sys-apps/hwloc/hwloc-1.11.13.ebuild
 1906122139 ./sys-apps/hwloc/hwloc-2.0.4.ebuild
+1906130039 ./sys-apps/hwloc/hwloc-1.11.10.ebuild
 1810131339 ./sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
 1903311109 ./sys-apps/osinfo-db/osinfo-db-20190304.ebuild
 1905230039 ./sys-apps/osinfo-db/osinfo-db-20190218.ebuild
@@ -32325,7 +32328,7 @@
 1803140138 ./media-libs/libicns/libicns-0.8.1.ebuild
 1905250009 ./media-libs/assimp/assimp-4.0.1.ebuild
 1806281809 ./media-libs/jbig2dec/jbig2dec-0.13-r4.ebuild
-1905130009 ./media-libs/jbig2dec/jbig2dec-0.14.ebuild
+1906130809 ./media-libs/jbig2dec/jbig2dec-0.14.ebuild
 1905280009 ./media-libs/sdl-image/sdl-image-1.2.12-r2.ebuild
 1702282250 ./media-libs/quvi/quvi-0.4.2.ebuild
 1702282250 ./media-libs/quvi/quvi-0.9.4.ebuild
@@ -32525,7 +32528,7 @@
 1805012209 ./media-libs/libipod/libipod-0.1.ebuild
 1902250109 ./media-libs/mediastreamer/mediastreamer-2.9.0-r2.ebuild
 1906092339 ./media-libs/ptex/ptex-2.3.2.ebuild
-1905130409 ./media-libs/urt/urt-3.1b-r3.ebuild
+1906130809 ./media-libs/urt/urt-3.1b-r3.ebuild
 1805120339 ./media-libs/urt/urt-3.1b-r1.ebuild
 1902162039 ./media-libs/libaom/libaom-9999.ebuild
 1905212309 ./media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -32841,7 +32844,7 @@
 1804201108 ./media-libs/giflib/giflib-5.1.4.ebuild
 1807310109 ./media-libs/sdl-pango/sdl-pango-0.1.2-r1.ebuild
 1810112140 ./media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
-1906120139 ./media-libs/openjpeg/openjpeg-2.3.1.ebuild
+1906130739 ./media-libs/openjpeg/openjpeg-2.3.1.ebuild
 1901291509 ./media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
 1702282250 ./media-libs/icclib/icclib-2.14.ebuild
 1702282250 ./media-libs/pymemphis/pymemphis-0.2.1-r2.ebuild
@@ -35744,6 +35747,7 @@
 1904131739 ./app-eselect/eselect-fontconfig/eselect-fontconfig-1.1-r1.ebuild
 1805012209 ./app-eselect/eselect-pdftex/eselect-pdftex-0.3.ebuild
 1902270739 ./app-eselect/eselect-metasploit/eselect-metasploit-0.16.ebuild
+1906122339 ./app-eselect/eselect-metasploit/eselect-metasploit-0.17.ebuild
 1905202039 ./app-eselect/eselect-cblas/eselect-cblas-0.1.ebuild
 1709290606 ./app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild
 1712110438 ./app-eselect/eselect-package-manager/eselect-package-manager-20110108-r1.ebuild
@@ -40497,8 +40501,7 @@
 1809280333 metadata/md5-cache/app-crypt/md6sum-1.0-r2
 1905112002 metadata/md5-cache/app-crypt/md5deep-4.4
 1905112002 metadata/md5-cache/app-crypt/onak-0.5.0
-1905112002 metadata/md5-cache/app-crypt/jitterentropy-2.1.1
-1906112339 metadata/md5-cache/app-crypt/Manifest.gz
+1906130209 metadata/md5-cache/app-crypt/Manifest.gz
 1905172240 metadata/md5-cache/app-crypt/libu2f-server-1.1.0
 1904281339 metadata/md5-cache/app-crypt/debian-archive-keyring-2019.1
 1905222009 metadata/md5-cache/app-crypt/jetring-0.25
@@ -40538,6 +40541,7 @@
 1905112002 metadata/md5-cache/app-crypt/bsign-0.4.5-r1
 1905112002 metadata/md5-cache/app-crypt/signify-24
 1905112002 metadata/md5-cache/app-crypt/aespipe-2.4e
+1906130209 metadata/md5-cache/app-crypt/jitterentropy-2.1.2
 1905112002 metadata/md5-cache/app-crypt/pinentry-1.1.0-r3
 1905112002 metadata/md5-cache/app-crypt/gnupg-1.4.21
 1905201439 metadata/md5-cache/app-crypt/dehydrated-0.6.2-r1
@@ -42416,7 +42420,7 @@
 1905112002 metadata/md5-cache/x11-misc/xbattbar-1.4.8
 1905112002 metadata/md5-cache/x11-misc/spnavcfg-0.3
 1703221038 metadata/md5-cache/x11-misc/fbpager-20090221-r1
-1905191909 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
+1906130809 metadata/md5-cache/x11-misc/xdotool-3.20160805.1
 1905182243 metadata/md5-cache/x11-misc/albert-0.15.0
 1905202309 metadata/md5-cache/x11-misc/notification-daemon-3.20.0
 1905112002 metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
@@ -42650,7 +42654,7 @@
 1905112002 metadata/md5-cache/x11-misc/wdm-1.28-r5
 1905112002 metadata/md5-cache/x11-misc/peksystray-0.4.0
 1905112002 metadata/md5-cache/x11-misc/shutter-0.93.1-r3
-1906122039 metadata/md5-cache/x11-misc/Manifest.gz
+1906130809 metadata/md5-cache/x11-misc/Manifest.gz
 1905182243 metadata/md5-cache/x11-misc/sddm-0.18.1
 1905112002 metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
 1905131209 metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r2
@@ -43314,6 +43318,7 @@
 1905172240 metadata/md5-cache/dev-libs/libatomic_ops-7.6.8
 1905182243 metadata/md5-cache/dev-libs/jsoncpp-1.8.4
 1905112002 metadata/md5-cache/dev-libs/dotconf-1.3-r1
+1906130539 metadata/md5-cache/dev-libs/msgpack-3.2.0
 1905182243 metadata/md5-cache/dev-libs/libfmt-5.1.0
 1905112002 metadata/md5-cache/dev-libs/mps-1.110.0
 1905112002 metadata/md5-cache/dev-libs/cvector-1.0.3-r1
@@ -43783,7 +43788,7 @@
 1905182243 metadata/md5-cache/dev-libs/libcharon-3.6.0
 1905112002 metadata/md5-cache/dev-libs/libcli-1.9.8.4
 1905172240 metadata/md5-cache/dev-libs/jansson-2.12
-1906122039 metadata/md5-cache/dev-libs/Manifest.gz
+1906130739 metadata/md5-cache/dev-libs/Manifest.gz
 1905172240 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1905310139 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
 1905112002 metadata/md5-cache/dev-libs/libcli-1.9.7
@@ -44152,7 +44157,7 @@
 1905112002 metadata/md5-cache/dev-libs/legousbtower-0.5.4-r1
 1905112002 metadata/md5-cache/dev-libs/libreport-2.0.13-r1
 1905242139 metadata/md5-cache/dev-libs/keystone-0.9.1
-1906042209 metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
+1906130739 metadata/md5-cache/dev-libs/libxslt-1.1.33-r1
 1905112002 metadata/md5-cache/dev-libs/apr-1.7.0-r1
 1905112002 metadata/md5-cache/dev-libs/opencryptoki-3.4.1
 1905112002 metadata/md5-cache/dev-libs/libgee-0.20.1
@@ -44419,7 +44424,6 @@
 1905182243 metadata/md5-cache/sci-chemistry/votca-csgapps-1.4
 1905112002 metadata/md5-cache/sci-chemistry/chemtool-1.6.13
 1905112002 metadata/md5-cache/sci-chemistry/autodock_vina-1.1.2
-1906031039 metadata/md5-cache/sci-chemistry/gromacs-2016.9999
 1905112002 metadata/md5-cache/sci-chemistry/pymol-plugins-psico-3.1-r1
 1905112002 metadata/md5-cache/sci-chemistry/tinker-8.2.1
 1905112002 metadata/md5-cache/sci-chemistry/mustang-3.2.2
@@ -44485,7 +44489,6 @@
 1905182243 metadata/md5-cache/sci-chemistry/votca-csg-9999
 1906092339 metadata/md5-cache/sci-chemistry/gromacs-2019.2
 1906031039 metadata/md5-cache/sci-chemistry/gromacs-2018.3
-1906031039 metadata/md5-cache/sci-chemistry/gromacs-2016.5
 1905112002 metadata/md5-cache/sci-chemistry/wxmacmolplt-7.5-r1
 1905182243 metadata/md5-cache/sci-chemistry/pdbcat-1.3
 1905201409 metadata/md5-cache/sci-chemistry/votca-csg-1.5
@@ -44495,7 +44498,7 @@
 1905112002 metadata/md5-cache/sci-chemistry/MDAnalysis-0.18.0
 1905182243 metadata/md5-cache/sci-chemistry/votca-csg-1.4
 1905112002 metadata/md5-cache/sci-chemistry/bkchem-0.14.0_pre2-r2
-1906121339 metadata/md5-cache/sci-chemistry/Manifest.gz
+1906130109 metadata/md5-cache/sci-chemistry/Manifest.gz
 1905112002 metadata/md5-cache/sci-chemistry/eden-5.3-r2
 1905182243 metadata/md5-cache/sci-chemistry/mm-align-20120321
 1905112002 metadata/md5-cache/sci-chemistry/ortep3-1.0.3-r1
@@ -45777,6 +45780,7 @@
 1905112002 metadata/md5-cache/dev-lua/lpeg-1.0.1
 1905250209 metadata/md5-cache/dev-lua/lua-term-0.3
 1905112002 metadata/md5-cache/dev-lua/luadbi-0.5-r6
+1906130539 metadata/md5-cache/dev-lua/lpeg-1.0.2
 1905112002 metadata/md5-cache/dev-lua/lgi-0.6.2-r1
 1905112002 metadata/md5-cache/dev-lua/luarocks-2.2.0
 1905112002 metadata/md5-cache/dev-lua/lanes-3.10.0
@@ -45797,7 +45801,7 @@
 1905200009 metadata/md5-cache/dev-lua/luasec-0.7
 1905112002 metadata/md5-cache/dev-lua/lua-openssl-0.7.3
 1905112002 metadata/md5-cache/dev-lua/messagepack-0.3.2
-1905270139 metadata/md5-cache/dev-lua/Manifest.gz
+1906130539 metadata/md5-cache/dev-lua/Manifest.gz
 1905182243 metadata/md5-cache/dev-lua/toluapp-1.0.93_p20190513
 1905112002 metadata/md5-cache/dev-lua/luasec-0.5.1
 1905270139 metadata/md5-cache/dev-lua/say-1.3_p1-r1
@@ -47190,6 +47194,7 @@
 1905112002 metadata/md5-cache/app-editors/notepadqq-1.4.8
 1905112002 metadata/md5-cache/app-editors/emacs-24.5-r7
 1905112002 metadata/md5-cache/app-editors/zile-2.4.14
+1906130539 metadata/md5-cache/app-editors/neovim-0.3.7
 1905112002 metadata/md5-cache/app-editors/nano-4.1
 1905112002 metadata/md5-cache/app-editors/kakoune-9999
 1905112002 metadata/md5-cache/app-editors/levee-3.5a
@@ -47231,7 +47236,7 @@
 1905112002 metadata/md5-cache/app-editors/qxmledit-0.9.12
 1905112002 metadata/md5-cache/app-editors/atom-1.32.1
 1905112002 metadata/md5-cache/app-editors/ee-1.5.2
-1906110409 metadata/md5-cache/app-editors/Manifest.gz
+1906130539 metadata/md5-cache/app-editors/Manifest.gz
 1905112002 metadata/md5-cache/app-editors/jedit-5.2.0-r1
 1905112002 metadata/md5-cache/app-editors/emacs-24.5-r5
 1905112002 metadata/md5-cache/app-editors/jove-4.16.0.73
@@ -49795,7 +49800,7 @@
 1905112002 metadata/md5-cache/dev-python/theano-0.9.0
 1905112139 metadata/md5-cache/dev-python/oslo-utils-3.40.3
 1905112002 metadata/md5-cache/dev-python/python-magic-0.4.15
-1906122039 metadata/md5-cache/dev-python/Manifest.gz
+1906130809 metadata/md5-cache/dev-python/Manifest.gz
 1905112002 metadata/md5-cache/dev-python/mamba-0.8.6
 1905112002 metadata/md5-cache/dev-python/spyder-3.2.4
 1905112002 metadata/md5-cache/dev-python/logfury-0.1.2
@@ -51239,7 +51244,7 @@
 1905112002 metadata/md5-cache/dev-python/blosc-1.5.0
 1905112002 metadata/md5-cache/dev-python/wcsaxes-0.8
 1905112002 metadata/md5-cache/dev-python/flask-pymongo-0.3.0
-1906082139 metadata/md5-cache/dev-python/cython-0.29.4
+1906130809 metadata/md5-cache/dev-python/cython-0.29.4
 1905112002 metadata/md5-cache/dev-python/pylibpcap-0.6.4-r1
 1905112002 metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
 1905112002 metadata/md5-cache/dev-python/ryu-4.26
@@ -51248,7 +51253,7 @@
 1905112002 metadata/md5-cache/dev-python/intelhex-2.0
 1905112002 metadata/md5-cache/dev-python/python-nbxmpp-0.5.6
 1905112002 metadata/md5-cache/dev-python/wcsaxes-0.9-r1
-1906051639 metadata/md5-cache/dev-python/pyyaml-5.1
+1906130739 metadata/md5-cache/dev-python/pyyaml-5.1
 1905112002 metadata/md5-cache/dev-python/bleach-2.1.3
 1905112002 metadata/md5-cache/dev-python/casuarius-1.1
 1905112002 metadata/md5-cache/dev-python/atomicwrites-1.1.5-r2
@@ -54110,7 +54115,7 @@
 1905182243 metadata/md5-cache/net-wireless/soapyplutosdr-0.1.0
 1905182243 metadata/md5-cache/net-wireless/rtl_433-0.1_p20180223
 1905112002 metadata/md5-cache/net-wireless/cpyrit-cuda-0.5.0
-1905302109 metadata/md5-cache/net-wireless/kismet-9999
+1906130609 metadata/md5-cache/net-wireless/kismet-9999
 1906051209 metadata/md5-cache/net-wireless/hostapd-9999
 1906051209 metadata/md5-cache/net-wireless/hostapd-2.7-r2
 1905112002 metadata/md5-cache/net-wireless/dump1090-1.15_pre20180509
@@ -54166,7 +54171,7 @@
 1702282330 metadata/md5-cache/net-wireless/hidclient-20120728
 1906040539 metadata/md5-cache/net-wireless/wireless-regdb-20190603
 1905182243 metadata/md5-cache/net-wireless/bladerf-9999
-1906111839 metadata/md5-cache/net-wireless/Manifest.gz
+1906130609 metadata/md5-cache/net-wireless/Manifest.gz
 1905112002 metadata/md5-cache/net-wireless/wifi-radar-2.0.8-r2
 1905112002 metadata/md5-cache/net-wireless/jackit-0.0_p20170918
 1905182243 metadata/md5-cache/net-wireless/inspectrum-9999
@@ -54947,7 +54952,7 @@
 1905112002 metadata/md5-cache/app-text/paperwork-backend-1.2.4
 1905112002 metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
 1905112002 metadata/md5-cache/app-text/ding-1.8.1
-1906111939 metadata/md5-cache/app-text/Manifest.gz
+1906130739 metadata/md5-cache/app-text/Manifest.gz
 1905112002 metadata/md5-cache/app-text/writerperfect-0.9.5
 1805012209 metadata/md5-cache/app-text/vlna-1.5
 1905112002 metadata/md5-cache/app-text/htp-1.19
@@ -55078,7 +55083,7 @@
 1905112002 metadata/md5-cache/app-text/cook-1.0.2-r1
 1905112002 metadata/md5-cache/app-text/blahtexml-0.9
 1905112002 metadata/md5-cache/app-text/mandoc-1.14.5
-1906092239 metadata/md5-cache/app-text/poppler-0.77.0
+1906130739 metadata/md5-cache/app-text/poppler-0.77.0
 1905112002 metadata/md5-cache/app-text/pspresent-1.3-r1
 1906051039 metadata/md5-cache/app-text/podofo-0.9.6_p20180715
 1905112002 metadata/md5-cache/app-text/xchm-1.29
@@ -55994,7 +55999,7 @@
 1905112002 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1905112002 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1905112002 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1906122239 metadata/md5-cache/Manifest.gz
+1906130809 metadata/md5-cache/Manifest.gz
 1906031809 metadata/md5-cache/gui-wm/sway-9999
 1906031809 metadata/md5-cache/gui-wm/Manifest.gz
 1906031809 metadata/md5-cache/gui-wm/sway-1.1.1
@@ -59499,7 +59504,7 @@
 1904102139 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.4
 1905112002 metadata/md5-cache/mail-mta/opensmtpd-6.0.3_p1-r1
 1905112002 metadata/md5-cache/mail-mta/nullmailer-2.0
-1906111139 metadata/md5-cache/mail-mta/Manifest.gz
+1906130739 metadata/md5-cache/mail-mta/Manifest.gz
 1905112002 metadata/md5-cache/mail-mta/nullmailer-2.0-r1
 1903092239 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.3
 1905241139 metadata/md5-cache/mail-mta/protonmail-bridge-bin-1.1.5
@@ -59512,7 +59517,7 @@
 1905112002 metadata/md5-cache/mail-mta/qmail-ldap-1.03-r8
 1905112002 metadata/md5-cache/mail-mta/qpsmtpd-0.95
 1905112002 metadata/md5-cache/mail-mta/postfix-3.4.5
-1906082139 metadata/md5-cache/mail-mta/exim-4.92
+1906130739 metadata/md5-cache/mail-mta/exim-4.92
 1905112002 metadata/md5-cache/mail-mta/sendmail-8.14.9
 1905191739 metadata/md5-cache/mail-mta/netqmail-1.06-r3
 1905191739 metadata/md5-cache/mail-mta/netqmail-1.06-r1
@@ -60877,7 +60882,7 @@
 1905261209 metadata/md5-cache/sys-boot/yaboot-1.3.17-r3
 1905112002 metadata/md5-cache/sys-boot/raincoat-0.11
 1905112002 metadata/md5-cache/sys-boot/unetbootin-661
-1906051039 metadata/md5-cache/sys-boot/Manifest.gz
+1906130509 metadata/md5-cache/sys-boot/Manifest.gz
 1905112002 metadata/md5-cache/sys-boot/gnu-efi-3.0.3
 1905112002 metadata/md5-cache/sys-boot/grub-2.04_rc1
 1905112002 metadata/md5-cache/sys-boot/udk-2015-r1
@@ -60886,7 +60891,6 @@
 1905112002 metadata/md5-cache/sys-boot/yaboot-1.3.16
 1905112002 metadata/md5-cache/sys-boot/lilo-24.1
 1805012209 metadata/md5-cache/sys-boot/shlilo-lantank-20040408
-1905112002 metadata/md5-cache/sys-boot/vboot-utils-72_p20181229
 1905112002 metadata/md5-cache/sys-boot/refind-0.11.2
 1906051039 metadata/md5-cache/sys-boot/efibootmgr-16
 1906031809 metadata/md5-cache/sys-boot/systemd-boot-241
@@ -60906,6 +60910,7 @@
 1905112002 metadata/md5-cache/sys-boot/grub-9999
 1905112002 metadata/md5-cache/sys-boot/mokutil-0.3.0_p20170404
 1905112002 metadata/md5-cache/sys-boot/vboot-utils-59_p20170413
+1906130509 metadata/md5-cache/sys-boot/vboot-utils-72_p20181229-r1
 1905112002 metadata/md5-cache/sys-boot/grub-2.02-r3
 1905112002 metadata/md5-cache/sys-boot/refind-0.11.3
 1905112002 metadata/md5-cache/sys-boot/syslinux-5.10
@@ -63265,6 +63270,7 @@
 1905112002 metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
 1905112002 metadata/md5-cache/sys-cluster/galera-25.3.26
 1905112002 metadata/md5-cache/sys-cluster/glusterfs-6.1
+1906130509 metadata/md5-cache/sys-cluster/ceph-13.2.6
 1903011639 metadata/md5-cache/sys-cluster/kubelet-1.12.6
 1905212309 metadata/md5-cache/sys-cluster/galera-26.4.2
 1905091809 metadata/md5-cache/sys-cluster/kube-apiserver-1.13.6
@@ -63368,7 +63374,7 @@
 1902251540 metadata/md5-cache/sys-cluster/kube-controller-manager-1.10.12
 1905112002 metadata/md5-cache/sys-cluster/teleport-3.2.0
 1905112002 metadata/md5-cache/sys-cluster/cluster-glue-1.0.12
-1906120139 metadata/md5-cache/sys-cluster/Manifest.gz
+1906130509 metadata/md5-cache/sys-cluster/Manifest.gz
 1905112002 metadata/md5-cache/sys-cluster/heat-2019.1.9999
 1905112002 metadata/md5-cache/sys-cluster/cman-lib-2.03.09-r1
 1804020008 metadata/md5-cache/sys-cluster/pmix-2.1.1
@@ -63614,7 +63620,7 @@
 1905112002 metadata/md5-cache/x11-apps/xwd-1.0.6
 1905112002 metadata/md5-cache/x11-apps/xbiff-1.0.3
 1905112002 metadata/md5-cache/x11-apps/xlsclients-1.1.4
-1905112002 metadata/md5-cache/net-print/cups-filters-9999
+1906130039 metadata/md5-cache/net-print/cups-filters-9999
 1905112002 metadata/md5-cache/net-print/hplip-plugin-3.18.6
 1802061938 metadata/md5-cache/net-print/cups-bjnp-2.0
 1905112002 metadata/md5-cache/net-print/hplip-3.18.6
@@ -63629,7 +63635,7 @@
 1905112002 metadata/md5-cache/net-print/hplip-3.19.3
 1702282329 metadata/md5-cache/net-print/cups-bjnp-1.1
 1702282329 metadata/md5-cache/net-print/ink-0.5.2
-1906092239 metadata/md5-cache/net-print/cups-2.2.11
+1906130739 metadata/md5-cache/net-print/cups-2.2.11
 1905112002 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
 1905172240 metadata/md5-cache/net-print/cups-9999
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
@@ -63655,14 +63661,14 @@
 1905112002 metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
 1905112002 metadata/md5-cache/net-print/poster-20060221
 1905112002 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
-1906121209 metadata/md5-cache/net-print/cups-filters-1.25.0
+1906130039 metadata/md5-cache/net-print/cups-filters-1.25.0
 1905112002 metadata/md5-cache/net-print/poster-20060221-r2
 1905112002 metadata/md5-cache/net-print/lm1100-1.0.2a-r1
 1905112002 metadata/md5-cache/net-print/libinklevel-0.9.2
 1906041409 metadata/md5-cache/net-print/cups-2.3_rc1
 1905112002 metadata/md5-cache/net-print/libgnomecups-0.2.3-r3
 1905180439 metadata/md5-cache/net-print/cups-2.2.7
-1906121209 metadata/md5-cache/net-print/Manifest.gz
+1906130739 metadata/md5-cache/net-print/Manifest.gz
 1905130409 metadata/md5-cache/net-print/gutenprint-5.3.1
 1905112002 metadata/md5-cache/net-print/cnijfilter2-5.40
 1905112002 metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
@@ -64232,7 +64238,7 @@
 1809180947 metadata/md5-cache/app-benchmarks/sysbench-9999
 1807111209 metadata/md5-cache/app-benchmarks/geekbench-3.4.2
 1905112002 metadata/md5-cache/app-benchmarks/nbench-2.2.3-r1
-1906051109 metadata/md5-cache/app-benchmarks/Manifest.gz
+1906130809 metadata/md5-cache/app-benchmarks/Manifest.gz
 1905151839 metadata/md5-cache/app-benchmarks/httperf-0.9.1_p20181111
 1905112002 metadata/md5-cache/app-benchmarks/wrk-3.1.2
 1906051109 metadata/md5-cache/app-benchmarks/cpuburn-1.4a-r3
@@ -64243,7 +64249,7 @@
 1805012209 metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9
 1905211939 metadata/md5-cache/app-benchmarks/bonnie++-1.98
 1905112002 metadata/md5-cache/app-benchmarks/acovea-gtk-1.0.1
-1905191909 metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
+1906130809 metadata/md5-cache/app-benchmarks/stress-1.0.4-r2
 1905112002 metadata/md5-cache/app-benchmarks/libc-bench-20110206
 1906051109 metadata/md5-cache/app-benchmarks/wrk-4.1.0-r1
 1905112002 metadata/md5-cache/app-benchmarks/ioping-0.9
@@ -67198,7 +67204,6 @@
 1905112002 metadata/md5-cache/net-misc/ncp-1.2.4
 1905182243 metadata/md5-cache/net-misc/fatrat-1.2.0_beta2_p20161204
 1905112002 metadata/md5-cache/net-misc/ifenslave-1.1.0-r6
-1905112002 metadata/md5-cache/net-misc/whois-5.4.1
 1808221609 metadata/md5-cache/net-misc/geoipupdate-3.1.0
 1905112002 metadata/md5-cache/net-misc/socket-burst-dampener-1.1.0
 1905150809 metadata/md5-cache/net-misc/ofono-1.16
@@ -67483,7 +67488,7 @@
 1905112002 metadata/md5-cache/net-misc/felix-3.1.3
 1905250209 metadata/md5-cache/net-misc/connman-1.37
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
-1906121539 metadata/md5-cache/net-misc/Manifest.gz
+1906130809 metadata/md5-cache/net-misc/Manifest.gz
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1905112002 metadata/md5-cache/net-misc/nxplayer-5.1.24.1
 1905112002 metadata/md5-cache/net-misc/mosh-1.3.2
@@ -67492,7 +67497,7 @@
 1905112002 metadata/md5-cache/net-misc/sgopherd-17.09
 1905112002 metadata/md5-cache/net-misc/ptpd-2.3.1-r2
 1702282329 metadata/md5-cache/net-misc/httptype-1.3.9-r1
-1906061009 metadata/md5-cache/net-misc/curl-7.65.0
+1906130739 metadata/md5-cache/net-misc/curl-7.65.0
 1905182243 metadata/md5-cache/net-misc/remmina-1.2.0_rc24
 1905112002 metadata/md5-cache/net-misc/nicstat-1.95
 1905112002 metadata/md5-cache/net-misc/netifrc-0.5.0
@@ -67675,6 +67680,7 @@
 1905112002 metadata/md5-cache/net-misc/bgpq3-0.1.22
 1906111839 metadata/md5-cache/net-misc/openvswitch-2.10.1-r1
 1905112002 metadata/md5-cache/net-misc/pump-0.8.24-r4
+1906130209 metadata/md5-cache/net-misc/whois-5.4.3
 1905112002 metadata/md5-cache/net-misc/radvd-2.14
 1905112002 metadata/md5-cache/net-misc/asterisk-13.23.1
 1902112049 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20170310
@@ -67694,7 +67700,7 @@
 1905112002 metadata/md5-cache/net-misc/rabbitmq-server-3.7.9
 1905112002 metadata/md5-cache/net-misc/pimpd-0.8
 1902072239 metadata/md5-cache/net-misc/calicoctl-2.0.0
-1905130409 metadata/md5-cache/net-misc/stunnel-5.50-r1
+1906130809 metadata/md5-cache/net-misc/stunnel-5.50-r1
 1905112002 metadata/md5-cache/net-misc/zerotier-1.2.12
 1905112002 metadata/md5-cache/net-misc/hblink-9999
 1905112002 metadata/md5-cache/net-misc/uftp-4.9.5
@@ -68310,7 +68316,7 @@
 1906031809 metadata/md5-cache/sys-apps/dbus-broker-18
 1905131139 metadata/md5-cache/sys-apps/iproute2-9999
 1906051209 metadata/md5-cache/sys-apps/toybox-9999
-1906122139 metadata/md5-cache/sys-apps/Manifest.gz
+1906130039 metadata/md5-cache/sys-apps/Manifest.gz
 1905112002 metadata/md5-cache/sys-apps/s390-tools-2.4.0-r1
 1905112002 metadata/md5-cache/sys-apps/guix-0.16.0
 1905112002 metadata/md5-cache/sys-apps/restorecond-9999
@@ -68526,6 +68532,7 @@
 1905112002 metadata/md5-cache/sys-apps/net-tools-1.60_p20180626073013
 1905112002 metadata/md5-cache/sys-apps/lsb-release-1.4-r1
 1906051209 metadata/md5-cache/sys-apps/toybox-0.7.5
+1906130039 metadata/md5-cache/sys-apps/hwloc-1.11.10
 1905112002 metadata/md5-cache/sys-apps/cinit-0.2.1
 1905112002 metadata/md5-cache/sys-apps/findutils-4.6.0-r1
 1712280039 metadata/md5-cache/sys-apps/isapnptools-1.27
@@ -68777,7 +68784,7 @@
 1906121609 metadata/md5-cache/media-libs/openal-1.19.1
 1905202039 metadata/md5-cache/media-libs/libpano13-2.9.19
 1905112002 metadata/md5-cache/media-libs/zita-convolver-2.0.0-r1
-1905130009 metadata/md5-cache/media-libs/jbig2dec-0.14
+1906130809 metadata/md5-cache/media-libs/jbig2dec-0.14
 1905112002 metadata/md5-cache/media-libs/babl-0.1.38
 1905112002 metadata/md5-cache/media-libs/libmediaart-1.9.4
 1905112002 metadata/md5-cache/media-libs/libXcm-9999
@@ -68787,7 +68794,7 @@
 1905182243 metadata/md5-cache/media-libs/vigra-9999
 1906121209 metadata/md5-cache/media-libs/libshout-2.4.3
 1905172240 metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
-1905130409 metadata/md5-cache/media-libs/urt-3.1b-r3
+1906130809 metadata/md5-cache/media-libs/urt-3.1b-r3
 1905172240 metadata/md5-cache/media-libs/alsa-oss-1.1.8
 1905112002 metadata/md5-cache/media-libs/spandsp-0.0.6
 1905172240 metadata/md5-cache/media-libs/libwebp-1.0.2
@@ -68867,7 +68874,7 @@
 1905172240 metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r4
 1906061009 metadata/md5-cache/media-libs/lilv-0.24.4-r1
 1905172240 metadata/md5-cache/media-libs/libvorbis-1.3.6
-1906120139 metadata/md5-cache/media-libs/openjpeg-2.3.1
+1906130739 metadata/md5-cache/media-libs/openjpeg-2.3.1
 1905112002 metadata/md5-cache/media-libs/libpagemaker-9999
 1905182243 metadata/md5-cache/media-libs/glyr-1.0.10
 1905182243 metadata/md5-cache/media-libs/x265-2.8
@@ -69059,7 +69066,7 @@
 1905172240 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
 1905182243 metadata/md5-cache/media-libs/vulkan-layers-1.1.82.0-r1
 1905172240 metadata/md5-cache/media-libs/vo-aacenc-0.1.3
-1906121609 metadata/md5-cache/media-libs/Manifest.gz
+1906130809 metadata/md5-cache/media-libs/Manifest.gz
 1905112002 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1905172240 metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -72124,12 +72131,13 @@
 1808272209 metadata/md5-cache/app-eselect/eselect-unison-0.4
 1806032138 metadata/md5-cache/app-eselect/eselect-ctags-1.18
 1905112002 metadata/md5-cache/app-eselect/eselect-lib-bin-symlink-0.1.1
+1906122339 metadata/md5-cache/app-eselect/eselect-metasploit-0.17
 1904210639 metadata/md5-cache/app-eselect/eselect-timezone-0.2
 1905220909 metadata/md5-cache/app-eselect/eselect-php-0.9.4-r5
 1905112002 metadata/md5-cache/app-eselect/eselect-repository-9999
 1905142109 metadata/md5-cache/app-eselect/eselect-cdparanoia-0.1
 1803150508 metadata/md5-cache/app-eselect/eselect-gnome-shell-extensions-20180306
-1906061009 metadata/md5-cache/app-eselect/Manifest.gz
+1906122339 metadata/md5-cache/app-eselect/Manifest.gz
 1905041339 metadata/md5-cache/app-eselect/eselect-pinentry-0.7
 1905112002 metadata/md5-cache/app-eselect/eselect-opengl-1.3.1-r4
 1809140039 metadata/md5-cache/app-eselect/eselect-python-20171204
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 579215642188..eb1c0b5c3622 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Jun 2019 20:00:01 +0000
+Thu, 13 Jun 2019 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 18d4a5d8a976..de92d9443fe9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-09ba01b6ece75971368ea4d630269592403e129d 1560366841 2019-06-12T19:14:01+00:00
+c985eac2728fca3e8ec32fb3bc32de4415eace22 1560401085 2019-06-13T04:44:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3ab23c614f81..35f4ef49c99f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1560368101 Wed 12 Jun 2019 07:35:01 PM UTC
+1560402301 Thu 13 Jun 2019 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1c3a6eb2ac71..f0c6ebedcd0c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Jun 2019 19:38:45 +0000
+Thu, 13 Jun 2019 05:08:48 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e3060aa00e54..ead6db5a922e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index aa2c63b639b8..b231f78622dc 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,6 +7,6 @@ DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba15410116
 DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4
 EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
 EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
-EBUILD curl-7.65.0.ebuild 6976 BLAKE2B 3514cca4b250cebd505d4f30a8cc99baf4675108e8912dc477151b9e2a3ac27b0da3741246340e4a4a57728f7615ba6b7d94e8c4370c259537d948f311b274e1 SHA512 c0a0848bfc8fcaa82a08c32636883bf6bfdfc74bbeb1e05186ea640558becfbb5df5ea331f1627de18b1196ee5a0b9538f26412e5a8b5dde0148477985a5ee7b
+EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
 EBUILD curl-7.65.1.ebuild 6986 BLAKE2B b060aef8e919418996ed1815507b500c93dfb886565e184414ce968515f5ef8316cafb4232228fa6b3466583adc613f1fd6f55e83580d64862aff4e94c84fdad SHA512 ea65a7aaa2ba8b3f2931a4726cb3756fe14adcb8a44293ca3bd09d4b2482c272470e5f7b89f818a9a88866e81b1602049a0cd34678f7a4599c0705b383d3ae3b
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild
index 919241dde98a..2288b6efa99d 100644
--- a/net-misc/curl/curl-7.65.0.ebuild
+++ b/net-misc/curl/curl-7.65.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 45da27ff3f11..835067a7824f 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -11,7 +11,7 @@ DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1
 DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
 DIST stunnel-5.54.tar.gz 985587 BLAKE2B 3f736301f042387bfb1b892bf33b1baa1b93459db84cab61844bb19a423a4cced65fbc6f5c1bacd0a638596553e5f9a08ea72175c8fc31195e103615ff9fa591 SHA512 3c8f782c48fbe2dc4909e8d4c5db6491cd9c58fe0763107546d8420b8b49a02a4a1258e88282d07b31e784111c7f167d66c7c2af92f347685b393d443a653cd9
 EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96
-EBUILD stunnel-5.50-r1.ebuild 2891 BLAKE2B 0fd609cbe4542c98b2da12e9f5b10a9c7b78b193b64b1bb6b9c949556a5fce5a05719455876932f759abb300e1a0c9a737f5715c856f80504ba82c5dba9a82c2 SHA512 4ab5d9f3986182beb5fe5e1f32a1cf1e164eacecc4295dba1194a24db2dfa58a63af0d547487029b5245885cb9e87a2bbd93bcabde58b49bddc1c12445bfdf22
+EBUILD stunnel-5.50-r1.ebuild 2890 BLAKE2B ffa69c7b02614e5e43164dade91920f81f2cba817c0e8c057bc9a795c667f3f6f045697ff00499359b444c3f9e226c0ee044debee52cc2e9dea6c0bb233c637b SHA512 bd837960737a05e94d0905663ccc58d7216a054222af31b6ebc907e7855e5d6e2c995f0fb256b89df08dd77d7b8af0f0f362350f8e3f2f02ea91c6feb00853c4
 EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419
 EBUILD stunnel-5.54.ebuild 2907 BLAKE2B f2f85b3b178486d0c6720cbab05be44feeaaf238e476bc43b216bf181435b3b092ce55b4fa2ef40592f06b8f84c0f7d705335c782df9fbc7dc9c6daf4d328d32 SHA512 ae6df10bc5c499b3a8e4835334358df143fb5da32b8c578ed7dbeace2b8d297e27315b0d1639b4eabdabe91a145c9a11d1b9a0e9ba761abfeeea411e3b045f04
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index 952a61ec9506..ee1ce7200b6b 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 4221120f69b6..8a71218e6153 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
-DIST whois_5.4.1.tar.xz 83748 BLAKE2B acc3267a78c22937967cea92b542d92e99dc135a70550f242b098e0a459193564514c6b28c0290a82b9321a6a081793f64d51157c75cbe852fbb91a7cd353310 SHA512 8036679be4b5cd7ab67903ca1c949e0261bd2589f5a4efa18b10ecab8a1e13d99e5e8b839a4974af22c6afcfff74f7bd1c4361ef1aa3ebf7621a7c8a6bc98c25
 DIST whois_5.4.2.tar.xz 83832 BLAKE2B ea217d44c87fd92b6e005f344b31424a3a9481f6a892b911dcbe7794ab6e28229bb74bdea02be05ece9b18a5bd4802a4c7ab0433eaa3edcd18bb5bdd06cfe3d6 SHA512 09b10529a4cc1305802a4dcaa5090e05a4abb20863a622dcad3d1f0759d56c0604280fea703a1522af1e2ddf42e5dc34710c411f306debb420cda9e1956b3cde
+DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
-EBUILD whois-5.4.1.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
 EBUILD whois-5.4.2.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
+EBUILD whois-5.4.3.ebuild 1598 BLAKE2B cdef56fdf0815b5d0758fcf61bfcbefbb2d71f5e65200321041d700c2d6f15b236fe017c590413a9c30486d585549f04ce0ec45923a260d78c1f87897701a8dc SHA512 90a12f87d32e638db88fe81e23d1b21fa6650158f7f77ca196ea57d2254f5deaa8e01014debf6e1daf10baf3b6e830e25d4d34b4b10d2e18b6cd5645213500dc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.4.1.ebuild b/net-misc/whois/whois-5.4.3.ebuild
similarity index 91%
rename from net-misc/whois/whois-5.4.1.ebuild
rename to net-misc/whois/whois-5.4.3.ebuild
index 05fc6a779ed0..48a22010a162 100644
--- a/net-misc/whois/whois-5.4.1.ebuild
+++ b/net-misc/whois/whois-5.4.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 MY_P="${P/-/_}"
@@ -18,7 +19,8 @@ RESTRICT="test" #59327
 RDEPEND="iconv? ( virtual/libiconv )
 	idn? ( net-dns/libidn2:= )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-arch/xz-utils
 	>=dev-lang/perl-5
 	virtual/pkgconfig
@@ -59,7 +61,7 @@ src_install() {
 	dodoc README debian/changelog
 
 	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED%/}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED%/}"/usr/bin/{whois,mdwhois} || die
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
 	fi
 }
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 536a9467c972..6d87b02f868b 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index d25e67a9d4da..ed168245f1b1 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -6,6 +6,6 @@ DIST cups-filters-1.25.0.tar.xz 1447496 BLAKE2B 297f16a5580787ccf1494ae99a90ed59
 EBUILD cups-filters-1.21.6.ebuild 3488 BLAKE2B da4a24389073b98e8d081290baf781dca00fd9c78512f17c74c8e1962a2e54cbfcac5ae28fd4f2a7ad9c4d9e15b8588a88ddcabfbd33e333839e26d138bd9fc3 SHA512 48d0ab3b1f0361006e79426bff2ad563950ad90833f49aad9934c8cfc607c89fc8ab9ef74c18d832113ba35a76d0a46d5135b739619550790a751a20edf0cca0
 EBUILD cups-filters-1.22.6.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
 EBUILD cups-filters-1.23.0.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-1.25.0.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
-EBUILD cups-filters-9999.ebuild 3415 BLAKE2B c989890436b23dcf06a9de7e35be07b149e6d6f61138bc5c98097b15e0ee36f37cdd6ccd011022a433ae3cc45aac35e77ff3ed014c1b1945740f9ea6e85c27a1 SHA512 6749713a40f33310fc86c4c27bdc7171f5380cd7ca06b84990c46aeeee49d165de95d33f0f0df19901c798bde4d36acdc37790e678938ab15d68551389cd2177
+EBUILD cups-filters-1.25.0.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf
+EBUILD cups-filters-9999.ebuild 3384 BLAKE2B 91f79e3470ff93e629fe4d0058951c69439b09da27a7fed891ba71b0453922f7ce7160a5e76b2d523474a99a100807a72ca597987fccae3332115ffa770288db SHA512 0feb327adc4272a479baec21ede0df9d125b1255a4fe6093a7255aa714133f3a7d2141d51eb1c4f89e0f39e779016a9627988e0c29f3f8f3c7ce1c2ecaf150bf
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.25.0.ebuild b/net-print/cups-filters/cups-filters-1.25.0.ebuild
index 9549f96b1d5a..707a8fe57462 100644
--- a/net-print/cups-filters/cups-filters-1.25.0.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.0.ebuild
@@ -73,7 +73,6 @@ src_configure() {
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable postscript ijs)
 		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 9549f96b1d5a..707a8fe57462 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -73,7 +73,6 @@ src_configure() {
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable postscript ijs)
 		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 65c3a7d3cfac..b2d685a1c2a6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -10,7 +10,7 @@ DIST cups-2.2.11-source.tar.gz 10405908 BLAKE2B 9b7ee4da9502e42fd1b4a2c57ab709b3
 DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
 DIST cups-2.3rc1-source.tar.gz 7926640 BLAKE2B c39bee2c4697eb540cfa02ee2ce0fa8a79d7efd0a7e65db19fada8473997841e5c341c209eba8eb242e57bb21b0dbded1ca340654874b9400318ed2d9332b890 SHA512 d2411c1da576bd7d561c5465fba0824af86d7b52792482d90876847d0869a5a092de12efc761fd403c74be072c6d6eb5bf407525f187051683dba694e5f7febd
 EBUILD cups-2.2.10.ebuild 9894 BLAKE2B 4e70310a747b178a61bcaaaeb11422297876090c465bb3a94f18173a5dc82192fe4daf6b26fa891eb54203d7f8671f18942f43f8d25420551bde5ac7453f10e1 SHA512 7d2491a410d4904db8e4b3ac37b8caf9a01378c7ca0bc77d3f11d4c9c105dac14fe09c7165248de200aed4c784e8774155ca06eaa6bb47ff5b4c8bfe201f25a0
-EBUILD cups-2.2.11.ebuild 9745 BLAKE2B fba472b4339c783d3e9122ffe85063e02ba5b97f3c9f2ea28521d7627615c87bcdb0249f1288c26c8df44e255bdea979975b460f794804575dd5ed6fb1d5f5b5 SHA512 10eb29d5b9cc25e0b995101b642438f4507f877046af4593937b68db04dd8e0044ec5fd1110ad6431e3393544b51fe25da6e2cada672a40d225017db5024c951
+EBUILD cups-2.2.11.ebuild 9744 BLAKE2B 22583f83446afd68acca4ce259bce5b610c6243a32664fabecdee98e3c770ad27f0291e67e042f1ab69fa456a0190ab5214427bb9eb59d5b105535e0a33f6ea7 SHA512 648e9b62c65482a2eed5cb3da1a0041616197f4ef1e1e85b9c2362dfc9689828e255fd4641900f46830e0a281c37da13e451b914416c76bdcd2e1c76bf4104b7
 EBUILD cups-2.2.7.ebuild 9943 BLAKE2B dba68af1d04c28848774d0d8fa0728c1492653e3727ac3243313f285a77ac05946d1aa3748ab2c93f05b8dc3ba417ff040ca338b5800aa0e99a792ed50352084 SHA512 0070de7ecb93f7f9bbc559ee45da2e6f4b7bb1914fca2495da136a41b5098db6e02107a3b2ed0fb49320f965694d9085b93963f88de45c1aec71c554bf185fdb
 EBUILD cups-2.3_rc1.ebuild 9531 BLAKE2B c92b415be48dfe3209bbf8affb451374a1e76f6bcb75d4a74c32beaa7a6feb79a86a49546054655cf4b32bd208b157957719a7611beb1d4ecc18ee308d9da879 SHA512 70302e04dfc1acfa6b9f8ed6db5c974b63e2210cd94b870d45acfd58bb61beb80cb336a3a39f5fd4293625a527020a8754f546e2129ff27c118028a1734f19ab
 EBUILD cups-9999.ebuild 9530 BLAKE2B 7a5c24b50dd094380001641f0a062ffe4aecb6c71abd16c24b211bdb788f47023700c641d9c2d968fbf0ec0c4b85ea0134c517dcc941388bb83db92c2b9a22dd SHA512 01bd020f44a4ff22fb769939ec89f409cb6803fd3ab40d9fa48faaa1da917b829d2dcfcc025a168deaed5b1454cc4f3c3c4d3712d674b916591e6c78aa55511e
diff --git a/net-print/cups/cups-2.2.11.ebuild b/net-print/cups/cups-2.2.11.ebuild
index 67b8f41dd08c..9e591e4e0b1a 100644
--- a/net-print/cups/cups-2.2.11.ebuild
+++ b/net-print/cups/cups-2.2.11.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
 fi
 
 DESCRIPTION="The Common Unix Printing System"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3d6c5ab69b36..4af92a5a349c 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 67d268228eb8..806709e9a18f 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,9 +1,11 @@
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
+AUX kismet.confd-r1 516 BLAKE2B ece6cb105b23a69f2a00e934bbb43c9e8b68dd0704111c54eeb011be8c202cf5e2e533281b4a59a789886838ce7c9192c506823a397f7ab2ee95bc3237397159 SHA512 25c3cc550c53a1798fe4330c716d5c5e933f016c1b29b2ff1d79683254798cf75ef818bf5feb3a84c7e7ef10de4dd15254529e558005acf6ccdf69d9a324d209
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
+AUX kismet.initd-r1 597 BLAKE2B 07adebfd969a7f7f7ed4868049ec9d40470cee0b1158ff4dd934f68ef335f1e07fe128c40f02f92b432e43690590165cd62fb97c3a73ac996edacaaf9a5fbf5f SHA512 15df53b4e42dc71527d05f3243606b521b6700cd2e97f56a9ede77cd4e2cc2eeacc5089fbc5735da970e0e3ae9cb65d93d267c7069c72f6ffb2cd417f7550e4a
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2019.05.1.ebuild 3426 BLAKE2B 411ab8cb5c085ea6031df9dd1abeeae2693826a096f914474aa02f3a84a442f180962b09ef933b16b496dcde8a04f8304d4ce8c5a1ab09eeaea151e1328ebf2e SHA512 34a1e6c9d617bf5bcedf2d56f28311ecead912db0d6ace211198a14c7dc79f86ace08973e40b9cf762051ccac4c81f948a1c6352a77855cd4f08ebc9bcc9b00c
-EBUILD kismet-9999.ebuild 3429 BLAKE2B df2b377fbec665bd26deebe0162ca9861e2f228c497bf3da1c3e6b37a74c6da0e0d7776f1fb9ca1d2b072575a89a446a48d1ee0101666117f808fcadd27c07fc SHA512 76bdb921dbb8d8af6c38ac2fa6399ee77d62b52c30afa69f217f09f872292bc24104b1caceb9e19be54220c69d92cc11f1e5f561d1c5113c07542bf2fdf3b72e
+EBUILD kismet-9999.ebuild 3435 BLAKE2B 5a0b61d4074417391e8d4712a4d49c4728071e861ed3453f17bca81386e143bb5d3dd30467cd9fe34dc81ec23e7518092df509cdc94e5802ebaba62c120333ed SHA512 a16498604c8f363607522dae3dea555d732fa7462f00cc83fc8a24f72ec4751b0565b8de1013d7ce0d543de144057358608681bd1ab3392cca03b830c360e3e6
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
new file mode 100644
index 000000000000..42f617372ff5
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.confd-r1
@@ -0,0 +1,14 @@
+# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
+
+# Kismet configuration is done in /etc/kismet*.conf
+# It is recommended to put user config in /etc/kismet_site.conf
+# where kismet updates won't try to overwrite it.
+
+# To use the kismet init script, you must have "logtemplate" set to a location
+# that is writable by the user assigned by "suiduser".
+# e.g.
+# suiduser=foo
+# logtemplate=%h/kismet_log/%n-%d-%i.%l
+
+# Options to pass to kismet, see `kismet --help`
+KISMET_SERVER_OPTIONS="--no-ncurses"
diff --git a/net-wireless/kismet/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r1
new file mode 100644
index 000000000000..4c1891611967
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+checkconfig() {
+	if [ ! -e /etc/kismet.conf ]; then
+		eerror "Configuration file /etc/kismet.conf not found"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting kismet server"
+	start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
+		--background --make-pidfile --exec /usr/bin/kismet \
+		-- ${KISMET_SERVER_OPTIONS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping kismet server"
+	start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
+	eend ${?}
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 2ddf82ae347d..ec7ea7c64b4e 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -102,8 +102,8 @@ src_install() {
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
+	newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
 }
 
 pkg_preinst() {
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 5a2becb6abb0..8dcbe4880070 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index a4813e16aab1..aef261b6abd3 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,13 +1,9 @@
-DIST gromacs-2016.5.tar.gz 27369491 BLAKE2B 4a8bf1ae3e298ac2e26ec476130720dc3ef00db5d999e3a45fdbfd7fbfe7e94fbc86be6ff0f2f23552769c8bc851ce49c73f6fc1ab13f372523279b93e7794d7 SHA512 9cb8ff88871aa5df0967c60ba303c03296c6fa3c215cd01b26259df7753f0014f04222078ab4b84a66a1f709997837134d5c0f74da19b78322e410010c9d9e10
 DIST gromacs-2018.3.tar.gz 29915626 BLAKE2B 6e6eeafecdd923a25b4a2a78a8e89f793639b57ffbd63f19d133d8474302f9a381041f138a509dadb42b36e25fe508729e860efb6b0c75cdbf01d924b0a8fd83 SHA512 3c4d6eb3942d7b54d01c94c6f6f5ae706e0f5d4f9901ea11a56fde4df97b1a9112007f2cb13feea0f19f30c89f57ae80ff53a8f5203b8cdff103aa903cd0dc8f
 DIST gromacs-2018.7.tar.gz 29912662 BLAKE2B 0714b28ec2443f3201275fc2fa6db1202a059161362134d4de03a900a3a67fe9d31ba8c058d5ee971198fecd69379fcd389f03d25c61f50b8460c43ba5c564d5 SHA512 fbc3b847b70b1396f412b8f4a1b977268651f8d53a222dcf6349fe563ff6319e096484209a24351e382bc9162a949b3900591f5b469c32dd9effeb894f03c172
 DIST gromacs-2019.2.tar.gz 33437869 BLAKE2B bebe4942688dace148856d4491b687b8e0fd2c86d7fbd9eecdb46824d316a0fc3854464ecafa79d8db92327ee8467be204b050c11f1e71132184efd812c3bf09 SHA512 da7ff24e8485774e22d1c2464fbe64675c3305ef0e21a3d17e363201031952e5d4a9b81f572d5284fb6f2596ed99daf62fe78d653387d9d714274f46bc750183
-DIST regressiontests-2016.5.tar.gz 67641413 BLAKE2B 4fcd30c198f3acbbabf1104c040d9a686de49536a97dbeb14732bfa0ed3cf37aa61b1b0f45393668985b993d1f1862a8985e416af819cf9793f5964f3e4f43cc SHA512 31764fd99cc4185d61de5d4443ee482c27b13533451a24aa0e4899997ce275a63685424eafacae38b1a3ffd4ce0d5ebe02a90348953b04c104f91376f0edfdff
 DIST regressiontests-2018.3.tar.gz 67857855 BLAKE2B acd7a05ae79d1b4eb47d0c68a3fec9ee19f028a5019f39c37a033f48cf6da2a468375180ad6ceca9ac4f685a8bead38550663a47d6427b51f84c32a5c810e5f0 SHA512 57980d49efe6dcc3b3d14b5913a30c68fc1de5b679ef986fec1a149c76f67139b0299c3ee2825451461294fab5f345c7ad4f42e90f8991b81aafe9c369f3ff0b
 DIST regressiontests-2018.7.tar.gz 67856738 BLAKE2B 955ae8b5e74f90fec704cf41fbd00bd8c09d754f950551fe0adfcd407db6fdb4491a3815149ea37d36c747316c79d462e823b9f6b26f2376bf90d87aad95731b SHA512 c2ff390750bd99faebcd8d5dd8ad6dbf2b00113ed888bddddf985dbf95d7f347093adb67f3c396547b3e2990de330fddb7efe83ded91a72cf97c82a1dac7e826
 DIST regressiontests-2019.2.tar.gz 67643003 BLAKE2B 4178de5d62f194a81f97e442c10f123dc59c5e63f2078f7f07135709f3f6e530e0d237bf40264b285c084519d5ace75dfcbcddc16dc740c4f17233dc33542e45 SHA512 c1f25bc770d3f0a873c887d5563c1cd88179e81211b70ce6f5015696e6fa0b6931a8da7a449f2b223f3105b9e2e7eca67248e96fbfc2a7fd5fb360ba616f22ff
-EBUILD gromacs-2016.5.ebuild 7973 BLAKE2B 72b0552595f3187c91bfff89cbe49ac5dbfa1396d82f32428e1519e98aff243f5a68e1c7679386abc8eb0bbb62f40f594def4fa2bf8460134631f5c9e734c456 SHA512 a269b5bc8a484bd27b75f0301267d432d1d0ffa3389f190779acf474410401f8b81fd5ae4fec286472c99e75076da592f06566a777773518b25f2b2b29f9967c
-EBUILD gromacs-2016.9999.ebuild 7976 BLAKE2B 24237f4e253faef5df7600baafa01ac9db0e7eacee6c4a5cef6e9e17961e159c701ef8573b3cea4703511f759d7659c5bbd925c8739c1bcf172f9fdf296c7cb2 SHA512 80307361e6b22dcf182bf77c587c31089eb1e85cbda69276bcc90fd85f10a143f69b2568b4ace41104d602793de3fd7219271ca28228ae0b621e23e7c7b58227
 EBUILD gromacs-2018.3.ebuild 7824 BLAKE2B cc5ec314f5338c269d00bb8ec7af34f38134c59dd7009fc593cfa559cc68e69753f17bd8b77f5156f08999a83980d1e1c5684fd9ed489386af309f1babf850aa SHA512 d47c8c6e1e4c1dc5cd2429e5c77f04af822b5995cdd1f93a1331442dfe95d0192bda5565d3837575100f2fe841f1006cd38698ced727525c716d1925c0e65579
 EBUILD gromacs-2018.7.ebuild 7825 BLAKE2B 8ec9d3451720801d0249a6964b3df6dfd774e66a6ec790a0ebaba967d9d9fa23785ed5c229e8821de40f663d6adfaaab1c056ac36b78ebb1ce8213b0bffee7f7 SHA512 5e39cf72d8344c4690161a1ce4a6961ff2fa492167d4dc768de623c3ead7bb40d42a808f5a20386c39530bc33e9d74feca69181929a387c2fb1d41e69dfe7f91
 EBUILD gromacs-2018.9999.ebuild 7827 BLAKE2B 97a2437061a55854dd2799c8bdbec6a342586fc480785ea52de8d6b612c747ace1fba0a1fc3dbec9904cafcb3abdabd363ba0d6285cfc44f60964047c52f5b74 SHA512 975f2bcfdd93df006ec2a8f439a2a90e4c9079c58209ec2828b5647d96c29f7eef7fd0c79da844cc8d4e449b573a75884b19c951649c0028133d3fa87b03934c
diff --git a/sci-chemistry/gromacs/gromacs-2016.5.ebuild b/sci-chemistry/gromacs/gromacs-2016.5.ebuild
deleted file mode 100644
index bef5457975aa..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.5.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( <sys-apps/hwloc-2 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sci-chemistry/gromacs/gromacs-2016.9999.ebuild b/sci-chemistry/gromacs/gromacs-2016.9999.ebuild
deleted file mode 100644
index 937bdf673d2a..000000000000
--- a/sci-chemistry/gromacs/gromacs-2016.9999.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1 toolchain-funcs xdg-utils
-
-if [[ $PV = *9999* ]]; then
-	EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
-		https://gerrit.gromacs.org/gromacs.git
-		https://github.com/gromacs/gromacs.git
-		https://repo.or.cz/r/gromacs.git"
-	[[ $PV = 9999 ]] && EGIT_BRANCH="master" || EGIT_BRANCH="release-${PV:0:4}"
-	inherit git-r3
-else
-	SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
-		test? ( http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4 cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/"
-
-# see COPYING for details
-# https://repo.or.cz/w/gromacs.git/blob/HEAD:/COPYING
-#        base,    vmd plugins, fftpack from numpy,  blas/lapck from netlib,        memtestG80 library,  mpi_thread lib
-LICENSE="LGPL-2.1 UoI-NCSA !mkl? ( !fftw? ( BSD ) !blas? ( BSD ) !lapack? ( BSD ) ) cuda? ( LGPL-3 ) threads? ( BSD )"
-SLOT="0/${PV}"
-IUSE="X blas cuda +doc -double-precision +fftw +hwloc lapack mkl mpi +offensive openmp +single-precision test +threads +tng ${ACCE_IUSE}"
-
-CDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libICE
-		)
-	blas? ( virtual/blas )
-	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
-	fftw? ( sci-libs/fftw:3.0 )
-	hwloc? ( <sys-apps/hwloc-2 )
-	lapack? ( virtual/lapack )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-		media-gfx/imagemagick
-	)
-	dev-libs/tinyxml2
-	"
-RDEPEND="${CDEPEND}"
-
-REQUIRED_USE="
-	|| ( single-precision double-precision )
-	cuda? ( single-precision )
-	mkl? ( !blas !fftw !lapack )"
-
-DOCS=( AUTHORS README )
-
-if [[ ${PV} != *9999 ]]; then
-	S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-pkg_pretend() {
-	[[ $(gcc-version) == "4.1" ]] && die "gcc 4.1 is not supported by gromacs"
-	use openmp && ! tc-has-openmp && \
-		die "Please switch to an openmp compatible compiler"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default
-	else
-		git-r3_src_unpack
-		if use test; then
-			EGIT_REPO_URI="git://git.gromacs.org/regressiontests.git" \
-			EGIT_BRANCH="${EGIT_BRANCH}" \
-			EGIT_CHECKOUT_DIR="${WORKDIR}/regressiontests"\
-				git-r3_src_unpack
-		fi
-	fi
-}
-
-src_prepare() {
-	#notes/todos
-	# -on apple: there is framework support
-
-	xdg_environment_reset #591952
-
-	cmake-utils_src_prepare
-
-	use cuda && cuda_src_prepare
-
-	GMX_DIRS=""
-	use single-precision && GMX_DIRS+=" float"
-	use double-precision && GMX_DIRS+=" double"
-
-	if use test; then
-		for x in ${GMX_DIRS}; do
-			mkdir -p "${WORKDIR}/${P}_${x}" || die
-			cp -al "${WORKDIR}/regressiontests"* "${WORKDIR}/${P}_${x}/tests" || die
-		done
-	fi
-
-	DOC_CONTENTS="Gromacs can use sci-chemistry/vmd to read additional file formats"
-}
-
-src_configure() {
-	local mycmakeargs_pre=( ) extra fft_opts=( )
-
-	#go from slowest to fastest acceleration
-	local acce="None"
-	use cpu_flags_x86_sse2 && acce="SSE2"
-	use cpu_flags_x86_sse4_1 && acce="SSE4.1"
-	use cpu_flags_x86_fma4 && acce="AVX_128_FMA"
-	use cpu_flags_x86_avx && acce="AVX_256"
-	use cpu_flags_x86_avx2 && acce="AVX2_256"
-
-	#to create man pages, build tree binaries are executed (bug #398437)
-	[[ ${CHOST} = *-darwin* ]] && \
-		extra+=" -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF"
-
-	if use fftw; then
-		fft_opts=( -DGMX_FFT_LIBRARY=fftw3 )
-	elif use mkl && has_version "=sci-libs/mkl-10*"; then
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="${MKLROOT}/include"
-			-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)"
-		)
-	elif use mkl && has_version "<sci-libs/mkl-11.3"; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	elif use mkl; then
-		local bits=$(get_libdir)
-		fft_opts=( -DGMX_FFT_LIBRARY=mkl
-			-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)"
-			-DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)"
-		)
-	else
-		fft_opts=( -DGMX_FFT_LIBRARY=fftpack )
-	fi
-
-	mycmakeargs_pre+=(
-		"${fft_opts[@]}"
-		-DGMX_X11=$(usex X)
-		-DGMX_EXTERNAL_BLAS=$(usex blas)
-		-DGMX_EXTERNAL_LAPACK=$(usex lapack)
-		-DGMX_OPENMP=$(usex openmp)
-		-DGMX_COOL_QUOTES=$(usex offensive)
-		-DGMX_USE_TNG=$(usex tng)
-		-DGMX_BUILD_MANUAL=$(usex doc)
-		-DGMX_HWLOC=$(usex hwloc)
-		-DGMX_DEFAULT_SUFFIX=off
-		-DGMX_SIMD="$acce"
-		-DGMX_LIB_INSTALL_DIR="$(get_libdir)"
-		-DGMX_VMD_PLUGIN_PATH="${EPREFIX}/usr/$(get_libdir)/vmd/plugins/*/molfile/"
-		-DBUILD_TESTING=OFF
-		-DGMX_BUILD_UNITTESTS=OFF
-		-DGMX_EXTERNAL_TINYXML2=ON
-		${extra}
-	)
-
-	for x in ${GMX_DIRS}; do
-		einfo "Configuring for ${x} precision"
-		local suffix=""
-		#if we build single and double - double is suffixed
-		use double-precision && use single-precision && \
-			[[ ${x} = "double" ]] && suffix="_d"
-		local p
-		[[ ${x} = "double" ]] && p="-DGMX_DOUBLE=ON" || p="-DGMX_DOUBLE=OFF"
-		local cuda=( "-DGMX_GPU=OFF" )
-		[[ ${x} = "float" ]] && use cuda && \
-			cuda=( -DGMX_GPU=ON )
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_MPI=OFF
-			-DGMX_THREAD_MPI=$(usex threads)
-			"${cuda[@]}"
-			"$(use test && echo -DREGRESSIONTEST_PATH="${WORKDIR}/${P}_${x}/tests")"
-			-DGMX_BINARY_SUFFIX="${suffix}"
-			-DGMX_LIBS_SUFFIX="${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
-		use mpi || continue
-		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
-			${mycmakeargs_pre[@]} ${p}
-			-DGMX_THREAD_MPI=OFF
-			-DGMX_MPI=ON ${cuda}
-			-DGMX_OPENMM=OFF
-			-DGMX_BUILD_MDRUN_ONLY=ON
-			-DBUILD_SHARED_LIBS=OFF
-			-DGMX_BUILD_MANUAL=OFF
-			-DGMX_BINARY_SUFFIX="_mpi${suffix}"
-			-DGMX_LIBS_SUFFIX="_mpi${suffix}"
-			)
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" CC="mpicc" cmake-utils_src_configure
-		[[ ${CHOST} != *-darwin* ]] || \
-		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}_mpi/gentoo_rules.cmake" || die
-	done
-}
-
-src_compile() {
-	for x in ${GMX_DIRS}; do
-		einfo "Compiling for ${x} precision"
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_compile
-		# not 100% necessary for rel ebuilds as available from website
-		if use doc; then
-			BUILD_DIR="${WORKDIR}/${P}_${x}"\
-				cmake-utils_src_compile manual
-		fi
-		use mpi || continue
-		einfo "Compiling for ${x} precision with mpi"
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi"\
-			cmake-utils_src_compile
-	done
-}
-
-src_test() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}"\
-			cmake-utils_src_make check
-	done
-}
-
-src_install() {
-	for x in ${GMX_DIRS}; do
-		BUILD_DIR="${WORKDIR}/${P}_${x}" \
-			cmake-utils_src_install
-		if use doc; then
-			newdoc "${WORKDIR}/${P}_${x}"/docs/manual/gromacs.pdf "${PN}-manual-${PV}.pdf"
-		fi
-		use mpi || continue
-		BUILD_DIR="${WORKDIR}/${P}_${x}_mpi" \
-			cmake-utils_src_install
-	done
-
-	if use tng; then
-		insinto /usr/include/tng
-		doins src/external/tng_io/include/tng/*h
-	fi
-	# drop unneeded stuff
-	rm "${ED}"usr/bin/GMXRC* || die
-	for x in "${ED}"usr/bin/gmx-completion-*.bash ; do
-		local n=${x##*/gmx-completion-}
-		n="${n%.bash}"
-		cat "${ED}"usr/bin/gmx-completion.bash "$x" > "${T}/${n}" || die
-		newbashcomp "${T}"/"${n}" "${n}"
-	done
-	rm "${ED}"usr/bin/gmx-completion*.bash || die
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	einfo
-	einfo  "Please read and cite:"
-	einfo  "Gromacs 4, J. Chem. Theory Comput. 4, 435 (2008). "
-	einfo  "https://dx.doi.org/10.1021/ct700301q"
-	einfo
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 81061241bed0..9ccdde3472af 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 93980815caae..04efeb69d834 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,7 +1,9 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
+DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
+EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900ce134485c59a0b41a01120950c1c083915a2cd1752c3da2811914d8c007d7d726a1b9c8ee37d7ead9a27e92a70 SHA512 e3d6fdbb65ccfe9a19bbadac45e19c2d485b303995ef790cacbf441e30009c808dc6e2981822e246ea5db662a03eb6382ec21b63bd7d63948a6778f4da4e47be
 EBUILD hwloc-1.11.13.ebuild 2182 BLAKE2B 6597d78e44eb15ea1a24cda4633109f6c10e6198c56f298a53dbb5dd237968c372b1fea0fb84769547d3d0422039835fad231f0618e0fc629775c1f9027530bf SHA512 8b6f4536484e2712c67d079961ef353446801ed59ea04819a0bcfba2841d0bfb0c76afcceadc6b328283fc3b2db92f548f98807611e36b11211270fac540ef53
 EBUILD hwloc-1.11.2-r1.ebuild 2169 BLAKE2B 938851b64cc610349a7a204953fbad5914d238afc5f170ef48b56b7905184747c2b5d84261478a3921946743a35e2a9da0d723cc09b97f785b4acb4c32899cfd SHA512 7b5931e6e1d4670a7f8aa6a93b367351da99bce3dfcea04c88865e47a617e93928c24eefec5a6a92d85950e3081cb08d61a4aa1e0842f2d11eea670d27d487a3
 EBUILD hwloc-2.0.4.ebuild 2053 BLAKE2B 64d882e86ce13b75342678aba12510047875bda3432cd2da5682d2565c046ccf15e25d43f0433d9dd67352273fbbc37cdf0022f5fafc6e89ae53ac29c6786357 SHA512 ad144a98b81cc886152eb13c46890290f2d7351bc0973ecf79099a6735a8ec78910f35307fb66ca661b86a5fe77d0921150b63175b001de57207e2986768e5e6
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
new file mode 100644
index 000000000000..e2f6d1687b8c
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools cuda flag-o-matic versionator multilib-minimal
+
+MY_PV=v$(get_version_component_range 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+
+# dev-util/nvidia-cuda-toolkit is always multilib
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 )
+	gl? ( x11-drivers/nvidia-drivers[static-libs,tools] )
+	pci? (
+		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+	)
+	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
+	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags -I"${EPREFIX}"/opt/cuda/include
+		append-cppflags -I"${EPREFIX}"/opt/cuda/include
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
+	fi
+
+	ECONF_SOURCE=${S} econf \
+		$(use_enable static-libs static) \
+		$(use_enable cairo) \
+		$(multilib_native_use_enable cuda) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable gl) \
+		$(use_enable pci) \
+		$(use_enable plugins) \
+		$(use_enable numa libnuma) \
+		$(use_enable xml libxml2) \
+		$(use_with X x)
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 44f1e85f0aaa..f871812ec81d 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/vboot-utils/Manifest b/sys-boot/vboot-utils/Manifest
index b0008742b3da..aa1aa74b10a9 100644
--- a/sys-boot/vboot-utils/Manifest
+++ b/sys-boot/vboot-utils/Manifest
@@ -1,5 +1,6 @@
+AUX vboot-utils-72_p20181229-libressl.patch 426 BLAKE2B a67628074549b60e899f20a2589b64ab7dfe90f6476f44c2bb028f0f90b847173eb3e6ea975858a627a257bdaf2121865a7c83cd4d253cbc1d6ad412f0b8e84d SHA512 a78eaa53cc784845a99686025f20f7b10f5d285f4b145fa0e2371b4d242d489a21e91253e7a3b5cee12565c8412224556240acc555b0c9500d5a46b7b1356bb3
 DIST vboot-utils-59_p20170413.tar.xz 18431260 BLAKE2B 73853f92c5855a1fbcad55c696414317f46a06a69901529dd6da19be2abe4ca0337cf20dddc4f84f1d2a99357bb2f01df115b7d16c45f9af62dcd1b833580d46 SHA512 f92b9aed7a52ac7bab49b624725d4963564a22a03741619ad4ef1bc0a1fdee5123c68f3dad5bef9fb033f94f2a9ae99478c16386758fe4667a361bc91dda8048
 DIST vboot-utils-72_p20181229.tar.xz 18489004 BLAKE2B 444eb0bc2c571ad79d26d473da724016d6d041207beaae161f6c1155768ff9d0b1c8b7b070b828083cc1396266cc77175a75e8067ce22613c75b4d77780dda75 SHA512 41df034dc5498bcbec0d49a472331ceb2fbc2eb3b4173d5c56e920d65ae485382b3d811e5f2c13cf45a1b05a5d6a24197924fa1c76ada9c3aac14fa3c4c363fe
 EBUILD vboot-utils-59_p20170413.ebuild 1961 BLAKE2B d519504ba8c955b164395dc95b2a0bc275548c97adcefe6c90ef81bd3ebe1ec8554f4fc42d2197227ee140d5c14a3b1f7097034cbdd42f065e756758b881a253 SHA512 90bab2830cab6eb87ccb8e85f1953c6b48c75accfc8c13a46a54fefeba2cd070497fab821b0103a0e4310c42e90bd546d3bb737dbff50a4b225f05d4dccc923e
-EBUILD vboot-utils-72_p20181229.ebuild 2627 BLAKE2B d60fa4e962e8fe03d17c082e5ea8f35da186eaf6a3bd2065ad561cf190330009cc39f028886c1aee5c68650e8328f3755f8c679687e8207443a90ad36e549f7f SHA512 b66494a0ab22bc9999d0eaea7736884a7948c76f38a18db58853888145e17165810dd86a8756759e97b5f12bdb43bf8962422f1bc3384040b86fdce4b0c31948
+EBUILD vboot-utils-72_p20181229-r1.ebuild 2553 BLAKE2B 92b5f8ff21b9303892cb5c9e08a53f4eaf369bfab1ac7241807885acb2c5dc93270a2c159eb31279643bde718089f47b07467dc7306725dc4ab68e7ed2130593 SHA512 83cbf358958d9307ebd71afa7f739cdd6d851f96188c9f191deaf9c41ed6b28b249d402f92d33075361bd1af1177b025094aaea0a14bd6dc48c1ef44ff2546e3
 MISC metadata.xml 488 BLAKE2B b3c656e8e93662a5fd2cfb7559ca150c9df50831789447fe1e4aa58b99b205daa70b5bcfc98e1e78e44cf0ef89ef9a6efc8563d31c2d3823aa7c07d1ec4cf3fb SHA512 b9c53eec1a6b1db1274f2baf51915691e36678eb1cc8e6b7cc1596b4912410b86e96175cd6cd614acc044a3b2fbf8ef350ba69daf6741802e926fc3ec2c73914
diff --git a/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch b/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch
new file mode 100644
index 000000000000..6702a9f590bc
--- /dev/null
+++ b/sys-boot/vboot-utils/files/vboot-utils-72_p20181229-libressl.patch
@@ -0,0 +1,11 @@
+--- a/host/include/openssl_compat.h	2019-01-03 17:32:20.000000000 -0500
++++ b/host/include/openssl_compat.h	2019-02-23 13:40:27.521664838 -0500
+@@ -12,7 +12,7 @@
+ 
+ #include <openssl/rsa.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER < 0x2080000L
+ 
+ static inline void RSA_get0_key(const RSA *rsa, const BIGNUM **n,
+ 				const BIGNUM **e, const BIGNUM **d)
diff --git a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
similarity index 95%
rename from sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
rename to sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
index 273d3ec48ff2..01bb8a2e8179 100644
--- a/sys-boot/vboot-utils/vboot-utils-72_p20181229.ebuild
+++ b/sys-boot/vboot-utils/vboot-utils-72_p20181229-r1.ebuild
@@ -42,6 +42,8 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-libressl.patch
+
 	default
 	sed -i \
 		-e 's:${DESTDIR}/\(bin\|${LIBDIR}\):${DESTDIR}/usr/\1:g' \
@@ -53,10 +55,6 @@ src_prepare() {
 		-i tests/common.sh || die
 	sed -e "s:/mnt/host/source/src/platform/vboot_reference:${S}:" \
 		-i tests/futility/expect_output/* || die
-	if use libressl; then
-		sed -e '/OPENSSL_VERSION_NUMBER/d' \
-			-i host/include/openssl_compat.h || die #674522
-	fi
 }
 
 _emake() {
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 5d0823578bdb..5dd890160569 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index df1d1773a4f8..c1b79ab2b8ff 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -19,6 +19,8 @@ AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df5
 AUX ceph-13.2.0-no-virtualenvs.patch 4466 BLAKE2B 9f5176b7d3ee3b3602341864af8eb2494cfcc2268492d7ecf9f43576963de913c9be52259dd16c2a3ad6440eeb33604ce609fc11e7e36236a37c02b84ad81890 SHA512 7b9ab0a7e22784f66253f873dd76bb3e76cfff4781632ed51d39beefacdd1a7f4d90441aff9fd93987837fadaa847906bba32eb18c86f8a8fe31205246cbfd8d
 AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e
 AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d
+AUX ceph-13.2.6-dpdk-alignment.patch 612 BLAKE2B 7f75b53383979d5790862c91ff67b41c16d94e6572c9c387ae511401d22562493bddb296f47bef60ebf586683df36b5b62744ac30d43b1c4eede053d6ae4438a SHA512 058bf0a564a158356e5a87099ea8d1372123eeee8bfdb3c25870911dccc351f33e00793456c5c04f670946559cd49bc6a8cab5553dc99bebb570910b4a787d58
+AUX ceph-13.2.6-no-virtualenvs.patch 4137 BLAKE2B 9cef3ed31ec0ab2d13091b0b76071532ffd021a5627fa91808bb7eff382a4b29945eaa6bc529e8ee3176056caf9f62af0fb4b4210d2549bbc05f018fd4ecd75c SHA512 051c80c70a951135e2a00f6688ff03f604f89c65be47c4e00e2f72ee1a071be067cc8a7a60fd4ef78587a6b79b2b26d52d5dc3efbdcf0e11d4e3e1156483b03e
 AUX ceph-14.2.0-boost-1.70-sonames.patch 13703 BLAKE2B a619a07217895ae34a84c145930d9b477cc557d5088d1fb915f0427556330a24cb4385e953facf7cb2dcf99c1245bd25d2ebe25db56dec40648ad065bce7e873 SHA512 69f82d5f10b1237c17428b11e746422fcd0e1be735500032892d834361e636a23135cb7e6f537cbd808b74378325c24132a88f256abcce40ec1bdfe212b7648c
 AUX ceph-14.2.0-boost-1.70.patch 5556 BLAKE2B 7610a48c30fe5cf8462f498501a36c17c33289967e7d50456d6b8e6c467db89b768f73bb6e69ecd4c6dec0432d4fbb47af339f02eb510ba69770b9b122b41dbf SHA512 71ee1d583f71b2c52fee40e5105d1ff1d4b676230eac7c19f42754316c3958808304155a48992f8766eded52d3e28007b631680dca8b4672153fa44b8eccbbb8
 AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2
@@ -48,10 +50,12 @@ DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c
 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac
 DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8
+DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c
 DIST ceph-14.2.1.tar.gz 117111511 BLAKE2B c00181223c6e02e7fe696ed4226f1751eca48e799f8b5377a06621eb3300f81b58dc20f325b455df04fcbd0c28b981fae1cfc778a8d69414247ddd206d0c6175 SHA512 fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866
 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f
 EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5
 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1
 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3
+EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792
 EBUILD ceph-14.2.1.ebuild 10034 BLAKE2B b179d248d3b80566cdd061463beea542ec7013646c429cb179620f09db0c485f6e6cb6192df0c37c398f167d57e6fcbd7e0d51df543abd32ddf72a932a9b0283 SHA512 be69c25fac899365a3fb5074233fc8e6561e5f1c35a2cd21a712cc218c5aef7ff220eeecbcf1c2412fec67aca4bd147a5d35077930adf5f9a41011935eb6b905
 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250
diff --git a/sys-cluster/ceph/ceph-13.2.6.ebuild b/sys-cluster/ceph/ceph-13.2.6.ebuild
new file mode 100644
index 000000000000..18241357036d
--- /dev/null
+++ b/sys-cluster/ceph/ceph-13.2.6.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
+	python-r1 udev user readme.gentoo-r1 systemd bash-completion-r1
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+	SRC_URI=""
+else
+	SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr"
+IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc"
+IUSE+=" test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+# unbundling code commented out pending bugs 584056 and 584058
+#>=dev-libs/jerasure-2.0.0-r1
+#>=dev-libs/gf-complete-2.0.0
+COMMON_DEPEND="
+	virtual/libudev:=
+	app-arch/bzip2:=[static-libs?]
+	app-arch/lz4:=[static-libs?]
+	app-arch/snappy:=[static-libs?]
+	app-arch/zstd:=[static-libs?]
+	app-misc/jq:=[static-libs?]
+	dev-libs/crypto++:=[static-libs?]
+	dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
+	dev-libs/libaio:=[static-libs?]
+	dev-libs/libxml2:=[static-libs?]
+	dev-libs/nss:=
+	sys-auth/oath-toolkit:=
+	sys-apps/keyutils:=[static-libs?]
+	sys-apps/util-linux:=[static-libs?]
+	sys-libs/zlib:=[static-libs?]
+	babeltrace? ( dev-util/babeltrace )
+	ldap? ( net-nds/openldap:=[static-libs?] )
+	lttng? ( dev-util/lttng-ust:= )
+	fuse? ( sys-fs/fuse:0=[static-libs?] )
+	numa? ( sys-process/numactl:=[static-libs?] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:=[static-libs?] )
+		libressl? ( dev-libs/libressl:=[static-libs?] )
+	)
+	xfs? ( sys-fs/xfsprogs:=[static-libs?] )
+	zfs? ( sys-fs/zfs:=[static-libs?] )
+	radosgw? (
+		dev-libs/expat:=[static-libs?]
+		!libressl? (
+			dev-libs/openssl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_openssl,static-libs?]
+		)
+		libressl? (
+			dev-libs/libressl:=[static-libs?]
+			net-misc/curl:=[curl_ssl_libressl,static-libs?]
+		)
+	)
+	system-boost? (
+		>=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
+	)
+	jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
+	!jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
+	${PYTHON_DEPS}
+	"
+DEPEND="${COMMON_DEPEND}
+	amd64? ( dev-lang/yasm )
+	x86? ( dev-lang/yasm )
+	app-arch/cpio
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/sphinx
+	dev-util/cunit
+	dev-util/gperf
+	dev-util/valgrind
+	sys-apps/which
+	sys-devel/bc
+	virtual/pkgconfig
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		sys-apps/grep[pcre]
+		sys-fs/btrfs-progs
+	)"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/socat
+	sys-apps/gptfdisk
+	sys-block/parted
+	sys-fs/cryptsetup
+	sys-fs/lvm2[-device-mapper-only(-)]
+	!<sys-apps/openrc-0.26.3
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/cherrypy[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pecan[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( $(python_gen_useflags 'python3*') )
+	?? ( jemalloc tcmalloc )
+	"
+
+# the tests need root access
+RESTRICT="test? ( userpriv )"
+
+# distribution tarball does not include everything needed for tests
+RESTRICT+=" test"
+
+# false positives unless all USE flags are on
+CMAKE_WARN_UNUSED_CLI="no"
+
+# ninja does not work at all
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+UNBUNDLE_LIBS=(
+	src/erasure-code/jerasure/jerasure
+	src/erasure-code/jerasure/gf-complete
+)
+
+PATCHES=(
+	"${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
+	"${FILESDIR}/ceph-12.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
+	"${FILESDIR}/ceph-13.2.0-cflags.patch"
+	"${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
+	"${FILESDIR}/ceph-13.2.0-mgr-python-version.patch"
+	"${FILESDIR}/ceph-13.2.6-no-virtualenvs.patch"
+	"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
+	"${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch"
+	"${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
+	"${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
+	"${FILESDIR}/ceph-13.2.6-dpdk-alignment.patch"
+)
+
+check-reqs_export_vars() {
+	if use amd64; then
+		CHECKREQS_DISK_BUILD="12G"
+		CHECKREQS_DISK_USR="460M"
+	else
+		CHECKREQS_DISK_BUILD="1400M"
+		CHECKREQS_DISK_USR="450M"
+	fi
+
+	export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
+}
+
+user_setup() {
+	enewgroup ceph ${CEPH_GID}
+	enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
+}
+
+pkg_pretend() {
+	check-reqs_export_vars
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	python_setup 'python3*'
+	check-reqs_export_vars
+	check-reqs_pkg_setup
+	user_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use system-boost; then
+		eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch"
+	fi
+
+	sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
+		src/bash_completion/CMakeLists.txt || die
+
+	# remove tests that need root access
+	rm src/test/cli/ceph-authtool/cap*.t || die
+
+	#rm -rf "${UNBUNDLE_LIBS[@]}"
+}
+
+ceph_src_configure() {
+	local flag
+	local mycmakeargs=(
+		-DWITH_BABELTRACE=$(usex babeltrace)
+		-DWITH_CEPHFS=$(usex cephfs)
+		-DWITH_DPDK=$(usex dpdk)
+		-DWITH_FUSE=$(usex fuse)
+		-DWITH_LTTNG=$(usex lttng)
+		-DWITH_MGR=$(usex mgr)
+		-DWITH_MGR_DASHBOARD_FRONTEND=NO
+		-DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
+		-DWITH_NUMA=$(usex numa)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_RADOSGW=$(usex radosgw)
+		-DWITH_SSL=$(usex ssl)
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_XFS=$(usex xfs)
+		-DWITH_ZFS=$(usex zfs)
+		-DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
+		-DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
+		-DWITH_SYSTEM_BOOST=$(usex system-boost)
+		-DBOOST_J=$(makeopts_jobs)
+		-DWITH_RDMA=no
+		-DWITH_TBB=no
+		-DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
+		-DEPYTHON_VERSION="${EPYTHON#python}"
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-Wno-dev
+	)
+	if use amd64 || use x86; then
+		for flag in ${CPU_FLAGS_X86[@]}; do
+			mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
+		done
+	fi
+
+	rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
+	cmake-utils_src_configure
+
+	# bug #630232
+	sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
+		"${BUILD_DIR:--${S}}"/include/acconfig.h \
+		|| die "sed failed"
+}
+
+src_configure() {
+	ceph_src_configure
+}
+
+python_compile() {
+	local CMAKE_USE_DIR="${S}"
+	ceph_src_configure
+
+	rm -rf "${BUILD_DIR}/lib/cython_modules" || die
+
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	emake VERBOSE=1 clean
+	emake VERBOSE=1 all
+
+	# python modules are only compiled with "make install" so we need to do this to
+	# prevent doing a bunch of compilation in src_install
+	DESTDIR="${T}" emake VERBOSE=1 install
+	popd >/dev/null || die
+}
+
+src_compile() {
+	cmake-utils_src_make VERBOSE=1 all
+
+	# we have to do this here to prevent from building everything multiple times
+	BUILD_DIR="${CMAKE_BUILD_DIR}" python_copy_sources
+	python_foreach_impl python_compile
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+python_install() {
+	local CMAKE_USE_DIR="${S}"
+	pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+	DESTDIR="${ED}" emake install
+	popd >/dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_foreach_impl python_install
+
+	find "${D}" -name '*.la' -delete || die
+
+	exeinto /usr/$(get_libdir)/ceph
+	newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+	keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
+
+	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+	use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+	# units aren't installed by the build system unless systemd is enabled
+	# so no point installing these with the USE flag disabled
+	if use systemd; then
+		systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+			"ceph-mds@.service"
+
+		systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+			"ceph-osd@.service"
+	fi
+
+	udev_dorules udev/*.rules
+
+	readme.gentoo_create_doc
+
+	python_setup 'python3*'
+
+	# bug #630232
+	sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
+		|| die "sed failed"
+
+	python_fix_shebang "${ED}"/usr/{,s}bin/
+
+	# python_fix_shebang apparently is not idempotent
+	sed -i -r  's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
+		"${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
+
+	local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
+	dostrip -x "${rados_classes[@]#${D}}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
new file mode 100644
index 000000000000..c5d048eb7a2e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-13.2.6-dpdk-alignment.patch
@@ -0,0 +1,14 @@
+diff --git a/src/spdk/dpdk/lib/librte_net/rte_ether.h b/src/spdk/dpdk/lib/librte_net/rte_ether.h
+index 3a87ff184..8090b7c01 100644
+--- a/src/spdk/dpdk/lib/librte_net/rte_ether.h
++++ b/src/spdk/dpdk/lib/librte_net/rte_ether.h
+@@ -55,7 +55,8 @@ extern "C" {
+  * See http://standards.ieee.org/regauth/groupmac/tutorial.html
+  */
+ struct ether_addr {
+-	uint8_t addr_bytes[ETHER_ADDR_LEN]; /**< Addr bytes in tx order */
++	/** Addr bytes in tx order */
++	uint8_t addr_bytes[ETHER_ADDR_LEN] __rte_aligned(2);
+ } __attribute__((__packed__));
+
+ #define ETHER_LOCAL_ADMIN_ADDR 0x02 /**< Locally assigned Eth. address. */
diff --git a/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
new file mode 100644
index 000000000000..ad38799b6901
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-13.2.6-no-virtualenvs.patch
@@ -0,0 +1,74 @@
+diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt
+index 6e5946b784..233cccfc9b 100644
+--- a/src/ceph-detect-init/CMakeLists.txt
++++ b/src/ceph-detect-init/CMakeLists.txt
+@@ -2,8 +2,8 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtua
+ 
+ add_custom_target(ceph-detect-init
+   COMMAND
+-  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
+-  ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
++  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DETECT_INIT_VIRTUALENV} &&
++  #${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
+   COMMENT "ceph-detect-init is being created")
+ add_dependencies(tests ceph-detect-init)
+diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
+index 00aaec4a80..b0700c488f 100644
+--- a/src/ceph-disk/CMakeLists.txt
++++ b/src/ceph-disk/CMakeLists.txt
+@@ -2,8 +2,8 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
+ 
+ add_custom_target(ceph-disk
+   COMMAND
+-  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
+-  ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
++  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${CEPH_DISK_VIRTUALENV} &&
++  #${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
+   COMMENT "ceph-disk is being created")
+ add_dependencies(tests ceph-disk)
+diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt
+index 88ca8a60bb..77c716cdb1 100644
+--- a/src/pybind/mgr/dashboard/CMakeLists.txt
++++ b/src/pybind/mgr/dashboard/CMakeLists.txt
+@@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
+ 
+ add_custom_target(mgr-dashboard-test-venv
+   COMMAND
+-  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
++  #${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV}
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard
+   COMMENT "dashboard tests virtualenv is being created")
+ add_dependencies(tests mgr-dashboard-test-venv)
+@@ -13,9 +13,6 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env)
+ 
+ add_custom_command(
+   OUTPUT "${mgr-dashboard-nodeenv}/bin/npm"
+-  COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv}
+-  COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv
+-  COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 10.13.0
+   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+   COMMENT "dashboard nodeenv is being installed"
+ )
+@@ -27,7 +24,6 @@ add_custom_target(mgr-dashboard-nodeenv
+ 
+ add_custom_command(
+   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules"
+-  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && npm ci && deactivate
+   DEPENDS frontend/package.json
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
+   COMMENT "dashboard frontend dependencies are being installed"
+@@ -62,9 +58,11 @@ else()
+   set(npm_command npm run build)
+ endif()
+ 
++LIST(APPEND CMAKE_PROGRAM_PATH ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/node_modules/.bin)
++
+ add_custom_command(
+   OUTPUT "${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend/dist"
+-  COMMAND . ${mgr-dashboard-nodeenv}/bin/activate && ${npm_command} && deactivate
++  COMMAND PREFIX="${CMAKE_SOURCE_DIR}" ${npm_command}
+   DEPENDS ${frontend_src} frontend/node_modules
+   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/frontend
+   COMMENT "dashboard frontend is being created"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d9c092209d70..5f75b5b8266f 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index 604ad3938254..dd33925a83e0 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
 EBUILD xdotool-3.20150503.1-r1.ebuild 1296 BLAKE2B 2254e8e361b00d268b515fc5c9bb0b964cf800109d9b642d7fa892f37f18e4cde8cc962757a2fb5032240c7b18ea4f6281891b08e22064cb38ea5f684adf7cb9 SHA512 b6adda51b715bb0a1171b9c1ba515c03a960e2cd46522625c4d701b318e35efbcad9927e0a9aa0653e51635b4f41d84bfc4f7e3f0f6fafc0d25d37e3e65cc0ed
-EBUILD xdotool-3.20160805.1.ebuild 1351 BLAKE2B 00fd7f6f259827339c43949557726bf7bc4acdd4171201d0f64f4e22a2d3fd6ec033d20c8ae48af37c6e05cdd34b005eafcc7ada5268a45eef14d316261ba4f0 SHA512 d27b83b5a93be4f1952c75927de0775304bf474b2e491eff781339b000297c7f01f345353849336f03405df3a173916b59becdc63927995ff734b24a9da9582f
+EBUILD xdotool-3.20160805.1.ebuild 1350 BLAKE2B 40f5a3d18293cfd1aef97b74b1916494b380065f910126b8f71849734bc0fcd33d638fff988e827269c00de4ac37dcc5a7bb28d71ecc18f9afe9f97a86ff5d83 SHA512 1c26297aabcc3e86b1392756da3fbef93132030bad486d907f73458574941479975fe4b88f9a6ee9b673192b765973c2699a2b130eaadf860f347fce0beb60d3
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 8dc6d7406c21..fcd7fd283af2 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="