diff --git a/Manifest b/Manifest
index c471f2688e08..0e2820174b5f 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29628 BLAKE2B c8c902ea2f9a8d9613e11bd8596cbf68776f734adeaa27057ed1a4fac6c2b7cb2b187d279150e5ba78cbd951853c09dd38f2357e040cb68570ed33c2fbac5c45 SHA512 0da21cbc4a218a6dbf12a89ca628f7f78798d6ac7739e9946715b343ff65d5ce2bbe8be44552541e8bc015c940b3d30ee0506fa1bb77d7024be6c44683119f09
-TIMESTAMP 2019-07-30T14:09:04Z
+MANIFEST Manifest.files.gz 29612 BLAKE2B 3231fb8bd44262b42699bf3b3e3a324bcb3100b0acd0e2273b7199bdf9bc0abcf7c3f0a4114e93f5d2449021aba843502cf868d1c006a4a09081e62ffbf999ce SHA512 c2282e137e52b3a97b69a8161222c8102c9b0c2ae918c58829f68813fe5880fe3fb1e0815a2a6a2e38ccf9b5c673cd3f28bb42a22157098c67d0e217039a6256
+TIMESTAMP 2019-07-31T05:39:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1AT4BfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1BKXVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkMQ//QkmE5GI91XHiwTwp61ynLXYXV33zRVdU+7rRga8kwKEU+g47Pil8aeyf
-ZJ/xuB3Q3T74NpXCHGkznZfNwXlCIVe+/uehfQFTwYvE5oWAgKfS+lAINjYueCy/
-2cmbO9Ql6i61cRoggXsQW9ZI77XAFNYwJJWTMdwm/O3ybTMoqMIiw1JQl2gK9Xyz
-GCwmd/wYV5j1/B65Ftpdi5/+i1B1H2i5XZqMskCctli1AI4jWfOoJyoKncRFKW2V
-GY0rn+zgLPs4ooTUsezFJAvPwCD4Rlm36IKlt4g/Zo6jdMgn0qAKiGrjwhTGRxnK
-26RIguqrNk3bT0MgA16LfENb/izeFJT24hUC97mKV36t8nhj/MjigHWzzv1L4PDV
-jQQKYMYw9bD9cPVE0T4DRZrGwvKhV5igioBOrLUojH00bNMqF+KySq/lYlj4S8Ek
-r+Ww6IABySh+qT3lB3lvEIqyvdVtd/Ug7qZAoN2wllhSDcer9kx+FkTzTrcb6cHl
-4SpSMD0/uDYAX+CwcdVDghV6FlPJMAvfTWBArofleeUyU3tNnor30UOOF4qb44Ln
-cfP4lH5K1ar8hyA8p2rRceQmp3JJQz754lR3YMKNfoiGTpFTFqPIQdKHdg5C/kVj
-CqJKwM7JSBrA+vwANhNQWKUOzgxwZFtlERQeCpDRKVA+xcOyv38=
-=fVsG
+klAjLg/+PBe4f5w10Gk48PwGrrHpCha34bUNZfTwvYuHiZcne4lrphZGPlYmp/Mz
+T3vtr0eY5GYXvD4ooerwElBJDDrZePKoViRr/Rlg/xf9KfMcYs11Ahubr9DZuVcZ
+SeNZ4dA7RqfzCVn40be3KD3/Ed1/9zAreW2hIx0yGaiopgQ5CGOFbvE5BewuVJ/n
+or9X5BUgtovnqCB/h8X7GKAdd+ddaPPTNU6+Uz3febHRB98hIB9iysFEHZUWhFSA
+kpyjYmwKqoQQtM3GRVmYDgWAog8laPi8p9KoT8UYMki+ymv0yiVmkNsTDe8xJA/3
+0JSjx/WKFed19zvHkYb2IOomjeF0/FnaqkNdC7tcpq052SupJu+o50xDte3UOWTB
+LI44Y+b4geDbS7cN1v6XCBODbK5DtVjMccrvdw9sNfXtiVPQvUoMiKGMXc89SrR5
+ZR+BaFRyDiRYP2JzSGg/eTy2k14Es3h2rXbqgIpe7IgGhSgck/kJQJiABpj5/EBR
++3Q+1v2cVlwUVInkuoJ0QZ+/P3ywnCIaibJBWKwI01Qg9wRn1U3czwJjYLqvQC/5
+k+woCkytkwl62VrqytxL1oUlg0Y8p+2uBGfRPMtZVT3jxmFo92SQGw7Mgbjqb1Yc
+PXhtDAFZAZvkBZe09l6BfreuKscFn/r63q6vxU3dUe3m2PDRLt0=
+=0Cx9
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 063afc4756db..e396d4d9839b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1f6aa4c488ee..9a8b917d8021 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/reportmagic/Manifest b/app-admin/reportmagic/Manifest
index 40f40bdaeff4..09b46885b1c8 100644
--- a/app-admin/reportmagic/Manifest
+++ b/app-admin/reportmagic/Manifest
@@ -1,3 +1,3 @@
 DIST rmagic-2.21.tar.gz 451179 BLAKE2B b52d8dc7473d8679c0698a4d053a9740e72242b5e4de75b9ac44b9f38709c81f61da3b2dda814f5ed1e503192891fe33f070fc037e88fe7cc26c542fc67da02a SHA512 ed9f4e6f8d6160afbe138125c4cb65010a08b95390117ebf07ccde289ff42b78664b1fe677e23f46a221d153889f807c545329936829fceeae4690b00732a637
-EBUILD reportmagic-2.21.ebuild 915 BLAKE2B ca5be4252741dabb895e444c0f6c104b9b7c667c227ee25014b285efb789872bfd7f324ee344f6042a623a6d53d7d4550183bb10a3e2199a9e1b44cf92e952b5 SHA512 e02d7013ac519ce0568a46d1d7ce66dd6de2f2982aef7f9e8f9aed9f120e448a12e0d68a2bcb505179283972bd6c0898d89132931ceb3c5efffd6586b2a81d72
+EBUILD reportmagic-2.21.ebuild 918 BLAKE2B 0a6d0aa7bbefab15fdfaee46e525a51dd9745236a3487dd580b84b42afe8a22d08fdb83e26929793029dd09a76414a0051366652a4bafb3ea2d33f276304e38d SHA512 38dfcf32628ef422aaa461a57ce27f82e9674a183f2820b7dae1f5917e4e17c3f9e8dc560bf5dbe19b6e0f961a24172563cfa06d5c8eb1b40ba6899ca5e0e032
 MISC metadata.xml 275 BLAKE2B 3d57550415af007a55b63e9043ab4d6a6e77c51dbfd7e1e9368e18c0078e7a9f096ef3d5dbaf4d65ed3cf1bde0d32b184724ad06c93e654d07f9c4b83b1d04fd SHA512 8c3747aa12bd26e790ea267481292eb4ebfc2d27b7acb498547aae3d8479654ac9d13aecd61a49be21de831924ee3fb809d4da5a4c765127af10e13a9cb32fd2
diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
index a0214e8b9306..2993a06ce843 100644
--- a/app-admin/reportmagic/reportmagic-2.21.ebuild
+++ b/app-admin/reportmagic/reportmagic-2.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.reportmagic.org/rmagic-${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="truetype"
 
 DEPEND="sys-libs/zlib
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 399f5c4f0d1e..ec1d9818baa3 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-text/kup/Manifest b/app-backup/kup/Manifest
similarity index 66%
rename from app-text/kup/Manifest
rename to app-backup/kup/Manifest
index 66f9c15b4326..cf7050903255 100644
--- a/app-text/kup/Manifest
+++ b/app-backup/kup/Manifest
@@ -1,3 +1,3 @@
 DIST kup-0.7.3.tar.gz 1024916 BLAKE2B aab2a1c58bc7feb6cc734a61385841b9c9b47995ba0c7e66b0596ddd7ae77b2a2b750f23f452e591c609f4a59a894815f8cfcb82c8bc266769b6e908463c009c SHA512 62609eb3c9a873045a9f02d22be5413f73f909e77d82f287ff5b2f816d2d6930a8d8ca77537a52189a98fe11441eb10f5530dfdab02ed0c09b53a2c4b5b4be80
-EBUILD kup-0.7.3.ebuild 1243 BLAKE2B 5a53390bc079e48123164cfbf3af8cce52dd2f3ad77cd0e08073f21805ca616dfe542bba070e79bb0b652db760066e282489d0d5df4beed9d9bf6a53f2cb76af SHA512 05bd9f7580d5df45e8fa10136ab0d8e69c79079aa7f7299ed59a21484dd27c55dbc9c49d784014901f99c51a76942235b80226a4e091bc96401d709b54ca47ed
+EBUILD kup-0.7.3.ebuild 1258 BLAKE2B 2671ae09cf4c268166253c2659a26caca327f9850af29792046efdb5af50c3bfe5e47b0f8b8f88808d92fc1924d8350f464890e7bf08a80808490ff10293425d SHA512 fb1645a3ae19b408c9c85d0eb9aa3f65f5afffb42c17c4b6f59c0ef7450419845fa1238715dd8ebdb43bba648c71f8540723133b6bfd7732803ed71779ba30c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kup/kup-0.7.3.ebuild b/app-backup/kup/kup-0.7.3.ebuild
similarity index 98%
rename from app-text/kup/kup-0.7.3.ebuild
rename to app-backup/kup/kup-0.7.3.ebuild
index 1096cae5cad2..36e2caeb59b5 100644
--- a/app-text/kup/kup-0.7.3.ebuild
+++ b/app-backup/kup/kup-0.7.3.ebuild
@@ -42,6 +42,7 @@ RDEPEND="${DEPEND}
 	$(add_qt_dep qtsvg)
 	app-backup/bup
 	net-misc/rsync
+	!app-text/kup
 "
 
 S="${WORKDIR}/${PN^}-${P}"
diff --git a/app-text/kup/metadata.xml b/app-backup/kup/metadata.xml
similarity index 100%
rename from app-text/kup/metadata.xml
rename to app-backup/kup/metadata.xml
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 60361e29c018..5c1c209dc681 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index a84de39d1e53..f3f253fad286 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -2,8 +2,10 @@ AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927
 AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
 DIST free42-nologo-2.2.1.tgz 7398286 BLAKE2B 041c9672305b712efab8e7d5eb73bc0bd159b5fd61e9ecf39d5ce691aff045be4a6a4c635c0948e610e51832db64b388bdd001eb57aad41724e27dff4cf95a0a SHA512 2ed735ff161ea14ca5be97131b69065410faa699ed05d3eb94abbb9653c694d83fc4e45ea2bcf0c2a7894f89e731ee7839105dc1d58d6a6326047c9bd55da5d7
+DIST free42-nologo-2.4.2.tgz 7403471 BLAKE2B a2dba75bbdb8ceaee2f11dbc053ce50d71e0b5f46165fb61c6d3441326dc43b2afcdc2b99cbb638bbc59e19c5da948ce748b76ff4c612d5ed44e706583b159fb SHA512 046a42aebf1b4220acb9227dc365c26349b7a69c39d765b5ab59c83d9fc644055324c6288aaf87e6f9265310b5969335bc8be7035a84935fd7dda29bd9caf5a7
 DIST free42-nologo-2.4.tgz 7402688 BLAKE2B 5e1a46977a3e385fc44f09b5e0088cf73f4a67c3657110311e95795a5b7beb2583dc56bee14e0f578f6ee3517acc78b311b2da0e1671c38d7a5bb150c1e30197 SHA512 a74efd40a952892f346bb4c4096b6e0c00c337e782696de1064d626ea1bbc8aa5a9b557ad233ac92bd27ce8fe4202837e72eddf8f0b31c9320e8c150c6c0b408
 EBUILD free42-2.0.20.ebuild 948 BLAKE2B 59ada24ef7746d402bfc2e9cb8ea80c23a68e3ffcd1a3da035281d7544422b21ee3c41fe005721672a180f97a850a7066f3a8087f4aa377fb4c0b4e6233fe49f SHA512 3c117630b0266091dff0b540c1975f6e5c69ec46d8a1f8ad55d7757147df9fc2a6bc9bd3bcfead241cfa8dde29deed727bc1bf39e1f833aab686f2c98504a123
 EBUILD free42-2.2.1.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
+EBUILD free42-2.4.2.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
 EBUILD free42-2.4.ebuild 1039 BLAKE2B cf5965b23191d1c38450c6643844ca476f3b812b7cda7f17e963c1de3a4d0ff9146ee9a913131a208cf5567a01e92b19fc1700eee272a71f30ec1c51e0262018 SHA512 8b60d1a40b493a0a72c8b4f36fca1228c6f64d5bb7758594f923f2c6dd5db480381401b666b8a485012fd12a55b538e610b02000d2a394eb6516242b9473b4c9
 MISC metadata.xml 547 BLAKE2B c7cdf7e2a312b69ae94b467836751bbf61dc771e58866edc21d70bf1b15c776afaefc20a947f6dc8af6586ec2b5e3416bd32446ca3a92890ed573daad6e48d38 SHA512 99885c9a7abecc41f53a946d1b94d2f8d8fda74f0e3f0a0cf6a43a418a874922594841e17b6197aee9f80b007d7633f2154ba85cec81dcfc22efcc7b52edd15d
diff --git a/app-emulation/free42/free42-2.4.2.ebuild b/app-emulation/free42/free42-2.4.2.ebuild
new file mode 100644
index 000000000000..73ac9b4e00d4
--- /dev/null
+++ b/app-emulation/free42/free42-2.4.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 toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.10-fix-makefile.patch"
+	"${FILESDIR}/${PN}-2.0.10-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+	default
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+	emake -C gtk clean
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+	default
+	dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index fc7bcf1a9346..d5215c846722 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,7 +1,9 @@
 DIST slirp4netns-0.3.0.tar.gz 180149 BLAKE2B b7c552b5660f4be4a95d573ff51bbde1dec1daa7dd0d5a6c49b3d761743561e8211972d16e588519bce41eee0dd378837f7de3e4c7ccb37f13bfab21008ac640 SHA512 85eea233531123297efa5e7225cbda21c10ecb297fe13cd8bf75f8d18052bc8533c2db8ce6c1f7876f42b89e31ed2859eef33a3979cad95326d0c4b19f2871f1
 DIST slirp4netns-0.4.0_beta0.tar.gz 171557 BLAKE2B 0d4d26560807559e1783ab53086236235314b55503245474e34200be2a24541c7adfacfea7cfc91e97a5cf68a0c1c905db5ab4e38d91396e16e2bbed50f35c39 SHA512 5c6d3d55f39cb758f61cb408f5c2f05a7f31ba7d84c47dc3fadd7573122eef30eab643b79f16fdb76074b5ce485f22227390ad6055362d55d9e2352d7d490cc7
 DIST slirp4netns-0.4.0_beta1.tar.gz 171766 BLAKE2B 814151f588c431dce5e02b108051886dd1ba40027eb1b72280e7621529729bdeac8d6f4267a01b3a09f34df528aa42caef517fef5decd854fd20ece608bb3590 SHA512 459ccf75dc5a0e2d768f1553f5ce9f85a23fa7ffcbe3da57205290c2868cf0fb3fe148e59590be5914d215e7727df6f97f2f21d5e33b9463d119d307680c3071
+DIST slirp4netns-0.4.0_beta2.tar.gz 173593 BLAKE2B fd827f92db03eddea86bccf401ff67535343cf759353e3c221fe1d3de494e8cc0c83169ef5cda900e512aeb16cfb7e5ba6181729483fa48d8f3257d70035a41a SHA512 38b6a1fbaceece1fe151477b3bc7db624e79e2b7913f5cca9e826a5f4289e53cfa584cfb90a5a3520e3e342eb803ff8ae090ca9892ea1051fd79ce802328e578
 EBUILD slirp4netns-0.3.0-r1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
 EBUILD slirp4netns-0.4.0_beta0.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
 EBUILD slirp4netns-0.4.0_beta1.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
+EBUILD slirp4netns-0.4.0_beta2.ebuild 785 BLAKE2B af10a9e9dce9c2704471ac8f46d9b7972c4a3192954bf8b97b0b147db590a570973f1f52e05acae8f9facac15bc97e88a13a4f6663a305d042684c7e32ed23ea SHA512 1622a35e5e6baee1617fdf060336c3ef425faa605e0255471666c0227ebb320dcde9560058ebfd2a0dd1746ebb4f2661f0f6311fd0173912033ac20245ec05fc
 MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
new file mode 100644
index 000000000000..87e485ef0571
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_PV=${PV/_/-}
+MY_PV=${MY_PV/beta/beta.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2=
+	dev-libs/libpcre:="
+DEPEND="${RDEPEND}"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You need to have the tun kernel module loaded in order to have"
+		elog "slirp4netns working"
+	fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e0c36f35c1d0..c82dd4ebef43 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 431a48a7598a..e3c7ca921255 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -4,6 +4,7 @@ AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.5 2050 BLAKE2B 51908266d476c0fe21ceeb01e4fb9aede5ef70944025a26dbbaea582253e32442a938e39842371397b15c70ecfc9ae4abc8f549f75c3fdf55e1d09e16c25f871 SHA512 127f050a322ba2fd1ca92352ccfc9e3abf5e768b0c1b6e6fbb73633f4aa8fb3dbc8c9118428ed56070e91e2141edda2cd488185a272f0d0022e88ca32172cd7f
 AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30
+AUX elasticsearch.init.7 2158 BLAKE2B 934840e6013bca18282ceb6566bfe4fa9480a72a458bf1fc0566f4651e9e749ee9ff90f3bac2fd1cb75c5f7a3e91842a751af00b6245292600ad56060318a8ec SHA512 b847b089c18ec10892c395017a15f1f6e5af42055b11252219c832877f3f5d6c78988af85eeaf671fdfd9a7155ce19ea8e16f70bfe86c4453ea0174908eec520
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
@@ -15,15 +16,18 @@ DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee24341
 DIST elasticsearch-6.8.1.tar.gz 148584086 BLAKE2B dacc3fdf142fc46ede2a5891f95f69a1200632c46b57eb03f948437a39ef92538da7d3e64afd52c4acae478e6758b355729f8cbf8ceb91aa3d34353ff434fed4 SHA512 1d484287e9b67b16c28f1a4d2267e7ceb5a4438a18b26b3a46d4a176bb3f2f6fcadcbda617a7a91418293880d38c027266cb81a4e8893a28adee9fa693b2318b
 DIST elasticsearch-7.0.0-no-jdk-linux-x86_64.tar.gz 149074223 BLAKE2B 3c210b81de8882f99be45adc811c3867acb276978d3c788db5cb00ec0eacd0f096933849dfa066160ca2ec05e3fa2962329b200614db9927e4424602da53508f SHA512 b499aeab6a3f883547974b36221fd808a9da70ae0622856582287dcf729c3a2acfb1faef2727b17be97f64d8bb56ac5cdbae6d63f2a146027153f170ae6d91fc
 DIST elasticsearch-7.2.0-no-jdk-linux-x86_64.tar.gz 138948007 BLAKE2B 0e03779669f6113eac1561a3a907d8a3286ac7c7229e0ff7ad46ede4f22a2829f8d2ffafb319427f789fb95cca6669c59f8d840ec83625889bcdd6ada91be1d5 SHA512 b49a6d6b7361c499b1d9a9118746229113eaf4b88c1ad755c1ae8fd713428db4bc296cd75f3df58a239b09d6a8281f670f69c320839ef000596c776141cb1ce6
+DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
 DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
 DIST elasticsearch-oss-6.8.1.tar.gz 68419519 BLAKE2B cf34c4cf095b4271d067802df8130d66167e5f01fd0231361ce3e7f5e1023b39e6fbc325cc575f2c353a30b011127934b7b7a04f9a48998f88d27ce8a5560bf4 SHA512 cbcc81b8dd3a7a63c6e6574405417821c5dcd1a0b5df813818d39353fa29ea28e443db64b1a1938a1ffb23aa17d706e3edb6a46fdb24992b92f918d8d4f0c08a
 DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b277dc9997b155b54217f485c314a7efa35777bcb81908ce900e134e62d7ef14629cfeebcd3ebb724b76fe5380085ae6b50df46bdfddf5f657a0d2da3eb SHA512 ec9381d9310145b80fb2b8cdd7b7953ea7b2b45a66bf8435d8a982aed0eeb59f734f3936b4b40ec4530e106878d25c2f63d4ea7a734b12f1c8d86b39f7894963
 DIST elasticsearch-oss-7.2.0-no-jdk-linux-x86_64.tar.gz 68964879 BLAKE2B 6bebff074d9a22abaf1a7b669d9a47254a658f4954b2e27d4251860a0b8cd29f4bbc3baf217d7fb90c492d5dabce802b1e4d359531202e677ffcfd573b51b343 SHA512 a538c82dc177a66004912ce20b1b50ee1270e45b56879b4f0b7e2d4bfa00d9fe5c113b5e4927cb6f5669f8a1f2f4953c4bb12dc4a10510af4658bbcbcaba3cbc
+DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.1.ebuild 2579 BLAKE2B 8581c232ba6a291994a61ef4c9406bfaf0fb6590fee36c60cab0d319a8a0472e2899fc2e136ab4267c1b6d6d52d601d4d4cb7fd5090ae05e46b63856dd986974 SHA512 956ab4ca9d9d5643ea3045cb15d6e98c6de74fe4bed56b4e44cca9a5b9073ad3d04fb24c8b7c04bb0dcee7f0a5baa9a44aea8e00999857fe51437e42bd6015a1
 EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
 EBUILD elasticsearch-7.2.0.ebuild 2478 BLAKE2B 152933e675b5d159de07e31592f883d16206201b844056c3e27ba69b27769700ff0891938e017deb0600d3be08b1d172d2856b482b7a98887f648ef54f151e49 SHA512 de5df3dae8215eb3fa3cb2306a0da5b87e3dd4135b8cbf663fd297d6b8e074b643b4c611f34da5ac87fce7658b46efc7803ff92f97b44cd88ae6af5d98fd5e8c
+EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
new file mode 100644
index 000000000000..37f142d87742
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.7 b/app-misc/elasticsearch/files/elasticsearch.init.7
new file mode 100644
index 000000000000..cac781c968d1
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.7
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${RC_SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+JAVA_HOME=${JAVA_HOME:=$(java-config -g JAVA_HOME)}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_args_background="--daemonize --pidfile=${pidfile}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	else
+		"${ES_HOME}/bin/elasticsearch-keystore" upgrade
+	fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 023672da919d..24357a6f3d08 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index 76f4f6a00546..ea42dc1850ac 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
 EBUILD capyt-1.1.1.ebuild 619 BLAKE2B 39f761d1aaea36e271dc9dcb532c05a66012daff02f7bcff75b063813ce5e3fd0ba8e85ba2487a8602685e3542ef1c1fa32cd333fcd1709ac3028b37fa53cf2a SHA512 28d490b8e6e6ae460f65efb9e33dc00923607d91a346e668851728a63e7a6ccaae51b22a3a95a9ccc96c30052c5a24dfa3ee0067226695874ef2bb583d6f348f
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/app-text/capyt/metadata.xml
+++ b/app-text/capyt/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index 167d671c593d..c7bd5c2bc615 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,3 @@
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
-EBUILD libabw-0.1.2.ebuild 858 BLAKE2B d34d26962595d570d4fe4b654ccc2f53839af6dff1225e588476c31a13bbc285b5f168ab8b145f52715816c7baa5d2b9af8a8039d9e695f371462489b6418882 SHA512 0d086a178924935848828d4e3805c8c487a9e8f0ff872bbc8b103d504d8b596b7229a35aa3816aa174ddfe7959789264bc02418d723f4b78285e1254dfcfdee9
+EBUILD libabw-0.1.2.ebuild 854 BLAKE2B 605b465b931a138beac45a6084d9cc2b0000e57f7cee102681cd56fe3f56c963309d0556ad5bf1f146b5de33246a5337ad024ef3f028b3530281f4a99aed6b5c SHA512 448e45210f18856a9713b959256dc4b861ae7004efa546a0295ea261fbc13a1aea5244e1ddeb93ec075dd6579c301b1a60526b84c0272221e1226b6af292ac33
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index 99ad555c2b0e..55a551b2fc4f 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index 595844547d40..4149fa711c0f 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -2,6 +2,6 @@ AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04
 AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b514569540d940f433b5d293a497e211782059186688d94db8139b1f9f0859180f59ea4ac7c0e9c86ca10d11a934 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.2-r1.ebuild 1079 BLAKE2B 8f7c519b161b6fdb8d6f0c55294fc2de890ad0d16086146b1316ad3794422d69117994359a4b669d2388eb905531f62cd7b89337f7a256b36b4dcb2d0d00f4a3 SHA512 2ec5e9b00df55ba2c20c901f2512fabf5b3aa5a4ec8812f24fa83a162dbc164f7f86c658e07b850c8ce9f58410c5ec227e45c51400fcc04a7ad4ac5830cd310f
+EBUILD libebook-0.1.2-r1.ebuild 1075 BLAKE2B a7d25b9a34b217c50b4d687c3da29fe3fb43db886a09d2f47f3c17fbd0de02e52189b1f8ff53305afead4d332ea1e14f02420e0d88416ec68b8c529bb488ce46 SHA512 31b59ee0ad73f50e34a3c344902952a429c25b55f48e47832af1f27b41851084bf0cb0bdfb6957db243c87311d66bb71349a2f740325bd60d81b168c208b43c2
 EBUILD libebook-0.1.3.ebuild 1018 BLAKE2B fc52e8c376ca1ce72502b752f0feb5817e7e165c926860989e04645e658992502942584d6aaa7c9a156ff5b82329d8d8631daef0579ece9839fd75e273765c97 SHA512 97db9fe34881c30583a616470212182e7553c475c8dae1999555b85519318e55cc6c4e15d25de4678ad1681b6897edfbce89b247f01d8234f8f8a161b308b6d9
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index e30d1ced7b2e..e91c7a75c406 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test tools"
 
 RDEPEND="
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index 04fde756212d..7418d1252236 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
-EBUILD libepubgen-0.1.1.ebuild 718 BLAKE2B c0cce96af57e952fba18766c1aaa4a127909b50c721877439b742d403e20869d2beb6796f7b741e88696a754f31270496e10bc0a3dce2686e568200a74e518f2 SHA512 c88f740e0b65846d749de01550e180e0d735cbabc6883ff9d187fe616e7b65a101c37c4ace2aa6af79b20adccbc9ae14af98c91465241f6d3f85149282b72865
+EBUILD libepubgen-0.1.1.ebuild 714 BLAKE2B cc26874f30252435c86a3dbf52dc433619aee25c9e0574727e00939b543d723b39c3524338c85dc8f25849863a1cf6571f15ca965b90799058de4ee30a6cb3da SHA512 faf13a9ce9a35dfee5ec71fbcc8293ded2ba9be62124c49048909c2764c5a1f9f58386c5f379119be4dbc19e662c705b53c538a0adc7460e68ac3dd093b21676
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index fd9039c5978c..da571d0a4452 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 35ddd2a7322e..a400bde39d20 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 628 BLAKE2B a8dbab7b39a9fb9b8558ef49da69ff21533e1e0c89882e49ddb1faed7e10c92cc89906807a835d0ccce5415cb3c6b781f505294067f10d80b2988c3fcee2cc8f SHA512 ed2e2d1682016b352f142ea8ee01cd9d64e144eeaacb0549a780bffe49f339a3ed35aefb03585ba65b8f62e3d2075e32469a3100800173345747b4cc6f37b5e5
+EBUILD libexttextcat-3.4.5.ebuild 627 BLAKE2B b6e418e9e373d92897d17d4750765dc809c627dffc8f83593879d67d61aa26a960057ac4a53d06a65c42145aeb7853c8eddd030c9a3974c8f3855c5679616898 SHA512 7f8ba955d62462b616cd0d0d3323a04235aea1569566d1ae14a8216328b51362de5833a11ba4353c64b5ae3630049406da212c436d9b36895d8faf5ddd7169d3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index 783d78935393..345828583432 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index e44355874684..49a3fc1d23c4 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,4 @@
 DIST libmwaw-0.3.15.tar.xz 1289744 BLAKE2B 9aed923542e795904761e4969299785906aa65c735541788d91eb41e80420ac6c6df4df5e0cfa156c71d4e100c601e5e984de10c6a5f66eebe6ffb5f0374cc1d SHA512 0b2443fc6bc9da9247f7585743424df440f89317af989018d8b972864bf91e3c5cd78c39094a45d9de8114906b2b2a93f68ddb967af8565e4b499f643d86e682
-EBUILD libmwaw-0.3.15.ebuild 1025 BLAKE2B 17b65521eded14318a96cff1732805277042d850826b56b4f53a2b5de13c44e18a62eb22c99bc7bd54da34bdf483b2e8bfe06f929270d0c2d3efa49bfdb31021 SHA512 7c96b598b5d010b85b2fd46c89ac09ab41775673e8fe51f16ecf485d8c9871d6810a040cb8de491f2f0c94fe733992b559337343ca3675160345bb75ec7ce836
+EBUILD libmwaw-0.3.15.ebuild 1024 BLAKE2B b83e05b736486bae6f4baf0f2f4f0fd5bbbb831f85b671e438d339739ef270cd8cd2d7237302e97d2eefad7016ed06439bfbde6e79a4cc5e50ed35f2e9c138e7 SHA512 35756c8f95801ee8a6f424ac812b182ff5dd12196e38bab7c162a2bfb0f2a43259bf00cc70df800f7b4699aa7f8be2ec64b1ebd1653c717fe0dc3ba407e032fe
 EBUILD libmwaw-9999.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.15.ebuild b/app-text/libmwaw/libmwaw-0.3.15.ebuild
index 6ee596d45033..e32ab9325291 100644
--- a/app-text/libmwaw/libmwaw-0.3.15.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.15.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Library parsing many pre-OSX MAC text formats"
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 4c702e621bb5..a565b4d901e0 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,4 +1,4 @@
 DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
-EBUILD libodfgen-0.1.7.ebuild 836 BLAKE2B ae63e6eaa67ff60c83107878e09319d0c5cee67886f845cacb3f179444804c09762c957c34866d08adff1b07117084a9f1bc56f4bf5c798fa4182d1e783427e0 SHA512 fd80024ced4338930497c47c9a90c37cf529558bf80f6adff711594889743346e1fd20b2b057260aeead230061c5e6130d8cf8145fed3243f31f29991a4e4864
+EBUILD libodfgen-0.1.7.ebuild 835 BLAKE2B 43fc3f7b2c4e7bad4d5e11fa8070e8b173c20956a5c22c51a8861982ab24194555840ce02fe9e83e64f4cb0b4947196d1818a88c8ace31d254e3e9f5efc9213c SHA512 067986c043c2e4966d25e3fd9722718c30a670cbdbdd6980b8d7ec6da604cfe5fd239d28dfe67a46bd0a1abc606d22749347ab777551c46be440a0a636f21160
 EBUILD libodfgen-9999.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
index 0f71db5b0fc6..7d98bc7374e8 100644
--- a/app-text/libodfgen/libodfgen-0.1.7.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 376fbc8df4d7..5ca6d5f340a6 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 792 BLAKE2B 40a2127fd6244e2325dca9ad5049a36e68863d9980f496d1db879c2774512f667168cec8edcdaece381f5cd2bc83256ca697b01d1ce8c7f4edf35690afa6c81a SHA512 0424c54b1bde5a53883c314ea721c384702dd41fe427f9efad4daa6576988664dabbe3f19929007361c0c98d84923d63debd9874aef28defe43ee49a0d5c4900
+EBUILD libqxp-0.0.2.ebuild 791 BLAKE2B b1b867d53532481ec393b42d5af4436c24cb7df2e769507e1afc5b2300d68ef953e7f32b5f6cb2247cc6a63171a3fc4d08b21c429fdbc3f3af812ba0e5f38624 SHA512 4becfecc0a432ce757f43a3b25cfaa74a99dc8cc653d8457628d1dc44023a6cb9e3b4840402048b04bd5abb3cc424f654bbd6a0d9af742ef889f6dbdb017b9dd
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 0b3de557f1e0..e15f19284937 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 453576a08c95..ed6be73c8026 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,4 +1,4 @@
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
-EBUILD libstaroffice-0.0.6.ebuild 943 BLAKE2B 3effcea72ead68060aa8ceec07ce52f8de1085d5ea37bb3911295752525bd2b169c0bdc776fe7aa95655d63450848ce157a5d456617a476632575f2f6e7d18d8 SHA512 678c5061783f45fe4871a01d33cb1183b9550bd4c0446c6b9a376e3cbcd4a48288a2e1338e6127c5ceba8811fc0ff4da631bcbc8b9ec102c19a7a6bd00f5711e
+EBUILD libstaroffice-0.0.6.ebuild 939 BLAKE2B 0c15a6739fd974981ea96eca622e2b5f4a9c92a5b26cb59c6f9f0003fc7746d004443887b93770a24a46c1b2af50e0aefa93895c10d9b0aaf10021329f0d059a SHA512 c5ac1dababb01bfd8c208ba686dff5d9745c57923550e780a0970b2c8cdc2bc2b4382085f0be2eec9ba5cdfa4adf8a182f810a4db3d8a586e2fe873bb696ee55
 EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
index 0aa7e20b8544..e88162618cf6 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/fosnola/libstaroffice"
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 IUSE="debug doc tools +zlib"
 
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 1e070e3d2a15..5ff95346c13e 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,4 +1,4 @@
 AUX libwpd-0.10.3-gcc-4.8.patch 470 BLAKE2B a77e5a6fdc4dbadc716ed3c4bdb5ce04e2e173a9ad6dd57def6e622ab68db2e5d386a21d653a515b069c4982df83ee99ceabd80ce36ef6ab0605351beaafec5c SHA512 9bcad3f4ae15213c26d9730e5a496dffbb1c01b1ec85fe4eda8edc5bda3ddbc0df5b6d6a9eaa3d9c944f3f5900c189197cc0925df5adfc6523eed3e4ea327564
 DIST libwpd-0.10.3.tar.xz 534712 BLAKE2B a7b39713c0df908912d0f6f94c6c0f7056a685dee7542ea88c441f055ad7cc62c1159985c459a4ff67d5b5fe4c412c31c9a9a2924702386ed5b8250147f071ff SHA512 df14f11e885a583218afdb0aafe8a15d01890289af8b316cd1d225e4a83996c82907fbfdde83257dc71d99bfbc5b21b2c96536f5a783748388659155dbdb8949
-EBUILD libwpd-0.10.3.ebuild 795 BLAKE2B ddd9e9a96651d286eeb9a8b8e9ffee5685eca43922fb006b790c01467815bc89cd14a208186efaab2f01d1360c91ab55fccf07e8f4fc7f0fb49377fcdacda535 SHA512 765e6ae85b845e143749089937e461dce08bf932d188a6f075a6d3b5e362e726a1bd191af2c7807987d69bba4c1ffb4d2636a6d838005e128dc28feed5dbced4
+EBUILD libwpd-0.10.3.ebuild 794 BLAKE2B 0fb4a68db20356acb7ad4f03584ac91774fb4ef65c667dd288ced4723c77ad42724feea0acd45d4846aa05a431b229153aa7df85ffd2b19d97dce4a5f1b95610 SHA512 c35fa2c99e18a8340298c8a2b0a25475a10da80f8243bb2542b080f17df2f091452c5c27a99229bfdbd9598d7de70aa510fd0e21e4b4bf51ffdb9fa99503aa17
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index ea3bb49c4cd9..c05f26f93137 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
 IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index 5820f5e4e7bc..da1cbaea0b5e 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1,3 +1,3 @@
 DIST libwpg-0.3.3.tar.xz 328664 BLAKE2B 02ffaf8ea96e66dea94d847c85e17db5b7efcc5891bb1bf4069e664ece09f808b7462fcbb08a75d6ab17fff4ea51a8e494c48fba1540aed132f47d05b746e1a5 SHA512 99f8346b336eb902626fe07836c73870a57e100620ddd242ce7c2866e564483ed024a3a0b2804f81a0f59a0873310c3a93c005d306437a27818a6f4374c0c491
-EBUILD libwpg-0.3.3.ebuild 775 BLAKE2B b07167305dbb6e10d4a03fae5d4e968ff941e87cd093dfee4b425948406ef352059709a805d5322e47b138589348c0bde7056208e2d7a61ea8cbb55a2fc9dd0c SHA512 affa8eefb3346a6d1c6efd3b97a8c16970b9d20ddfeecfea81b0c0c8bfadf55da42478fbdafdfdf1066d3a49d18219139aea2535f1b5bf8e919cc716b75496e7
+EBUILD libwpg-0.3.3.ebuild 774 BLAKE2B b460bed9645b23cf216d0ec407f1c1c509fa875b466c9f47dd409f8d154f262dfaa69010db9725377cf12506ccc20a771d3859213d09dfa71ac6f90afc5493f0 SHA512 a101526ad894f0c6113ac2a85ee5ef2d43577bbad3880290013034fd6de83934173d6439e666dc5f7c118683bed5418506a3d53ceea0ed63193edcdb6d9c6992
 MISC metadata.xml 441 BLAKE2B c04d84af2f7d50d0c2ccf2b134b90de33ecd52a1be37e018c2c4ae071f0a54628b16c3da82398bddc4b9d53adff5f0b5da0356d12b9138b19cd4bcc7433a1255 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index 1342505d388f..79b75e002d3a 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 69641e1d6a4f..daa10db42b50 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,3 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
-EBUILD libwps-0.4.10.ebuild 743 BLAKE2B a5bd0c6e8dc1160ebcc84e84c7106c79ba5ef155acdb990738d291b3eff8c22ef0c6cb6c2d98becfa2bab96109c818a03cf4bb5c3ab6538adc38510fccaee3c2 SHA512 32654eb9f678d48137657df634c3ce054e5128d8aafe3ec54fe00a4e28a962ba1202b910c93c76070ca8826632709e10fc8541cfd11ac408d5177fc737e9d773
+EBUILD libwps-0.4.10.ebuild 739 BLAKE2B 424f86cd3bef154f0221e14b568603c0578b298032fab736d2ffda545a5c26f132d96fb4ba11516b0c839669d54f3103ddb5f13854b485109e8897e1573203a1 SHA512 dfe7e90260e69078903641bb058081e0cda277d9507a8eb5d885fddf82e5c571c4b956b99e26ebf20cd2656c981c18f7f9c6cc108aee73543a5fd8532a1ea88f
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.10.ebuild b/app-text/libwps/libwps-0.4.10.ebuild
index 3fa616fb8cd1..7f0beb210daf 100644
--- a/app-text/libwps/libwps-0.4.10.ebuild
+++ b/app-text/libwps/libwps-0.4.10.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc debug static-libs tools"
 
 RDEPEND="
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index 1e009e02e022..9199910543d7 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1,3 +1,3 @@
 DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21
-EBUILD mythes-1.2.4.ebuild 590 BLAKE2B b36239f6e550883fb4ba3dcef1eef3b3da6e1fd13470f20ea42b4169a341c8fca65e0d5a9fd1eb1bbae8165b1943e4a982d64fd6ff4a35214039c8f82ffb7b26 SHA512 499fe11088df9d7209b5d07960d62b0999724dcaff9f31ff297b427b009b1761794028588981c30b1b78930d8723f1658b6d0832032b0a64b37f6fa617162443
+EBUILD mythes-1.2.4.ebuild 586 BLAKE2B 2ee213b098535482158ef4923a0a0d6ac5f7b15f408aec6b2bf01cbd34ef43d0894fbbbea6ba529d2b89cced828b400cca7e64d671df2afd16dea11c3ce94489 SHA512 0888b8c385ebb826202f1ad565d58cd62745030e6fa068b1d6836391a80ca6edc60020996109c5145e233ecd66798370d268ad5221ad67d216c1dd6a10ce886c
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/app-text/mythes/mythes-1.2.4.ebuild b/app-text/mythes/mythes-1.2.4.ebuild
index 81f68e81f551..9d0fe705e834 100644
--- a/app-text/mythes/mythes-1.2.4.ebuild
+++ b/app-text/mythes/mythes-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-text/hunspell"
diff --git a/app-text/tessdata_best/Manifest b/app-text/tessdata_best/Manifest
new file mode 100644
index 000000000000..053f78b19351
--- /dev/null
+++ b/app-text/tessdata_best/Manifest
@@ -0,0 +1,126 @@
+DIST afr.traineddata-tessdata_best-4.0.0 12800552 BLAKE2B 8516c5cd9822dd9726d53c4cddf47db951b081de615461aba58d55ec354741fa499ad1a9d8b3e5fcaed28bec2776501b77c1976a200fc8c71bc0663309157f89 SHA512 e9bce3ef62c25b47513d34997d2c29fdfa575af124deab0fbc90445261b027a20febfbc5a80fb9beb51a121ea22b6a1821d3b4ef89b74781886f6d93a9a75f3f
+DIST amh.traineddata-tessdata_best-4.0.0 8389639 BLAKE2B 5e4b3502da9f5fe05e502ee6baadf379b5aa5ac88fee647fddeb8f20d69ac3cbded80674767357ff7c032d0f425d4bcd56bed7048fd99340b78d983a117d521d SHA512 23cb84401f682a444f4faad0096b54f378881ceada0b29b9a59a2e24a81a5b5f96aa933fce8e03af9a2f2b1e3703283086a468d600181ed35d3901eb5c7a6d29
+DIST ara.traineddata-tessdata_best-4.0.0 12603724 BLAKE2B bf6543011c4d97de98b6054134c8af3c6275629229220e0f30463c4ea2efa7ab5e653f6af9ff973ad63394cc79d0591000fe762f75e27229878067d0f088f30c SHA512 9b1768280a418986c32b490963edafda84ee007d7e6109c4e532cf02717a109d96483cb95967a847e20e26959753d0499245db4eb6fb361ca8ebc6f5eed7af0b
+DIST asm.traineddata-tessdata_best-4.0.0 11315350 BLAKE2B 26bd54cb1837e897c89ad0e12baa1574caeeb218f6e43bbabf91fab07c769c978a866803b338d2d6be1df51519c6a84f1313b4f709b2009e4a86c0faea667ca3 SHA512 8dd2b8f19f383d1a69420e0d04f3999aa96c08aa1757bc8996624faccba4eb7e717464ff2f2199127ecc7eb4f1b95c8e285abb9244c352297105d3272840a2e4
+DIST aze.traineddata-tessdata_best-4.0.0 6281404 BLAKE2B b03b2a04f7368b0980f02720536c030ce866d033873b98fca1e6ce05c0da16a22b86292141aa008b985b5b558bac1d13f25ef52389bfe735ee8837eab6a2b330 SHA512 e0c52f7d39ab6b5a6b71ffa8fd8c4226cd71a670800dbfa463e534b1088481a58b50215dcb277d348e4182c9ccd2c1848c2988bb48f4f4a536fb6e8b9602ef4d
+DIST aze_cyrl.traineddata-tessdata_best-4.0.0 4700277 BLAKE2B 9939dc7e79a25558bda5e21489f0a03ce7897d258a560f592954866fb9dea6da6ca2633bb42d9390cca07c791ea51223e80438c296e1c137b85013b717b84f2c SHA512 9b21f8414eac8b1767dcb91d6e8bb0639352f8a90c485699f93ccb2b4665e50b06512ce8ebbedce4ceebceac7d53bdb1087022cd920e60f6162988f0d66f38ff
+DIST bel.traineddata-tessdata_best-4.0.0 10870278 BLAKE2B 8c278495a70366096ef5b43089edbf623beca8e148a8fe79c403371e8097edd2aece4c7f049a60c8a6a9f7f999c8d757f2695f1db3f5fe8c7a2103a766e9264a SHA512 44b8952b047eccba08947d3a0d2db0052074cd859f5b2092a80ae3e2dd913ccbc454f1dae1160bb83d449f9624cc823f1899f093fa42fbdf6eac85c7ec24b9b5
+DIST ben.traineddata-tessdata_best-4.0.0 11045427 BLAKE2B 600c56077f2154a6b31d938b0cfda2606e33ae6f8234f0bec3be1c3cf48416f589d6faa8c8184ac06ef6f8dfce3247058638c3e69f4cbf3c652d15fbcaa2615a SHA512 15d3c38afcc49e4fe372fd9db76348faaf555a6e6955d08c10b02360ccac95f47d44dd06f19a1827b7699cd4e5c1f349e5d5b61c3ce86b22c3aae7b837a82079
+DIST bod.traineddata-tessdata_best-4.0.0 8623846 BLAKE2B de262fd99ba9d24a76778bf946e093f9f277fc9b89d2ac49485f9f0d9b7540297544a41e801c83a5ee79e944224aa36769bb73915dbd10a2b8770cb07538a1a8 SHA512 a0f18a3a3a9ab10092ef02218e521b3b84109bfb6e57dd56cd99e370a4b6f52174443cb48e5e329ece795c4a87c32e63b4c2f2b6ce2a4ab1750697877f8887ba
+DIST bos.traineddata-tessdata_best-4.0.0 5264248 BLAKE2B b4cf0d6b2c5d54edcdde4550f30ca826fa2380465877bf4cae08b3d9a62da80919b27d5b193521b809a8669164f1c215a2f32d9bc06fc9f521a756669fe4a23e SHA512 9f290e6a7f3d4ac04c96d8aaf8937d6f6f5efbb9aba736fe986bbb755c93f7a7e48e45294fdfb88a6322567502d9928bab90931f244a108d7de226bf09e9662c
+DIST bre.traineddata-tessdata_best-4.0.0 15640760 BLAKE2B 048501ad16f9b9743a06d38751847a18b40a5d6279dcb9b335eda80599fdc0b90b19fec096462f0ad2dc22814cf34d7505b5cf57bcc4a690e159a3e43b4a5f2f SHA512 8364b310c4753f2c2a90192f6c269bdcaad03e01862ceb4d6aaf63f2fd253c93c47050502ee771239f6ce9ccde0fcf09b044ada60013af00b9e21aafe2d3372e
+DIST bul.traineddata-tessdata_best-4.0.0 8844613 BLAKE2B 0ada273d26264250ae81b07b4f38a9d6f7babd1fa696f2ef90d42d6b354a3ce3fc2d26df5ad93119ced5c280e0a5cd6e0ff93400024828557b1e2947ac044e1d SHA512 d1c86d739e7cf2f3e2bcfe4956c05b66ce591764c1ddf9ee90bf5a1a5c81e4d360a59e963a0b9b27d071a649bd4b4ca3ed27fd65c67faf5b8575f747b096cefe
+DIST cat.traineddata-tessdata_best-4.0.0 3802329 BLAKE2B a3b3db78e27eddb0dc887b166b03925c5af13fde2c77604496d73236a360107f7085d7a0cec910261b4f9cd123a27cf372b90c0369d6c2f66b942a30448263f8 SHA512 096447e78590e3eb791a17e3b27ef8b157d9c99f7b8d0347324244f339065771efe59490889f0de590a814777a401088be24813715fb4e8ca17f7700f399feb3
+DIST ceb.traineddata-tessdata_best-4.0.0 3452674 BLAKE2B eff60a3af369f0338cf406ab4d9969332f7f2cdf23e684274a1dd52b6533321bc9aaa76d8326ec237c009c99d922876c77aacc752d8b682cf695ce429c6019ba SHA512 21c5dce8c55569c9781fa81cbfdb3af0a13ff2d4734148e953b7f30f5f1f39e09d4f846f19f58ed327112d265c703ac753e30908178faf98b477bf8e4a2079cc
+DIST ces.traineddata-tessdata_best-4.0.0 10918912 BLAKE2B cc9ebafa23419ecb5e02cd751927db138323db2c95e246ab8a42c574740aa1d9e7b38f4d17d556d8450279e250bcb03119bb7557b62269c7d0afaed067654a71 SHA512 531bb649cd6aa0304d531045862c9472baa2dc595e763d32fdf4bd9f80bf906ea5b50449c88e11ee2a0ceae69f4054ac08b3578cc3e627824794cdb233f1833a
+DIST chi_sim.traineddata-tessdata_best-4.0.0 13077423 BLAKE2B a3fe3ac979c132d708f767d2609be44f74ae76056fa0e3b4ed1327d7b18906b02b91e3a622265e21bd5ba611a15da46e3308ab1bc89689fd891c7575248d2ddf SHA512 c006516f421ba98b2a9f5cc02bdc6ec0521ae17f8f9fbc978463da6e9d850a1632f52104cc97526cae660548663d25b60f23569f2081ead05624e6cee377d3d8
+DIST chi_sim_vert.traineddata-tessdata_best-4.0.0 13077418 BLAKE2B b1249d27047536c2944850f9e612cb2bf42fcb0b0fb3bf40cf625e2ac41ce87406d80cc3e1a5e073c62d6aaa45306f1762174ef892d2a17fe0e327e7b0a0e0ca SHA512 8da7de7a338296718903466f8581c4d8643763ac5ba4c96829e29f476a7a3c35fa38ad4716bbe65ce18343830532febf95c4558dcedbcf786268644941032d8d
+DIST chi_tra.traineddata-tessdata_best-4.0.0 12985735 BLAKE2B e1665456c32273e16ffeaa43c4f144a23bc13f6621e545e5f94ec10f0ab56eb501f70ec96349086fd3622bc7181708e0aad21c73876ff3f495a1dd37c4b42155 SHA512 3c39744956e74f54096b84a5042dec0ee7e79d0ac718b8e6260499a4081c900a036b80602e914e002a4464787148e1ac09bd9bd14b0b8ff2b482ca1adde0beb0
+DIST chi_tra_vert.traineddata-tessdata_best-4.0.0 12985432 BLAKE2B 0a7dca44efebfd4739c7cde0cf53933b9cfbf31b7b27232730325f2e511107743cbebe30967a764c9f6bd7d4c93014cba967ba75d0b75fc52888ea8e5c1348fd SHA512 fd7b7ba73daafccb1ebfec7c641908198f702cc697d6131764f506f00eded1f8fd65a85d50dd74df2fe096a5a471878713f604f33dc4495281126fdc800fdc95
+DIST chr.traineddata-tessdata_best-4.0.0 2258703 BLAKE2B 62f772f6d5aa3670522d41d4f9427af2334a232219b97ce80323286d7b34c99d0e3d2ab63b15265912a6d312b6895505c72d84a807dc1dacbabe51059d7873c7 SHA512 f18a03c64988bcd6b6a395a04ee825bb638f39aea627e2c74d501b3e673e6a931f67dde6ad6da266d95d061e60cb2d651e862dce358ac4c0164351a8dfc898bb
+DIST cos.traineddata-tessdata_best-4.0.0 8830216 BLAKE2B b796c8f6715ec79b303b416b6b20af86f7036619ce2f2c3fc3f470b71363aa0157927ff6d970b6c5dbc026fe9b39afc70688033b069f2eef9db876b2c433799e SHA512 c85d4bbd38f4d2f2795b72367fcf5e924f1f95aa9a136ff5a61f8c4e0a736f9adbc517287a115529c8b314eeb69d93b35f481ec9eb8de732840a681f1f8f1d63
+DIST cym.traineddata-tessdata_best-4.0.0 8750784 BLAKE2B e9714cf2a55bbcfeea8167964ca3335d36422f2f53c4dc67ff4f17f66e214dd93bb2ac99f54fdbb592b5b3b39fee3109c5819ba966be1f89bcdb4b6d4c8effb2 SHA512 68d0f9deac6986ebf4b2d4010d03973359b1d263338ce19019539555a233bd25d7584cdc378b026cd2963340a25941f53d1fe37fad47d79e9ee19054928386b3
+DIST dan.traineddata-tessdata_best-4.0.0 9758142 BLAKE2B 6b472ed80fd2156170e5dab387576d3d4964bc2c278b6c194512c4c888ed9a0b47711d1a916eeb32b059cff22795353f3bf5a2a8bd1f7364f5d8cbd307e35eb4 SHA512 c6e20f8a53cf2854609861388d5dfc248cd3094ffb15050451cd3fd0223a0bba2b5a8d6a5bd787e51668156104d86a6465aa0567dc5812cefc90887129be086b
+DIST deu.traineddata-tessdata_best-4.0.0 8628461 BLAKE2B f46ecb469ae63d1a933a64933073a8c6100e4f1e5074b3581bccc70097a8eedbd8b2496c40d3201527e11e80070257a5a3694cdfb6fc3137c2ff12e6652e64b2 SHA512 9460fdc12737ba23040fa7a0f450100dc9f9fe65a7318041b50c42a9f6a7bf43f2027de938dcac8edbc8bccc12570766272f870d0e57a378aced8ef254a63724
+DIST div.traineddata-tessdata_best-4.0.0 4574116 BLAKE2B 402f9c0b234bfa34d9f9450bca87df5ce4e3720cd30c6625b5a03fd4920c0a531f716d2c18fe1dfabbf978050dd4caa2000c84f93ae4ac93a21288c812575c3e SHA512 378c76e0fd6c503e11c9b52f778b9d772d11fcc799c3a17013c504f3d5f385eabac82978e937f4d63316ba8a45df16eb827365b3a8bdf9b5b10f89c5e32c73eb
+DIST dzo.traineddata-tessdata_best-4.0.0 3243805 BLAKE2B a0c9311f9c1da18ddaf85ab9ba8e81866c8f77799c2e9da9459d87592802f35eb55cc3ebf2246fd58d009efb284cb3668f1efc860de542bf5ed01eff0770c985 SHA512 20fe018e11196cb26cce9c47393ec46fea98672e161f8ede18ae64875542af4c6032cf56195fd5b458f619e475a86155659d540e72e1648857754ca522ce0070
+DIST ell.traineddata-tessdata_best-4.0.0 8945021 BLAKE2B 313c3c1f6a4c9c5ddfb37825d8921722372f81c859dcfc254e27a29aa63d04855ef048a43fbbcee112775061512fbd11eea120e4b83ae1c539c32e82bc00c935 SHA512 dc98885580bc039353d0c6fd22329105c03ad28dd77983a6954742534cfefd3574ffd774e6eafc5050ed432ec2d06432cbe301261ca50328af777fa85f853801
+DIST eng.traineddata-tessdata_best-4.0.0 15400601 BLAKE2B bea8595abb58265134361d87209601bfa0b3ab5c2b1a096cc6ac57a7a2bf969a1ecbbe3551838f3bb29bcef10419f53d90e1bbe8dc2ccc683db79477033a56c0 SHA512 f16df1c8288949cb05ec6eb544be15e200cf25e45208cb494df174d2c2f1e0820390d6f096a6e8b879056914a1f1abc8e0acd7dc16743c02a28ca5bfa515a3cd
+DIST enm.traineddata-tessdata_best-4.0.0 13281564 BLAKE2B b9bd94baec2633dacb212ddbc7743890cc4f2e8e26d5075c9dda988a29a460642acf05e85f58a2bf84f0ea0f2c235c85ac18a65be4c680b06949aeef8a9c5ba2 SHA512 915a03b42abc7d54aff548bcce70de3e574eb3c4a106896cc25fa831da06f9c069e08fd223e550aab13fd253e06ddc44f62e87ed693c2dc6194688c82da1189d
+DIST epo.traineddata-tessdata_best-4.0.0 7402169 BLAKE2B a9825a23e96f226362736ed1b9e22469c218bd280153fe014c70ed9c03f90684f974396051ca7dd59391183650d5636e9031f9ad19308211991e1696ddab1728 SHA512 d6018657262969af254e39ba171f457f325ed549c209b7f35265869a8cb1cf11818acc79cfb089e6bab1cd1bdb381d2687a426884cfee3c016b75be287a8e8ca
+DIST est.traineddata-tessdata_best-4.0.0 15833749 BLAKE2B 27865c57185888dbf1c0f44c9e6989e2461d58349d03b7fd68ed0334abb6e8a6673434d85584f4962693a8185d33d55d2207113c4384879cf0a117f28ce65a3b SHA512 a64631d732305c6baa4df8e647a8d37981c07f59c1a8a9799ae42c936c224de560983ba637eecda47187fcfce23374b7becaef4eafd7815ef25ee56772e7956f
+DIST eus.traineddata-tessdata_best-4.0.0 7933869 BLAKE2B fade285fb0dbcd142347d9d471e7a46436ae4471d155e3aac5c0128c917e88b7845ec2d20aaa4394dd782e59750062e154180a6824f5439a1d4f3435e2e8e3a6 SHA512 5b7191d550b48a7f6d298843f939a012fbe9ca6b242c9ce71a812a5dd3151088aeaaeb8e03a8b6d536aab839f55c16ccf38af8c406556bc493dd308d4e7b5e6f
+DIST fao.traineddata-tessdata_best-4.0.0 10030003 BLAKE2B 2f928b60806e82786c7d19de78a55268748cc73f985cbb7b815a06a94cd0aa64e7e6dba56124e47b401bea36638554af6d7eaf06e3e9fae8e24ec49d476043db SHA512 9bcc952f6a240ceaf47518dade699d8fe782bcbb838e68e0c125a4180f721d3b9ffbde9a4a69b637b253eea4914e6cc9c3059ebf8513a7252ae004f3e6039563
+DIST fas.traineddata-tessdata_best-4.0.0 3325955 BLAKE2B 9ad53a6da8bb33e378cd0d3b506e6faa1c3fab0409e872638be0a255c9c9db6add443f16dac2920fd105ea0eb6c4c8be41fd3ab8faaeacf302ae4f877ed8a1ae SHA512 02e5623de080228b4d97fef8b7792628f35592d883151855da17c828b4a96a036188465affc0b9672928868634ca9ced5007d3601b01cccebf8bed8b024ea4a1
+DIST fil.traineddata-tessdata_best-4.0.0 8978743 BLAKE2B b5ed3c82b1b71db2e468b3187eeb9b7c1225114e6c964e849ffe3535bc74569ff5d3b479c9fc805966c52af294ce94b7d3835818126cf0ac44a854785180bfab SHA512 85eb1e14dc5897ebf369ccade464f961c9e44ed7498700da0a94452fe0637814bea88edc6cf50d86d48cd6beadfe782d86e0583f8280034c29003432c39fc8a1
+DIST fin.traineddata-tessdata_best-4.0.0 14369979 BLAKE2B 8f6786f9806071586424159ea80105cc5f40f379c2489b435d59d9b803cb483c49d7aba2f3cf9a16e06b53ea3555631cdec543143e83fb8378ca46b3f56ba204 SHA512 21170644a11b47d4b299bc8c5f62c5ed08c84f6caba60684f4391f73060795b969c38f86a5e1828378974229637afac1730da30d25e329e15887f39eb146d8db
+DIST fra.traineddata-tessdata_best-4.0.0 3972885 BLAKE2B 83fa9e81f4e825abdbe01a02f9021624c2165280618e1d4a725a197099675183d4cdc513017c5e3df974401b7a9e82416eae772dfa9b9323f2fd5b7f6cc9637b SHA512 d77642b072445a0d69ecc28cf12669417d96aa750f76b99370442ae73c9ba2d595f87416a50a198d2119340a9d59cb5710cd81dbb239a403fd2fc4aa508b1d64
+DIST frk.traineddata-tessdata_best-4.0.0 12938047 BLAKE2B 5d0ce153f5e5836185f4bd614b62d8d29a899e30a4bbb2d8c92d24f43a84da01852ff254f257dfcfcd4502c2ecd0e678333704c0f7702a44d9e265c7d350d45a SHA512 5ac6de749edb99a9e3fd492b910791d617181da99f3f286415bd4a878b553a3d77cae0cbdbc02cacf9f126f96e40931fcdf53a75278cc43644d9a9d2ec92f1db
+DIST frm.traineddata-tessdata_best-4.0.0 4043005 BLAKE2B caf82bcf29ae6421b95d91dd1c67a7abec164667bb0f9f12b346e99a5b809a7540771377301f7016a9f90f24b605c13e43dccc31f5abc3c7ebd1b2860df000ba SHA512 dbddaffd85766e4d8eb1d39fb268c0d7beacb3bc43bb436fdbd88e5c0dded6a05ea93348a64471a53c45b0a6e3237fa3ec8ff044ba7491dc321a90e4ef555441
+DIST fry.traineddata-tessdata_best-4.0.0 8442509 BLAKE2B 780b051b8fb46aa13d0a30c704fbccce10e5819ef5f401e801c0fabd48f9e45bdb67bfaf259c3a507c7b6c708e2498da69d49e7c57e1b2fc72bd9389fafddc3a SHA512 9fff9834bde02aac94e8ff977e989e765fb13bc6f4a8a2bc5e3cbb425161345c01402bf71a4adb9355ea29c597686c8fc9372f381e653159993f4dfb149c581b
+DIST gla.traineddata-tessdata_best-4.0.0 9599424 BLAKE2B 542b614bd0b834521065a8043b661b59f7dff24f0a2aaf24cb29eb6e92e759c0ee81e0f3f31ffdd3017734c5b9fcbe42211b00e1d60df87444ba4a6a9852ff23 SHA512 bdc6a4cc57ffbe864506f05199db6b6721099a3d0d901f55d285aea851866084a712495b5c891a18ae2b4b69cb7ad94f924031e260c66ba7336d6d95b9f88657
+DIST gle.traineddata-tessdata_best-4.0.0 3942458 BLAKE2B 0af94df9951cc536d766d2249924890d1e90dd602a3edfeb1017069e217973702b65d8fc090a2faef304119147f4dc81ab761ca3ce9fe67861cffeebc3ab427c SHA512 f2c377288635034b6bd80f858544aa6ed54e8fd520ebc9fe7b7c3f49d675d43fdd9de7aecb35308a14526cb928ce944cd8f194f6ce2f237ee403987f83682df6
+DIST glg.traineddata-tessdata_best-4.0.0 12709487 BLAKE2B 9c8c85a3824f8a02d199a6f3edf1761b771aac27cea59faff6a46ef37adcb403ddac2e343bd8035f0f97a817d01b24e1e8bcf2b2f62619211a460609f65a05f3 SHA512 b4324a59313a7cf52d5f0fe08baaea3b8a9ed3f0d324f7c2da3745cea3ceb821fe630ef5f086c305f2e9f021075d98fd97e6e705cf7cbf15ba723d131fb3a99e
+DIST grc.traineddata-tessdata_best-4.0.0 5168122 BLAKE2B 02edd589fc91b5372903453d0c0c017ea6a57b7e182faa0759870b2dc494ece8e34bdd42a8d49a8b10f0ddf9ac47a7300777f0b6face4637dd48e23c5579d89b SHA512 fbf6fe197e1ba48dc336bcd5a9e75ca1647b82be9626e44e95f55f7d367f84f2e9440dc8bebf80548f64ff7a4c16ad6ef40f4e911924d470ad70f871d22acf77
+DIST guj.traineddata-tessdata_best-4.0.0 8515761 BLAKE2B 5781ee99ed6f2c562cff7ae1c4a135309c2690f067c3bf03efb886830196b02a061220afd66c6053dc6415f70c6b77bc59c5df0dc05ac7b807ba7b0f5d4d1c77 SHA512 5f8558f2d9a398b6c212ffa8228b46484fd216d778e8879a0b9fe0b0c2a6e1cd323771a4904e3df1a523b36ee7d54620896d875536a86f6cfcea4e704f26512e
+DIST hat.traineddata-tessdata_best-4.0.0 12128251 BLAKE2B 032b4b6699d7cebbe5630f91d13cff98af7590de352e50e00a6fb87f104eea9e50f4f45396fcee65dd59eb98a74f235bc6dd38a0c120eddca0aa771ee93efc71 SHA512 a1ee40dd1a434acc7e879afcc23683d45c8a38567ba62e60acf8db3a6261571f36706031759c982675a989d2b6676c94acc11e801857c808fddf04f665134745
+DIST heb.traineddata-tessdata_best-4.0.0 3704077 BLAKE2B eb21476cb86984b2693e4ff39067f26642c23403ed53f1ef65e547ab57f3817a71df9833ceae8151f1352487b60019a773253776f3a1341a0a2c5c18c03db7c3 SHA512 5de01f0981480af392c2ae4406a44a56566b513ec58a67435ba9d64cd158581ce98519317e5a2393c794ded05a8058dfdbf2bff63dbd589d2fd085b409f15e4d
+DIST hin.traineddata-tessdata_best-4.0.0 11895564 BLAKE2B ebd9bd3d4fd3a27df4386e1dc94d8290a80d75dfd5ebdeb7b3124a586724031cb9f0b019d97ff25477ee943502ff7916f54b166ae4e7e1f773339b6c423f004e SHA512 3dd7d4d5465a7bd8e10c48d73859e4efe2729d4fda875928a3ee83b682bec09bfdca79e0493f1926e4d23bcf7f6b01e5f6592d7785058b6795924f2e2b4d63a2
+DIST hrv.traineddata-tessdata_best-4.0.0 11195424 BLAKE2B 23d99627e833203bf02155ff4ca15192be080e3c23a8ca48eb71ea115786f8baf7514d6e9404b1c817b2f9c0d48c0eb5da4520397b3a38249ccf0478a48decc4 SHA512 06973f4cf0a59d398db2f45e36f94f0ea8e2bdfb2c1b209be1a850e8128642dd760d2aa8ef93c7972eca45c4f163d9b01e68949a173bd6976438b3596f2b2482
+DIST hun.traineddata-tessdata_best-4.0.0 12350405 BLAKE2B c8b92651907c1b7e331757834fabb39422fed2b8bde7d46ba87356d9bf31244618cb8b14c8053addc6633d43fbe7e4e533f4e94797ad6ffd5ad2a420f7835cf7 SHA512 4efb9618102b5daf6b98415609b8a7739da6d3febd69a1ae104fe581cd2d6f67af43ea93d4d358be9360a0a1229f001a1d76807018c74da36b5377e6b621f967
+DIST hye.traineddata-tessdata_best-4.0.0 6372242 BLAKE2B 0b279cfb8cba5b9a3c91ac67ad5dfdcd3680adff1d6775377d3e443389566cfb2bffbacb75b7c6ebbf8e26c7131a4bfd151282206bcdde9560ef3abe3e897067 SHA512 914156bf0dcd6edb6ffc293257008fa4054ae5ec48beafd880a7f023bc79de828426d7ac6a16ef2ce149487f93b505a9a8f953597036b81a8b751200d07b4158
+DIST iku.traineddata-tessdata_best-4.0.0 6139484 BLAKE2B 18fb25c82005ef5be4e86c9c735074c83934980ad509a6e2702639188fc673b0b310aed7e261ddbb64d1268e43ccc6c8edd13f8a65cab9d123c1ec0759325af0 SHA512 e29d908b81961d1beb207a86ddde541e30f0de68731b34120beab4236555a9755270e6a7406980fcc4fe2c941a724eccaf026d1b591c8183e1ddee0e64b54e7c
+DIST ind.traineddata-tessdata_best-4.0.0 8253606 BLAKE2B 2776a5ae7c44e0d2551b8952bf5d9cf35b72c4f114ff468d4758410391e315e52b936f68e06999f05dc74803a7d089ae8ff0d859c01154ab1a7987d5abcc4e07 SHA512 7bf08419b2779ba079b4fd11140f24b8faa5afa05aae44c15a484948360515a1a165f31af23bfd8603f4153cb12e5e67d7eb4019180cda763f1a04b515aa8b69
+DIST isl.traineddata-tessdata_best-4.0.0 9486436 BLAKE2B a640284660440872f3961deae0806ba014d32b4f8a6525c1367a5b169ec5db7d5556fa258b5b3e08956d7adda0b4d0237307f646a23729bab53a1fec3c2de953 SHA512 adc95fbca6ea87fe91db123218be0227c1fc90b2117672bf82ac369cd1804407d8ac68c8b1551ef4db28ea306761cbeaa91b8e3ecfcb16a538e433f418f53905
+DIST ita.traineddata-tessdata_best-4.0.0 8863667 BLAKE2B 6bb2669a54281839816de31b78cedec74f635e889d6e51b8258bd6c5876ab1caf50a69aaaca5b40a5fce49f0521a3d65edf6001f52b1c44897178b304319c3be SHA512 ef13b6cb7843641f8452f8d40aec020f77883394b0ef0af4b5119c42da487e21ebce6e1f450016f077c4f1731cb7be72009b144bef7b54417c468881a834a310
+DIST ita_old.traineddata-tessdata_best-4.0.0 9852171 BLAKE2B a1faf32be7eb69f1e2fe655efdb3e3172dbac87169cd1128e5bbefe135fd65187a63cd3e51c384b1416ff4105c1925593896dd4716ebd19d4598a18ccf19c3bf SHA512 b7ad04ab231a5cebd752192a7848862bbc6b690bfc0797bb078fd55eb23d053d5c2fa426ab70cf18ef0ac846eff1b970ec31c57232d70a4b156e1fa33309742e
+DIST jav.traineddata-tessdata_best-4.0.0 8650382 BLAKE2B 057f692c760422c05510d13dc2d2c18229ab9a593dd76a8959784acabc8aac6556415412b4a113af97cc1422ab5690f0e27dbc7dd38f8e0e974cfb51fcad2152 SHA512 4a0ebe7fe0e7f9ae581f948be08727b95fcb03e4ae4be19daf188c52af2e22cec2923061a542c9c1a314f7d6bb0d04a03b1f5f1b5bd81c9cd06792086f81a1d9
+DIST jpn.traineddata-tessdata_best-4.0.0 14330108 BLAKE2B c0d25e0f08fa1a6d3ccc2e88a114070d110365e7cd08f05ef31abb51ad5c8294845ad197cc9912559d8bbdd1946a483b2dedf0f4ca6ce510a30c362b02d53adb SHA512 d24b82cb668977e60fad9f85919b2918a218da8dd6f3b28f8e546d03c02cdad09eb9016fc31f139c25744685b443962a4bcd4e3902b52c00ff209f13c0251c9f
+DIST jpn_vert.traineddata-tessdata_best-4.0.0 14330719 BLAKE2B 26c938b545f6cf56e21d934f7808dc92b48df883e3b8c74ee90f94b5151f8ec137d700f6eb905c033579094fd4c1986bc4afe3294114a7c3bd9ad0ddbf443feb SHA512 cd589afa07afeba90acf2e5eed459aa58fca598be3cdb77c0bb71283033d965f5b8b61a501bde9014d30e7d247c6b9ec4ff63b37b902eabf78f445afe1dabefb
+DIST kan.traineddata-tessdata_best-4.0.0 10233763 BLAKE2B d12b51076b136167fd2331bbdd4b0443224ef1dac0f9b3e471b4580e7bb52dc93997eb55f5bc4221226b78a78c8037ad3ff7d32cf199bfb4030e78ef606aa197 SHA512 199b6912d415159e3c05c3dec45e71b52305862863b759abec826dbc17c88b08cdb18793f36f671522317df93c8b29a8abca571043aabbbf0be4bab4f8222ab3
+DIST kat.traineddata-tessdata_best-4.0.0 4487336 BLAKE2B ab056d4f64cf18205bb808e380aebd7941f62d84fff38515b5fcb1062812533f2a4a2b2f0dcde299d6a85302bc2d6cf90f3e02684d2d95b247e7c86f0299b6d5 SHA512 2b1709f8742c5279cf8f26d21a45c1bf1fab26f4e155a74092b21b2325e0af8578c39035665475a4f9b66319512630165425cd76ddf1489e50311fd5727b534f
+DIST kat_old.traineddata-tessdata_best-4.0.0 3174400 BLAKE2B f9903efa618d20868bf978a96a8dbe05f67725355cf3f361155433333f6494a35ad61d7c6497251bc1dc1569ab6107034f101490fe4d23c1f348357b52a5f2e4 SHA512 428dad38bb45bcba2342bf3ca22987e4e5207eafd9655ad04d9cd8c4e85ef74b05127c163c326b34178f6485c56e06fb0104f2281d9e6d95692b5a3845164d7e
+DIST kaz.traineddata-tessdata_best-4.0.0 7528853 BLAKE2B d19ddcca82b735f955c4c02efab6ac7ba9077bddcf831fd1b672a614acd4c46f7d241be6521fe99ee2d9c7cf5c03152e9fdc530f48810f7aaa3c9c421945293c SHA512 ac84426191000767ae3c54285f573ca84e08946c01fa87f63f4415a10091eeb5e65a7152a45291bd42ab57ac27b63464f9adcee976788c7ce1f18119aaceac3e
+DIST khm.traineddata-tessdata_best-4.0.0 8104332 BLAKE2B 7f80d38ba692b5ae23ca8f92fd3614874705de3d52f7a10e89bb592a403940b67f0f54c4202c9f202023d3c76654588569971eb9b231af9ee17fc1592a0f5cf4 SHA512 dcff174da366c4cfc06b6810f509bb1a0613844cae34b9f154181f8dbe46ef139980c755074533f233028d3b5ae975bdb60633b359ab95b150ad06111f26a834
+DIST kir.traineddata-tessdata_best-4.0.0 11948344 BLAKE2B 047793238943067971467cffc27ba17ac187e1eb6072a7849319bbc31a11d4c9b6df9e196240bcd2b0bafbd8211b9e79d04f919d8f5b1b1dc7e891380cb9bc7e SHA512 ec8bded96d932e2fee7ec93e58cffbd1cfb8eb83137bcea41e5e3bef7976196b63f292e562b7521ec078088e132e9b7e9cd96ae4e8a1aea38164fa98169cb4a3
+DIST kmr.traineddata-tessdata_best-4.0.0 10196464 BLAKE2B 23f9bf2db65b6e4b3a6c8ed15802df343af205e0323fcd6e8c1dcd2c09ceb576ad00023b71d4e650af5f9e0584420908da8b1d1b0d461d3ca9f87a0ef06eec63 SHA512 d74836bf88510378dc8e26e84d6d5c657a96e5fb0c6d20f4ad7ea5f971ad3606480b532d874dd2cbaff135a60002443ecf30b70ae1910e4dd63fa878da533b3e
+DIST kor.traineddata-tessdata_best-4.0.0 12528128 BLAKE2B cf2c35881ed56199f340a769aaa8e31b5de2e0323fe4ad5a833356cd3151849dc28008517e75935a7db2115ec32f7ea716b0a34a0b1777e1103ceb4299400bb2 SHA512 4b68eb2990f8ffdbd7c3221c3e68afbcd35e1dfd19bd0246bc1efb8a46a8bfd716a50f8f357f82680c806c08cb9e3c28b2dd691a00a490860f351c5532041e69
+DIST kor_vert.traineddata-tessdata_best-4.0.0 3964469 BLAKE2B 4cf74c82966cf829193a1ef45577445c4e43917647beb50e85bc7bbe4ce539f28e1bfd012bfb87a27abf995c5b869989cad900b2b2707dbd06578a94c339703f SHA512 2906bea31215b1978f1cba8f1a2f8f91761eeb3cc47fe822cd455df081ec8c095bb92fb61f4d564beab504ab6a1e9ed16b31e80a0803af5a734f917d1f87e046
+DIST lao.traineddata-tessdata_best-4.0.0 13532551 BLAKE2B dd02433df7656feb5e631728a1fec4d095976dfe4f461d0dde64a8dcb6a11546d3da36091bdb8be91c56fd4006378b2e8787097c6c252716465d416f739f2d92 SHA512 2704aab942012055526c00ad98f6bdcdf605c8f07cb34d6b6fc247deaae5f9d57e5ea41ab2f10eaac5730f5da36de4881f52b3458b3e00babe0e86f8737e5c7c
+DIST lat.traineddata-tessdata_best-4.0.0 9705145 BLAKE2B bbc4f50054e1ebdad18d77bcccb11e3c893526bfb6b71d907feb18871d14067dd006c240da6c9e930423c6ba65bd37071ea44b873a23a49cb6f3427f69535b35 SHA512 48cf8ac868375cc9f7de8ae7e0f9be52291f8876240575fad1ae7132853cada6c0d2b3435ac26b3e435b40d359a72c900146a6f5859c7ffa4d756199c320c85f
+DIST lav.traineddata-tessdata_best-4.0.0 5623473 BLAKE2B 12870708bfe94e9ebc202900542ca25915eab97ec38ff821c01bd2c1b8b6e7c3b05f44ded1695dddd3559351b1b69268a155739d0c10bf69cacd4eba5fc0e1f3 SHA512 83a20272a715862371dce6969cd558f605f0abf0afe83868ad69869429c3d81f1678d9577761760a92e7c5a0148d3688c30acada94a36f1c3ab01637a1eb340a
+DIST lit.traineddata-tessdata_best-4.0.0 10252680 BLAKE2B 796c2209770ba4872ff815d418322f0939b613b41bc23e41f1f91a78db69f5fe52328cc7ef3d8413b48014e4224d085af5d20ec8168ca158982e85cfa68669ab SHA512 9d90e648dc0c344151c99099474a70f885ac87f1fe1bba0984c2a9914db284965d7cb0c66fed7c33419ec647ece51512633fb5c6173c12f06ce570f28582c9ef
+DIST ltz.traineddata-tessdata_best-4.0.0 12721945 BLAKE2B bde28d2f6babe5699fed2098ebf2fbd360aae76f74cd7a36b40c0ab596f12840ebfb9d952657ffbb1f757c9be3ddc0311180f4554f21a6c40d4f28f187232dcc SHA512 2a5987f73fea783757ab0c6f21a48e513ba8ee8befc7ea2555375bf235c0f56e5b62b75bc4d88a93672e7908b8f74175541983671a23e1fdae709cead0038246
+DIST mal.traineddata-tessdata_best-4.0.0 12524967 BLAKE2B e8bb4d88c48377a47bbba99eca21ffcf33de90983246ac1e422a1b7a0131effa64d2857ba2e00ee30bda2264b48fbd653b360d5c2a4dc139ef2e309b9ea87868 SHA512 a8765853f49ca91a3ed9efb3e89e1f873b39df6e6dac5372cfe7d2764e004b14b084d296a8a41b315076240198af7db855c985d5d511f7732b9f77d3b167d651
+DIST mar.traineddata-tessdata_best-4.0.0 13437670 BLAKE2B 83df37abbc4f375647624ea504d517bcef197e027b040db94803223b64600ece936e66e023348758dc42445e34fd777c813ee695a2d55133a4fe4091f605d040 SHA512 06e071b8310806580a46e8050214f7a1d56fef22007e54b165bd56d614c363f800ce0b8facf8fa3904a14a808b69c768e37bae2414066a8c7e13fdcb1f0f3898
+DIST mkd.traineddata-tessdata_best-4.0.0 3453054 BLAKE2B 193a34a9cff32a78d15b995fd26618de6026e7ca6e1fa544761435e5dba9a0c1abd37299e9037c83f2946032edf30f5c3fa090302a4da8ed6922e7b9c0cc8e53 SHA512 bb0cae6b7487d9817285e2068336e7cc9c3a13c658b0378df2995e9def73da94cd91cfa69f7994e808486cf6ede9b142b1df1f6daf9ae738efe905be14cf4f57
+DIST mlt.traineddata-tessdata_best-4.0.0 5060029 BLAKE2B 9b0ac0bd9aa392fb9e5885d8a5afea1a6847f9588aac4a0e9e732b5f28a144b348b694a7a75e376c0492a38c49715e6d8acddd73a9f62bd4d0d1cb6466cffdaf SHA512 7ec86417946d24301018a87a4e58a12b227419d835dbd81a8c523ea9b1a00a576e048c623e9331e75b580124f93137e11548bef1f152e6eeab831e3c47ddfe4d
+DIST mon.traineddata-tessdata_best-4.0.0 8646663 BLAKE2B c47b10a2c3239f6601c78ce0b4876f9ca6205c8db6d067658ebfa977662aa82c0d01c183887bdc193f2be24c3f0a5b35d87c6f3f1d1096a244dd97d702c61880 SHA512 47d0b3d2ae789a51605f31dfb7ef498f336e7dc4c58e5e38b013c15e31c1cc7d1c307135663e00c01fe26024645384f4b4041a19bd62fde41ea9612f9ed586a4
+DIST mri.traineddata-tessdata_best-4.0.0 3610177 BLAKE2B ad2289db31a94c56dc40da2922572107071f40c2ab7edf7b755eeb2a05da1b0818e18a937bc4b5af26f46fea9764a01b9092e809104b9dad1154fba06a76cc97 SHA512 1c445a32d3356f3b7db55bd8be0358adcea3bb6c636755609603dc2cb766ec39b9f17e2ec7b07398f454e6b05b15c546603cc1b2084e1197d760d90b6a3892aa
+DIST msa.traineddata-tessdata_best-4.0.0 8230552 BLAKE2B 708ed1b326cdb7bcf4c63355825fd10f9305d749a82b3ce7366207be62751b840cee496de248d0edde6b5ecdf98ab0fd4fb757b55d4e07bb317a088be876f3f0 SHA512 ca5bd3d67068e806c5b695e90afb2f7dd09cbbaa52432c0b8cfacfec95ac435a6486255fed7c0f7f5c4aa3b2dcc957c88318750b29293857e491b4fe00f0126d
+DIST mya.traineddata-tessdata_best-4.0.0 14971060 BLAKE2B 5bcbf8cb5bf984d4818c97cb48fea8e9b7ce527b84f15e14e8f4e10ee6d32e86653927c3b9820292abf3b2fb3a20146e9bf9a0107dcebf181dd692e1d47ca246 SHA512 6acb78ccf8efe8741ad4c95755db932d7c38717dacac4bde60981329c6406d209767366efe3cfc7048111466696d6b99cb101c6f14428dedcc46affe5d52b538
+DIST nep.traineddata-tessdata_best-4.0.0 12387399 BLAKE2B 1f4551413cba4b637d7f4f842be04266b26069e505fb16c4b3134422fcb7d093deb7446136d19d6b95e652f1ce14642b79f11a0be5f4a0f5c54665e1aeab4754 SHA512 640fbd5cece117a5cceb88bc127fbe67254b70711d1b9005a18332586f733a58b98eb003265246e3dce4add40c037e6296b00cf54951f96e3f9404fe84d41fb1
+DIST nld.traineddata-tessdata_best-4.0.0 8903736 BLAKE2B f4eb00820909818215de071601ecd7714cea14ac019fb5cf6e95cb8d2094eedf9f56fc7f8220e4e6f44edbdff8cbf487e254b19fb05ab51432996ffb59745c16 SHA512 d2d04ede13181d10b0f9f21dfd2ff8471ef5a6c93f7b741ab622b98672302c30e65f5db6a3cdc66c5e5e68aec5a3822891d4f752dbd00fe914f758049e9b085a
+DIST nor.traineddata-tessdata_best-4.0.0 14312333 BLAKE2B 0dd82a39efc0b67cfaa38c04fea64022eda06bf5abb785ec0d219faf4d3138359a34232461e0668f03adc4bae121012b6449f9b509a7563203a3681a25b59ba4 SHA512 67e6ee54de53f4699324aab696a2d7b05275e7cdddc6354ce0a4784dafd8b7c9f5c8834b2658fee88e6592b88f6a879d643019e071cdb5241e36da2d57bd9f08
+DIST oci.traineddata-tessdata_best-4.0.0 12917692 BLAKE2B 3b38645bf2f3b653416f8984e19f016d17ea4e3e9b3541cf76b5529afe9f9c41b0c9f3feaf9413efe429b08146a094dabb464f17aa47a334fd6a4cfdb46d0bd7 SHA512 026111d374b5fe25676d53497b60df5f2cbf81c8458b1a909da7f827c9728a984caf264be8976c2be1c8e8976d2eb352d92e8e70ec97ea958801964a0eeb72c9
+DIST ori.traineddata-tessdata_best-4.0.0 8110602 BLAKE2B f032283fd0923bf940c114879599a1f88a9cdcaced9501d440f6a80b15067f8b136f127d6b95db83eb3de50a28e2a8d0db54e93ae6096b0bbb2badfc02831c2b SHA512 6b9cbb9e5daa207d6a569c9d34c7f852ae97cec1d11baf771aea4f5b9920af4372a0c0474ca0f176bcab3434faabc635786c299ec934ecd21896d80d2412ed89
+DIST osd.traineddata-tessdata_best-4.0.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST pan.traineddata-tessdata_best-4.0.0 11893154 BLAKE2B 47ad07a6ccd4e8b7f10d729dad72681bb378f14254b9dc4aadee2c3ba5f22c6bea88686fed2aa6bcf5f626baafefd3015f3482b4e9c06eb2c69a0dde874688a7 SHA512 5488dc7bdedbe0a66d3433251fa72274b2d1ff8d3cdcfa386c4a337af1a8150291d29eac567eb89e8ea4b5bb143779ea55b75e6caf47a2746d78370add6bfd5a
+DIST pol.traineddata-tessdata_best-4.0.0 11978867 BLAKE2B c16752a06705fc4e03af8f7853c52d872fb83deed5d1883257bcc7a359b22be484d38555812796e00600067e05f352151908be76f13d763aae0047dbcf0716c9 SHA512 be6e4e73d3cc348be82779efd78883c63ab5d6e0501364a276b2bf915c180db83510df788424426cff0043e92015e4ddf73d2edb2e4151cd49ec7b73d0b2269e
+DIST por.traineddata-tessdata_best-4.0.0 8159939 BLAKE2B ccb6fe1a816a88eefff3cf1e07c2802ed2bf30a909361d3ad731df7bd1c3b76a9ff86dcde080e099565c71ec2b4d238169bd8cd165af32293d1b89b480a5271f SHA512 8f12db6b6dea2e935f9a97f1e3e1895ca6637dc2efa3b5cff72ea09218c72fb25eec14d724518083fc9da5dc6622b414c65446206592c106e0848fb91df2ca80
+DIST pus.traineddata-tessdata_best-4.0.0 11987930 BLAKE2B 86c202f7c80b04ab431ce4463aebcf7c394175bbff8544e1bb0dba9d0ce4035b166521298b771bfcaa88ba7a7a04e273b9fc0a4759da8108619c1a6845572f42 SHA512 e8a632590ac96cd4fecffb0bdefc228652ebedeb9e6617fab0a8c24749647294d2bbd944894710dad57e47425c9d6e82c2a206773458d28033c856c37e468957
+DIST que.traineddata-tessdata_best-4.0.0 10774587 BLAKE2B 1bc0781cfba6b2ad8d1942fe45fc66827df6fe78be3411fd94397126ac0ab51590c33ced3b99776d4e08e8a2c897e8a05feb496781ca7972377288c129a6adc0 SHA512 339a3eb0ee317e68a019b32cc34d72484159910816257655ec251721ce58c4f3669379ffe536caa0db9c3d75fcda7db3defcb9bd8b2edca93c8ba6f0f88d2ddf
+DIST ron.traineddata-tessdata_best-4.0.0 9595755 BLAKE2B 2707507c8f0809d11f9614a8f66f9b1c40836a5aa487b61656016c307351e0eedab97e33842bf9016341f826a304863b7b8d2dec6bb5f6e762a0f3cf8a2b3a79 SHA512 517b0ff6dc8751f17e738db430b8c7cef7d1c424ef83b42a146247c0751641f108619862bca7485c8cc6d5df860926718f0e34efdd6944c1b54a779974c17cbb
+DIST rus.traineddata-tessdata_best-4.0.0 15301764 BLAKE2B 316b24890e0da638c6293ff3461cd28d73c19d995c9eadbd9bc10145e09913420a859ddc393c7f6c868826cdbec4348d8f4c9440089f9ca957edb0ef41e2c4a3 SHA512 2c2e6d1a3e7948eff5da71338012033016012307c917fea61fdcb79214c0758e3d043d8899048933ed6b3da2f5c03a258688bb725beeb11ed147542341ddd453
+DIST san.traineddata-tessdata_best-4.0.0 15136202 BLAKE2B ff51affb476bae8dd71b47c41a213e40c64e26fb0fd3f6b0dabbe10a7cfb04ad34a00fdf4418f5e7edfe61f89201af2043b0f88256b31e407f489a8dc68174d6 SHA512 43920be70343e36bf210ac2dcc42ec22cf96f3790967a0a84a107718298a20668a940ab7257536fe1bcba77e0fb79e71d2e7456fbe59193940f7bfc58ac52b1a
+DIST sin.traineddata-tessdata_best-4.0.0 8282713 BLAKE2B 5d9e366c6ad18d5966a6ab5d132a14801505405881b9bd7b8e7802bed6418e3f9caee4e4dffb4fb3a1b1db4f1b38e690294969fd01c670b8cba475ad0f4438d7 SHA512 0415737ad20912528e25883aefce20a06230cb1d2023b9f546afffcf5044f3757a792596fec3c3d68e04250b652203c926f89bc576fa8f4c583bb77094d66a5c
+DIST slk.traineddata-tessdata_best-4.0.0 11542252 BLAKE2B 066055ce404546365015f32f3af2f6d3e73a8b28788446129da3f99041e2425feee3d9371d61175b2213560875bf64826c2815f5e80177fc051aefcf2040ce56 SHA512 798fb550068ccaab98fca82633f2d01d384638105391894942eb9d5d0753d5586cb53fbd9da0aaeae569a3385f9fe8c32507163f6450353bccdbc5b32a081d83
+DIST slv.traineddata-tessdata_best-4.0.0 5879151 BLAKE2B 7f798b355d2b513f183d3e3f3caa2338051710543e78f2319ba8558244992bbfbdb358ad63a108c65d6e5b1ee4d6924faeac1ad263c82abb8571e739e1955cfe SHA512 b6fff55ef5d017620b30b30e17574aded00562f7011ff8fa630a484267ec1e3030a12e3adb829037bc6b5c247649ae6ce59543875f3bd11976de5cdafaefe2a5
+DIST snd.traineddata-tessdata_best-4.0.0 11981538 BLAKE2B 38aadb069bad14890e99dff8994f4436e72e931f60e92d0da32b778a2cdb72542fb191c952311e379c59a01ed6f90f2988defab074e2134b298fe4222744d39b SHA512 ce55f53cfb5d7a4c4a7afc9341aaa50c67f6b1d5f83e20a3ffec2a584bc7d044e7fd84aa6d87066f5f05f57033b4dc3a7be1c1e8b0ee880a13d4d6cb3ffff8d1
+DIST spa.traineddata-tessdata_best-4.0.0 13570187 BLAKE2B 2e4c0b7ec5e0adaf0fc8b056aabc23a98c89ffd9e00ca3626058c50a69b74fc4c33242855788dafa7baf24eec4eabb2d942347c341d1bc64498167829ece730c SHA512 bf366d88cdbaf35e339af3c61342ae5e697ca29630a258408b50e4030019f7ce93ef35d76b8183be167423d4826f9721f360b6a63fa7291552521d97aaa47c53
+DIST spa_old.traineddata-tessdata_best-4.0.0 9476925 BLAKE2B 8866d7c3f2574650531578d9dac007c0ff0395f82206f233f6b9acd7c5e704b557df2816cb1b041df68b3b53a2111e3b3f98f0d923f2efa0238fdec84452221b SHA512 8ef994a4afb35cf606adec72c71bf0a900f8ae78ac4c11f2cf7ee6df51f779983fcf2433e878a2544848368f7a3062842ce7418b25d158cb8e708eae4e4420f1
+DIST sqi.traineddata-tessdata_best-4.0.0 4631498 BLAKE2B b0febfe66567472574380662584951b4c58520dc3b2cc1147626025e39eb7b9d03e600e5adf007bd84af3fa196d187967176424a75d38c2bc1abbb34a1c1c75f SHA512 0c0e59c56b21ccf682d9acf70d190d6cef077ff4274316b9365e5a0fdf498e09eb9d3364e51fe04bafcf5bdc4b8d3847076a8274b47536c8e90f1b04a26d25ad
+DIST srp.traineddata-tessdata_best-4.0.0 9345851 BLAKE2B 00cb3a256624f3185b37db269421ee5af8887bd57f44f262af4b1972bacc5e074414a8c24f034b21174ef5026d99328da826dba4381e45e9d7ca8992115b3208 SHA512 ec8657724a65f719364cd73daf4435c06bc5b8e16d62aa2b5563cb1350ec5e324c296c186a912b19621083d1c85da95ab9dc12b445965ba5aa405b65d89639c4
+DIST srp_latn.traineddata-tessdata_best-4.0.0 9831713 BLAKE2B 9cc35896614086a4c4457f5cc473ecb9a747c2e390f3cda41e1234a9388e97b4fc415307b93078a2813f98b4b9cca773a98bc8a9e763d0afcf419d3fc8b1c3da SHA512 fe004effd2b8cfa63a186e02f80bf936c5fd010da6b1c74a118f0fed656b17e0260406d4aaa51247e8e3617f01e21f040c54e0b0c91fda83f5a5550adface6b3
+DIST sun.traineddata-tessdata_best-4.0.0 4132820 BLAKE2B fe8360b667f3002c93f70076de31a61a03273603828c105b73a354accf914255376d5efede2588f3c027618ec4fbd253e2a6996eb189db1e49d4993edf58f6e3 SHA512 04813615d4712725a63024e06843b024d88deaf56d7e01e81879f739a962ba21ab0af88a96e69c207d289cbcb66d3001458c8e4fab77fe26411ea6ae6852bfb9
+DIST swa.traineddata-tessdata_best-4.0.0 4914855 BLAKE2B 3a3e56fb2c81b4a7054cbc649a981561ca5c1ca56a197349ef8457e90aa6086db3e841c4f864b46cf756fe0074d3beca22a34d8a4ebe9dee487f62e0b4cd28fd SHA512 2827ed90b79b47eda112ffe5ba3ec2e5f7ad6edf2f37b823551e95f743871490e31ac3519b793e442222fa4f399d1d89a377d03d7cd5f95dd52b3293d9ae8c6c
+DIST swe.traineddata-tessdata_best-4.0.0 14325549 BLAKE2B b89a5b1e572ffe01d1bc9704c0be1b508cba5ef83f595c9d98fa3c2354dfae6ce4f17f726778979e834ca57df7c9c8c611b0027801faf5fcbac3b4b4c259e40d SHA512 b2eea45f2f7d9ef2ad665079a1f9e970e42352e478de1f2d267855193e9e9b6b43b87611a6fd43db6d2853191f1ce7c7964408f8d3ac16873c802f274e5c8f78
+DIST syr.traineddata-tessdata_best-4.0.0 12498294 BLAKE2B 5af569c79bf9a451f9ab478ae41310870cbe52e7b4133c89f8d4feba3d6e6edaa162c2ba6d561d9c85cb6d91d138693e07e2662194b59f06ffaa46533ff416e8 SHA512 886a4d9bdf035e2028371de5f98bc302645a68cdbf992a24c9d744aee3c8919dadf60ea594b8f5ca207bdef6be1c798fe9d942bead082dd02c0b42bb76af3307
+DIST tam.traineddata-tessdata_best-4.0.0 6023201 BLAKE2B 85687b4134422e5eace00faa8b27fbb5b2ef910f09d785ce598fe23ceccfc8b79fe3fd271553e7cee95cfa6f99be6125abc4ed03da517629c88d03fd600adb84 SHA512 ff9bd903b0a7a5e6568b0b525a54bb81d166126a75fd993cca17be30f44c3e0fb96622711843e7dc082bc0e3f348191a7185fd91e6e5e90aba4ad0bf133accce
+DIST tat.traineddata-tessdata_best-4.0.0 7585204 BLAKE2B d828eb6c787e8c3f6ae18b343e2e21c212e758d8599e5b5464862ade3bed3a3c2338eaf1fe1d892f0fc75290998da2b9ef6ecaaf976a6b08b81b4ecb8850ce86 SHA512 dd2f1d6ab9b8b359277886fe5b9eb83675e55de98c197706f85d5d4c07af89a94d873911fa0bd32459e295fe67b3d127b1457a3c02f15a6ec52ce4853705201b
+DIST tel.traineddata-tessdata_best-4.0.0 9098795 BLAKE2B a618b76b69b0378adbb9fc878057a2086dd076ebbbfe38007b2b9d1463c5cd0b9fbc5b873fb5a30a312cc761a415f48c7e10122435a6d03173e4da119a7ef33b SHA512 c6d7d230ddc19f03eed540f64e317aaa56bd9e3f126850cb0673e5ca90a7db5253a2ec21f6e691f2cf6abcd2211c801fc12cdfc9b960f69dc773e932e93568a3
+DIST tgk.traineddata-tessdata_best-4.0.0 4602842 BLAKE2B ae844f15123c4a260aef097f0aa631c149a92880a8d15d40af8253fb3e1c29b3ac726a8c6b9e0a5a31466b8011d36c4a1642b2665c887deb950dff559f3eb6c6 SHA512 6c3f59358b59f74e3cb1d8e4b197264498776efbafe5539b01263dfba118049b35f90daff315352777dffd735c02f0f70db1f147c82c964055d5c56d8e9fb773
+DIST tha.traineddata-tessdata_best-4.0.0 7614482 BLAKE2B 1622b6b4eff1028a526060ef41e5379951d3435a4f819922ad2ab31920a9c12c6d14fbc19e5135bb080237b2c4d605ef017ed2bceffc02e11b345203bdb43d0b SHA512 0888e634e8fe7dcadaa6f0b25857609b436e59dc2219f694314c71b80cefa8f9c6ee2a6ef273a04922d95f5b181b2a63a13f26886eefd6c99458247d9875e204
+DIST tir.traineddata-tessdata_best-4.0.0 2410256 BLAKE2B 52ab842a1bd1bf4467c58e2bc18de98b17f7d7fc8b6cdd0773a700358893e714a8d35faa2c6776cbf22ff8cca5c8a39e8386f295974001fa8e83d669f4924b7b SHA512 6192b4deb6481299d5f98b0fcd68d68b75883b77b8e6e9386b8535f56111d945d007326ea9befbde3c4e3ba6a8e4973202009ab7d11104ca72a4a85fc96626ea
+DIST ton.traineddata-tessdata_best-4.0.0 3729371 BLAKE2B 9644697ffa8195b8f8fef0b935d1a7e825b71908606e227dccf039e0bbd77244f9e8dc8f892c136dbe31b6c8265128c0a0988af59fe853d17d29b25db6795bc7 SHA512 11f9dd36c1c280d7e9656a19a321b2065f208b16863c77ac5a9dfd8de60f3ad22274fe67f4cd8855c96a799fdafc79e0c85610daff73d50753833c6b9b0adfbd
+DIST tur.traineddata-tessdata_best-4.0.0 7456265 BLAKE2B 8ae355fe0143da9a717758651f9004dade2349b5004aea7e5df6d0ea9b2912c64184ed9c80cb04606ebcadaa4f24d1b1974ced4b7a0f195a88ff465119c269a6 SHA512 c15d154ad8e481aec0f6e31c67a83049a5047920198b037b61b962ec77af7ef3247b2c0c82a7168fdfb5b73fe2895c1471f7cc0219b1660c2eb34413cc6a2684
+DIST uig.traineddata-tessdata_best-4.0.0 13074609 BLAKE2B cb83bd2439280b440a0ffbe2aa58ebdd33c986a10244c346e1618ad258c175c09b4519624421351090ea062b681c626b7919c270e4a1cf3136e75652394b26f6 SHA512 705c980b43bed650d3108ad7ae7185f587497067eb2a1a5a6d99c85f75283a6ce371316c284dd2cf6ca5a9bfc171fae94075ce29d4ff45df4d27a2100bcb6df1
+DIST ukr.traineddata-tessdata_best-4.0.0 10859081 BLAKE2B e6f8f21ce3a32821d1e0717a853da0de7e79be7b0b4c1e1ffd422d02fa2a2bfac203b62f3dc935e572e0e02bb41c3f67081ecb437a075d9f13e15d0e1ffb456a SHA512 466e84f93dccdd9dcb3dcf31ee567e1cc41e8073e056686c1ec64afefe72906baa2c0e6343187a76e3a493a63da38d7fffd48a783b3903f748fd69579a4128af
+DIST urd.traineddata-tessdata_best-4.0.0 7994323 BLAKE2B 4b85b704dbd597bdc3ad70d522257550d502c97a27cc6cccaacf3e4909376ae2165e8e441bbbf1800d63014a542fbefa6d641f1ae59593a673e3035babf922cc SHA512 34ac9d87d6f6fe55b92d33b65f45a91d90c76752bda558f0cafb44fdf0ac9dea171daaa0d6171fb7870fd6d3034694e5e82dd4a7a71ef6a3863a4e7d7acd70fd
+DIST uzb.traineddata-tessdata_best-4.0.0 12953454 BLAKE2B 3f0cec7aea011c184c4071161cd153fcb4e3b0c144352f2ed18933f066037d16ea84aaf623247d581ebe4dc1cb754fafcbcb86d9f286d6d5e47f251bf83c52b9 SHA512 7c00f8ac5806b232f4486317b0c0adda3f0a19a2996839ac744e7f5a806de1ec88efc602399d2f6f513e8f315f10c977b5da57e66f11b704126baaeb07cc526e
+DIST uzb_cyrl.traineddata-tessdata_best-4.0.0 4325478 BLAKE2B ca166dc584363364b33875063b0905d5c5a339591fb34d58b5026fa71df4fafd5a2b3e5d04ac2f9b75157c9781492a285f495c8cf1914ac0513edef18eef5e8b SHA512 9141c746b70a80cc662c3c9af6bd80798b9a1197aa925193efdb296169567d809b367f8c732dc73539cb9fc1234e06794e5e7c3f500f03ac2f8e0e1e624c4f44
+DIST vie.traineddata-tessdata_best-4.0.0 12435550 BLAKE2B 3d5b029e27c28d851b56fa9c8b69400c40404aee4a10b978eff3c616f402f2db07cee53633765e385eba8fafbd379b64656846c32b2bd04ca9bd5322a96451e8 SHA512 9633fb6dba55a6b2d80724b36d195799ca9f092e6284f6c40fdc8c5748c3f383c6beaa6ca2f46c7862893491dd58d4929297ea469b72698a6e1b0253d7c2a0fe
+DIST yid.traineddata-tessdata_best-4.0.0 3278995 BLAKE2B 52dec464f0cd020d8060e425db2edb40ffc48a0b7efaf1fe5e437ecdf2664739f8cca992000bdf6ddd40e641df9999af40353098bdc19c41c4c3cb4fb15d2cd3 SHA512 17aa0b1ac83245d594bae43b9341f82c97fea5da1a8bd5439c953bbf8b5aa7200353c77e2e43cb1e37432ef559fe27c5708957f14def42a6d3c93753d5e95c78
+DIST yor.traineddata-tessdata_best-4.0.0 3736121 BLAKE2B 370679dface083eef9f5c71e6f0c21bfb78dee7720b54c4431d4414468a6fd6c1ea01144eabe6d4fd992930efeb852f3ccfbc3428b7f3f8c6ac81f5e2613f048 SHA512 fd383977a7196f5e7d50bbd9a04c50783c8e5fb1512593c23a9fec6c49c3f756f0ecd78986cdf1381d6947031eece84680c1db51a727981ec905b3ade8829ddc
+EBUILD tessdata_best-4.0.0.ebuild 2196 BLAKE2B 5cde56a7f95464cd4ab531c806c56cc0315cc0679fc61940fdf3f66b0ad41e87dd768c949706669c3eaf0d8c51f07179aadc150971aa23067234b0d42903cce4 SHA512 ce605018b6c91ac3d65d7f429354a7f4cfcc1e3f137e3ab65ba6dfad0f7f3fcea550f1465125f2e29bedb8d7395edd9f9c640f66f8cc7b07d359925d23cd5b6a
+MISC metadata.xml 548 BLAKE2B cfc9d8a0d932ab7e4fe1fe8af8fcbafd14dce53b49be0e524ed56e4d6d639b915183116187273b128ce57b51ff40a8bd19771f8c3117aeb0ce2efc371c8cf909 SHA512 6cbf9f99075ce5d913b9bd63d7a0579ecd2e1770c4c2a0697728bbf7f8794c3e789a7bc4272383415c23e7f55baf821f083b538517cf19d51bbc42611d8acefd
diff --git a/app-text/tessdata_best/metadata.xml b/app-text/tessdata_best/metadata.xml
new file mode 100644
index 000000000000..a4461ee6746f
--- /dev/null
+++ b/app-text/tessdata_best/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">Most accurate trained models for app-text/tesseract</longdescription>
+  <upstream>
+    <remote-id type="github">tesseract-ocr/tessdata_best</remote-id>
+  </upstream>
+  <use>
+    <flag name="osd"> Enable support orientation and script detection.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/tessdata_best/tessdata_best-4.0.0.ebuild b/app-text/tessdata_best/tessdata_best-4.0.0.ebuild
new file mode 100644
index 000000000000..ce84d4949e8e
--- /dev/null
+++ b/app-text/tessdata_best/tessdata_best-4.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN}/raw/${PV}/"
+
+DESCRIPTION="Most accurate trained models for app-text/tesseract"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata_best"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+osd"
+
+RDEPEND="!app-text/tessdata_fast
+	!app-text/tessdata_legacy
+	!<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kmr-Latn:kmr kn:kan ko:kor,kor_vert ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# l10n_en provides the additional data:
+#	enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+	for file in ${A}; do
+		cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+	done
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/tessdata
+	doins *.traineddata
+}
diff --git a/app-text/tessdata_fast/Manifest b/app-text/tessdata_fast/Manifest
new file mode 100644
index 000000000000..ec957d75fe58
--- /dev/null
+++ b/app-text/tessdata_fast/Manifest
@@ -0,0 +1,126 @@
+DIST afr.traineddata-tessdata_fast-4.0.0 2652786 BLAKE2B b3d1b1bb64990dd3af9d68ba5071b37cb2c91321dc49208077c76b26919d380f1ceb56ba26310b3c2667bdb44a7ebcc02a13afd0c210af1cb3c9100a69e93c8c SHA512 77f83482d45412896a7020a9e2f20f51b5a4d9b12e5c37f9be14ce73256ff1fb007df3def44110a1eb6d38b8d4601993aa1d851fcb8c48df9746e5a41c190757
+DIST amh.traineddata-tessdata_fast-4.0.0 5470094 BLAKE2B 33cf82a06efdc245d333a7a869da42fd9c7bd552deb68090b28696c573dcb02b35ff4ab53bd5862853af7ef3f389c97872b5331f25ea0c3d5fe32ccf8a08070e SHA512 164a6df5e42cba07a167dc3e7f9548de9fc014037c70e5cfd8082408ce28987b3dd03d136752cf4808aca9dd5e4fd2355d5aa2426b86d7909fef92c410a17132
+DIST ara.traineddata-tessdata_fast-4.0.0 1432056 BLAKE2B ce83f34fee2d5725bec6b8a57555b51b1da29e1021e35c65fac553eb44375b4bc3ae6f1a5af52a9584a8c0aeec115a403767cef31915697e30d7e916a9b15771 SHA512 7641b0b0e888498aa3fe062d0d44eda9e08d34e46e1c5ef48f92e9a49d2477c0c4cda5f989862d5441d0804312abd81733baa18ef9945c22524f9b106fc4f81d
+DIST asm.traineddata-tessdata_fast-4.0.0 2045427 BLAKE2B 776ddd7cbcac01a5a1f5fed3b0c67dc8537ae30d49980e1417152d68260856075586939ff839dc8d4c09cef48a2b1aaae8b154540c16f49f66eef3b6f56e8a08 SHA512 66b847338ac5c2ce79393e669d8729be4c9b60c2b19648a42583b6a330219d3be4375d54eff36e7b6f0c5c19694971e7ee23be2b5817034fb2d531a0c84edb80
+DIST aze.traineddata-tessdata_fast-4.0.0 3524799 BLAKE2B d7de3840e8f34c7636a8dd1d99dc5d812bcb2d8e660c36ff59790f4b14dc6bc9c107207af10263d3cf0d56a705fdaf04a57f5ebdd7f1995646e8ab4d6a7899af SHA512 912fa6362e2b320e220f88c7157737e63982f9b3fdd7800a625ae1693034c9b24c7e34d893563491f5cd821abf6286f35947f8ef821ef5cd93575f9187bbd452
+DIST aze_cyrl.traineddata-tessdata_fast-4.0.0 1943672 BLAKE2B 90f20ce0436e49ab8c54c0b6e8f79f3ad83229d0d10b76d85b32a39266edc0b1070f3074e7df9cb56f58de18a2684caab97d07aed642b661698afec89c2b1b9a SHA512 153620a2c1d9c979be5eab5561a91a8dd2da6fbb73f537d54a021268e41c1ae11f579f027a320df1c3e1c8e8eaf4c6165ecbedf8027a0bd2c36e7c8856a874ca
+DIST bel.traineddata-tessdata_fast-4.0.0 3692098 BLAKE2B 62e03c20c02611a5b90faeb31806f2d6995e0eea72f17dfb7534524f44f30ed8f95198f912de44c6331af9ffb155da267b48552931b85c1ecc0461592b6de891 SHA512 87d5ad0c37cc08b483e1b99f8dd354f0bf5a98f0a87596dadb9c0d23ae1442edf330011eca4718ad959c14053b8834fe53b3fc5162d320019ba7d2c16faf2682
+DIST ben.traineddata-tessdata_fast-4.0.0 855841 BLAKE2B bc665e16fdf0593f5a9f33d8517e957b2b939eed6206a8da964c84a2aff277dc215d82576810a15d1bbaf1f4bcf2427440fdaa8a9da998bd4be7f3d7a191a5f1 SHA512 c282b2922ed741e2ba965e57f6ee81402ab594a1100320baa122b07b6f855e92d5b6ab966ca125de5e53c0a84912f6dbb3fa6783f72c6300ac76cebcb76f0811
+DIST bod.traineddata-tessdata_fast-4.0.0 1966440 BLAKE2B 5e5b872ee7a421976c11d22e473bd099bcdd91d4ac52ba493e4ba37ce259c5cfe35d09583828a62a2ed9554090b19df5b6b0253b0b8000e02e47b56b11d2cb1f SHA512 47ffef75c99e29653c16ba5c0c6d77644d44aca6ac92845fb46ac746765214155d5793e1c296fb4407d1e0d18d154ccc5626416c236da70fb051c828229c5db3
+DIST bos.traineddata-tessdata_fast-4.0.0 2498242 BLAKE2B 7017b91796d118279ae160263b7bdc974dcfaae7c6f41730c4461c70b764e6d598a79fdb6bfa33c63f1f51183ac7f581e5305710c43154df04735612666e4234 SHA512 64fc18c36b6c5144eb187c1f12af69b36f2bbe0b82c53fd16c58698a87843d053e0b0866771a20fc1543c827bfe25e14f871e20daec9a31983af76a400c48dc5
+DIST bre.traineddata-tessdata_fast-4.0.0 6335007 BLAKE2B ef0a779bbce60528fa5af10764e52126e3f8da1f9cdbdb0323408fdd255be57dc3860ed6d2b2958839489a2e867e51e3b0ef4519c9c018f2b68c6c9d57f45254 SHA512 9335e080bd4758b6e9891cc68666278f34667d0f2b2bce3ecd1562fa730e0a6f05c36173238153db1b6499212af28528e5727bd1d0ccde0e44761bab3d52727d
+DIST bul.traineddata-tessdata_fast-4.0.0 1675212 BLAKE2B b041a237afa60d75b8344cad3aa40abd51c49c1bf3573c9908f8bb8a6c408d232f18c6278f1d41f520c65ef7f0249dfc9c10e7701cf0a848878684b8531782a8 SHA512 c3abc2282f8808af4686fa5ecbb43d070de747a7645afe2a634ffae4fdb93b42f80023b6a5b86ce8d5270c64cee93c1818a8ddcb6826aae9ac9b54292a968219
+DIST cat.traineddata-tessdata_fast-4.0.0 1146012 BLAKE2B 1eb23b29e1c47c020d08c57b725539824cb425dc5dab39c7a3b2b5c741854ff4fa13ff7bec270612cea5f60313af5e9fd64c90ef09a0653a8a52d699959fd461 SHA512 8285ab38ce22c516ead5ce7a7505e7cf125e27b2c784e440a1126005f745dcb33aff2e3d9741e1f7fc4eced0117e71b210b0b4cb801bd3a6bfdc1ad548c0aa3f
+DIST ceb.traineddata-tessdata_fast-4.0.0 716214 BLAKE2B bf41070aa1b22aa6e91a702d0a808938f9933463a3027e23b72952de30ff24f6608abf62d5a0a3580fbe8a9c69de142afe59871eec9977d0af61a18dab8972c7 SHA512 e8c43a221789f78bd042fafd35e05e6b9f6cb00373ce29fab701a3f61c65d77464a3b2ff838b1f03a69ffa048803f640a2efba50dddee4a1b4d878d6ad4a90bf
+DIST ces.traineddata-tessdata_fast-4.0.0 3795684 BLAKE2B f66c0bba47862fc7bb76a8986ffedd6cc43bc4a8d6fd5cd2185f848437b557d81e70fe5f46ae232b9b751aa7fe81292afd0ed6442a7d5a87afa44e1ab1f07788 SHA512 85134421f9a21d7af0c676082745f7fa520d4298fde4976abcdb500cb245a1b1c79276c533a5b0c796df89f9654868959d2053488d4e43883dc62dd113dee74b
+DIST chi_sim.traineddata-tessdata_fast-4.0.0 2469156 BLAKE2B 8dc9b6ae16b2c59f7c1bcf0134b69c6eb1388384b18e2c5bb1ce972a3074b23486954204563f3a1570fb63615b97237dda7ebe5168d0d2c6f35d68a40d43aad0 SHA512 384895a4c6f6c523437e2f934f9f12c96fb42aa63958ff6473d04c79f6ce919c46412f6c0143c0e061c0198e9c4d9898b6734f7f18cfc30d427b644f0a089397
+DIST chi_sim_vert.traineddata-tessdata_fast-4.0.0 1927902 BLAKE2B cbfacf6ebf7db688c936fe86db5cff028d17b67e8f2244b92d9b48d607bfbaea6abd4748a91873650c2a260cd7923f198e5e16202791923a7dc6c6859ca16318 SHA512 5b88cf5c5e5fcc4aaeea2b9753a24fd71148e4d27d0c39102a0ade28e52b1976e8c519036fb27cff958e0f8200c81aef407991ca2b6aebe82324b9d81025a7eb
+DIST chi_tra.traineddata-tessdata_fast-4.0.0 2366642 BLAKE2B 4c21c8ab7fee9a0e5158b440eb4deb05876a6e61554351eb6bc7753baefb0f29545de2041f4c297a8b918a0f122078a021a56f8925c53a49c2ccf9f760440681 SHA512 363847e2903b1812db73c16a1fb8ef72e69c87f2b27057c636e48ad2e8a9875eb380bdd7950504d397e03610d681084079bc8029d03cdee63433ef0367035ffe
+DIST chi_tra_vert.traineddata-tessdata_fast-4.0.0 1824756 BLAKE2B 735792205ec0ae9e4ad3a2734e1a871e4090423800cfafe250efcf7e933c7f53448c60593d1cf7fc8e69eeec428d7be50b6dc99609706a1ad2b3466248702384 SHA512 b3c16ff72611ffa58a9196742430226399c2265999691932ba5cb548ca4e8b82f83abdd529e9a18637231e011c9a80852d8d652995046d2bf56cdfdeafc43e64
+DIST chr.traineddata-tessdata_fast-4.0.0 374944 BLAKE2B bc9e90db116774bca88314fd3de6603b19502bfa452d62bf5cbabc74a8039cfcae9380cd73f37ad9c57b1d2c5e1fc3eb79ad7e11fe06b28df277d08f7740de4a SHA512 a29dc9bb46870bf3e6ee70720781b2ddaf6ca8cbb6879e124b1184d2428b2739405bff6e1644b6a2e6c9089f642b52875782cfbc1dc41893b7fa8028a066535b
+DIST cos.traineddata-tessdata_fast-4.0.0 2299099 BLAKE2B 39ed95dd5d8103812c386f188f1df1706630de89c717a538d7391ceddcb380d953b5b7a7b53e67ab43f78fde7bcb1b843bcfc522c521fdde1e81fa29e23db8e9 SHA512 d1bdab82106240859319256e87667c0ef9d562559a29f7a148033b5baeced5970b7cd7a3415ab919a6eed7806c0569ab781386e88b2788a518b647f69c55cc74
+DIST cym.traineddata-tessdata_fast-4.0.0 2208919 BLAKE2B ea325cbb50984ed79e6398f4d4b1a0c627dbac410679126abfd7778e8d800f7ad972d8a919595816ee3bb2dc2969fb84625e931078b41c419cb8f917a2640301 SHA512 2c4092fa858ad2070784c9993744ee0bca1ec77f6261c849363d3643cd3f891af86d88f48150c70e7b115bbd04bf62ffef212e315929a880cb61d4695a8ce844
+DIST dan.traineddata-tessdata_fast-4.0.0 2580059 BLAKE2B 3f2582285ffa01934fd077a885c62c82040e1a5cb76be968575fa2485a91b8ae958722f1118531021e851964013f2acdd2df1ca659303c4859dfaa141e60b713 SHA512 d37d7ea48660cdd13f3bb7aef4d7dad6259d7690cd76f911537fc5bcee8c010c634e2c5c36a3ef0fc8b8067c68c4f50f8204e28e48966449f6b4e1364541ef78
+DIST deu.traineddata-tessdata_fast-4.0.0 1525436 BLAKE2B 5de6814e49ac640fe1ebfb5a04611fbafe935d204691458c91597db8ea7b834bcdf4fcbae2367ce7fae32b96524142bcc61b0a856705bde9e0fe2f46323d06e8 SHA512 192f71c0645a4034015997f13b1b6e76d726e74fe227ab528399d3cd4688723f77c2dcd2ff87563ab487c4d97139e8faa7e77e1fbd81d2ff02336bbdcd757b9d
+DIST div.traineddata-tessdata_fast-4.0.0 1774535 BLAKE2B 3cc8ac2271cb19fce7a0aee99b6581cb5bff57867e132640b74c975524633ee1cfb130482f7659ea6c6754f860f2d74ae29c41a61aaa10bafc6fbad0eec99646 SHA512 d276d2b8ba1ecce9fc57a5d8fd28a7a29dfe1d073769b953bb33d97049c643e276a78c3a8f2f797003ecbae30160e90e334090dc1fe63e822440a2827a074300
+DIST dzo.traineddata-tessdata_fast-4.0.0 449596 BLAKE2B 05c2567789f92741a5b28d5097fd6038376dc2837622d0cda23a634ee804bf7bea0a1910db4ea2f8dc45da3cf6d0f5d38e0439a5884b737325fa1895e34c5844 SHA512 b9d43ae331b620c312da09ddc80d7dad13a44057655f382fcc10bf384d75d5abc4026f8782c6be2031d5ce159a063b845da49615a318acb6f1d35f206251324a
+DIST ell.traineddata-tessdata_fast-4.0.0 1419514 BLAKE2B bf001f04d833952d8e501360ebe55aa7320a841cf966622ff5ded426d235d8f816c5cde690b6b33e33091f05268288c4dd428a09ccf29fbac377741d27bb8af7 SHA512 c2d483c117801b277bffdc16237c439f59896e5988b5d642483f351cf249359ad826153c50be8fa25e44cc6a19e8d6d0ba871a889618797e216858725902a143
+DIST eng.traineddata-tessdata_fast-4.0.0 4113088 BLAKE2B c7b206ddbd3d99cb2684cc5d3d8a438ecaa3aaba9b99bddd546c7fc9e9e096f67e1eed4979ed6836a82cdd2d9579ded736dccd5cdbb34d388c8b68603f00d246 SHA512 90aadb5e0c368781f94add808f6b4dd31d8e244c9fecbe6a233070cac9a4fc071fd23a09e4a7e041db8e26880a6debbdf32a6b701c28687b2ed1cac81f4c1d14
+DIST enm.traineddata-tessdata_fast-4.0.0 3101551 BLAKE2B 5265489398ffa074eba3f517e15453d3087b82d5466dc40f3d80923eecc9f8d0c9c52c0a7af98be34235ab0e9bcbb2b8ac178f6a03a2cd40f69d2e59f4a7387e SHA512 7dd3ca9383bfc9306f9a67dfb3ecd41a9e4fdf5b716e7444170472696afa7e78e02c334082563bc41383e9500035d19614beaf4cce314056368425117e1cd211
+DIST epo.traineddata-tessdata_fast-4.0.0 4728393 BLAKE2B caa6e5c7ee30a4e7c4982c980cbd2dc7df34fd5fabdecaca4803f683cb7b552de153f85bad1e1d9d368317a5818810ca2299e3f9e118cdac345608f1affd40f1 SHA512 56dfb4b5df1cad13c95882f282f6f153cc7851839801ed3b01890742c9d6ae704e03704372c3742129f8e832ad2c21a17f42065885fa148d1e1f45a1533e377e
+DIST est.traineddata-tessdata_fast-4.0.0 4458101 BLAKE2B f1b5955b2ccfd1700d6a025288aca510a2f3c41f37c29217a829081909e32ef0210a1a1871e782fbf97a6aabde33a6148afd11197a0bd5521407ba1ad85fa8e1 SHA512 6acf6ab676232950f02c3a321269f74b7c94ad32f385f0d3cdf354520f0cee513d529e6cdffb09847cae0183f052be0e6b4c2ba56a07d754674d56c826237427
+DIST eus.traineddata-tessdata_fast-4.0.0 5175921 BLAKE2B e40811460d4e081c65a5955e772c5fb9c348b8a8b920e027ba74ad280092637eb5604b2b6b9b88fcc325ad9896bad4fc91a91a722b7cc996bcf3a27618e9fc1f SHA512 48a46e2b55faa91817d89557750e74d7e31ff99bd89c3c3f746ed821108334e942f6d521a810c258a4e0342de3e8d01e82d941f4587662c863385e58a92618a4
+DIST fao.traineddata-tessdata_fast-4.0.0 3439772 BLAKE2B af3ed3e8ca58463225c351b7098c9dac81e0b2e5b923ee5d85eddc3542c64c132a1d38699b90a51e1ec0d7a3f0429849a113323bf36c27d0ffb9a2934995d5be SHA512 2d9de845e486942045f60048908d771d93dff093d33a6b40c83a59e871f870d4afbfae7bbd5ed0a60e1c6514a5b7ab279b92162bc81f89b53bbdb9e236b3f7fa
+DIST fas.traineddata-tessdata_fast-4.0.0 431500 BLAKE2B 2f98065bbb68756dd7c69116833477df3a08cd75417e52111a9706241686ed3015526d7e400fbd7334a08f17e58739de7b47d4c7b5c8203c16a63a4db7f000da SHA512 867015ae3218a4fd7de65d83ed526a4cbf40a1c5463b7ae731c391ecae4857e621cddf0d832f53c35a959131598210ea794c67cf1fea502cca98d66895cc7f06
+DIST fil.traineddata-tessdata_fast-4.0.0 1841715 BLAKE2B ffa4fb0a6c6e61434aeaed8708057b7a2b90f5c6a0eb9532c36c02da044edd471022de144406bb48d633a0d036ae23babc0204b10b762335eef7e529627d4dba SHA512 05d8710d8f35199e3dcc14768c0fb2c739f5525d671db8bce2996b8d7f00bab1f453f344ec8d5125a3d1d0ae833951bc89017e4d6ca1da023c2373cb7c34c954
+DIST fin.traineddata-tessdata_fast-4.0.0 7865732 BLAKE2B 8fbc976ac253490b4fdbee46f3a4124447a421ef468b45da86f5687594157021df92f49ea5193f44952a626eed4d8eebbbb958abcf1de00d1761d070dc2a32b7 SHA512 d894031f33c76462b12ecc58e77d7327158d4abc162c12e820bcf63d5f2fac4f61a036da3972feac9561d8ebed8962c03c9669a64b7bbdad4f7551dddc220877
+DIST fra.traineddata-tessdata_fast-4.0.0 1130365 BLAKE2B c7c88f049d5ba836decdf35e154dcf227a1bbeda827651221521198841cea8d1591affaf1aa19b027d62716ff9863076cc38ec88b3ace98096e08483f2988505 SHA512 ad3266d0d010a744c1728562000f3884951cdf00e1bb3cafa46f11156a3fa6ef6bfb1398861e91aa1d9c27634f29910ac3507f4d978f657f86c0061da8ae80fe
+DIST frk.traineddata-tessdata_fast-4.0.0 6423052 BLAKE2B 11d85620108d40efc54d8e2d12e912311727f7bbc0ef3188eaefebd74b2a24d2a2b8115ef876cb4c570f97b5e2852318cb7165368dbbfeaf53813f03434f14ee SHA512 c21d75128d2e23e3039605d5771c3b23bcde1178fd4baef2557ca2df05d58a003b35f69c410defd66fc1960942b4ed764c096e62c29b51b22ecd6bd498afa3a1
+DIST frm.traineddata-tessdata_fast-4.0.0 2024948 BLAKE2B b85819d5392ef2adbf6e6493b880e674764ee6497b5f229b32f928779c2a84f4e368263987ad1e75bb10e116fd74bffe8b7d6812f0005f1fddc0768c6f3ebfa9 SHA512 28311f40d5330a6c16592ddfb1ba42aab6d507808f8d9b5128dd4ab5910a53dfdb0077c69c361bfaf5dc87aa57f3ba6381abb8d101facd1dd394772c9f9a21f8
+DIST fry.traineddata-tessdata_fast-4.0.0 1906018 BLAKE2B 4931c400aece91dc112284b782e20a86fbf4ac875d32126b038fcdc74c20303b59ebe76ea96ce084140fb001d942eb043771159281ff0fcc2e1c00be42f626fd SHA512 50467465e85a2002204b7866c8ed420f1452f11613b433ba8d93a7e5a34785c5ca4873c2adce224c1af594d1d8667ff2780ba5701ad4b41287482bee0c30a671
+DIST gla.traineddata-tessdata_fast-4.0.0 3068307 BLAKE2B e7d7b8050acb1f8e3c83aefed5a277e503b6cfd9777cfbfb74a1602c60bd0b9fd088af878ff6ec26d438b45b5d4cadff4613773738f1e672cdc7095ba5127908 SHA512 ffb26a674357abf3e41e957e951d308509d1089a859721e1686d1e714bb2257893ca7a512b3dcdf86af975f7f8e5f59da969ab51b9c19702b30e7b057054ad94
+DIST gle.traineddata-tessdata_fast-4.0.0 1181824 BLAKE2B a17e491ec202e27dfdbf00b092d033c70e578cfa9e540b9ed3ca6d56a448a997fa8fcca6e1be9aacf041294d82a7f5968d10f66a731ac622b60d7224004ea854 SHA512 21450289464b9b1afad0ef4ebb1007fd5b06480f734e6e9610408df1141497534f869ccfb87055bbfb272c2edf568464e86e894f12f9cc3f269ad52cf149a778
+DIST glg.traineddata-tessdata_fast-4.0.0 2554555 BLAKE2B 458809fb87ff09b8c30c0dac39d2779209b90c24ae1fbbb1dc7fedf5d21b54652cfbeddb47130627ea539bf657f672ef43a8284eb0ce9b04f23492d17077752b SHA512 6abffc2a53692826f90a9141aa4e6ebaf800873c2735ca74781a8ac4b342ddc9b9aaba565ea984dafe53e656e6a62cfa3b5c97301e6f33ed175ff5e0f7f36257
+DIST grc.traineddata-tessdata_fast-4.0.0 2246328 BLAKE2B 3c80d1e1d78bf2e98b7249991d29cf2e996ed91ab8cfe50d75714f146762ad923d4f7a63c15ebc275c8dd3f097a7b4c53a161970a339d27d6b5eb205a3c4342f SHA512 af4618180cfc7e51b7febafff8175e1d3eb29131306e892466e6a18156d3c4b762cb944ab01d17f959087959a00c1c241c33456fa1cf1ae34a37593b1ccc407d
+DIST guj.traineddata-tessdata_fast-4.0.0 1418394 BLAKE2B 5e71fb762ebbbeadabd8c08db42223d0003cb80a0b9b1534b5ac4c976e3ea23cb83776298e7dd1e9bada48e65d8c5442a4c25177acb86c496258729e61270bc9 SHA512 715fcd16ff70862a8cbdc027233e53b66d1dc0c274abc4835c7e3125649459f6206aed0fd150ef06e30587322015f0a23e263f9cf7a676e001f22d8e396d9541
+DIST hat.traineddata-tessdata_fast-4.0.0 1976902 BLAKE2B 0885a56474eeb61ca4b179e23e33094b9f70896109ceb88ac91c23cf712c267ccd25fd62ec9b517e7198ecd06672dca6858abfe9c5f77827e09961057de4cb43 SHA512 0ea89d2b3d65a644b420b7453725b272121a31469d87c39ad44f43ddf8d9532a4a8b44ae7e1ea794ca26cd95f4818f223ea9ec9d70300e850940017ae843a109
+DIST heb.traineddata-tessdata_fast-4.0.0 961404 BLAKE2B 2fc743a316467b3f6930e606613015c2cffbf055eff3d0fc925fb93040145662ae39a5fb557a2a7e2b5a8ff16a9d7688bdc3af955467283ebdf1a5d5caa6366b SHA512 337dfa44bdd5183af58479fe49423d556ed178424afc898bf957b6c7598ef56c60b075b40e2ea176bf5b92c2c6525fff76f7379e418b50717588a18aea30728d
+DIST hin.traineddata-tessdata_fast-4.0.0 1122751 BLAKE2B 403c52eacfc24937208f8e57383d9f974b88c8f76d4ff791af296c6b3eb793cfacadf33b39c7d770b87aeaa549a50eeda8f57f25c952540a4341152a3050f827 SHA512 7aa080bca73ecbfabc8521dd86a5f4f3130547e78f78e6bfa840a2d670621f74d8c684e7cb76c2eb82e05fd05d8e21239a00f004d7337c9e788d6442d4fbd8ec
+DIST hrv.traineddata-tessdata_fast-4.0.0 4103348 BLAKE2B 6259795ec4a7a3da6d1730dcd7c1cdf79ce2f2056edf01deb03a604630b28951d6d228879d18e0681e9df67f66961c4d31360c61a419609f6c991c4e55aacd1a SHA512 85725aaa67063cc2a8ff45f8f14f4b8c7de73582857e3c460658b667f5fec8477ff87d9607bc073f141c525e0fa35a773d032b15ff165538af1eb038a10969ff
+DIST hun.traineddata-tessdata_fast-4.0.0 5296273 BLAKE2B 8335769bc1172e8a2de38d732be4d448ac66c27ad3fd0d819e387435996cf4b67061e6e61a702f3f04b49a66a85e12371342e14e55ad03bcc7b2649229ad087c SHA512 76b39f5d0947f4b5ba11d5590af42d01f69c28f5ae5e3ba9622a4a8dd8ceec9a8e5e7c770e8a80e1c70dffaed999c0cdd97a85bcbf0c9c2458de647935d4ea93
+DIST hye.traineddata-tessdata_fast-4.0.0 3463717 BLAKE2B b0bb21d341e311314dcef4d791f2285fcd740f214d18c7450c7854dfc15a5f87b337f0979f74be30546009dc7cb40a17cd07adbe75472823909cec6b527cf6a6 SHA512 2b5975c14a0b7cc619376b9f9496f10d2658ecb9dd17b13411114bdd45c9c6192d8832a93dcbaec47d7448fc3031e80452d2aec2eedc5b69c82fd485eb86f4ed
+DIST iku.traineddata-tessdata_fast-4.0.0 2802266 BLAKE2B 2a2ab57f047b2d6070ba576cd1f24290eaff51a38cba01ba4c0a73a81290aaf3f639628ddc34a7b3cfd4b520bf9c0c4912ab35ee889c6b3d687ff320c0d587e7 SHA512 914e906f05c4ebe2e80dda4ed6084f4019e8abc695fe300424ffe89d89471a9b37ee74e373140408ac1e3d92f8d083de478bbbbe44469d5874f552975db910d3
+DIST ind.traineddata-tessdata_fast-4.0.0 1122661 BLAKE2B 291abfa5c950d1a5d624eff64e3ff75c78d4957e3419f6d2de98d3c9078fc3a872cb85d0bd1daedb9c5317de5c1d0f0bcb238f34fe1d1bc0d769fc77e609ddf0 SHA512 0822c54a8e77b851653b64eb0d781fbeb87293774800c03ddb0fe4c8af8c824b171263b31a5fe5c6ad0ede84f1ea163ea4cc28505dfa3fcddaffc5e1c0530db8
+DIST isl.traineddata-tessdata_fast-4.0.0 2278973 BLAKE2B 79bd2e2400c8d1b6d72a03cb6199a19252c1148bb53cfa1760fbea9a2bc29b02bb974abda121179b40b0766d2564d33d263a8cc66c123bc334093809dfe327e0 SHA512 4e276e7cccb1d202b2d8330e136dd7cea0c9bc299d76362ee5c91ec284f79cf485087fa0bfa148b0ea145c13964b6caf2b0dbc84bba32f9abc1091ddce1ade6b
+DIST ita.traineddata-tessdata_fast-4.0.0 2701314 BLAKE2B bed6a28d3e8f62f98ca22ac53e743f3976834c53e4e55f095c0ed01a47fb074a59ce2ad6380927c943c17acc3c203e5c72cf2e9282e47a996f9254505817b3ba SHA512 40c9e15d4f57f911132169d0e6eb84db32a5a2dcbeefdc3c42247927c669400ba02cc0c9dd8e0a40d61fe833cb1e749e8626395f022b67856013ff5d32258e65
+DIST ita_old.traineddata-tessdata_fast-4.0.0 3286123 BLAKE2B 4d0e719af193377e0a46f3b1219db22925dc821194aa457500ddd60775a2c146a075a8ca16c4996ad93442c1059c3ef09de7110c37ac7645dda499608d2f5777 SHA512 0d65e0b06ef93dc189deb9f7ff8618a20fb38bc2125e1d49333580f45aafde7562a8ab8453ce9aadffe073f2d3f28a6fded0aa1141eaa3586c54ca7829d8262d
+DIST jav.traineddata-tessdata_fast-4.0.0 2982741 BLAKE2B 613dda2951f78360a05ef285094f6e569007613ae7fe52a3d3126d752839402c7e3dd2c1a5c8f4b94a468985ef72e3d6b26fd462202d86f889aa5d3d11809ce3 SHA512 3d6a9989eefa2ad5331e1f0fd423c555aa8871acf30ad5e22aad2216db8f0f90603cb0c38d8eeb0051bbe1f6d28001bc134310b6bac877aff5f9a68667482803
+DIST jpn.traineddata-tessdata_fast-4.0.0 2471260 BLAKE2B 20359dc1025cf3b08374c3e3f878b59569db926bd26b323f1f0fd6183ae46a9560ad49e2529ccbf868422aae841e37f47d108f64e928822541b08e77a00c95f9 SHA512 db7f78e17ac2618d2a99cc191a8ce5075f1d30ac2eb2f23760aa5671cf88dbc7e37299a0680756c2f41da0ddb47ee34ff3df70d428c7c2d5da235aa6bdd3fda2
+DIST jpn_vert.traineddata-tessdata_fast-4.0.0 3037480 BLAKE2B 730654349c325be01917f7cacf51e7a6b264844c37785c7c5ec160ab0d1939164ed431a73d3627cb76ea26f1011e5ee00ff2e3a526de8d25490fb353232478af SHA512 9ef76f29f4a763b1bec134c247c2943380bbf7d6ede007590e38af240daf9662c6eee7d7e47306b32009fbfd2b0340a1d39e6becaf4452461cb0791aa8c5defc
+DIST kan.traineddata-tessdata_fast-4.0.0 3608331 BLAKE2B 27d0f068f6b0cb6e035ab294bbaadb4a74fb18a76a8acb8e34d080580129cd852ad738fd9d0a299bd196dcd46b2256c8e8dcbff0ccd48b10b4502b8128e33486 SHA512 162bd3427f5b8a371570a3ca25f63b01981d0bb738ddf0b24bccf2b6eb4fe8912c301436c381dfcc5e355e5d3d6a59de11f0b9561d8f7d61adf1c7f0115b3ca0
+DIST kat.traineddata-tessdata_fast-4.0.0 2524769 BLAKE2B 259e97a041885253b60c316bdbac239b5d3e1bcb61aacab24a8a256c9d7ea2dfc8553892a39fc15bbcd97e4644a35f1044267e1c9ccd8a94325f629df27bc095 SHA512 ba6c0bc91618813a2e96807377a0e13c0eb85a4bc7dc225a1eee96bbb53a109cfbe4e7fb81a4ff4b5ee54e336cf7509e9dd68ffa5ce0349729ff39d982caa583
+DIST kat_old.traineddata-tessdata_fast-4.0.0 423167 BLAKE2B eb407b48c2b0daa6c986f22338780c14108db034ed2405a4dbc4302e518c0fee6878748f6ad8b62cd44bdf8123ee92d468cee3e3c6ec561751e797f36abd5629 SHA512 2f0d731ce33d926ad67cd0553aa90f0562be7abffde67c689b683e2bd8eb7cbe3a25e36b1ddb26d618e0a46da4323f9cd195522308cf1cf20ab737abc1013c93
+DIST kaz.traineddata-tessdata_fast-4.0.0 4734644 BLAKE2B ede0f1b3aac5bc8ace757b87cf73eca89c67dbff2e057632cabf45cf7ff87e36409883e5001853648e5e21456ed3c3b0464f5fe88be504894fbbded86e5613f4 SHA512 36b53fcb93d10f41c7cd36951feed877503e9614b32a8dcc4a3869f8882f449b312d27c021e07409c06e0a1a06e3af76be2a1b95e44a812f8cae6c38de8dad2e
+DIST khm.traineddata-tessdata_fast-4.0.0 1446926 BLAKE2B a529a692fb7ea211a0f998a007062be2ef8a465ff1a073fe423ba960e80a28fc092259cd4bac1039022205f184e526adbf2f1c582432ed9c7cf2cbb389a888d8 SHA512 4d48b0e87e3d748f8e1ff028da0fdd4037ac202065e9bcb1ae3d3a19cc335fd54701ecfa231b8424d60ed2608cac46abdd0284ff4267894e1f0c13477a13fc41
+DIST kir.traineddata-tessdata_fast-4.0.0 9928497 BLAKE2B 49416bb9778e46edfc06e6323df6df7cf36aad0ea3328b136a9bcd294e60dd127c5ae2ffb0bb610891b8020f7f14048738b9ef50adb2c5c2aa2195554a6da76d SHA512 031eaf4f2abcd43234fdd1ba75fb7d5b2d6ca047c9dd4f59135b679bb1ba480001435f4f41fe00c523ea817e17dbf595edbac0576f0244b2445426d4f9e2e689
+DIST kmr.traineddata-tessdata_fast-4.0.0 3568615 BLAKE2B 4078f4d83c308d0294853de2862da1aea195134fcb7964caf7b83100bc17e35e31e1b600f64e42b6672f95a9fe93a64064210f7120ba1807f9fbb4585d0afed0 SHA512 91e8407c1dc2b659ad187d62d8c8db6e67b888866ea2cc3f08fc304ef7ba8db360233c009e35bb2805fb13d893c95132cb4931c93fbf81b25109e9fb8c7624ce
+DIST kor.traineddata-tessdata_fast-4.0.0 1677415 BLAKE2B ee6ca7884bd6425c38b084ff6c919203ed0aab24e621bc40a7dd5cb7706043d6c8e53df9ee3a32fd18b53992a83f85f983adccf7b8a28e79843dc701ab5e9a7d SHA512 ca22e6229b66c3b614876275823a6582483d4701992975197ea5a29144b0b660dbf662a63552dd41bbd56a1c0e1ce5d50a68d69fdf0cda4948e87c92a0813b51
+DIST kor_vert.traineddata-tessdata_fast-4.0.0 1113715 BLAKE2B 9517d038076b1d954374177e5258849a51e5f25cb0b65f48c0a34454f149acddcadfceaebd31aefc69d393037944647fcfbe976afc23a31f45d900868a065e7f SHA512 9e3eaaba5102a4b8243683bae016afb5f7cb22000ab875df3120c22e722e1362704f3600e85a4c977fb5812b948d143a836f1aeeb104b37b61d5dac85b86c99f
+DIST lao.traineddata-tessdata_fast-4.0.0 6386744 BLAKE2B 437411c7d05abec9b5d8cc53eb9a51aedac6b61152bce2500890bfa10e8ea341a1e3ef4a062afc6abc907edbfa8dd6e0406a13010335c3779555ef9e3387b88f SHA512 938d976d5d1cc0abb9a039598d0d2fa7b324f92ae695a998fa1ce0c50cca1ccd1f204d70823011aa25b3b5facbe86abf20796aa2f0d0f9ebb6bc76e75c7f9427
+DIST lat.traineddata-tessdata_fast-4.0.0 3187463 BLAKE2B 9b1fd6cd47ac041e9069ad747e8ab26b27bcf742e2fa57433fc3336fb1d74d44a4800133095aac9e34b34bb2cb267aba1c9bd5cdc3d69ac83b69114ce5556b00 SHA512 99c79cfddd0e497544cd184e93dff6282bb1d07025020f0076d4131f9f8355431e77e2dc6af676cb90ca39d484bef4b3e6ef37a86d194007f45a019542ab9d94
+DIST lav.traineddata-tessdata_fast-4.0.0 2717247 BLAKE2B 11c7d19cff6c273b931ec771b8a445084854dc370d93aaf8edcdd325fc6e7b17df1c51eb9b3a4497bf81b29ae20693d7d933a9306eae28e480caadf374e1f2ca SHA512 cda428ed5a6ac3b4243222ca56f01d95f0b41d12c9b797ea9c1d6718b60206792638707b9c9653fcc5e15bb23244293fa437c036dba122764fe6456f56ead8c3
+DIST lit.traineddata-tessdata_fast-4.0.0 3154896 BLAKE2B 452af5355b4461e74bf371363248b2d1b5804711c6bda707ae1c66feabfab80ff8545954fb220b12d647c9be7d2d1762b82460af8cb5a856bc1099b142f835d6 SHA512 4b20e31086c4f08e424f678ce1b182a24d40deef732d7c355684acb7923e11db6ac3581213d673c970d5b24db2b63f896f7a849f714af6afa2354a65631a8018
+DIST ltz.traineddata-tessdata_fast-4.0.0 2606426 BLAKE2B 7c7f788b63cd6e06859c9e39385004d3b80ec3003b7053ee698525ecb00dc16d9fb13facaf98ac20ee7067a7fd634af690c6982ebffdf0f235574588556ff909 SHA512 30c8da2862c30be8c6c6b13bc9f2f16f2e5477ec6f9128759224ca6078b32904cfd6ed371e50f22567bbbe77e691e22c7487c9e9da55a3a06bd2ac03f0b50e21
+DIST mal.traineddata-tessdata_fast-4.0.0 5275996 BLAKE2B 8c4bef2de31709188457f2783ccdc68da35bbc64a4610f4561e2a7ea0d0e4323d42d3862541bf9ef720576d11c09b26200b7434a3541867287b04c9d502cfbec SHA512 66d8396f59b36f1d73ed497d50ef237cfa868707d8c52d6bfbe3f3467417fc971b225f5abf53918a04843e5336423c91254f31bbe2b387863120e08ff99e63b4
+DIST mar.traineddata-tessdata_fast-4.0.0 2118233 BLAKE2B 250a4d9644a09c2e9ba1fe3db5b6353d842af5904fd3aaf0af10785d733cbbf8cd4f44a4d8adce38ec27c8d30a3edf322a39358b1b6ef8b46a1942e733c0e315 SHA512 d7a8f138cfc50d6a43f4cbec1cc807d4d76d40d3a68401b39373a0fe0447c788bb054eed602e58325773cd8c044b3c314bdf896d9c3c5a3a0e14f1132a18e331
+DIST mkd.traineddata-tessdata_fast-4.0.0 1600188 BLAKE2B 6a828b56bbdf84b03716577a329a89c40ba44162471322c9fcf08651b526979d3c22b8b7a6f30c9ae8736938df6adc8d583db16279b72041a04ac89c0cdc953a SHA512 1c588acc96cd031c1c445f17f9aa1d63ebd15ac28798dbcd539c5d2ab7b1eaa12115920ebcf5c003cfd5b2b6534f692815c74c8bc0eba8fbef193a97ec1b3150
+DIST mlt.traineddata-tessdata_fast-4.0.0 2308796 BLAKE2B 59d9dc5efe3d533885273392dcfae66bfac07987052e434643eadbe16fce3f5b149b8e70617d5485f509dc3976636200984bf1da56201ca886922770913d63a7 SHA512 8cc864c4a2e56863509fd37c995d53e9ef65f25c7fffc3ca767e1b5238c761ec22c5e44a16813b54ce14c08336bdaa93856f694c7cb5616a5c2b011ad061c967
+DIST mon.traineddata-tessdata_fast-4.0.0 2137042 BLAKE2B 0ee7f4f2e56527bea8a1f777aebf1f2503ecaa336b2f3c1e4f63c536c5c44fefe668baba3c856857b5a92fd5bc7adca8c77afc8fd163826e6c8f8a7086e7bb99 SHA512 1faad826b8c270a2ccb77b25da707c38a471338f9beb3c37cd1778715dcd6a04a162875df04d44dec832168930e268dcd4479350170b88296ddffada315e14e3
+DIST mri.traineddata-tessdata_fast-4.0.0 862973 BLAKE2B c98d780a03d14bbb06ac42339b4d65692bc25154fcad265e06ea0aec45b79b3ae8edaa4cb8f914c1756348b2d99f68979f68ac6f54d2d301df9f0eacc8f2ec42 SHA512 bcd8ffc0760fe53d94e4b1fc403799ab0507c0886808e37c6d8d8a891f06efc9206e953efb40bdfcc8ea334c85cda23525fc0d22977ab141ee19aae06ec10cf3
+DIST msa.traineddata-tessdata_fast-4.0.0 1747801 BLAKE2B fddab2c54eee56e41abcb24fc8bf5513759e41493e5e912b368779056b4a6686c00357c277d3f726d25b694430ceaf2ccefc4dad035f499cbd43669bd8debe32 SHA512 dfb23a8a8da2702be188265bf23f4628ab8d407cd57e096d8910ef7ddc90b3877f4c88c1179cb2ede70aa943ceb2934fd69d411cc04d99420d04040b7e1bc0a1
+DIST mya.traineddata-tessdata_fast-4.0.0 4640561 BLAKE2B 3c2f46ff0e625e1462222cd2a2f0299571c65e4694a00d7797a86e69bc274871dba2eb3e259371ce419d4b31ae32e316cd3bbe6912ff47ebdaf48041674d45af SHA512 b530e32ba44bd9aa3d9557610a12a8d66b3b0895334e3360e6f1580ed4b3bdca03c148fe79080b23cfe9a700e8fc58480331cb1c04e8e7e5564d65451be5f02d
+DIST nep.traineddata-tessdata_fast-4.0.0 1002911 BLAKE2B 2b7d81f85eb5f476f60f9ea6470be0b81c030d2126bdd99110de8c4f2190238c7a5e576d0bf79a47221a196b5fcd411f71f42bbb260b781c869f03a648f89f1d SHA512 2f794299e4054ef4b251c44d3b96d8b7db7ddca90a3bae8a566ce6687fd30bc6b7125b06b58322c092ef714b9ab367e2a55234cbf08cbe3cf89078eba4706409
+DIST nld.traineddata-tessdata_fast-4.0.0 6050296 BLAKE2B f5b967f26c5e6f50047470e8c1f1903d505db34d9d0e5fb7450ce9ff39a13d41c16de521224fe68ebe6fd82ccb99ca4584b373e1d2c0684704862601eec1ee5f SHA512 ce1c8ef25bcc5321a65e6612caf2653248c1febb4bd10a18fb327cfc5deba9a59e5618c8316d5e171ca6fc00d1c7b4a898b34671476ed26a49c2e0eea1788409
+DIST nor.traineddata-tessdata_fast-4.0.0 3610079 BLAKE2B 295e547ed4866e47a9135c714479525e4076171870ee171e80bb3281e6eb6db9e1d4e47e4926b1a73bf2818dd4afe27ba7c84fab2a8159bc57ecbac18f0aa09d SHA512 6781645a2a70e259ef18be071b771c6b13849c1ff7aef6b452e8a93ca35e8b8010196731729b8a29e9622eaea2dbede0d1f5d12ce267a43721e8fe83d02efba8
+DIST oci.traineddata-tessdata_fast-4.0.0 6322087 BLAKE2B 2bde0d3f8ce2661d4984ba4558cdfa4339b7bf8e2108abce38f9777eca2c6a6f00d707c85312cc319172cba11c73faaaa2168f6990e9c2a2fdb53cad8d22fc3d SHA512 e942352dda42905367a5ec2207c08fb7ff0371e8f4fbc7883c77277ace0973602ead0c1a31eb943388e8beb609cec1cb4d7daf6a23c15360a04e59a8e8effeb7
+DIST ori.traineddata-tessdata_fast-4.0.0 1480066 BLAKE2B 4089720e159c1e41daf49c38b37f013c6c156be84316eccd7b6e26a18a36ac4fb3f00eb0a4498b718535154cf90da0a2344517c39fdb5f4cf66fb29d81054d64 SHA512 e6b152cf56d42aadee4930da7f94766ea69c195ddae86ddb43bc23be21def0dd2d9126dbdf554b09f49c1224e1a9e55818ab43ae647c7398ecdabc008405ef27
+DIST osd.traineddata-tessdata_fast-4.0.0 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST pan.traineddata-tessdata_fast-4.0.0 497721 BLAKE2B 6a17f91bb316971c937740ba897e226859f12841559e36c2f602de51177e3509575b0e521ddf3f5484b9626057a0b04d20f38c0a5762c09e17b1d51b939e477b SHA512 fa2071a7449fd52c94a0adf87ee0ed96b5750137a7cdba3d3869a987e632b9507b24413e786f870b81fdbb5fec8e4f148a3aa72e384ff0145e486b2fc4ccd654
+DIST pol.traineddata-tessdata_fast-4.0.0 4765518 BLAKE2B 26110b7317ec6d58ceb79f0e8f9484054e2cfedf43398f913c34145cd9a3931507e411d87bc9734f71f321532561900dc8ff6427d00fb246c6842213bc59d5c3 SHA512 bf4295bef318048712ea0c09e199468d136aeb6b7a919053324f628d05efdc132df7ca8439cc501e9a8950b6a5c4de7ba7327db00deb70923d94daf8fb942a43
+DIST por.traineddata-tessdata_fast-4.0.0 1982756 BLAKE2B 1297243d455f96fb6d738e2657dc6bed39223519556dae707156ffd208067b0ea56efea00e00c841f8355b534539f510e76ac7157931b9ca7624233563ea89e3 SHA512 b51776a7e20d12e11439a33f591ad41cfa9d25aee36d8503b2189eceb5c1bfbc20cc75af362141ad75bbff3d49b7e60dbb777f9904922d62612cdde30945ebd5
+DIST pus.traineddata-tessdata_fast-4.0.0 1772087 BLAKE2B 7d25782bb1c58b6f205227a6f555316b4da823bb388fcc10a87f811220364a38014288830ba2dd2c04a0e2706cd551e1ab9a245cb226300cbff2de08f4f0c0ba SHA512 db1543a0bedd85bdca96289cfe72e4048c42a0913b66a558cd952d8ea47acc5b3c280f57a1c909c57c427c6737162e7d39c19c60ffbfb48fcb0a7bbb4f3d53a6
+DIST que.traineddata-tessdata_fast-4.0.0 5026336 BLAKE2B 4d7d559e241054d3a91b669b8330d9cb3ee938f45226dcda989143d4a43bd457b79820b6d781a2f40ebb8516af1047d63e8c9a5bf933491e0799a94b94e8ed39 SHA512 18082ce5ce7e55a17c04c2b3d8e701f2382558456107a1678196208d265e43229a66180c2e8529daaaf686c97816f0df09775b483d594de6173e57354814e0d5
+DIST ron.traineddata-tessdata_fast-4.0.0 2376323 BLAKE2B 37d629e99487814dab6d8e6f107a188d0821726f75f4ee84387e1038ba61057c9d1c6b4de48574a8f5df541e3c4a09ef94ed5a1bd3a3e5a554305b5462d72cd8 SHA512 36639480ce972f1cbf0a020eb30b3418a6961046d0ff961c70ce953c5023ff4e20df22f43742693f43b98af4634c1f74e910db6643c3bb9898a4481ddbbba360
+DIST rus.traineddata-tessdata_fast-4.0.0 3861738 BLAKE2B 0a9ef4e0565a0ebfbac8c5c968db2cc0fbaf49b9c1e0ecf35b17087bb54b519f6710d804569752ab2392582cc8ca8ed070fe5bfb164130ebc9986c3db2a97fb2 SHA512 65254c36df8274cee0a2c32e9632f3c2c3c2c0032314bf0a99a4c23309e862da7c038ed85745d58697a814f44c656f22ef5a7815ae2bec33f80de1de8e1ea9dd
+DIST san.traineddata-tessdata_fast-4.0.0 12404677 BLAKE2B 4ae4406fcb2ee01a1914dcba1d54dda37ba8e2fd480f71f15beafe6dcc82fcafa0af3050cc952c36215d7bb8a87b62d7df2872b82c7ffe8eb85710badd59d1f3 SHA512 0e5b48e46e42a88ec63dd9743ecf4e9137912404b1a0cd8c26c43349d7ec7ac471bd986a7c9a4be97f802a80f7b5d18c74f55bb0006a473210b791d543b58707
+DIST sin.traineddata-tessdata_fast-4.0.0 1727413 BLAKE2B e9906ab16aca38864fbc96d24dcec836d42ee2f6b251af970b78c676718824d9383d41f7f566fc407ac3afb6356f5e7f02496d4628b29f400b5eece7bfd9097d SHA512 17e4d52188c745df7923cd802d2446c2dffbc34af8e6a795e939ab398e0874cf56b9a2f353975d12b4532688174a657c8763158ba182f2a203bc825b8e40b3ff
+DIST slk.traineddata-tessdata_fast-4.0.0 4427661 BLAKE2B e1e7849d8e823bbd573d5c3756ed1fce6f1e07dfffb1fa7a65f86f88d7cd222f3a648c46bbb6bbf0561aac9c7c5ac62476969b968c136a71926dcd5ab7fa30a0 SHA512 df1daaf259e2868a36f3d1e7edb79330b5d61c3104e1daab13cd8024f826a6181fab05dd18730e6aaa30e67f54555c80b95f8266101cdba03f71a70b93b94d6f
+DIST slv.traineddata-tessdata_fast-4.0.0 3003829 BLAKE2B a8b9f9fb36a2237bb5222122222f56cbad35681d2ea504703b7b7f167adba79bf366e14573e52f8ff1c999cb983ee0014c46d864c9a5cc862ed0041dbad9fd34 SHA512 723a1d1f32a3acc26bfea051856489d94e75bd4e987cac7d2b5de9fca4a233eda49897fc857094b658b77fb91bda7aa315114b4a5af4ba8f7d75baf2a8e06d5e
+DIST snd.traineddata-tessdata_fast-4.0.0 1694035 BLAKE2B 3e6af108b663fa45eb0e1ab0e126ede89f49eec19aea3a60d1d056e33e1afe9448f40071271cc9161cb04cee8c4a7f0c14b852891220034e9269a89c7e3cbf71 SHA512 4a8ffdd98c8ef9a3c7f8022964819818d3e03b2feb155e1d991eae697ac2a41858234cd8e6e73582cfb8c4e2fd6ac4efec115da43162059d35e4c77e2d569ce8
+DIST spa.traineddata-tessdata_fast-4.0.0 2294433 BLAKE2B c3cf779e0e6d4e6dbe4c170f9dfcb687f3d122fc22bf1cbe047f588ee44b2b1b61ed9df5d016ced47fc86a56708b6d0a1bc582f7e7da99e53e11840f555a96ba SHA512 901e8c0c6dc50f57c723922061d5a98b223f1b499b9af1546b072dd70772c5a3ffa33ddbc76295b115bd586863f3d653602bdb6d1fce28a59a86d296efa24241
+DIST spa_old.traineddata-tessdata_fast-4.0.0 2894755 BLAKE2B 7eb2186d63026f458e693af5fe40d6df826b2ac21629f007171b269d84cae5e84f5d7e5f47c9009a43bdf860ea288af4c958c270db6be1eefad7764bbad1fa3d SHA512 fa9f3f31c48dd30649907f4f624fdb43211c7e05741a32cab6f79ef0cfad7692507c5a059b48ff9cedd5446932231849e19e11c5b45f13c21743073ba951ce5d
+DIST sqi.traineddata-tessdata_fast-4.0.0 1874705 BLAKE2B db3745d277bb3ec7f52697c1b70c828d07a11e11cb702ca7899ddab773bcdb532f5779d8fde7c0bf8e926c893d07ad3cb0c65c0ded701f7a4029e8d58d672513 SHA512 b24c41da3ecdfa0b61498273ecfaed437366fd87221e8e007f1aebf1e3882f375ea80f39287082a110c378d999ccf1513e6ecc51e430ab2342f5b57794730755
+DIST srp.traineddata-tessdata_fast-4.0.0 2149931 BLAKE2B 8c422cd7b3fdbff165e85a8a3e1037f75a857baffa4f016cdd30393a24d5b3dde45d32217ba874d0449d4419d01a781a297e5154d8eadd5adfdb2516627028fa SHA512 919688e69d2afb36feb870b51534390a12e84b5ec80e934e8b34447cb6a96a9230ca81556bb55d49b56bd14acb90dedc5bdd9661b3d81bb587c31be88a3af9af
+DIST srp_latn.traineddata-tessdata_fast-4.0.0 3281787 BLAKE2B bc68b208d347ad06e10deee97d1726549faddd1ae2165348bd6cf2364ecbcf0d70a4fedfc7ca875c0248a5ea69b4c04e7a0de8c0d5ed8987d5dc275348899036 SHA512 3b6f64f5797ebd5695c76b9465c33990d5b49ea9ad6f95f9396a9c999c01e867c3f66b16f9122528a9c6232d97b87c3afdbe5b1bf009509edaed321b4d5a37f8
+DIST sun.traineddata-tessdata_fast-4.0.0 1369500 BLAKE2B 90729519bc2e9775a0423bc6d3a0dbb0cc540ddf7044e446d69be84bdaf7e18470d754f1e57c3b9c5e24f48ee39a82ad51f452af9e6a4c96285e32948e9589c5 SHA512 b2760af17b99f553d2c81615e2e46778ee6a2193405b8a3d9aa08fb514559676f2a425055a2e62713aaf3b51770bf880cc2c536044de376842413f376a6865c4
+DIST swa.traineddata-tessdata_fast-4.0.0 2167651 BLAKE2B 41b66aea58516fe8e4ec2696a17fee68faced7bcadcdbffb468fc75dc5bd3b6b29c7e3c75e01bd929a4ecad2d69859d62ff157e961aaa4f0f0c8a77d066181c9 SHA512 077df824f71b2dade65bb1611623ede7741dd138172bfde94be03e18478c6aa48082a1d09ea69f332f883b2d5294c120c31292ee34050e3f10cb2f5402758465
+DIST swe.traineddata-tessdata_fast-4.0.0 4167034 BLAKE2B 71422ab662dd7ce09e96242a03a2b8439a545022278585d9a370c11e770c245feeb297dec8a22a0b893b437d3f43e20b75f73709dbc62e3b7a25c693fba0b08d SHA512 1971bcfe5ec1ef0ad861cb9a0fa8eddac52ea537de1da52def098551795779db5a7ecdadd7546b83695e1f2116551d964e393a3fe8e16895566fa641e9af99a2
+DIST syr.traineddata-tessdata_fast-4.0.0 2207208 BLAKE2B 58c523b6b0ffc13f11d22c8fb265b0b61b773bf4a685b2b11fcf83065adcf355a8d8884e1a5b60e35aef7bd9266cb6e0d5d40a05c73d1b02decef3afb947ffd1 SHA512 ca4fa16f11cc05b796d60032e98bf2ff6e36d9a7a8985dd08034794e7acd62bf51ff6ecb95427bde146d99721e74a7dd60e5e11c1f15caaa24ecdfe09fbb82fd
+DIST tam.traineddata-tessdata_fast-4.0.0 3237963 BLAKE2B 6110cf03cd5448f5e677bdf1b05aca92989faf1b33e0acd2a4da5dd94f0e6652e3f5d040fa733bf8a47fa6d05da4a68e6b697d9b8f9fa27c2129b7a7109acbb6 SHA512 e0b12a15736d438698ad95d586fe237d104a8766c349ae79468d88fa2cc712448137088f52ee99bb4d82e79e4521f946eb9eefb8b022957aabc76b9709ccfef9
+DIST tat.traineddata-tessdata_fast-4.0.0 1072896 BLAKE2B cf085fc72d79963f8dcd5b0320c9f60cf7d193fde821cacfd6045c1691d01fe1d9d70b2a2747a4e67f6b2c93a9dde8a6637015e8daa4bec09e90b05b5d478fa3 SHA512 8b6c40afc7bfb86cde14352a93c58b12203173163269f3c8401ee1d2ed1f89831c3726a898cfdfdf76501078009721e1b020a62ceb0b6e9cd621f5cc27f4c2dd
+DIST tel.traineddata-tessdata_fast-4.0.0 2769654 BLAKE2B fb461715b626c5f977c82b897a4166417c8bbef7dbe331576cfc9897dd4e70a47dca24c0810227aa48cf882383edbc8f4a446fd04e6fdfa7dd635336bad463bb SHA512 89666af74698d21bd49d9fe3b66e4b07a4d5d68e99042edfc0611a2b08a25666b3a03915ca3ead36bfff02a89d40a25a455c534b1efcca32c7ea2a839e44018a
+DIST tgk.traineddata-tessdata_fast-4.0.0 2602685 BLAKE2B 265d8dc62f4bede659f9fb3be28d8711ec60ff507404758f9b805d081a3fa725e83efb1dbe79b1fbf4a9bc700880126900a9b31083d229ee626b8bfc8c14c292 SHA512 3c9b42b434fecbbce50873396908e910c18c3136b0f7c0a0c1ae77f02bf6fd9584b88a20b8d7cf09e2b6998a8f7df4f6aaeead7649cab68590999374f25c5991
+DIST tha.traineddata-tessdata_fast-4.0.0 1072600 BLAKE2B af2a4956b247cd9519a992716efa708013fc530a52636d3a62400b10cc309909a9a9dce25cc36651a9fe03d5934ee04e2eee5cadc7f5c6e93426138ad8f4e365 SHA512 942590b071264bc55bd74dcc0db652fe5ab9e70a98b6a17a0add7f5e7f1e26d00111f5e7dd8ba22324b17759309e94d6ac8a6222b33d37fee04397b55072b0e6
+DIST tir.traineddata-tessdata_fast-4.0.0 378822 BLAKE2B 3fc8133472f1753ba742ca5f935ec20370c30bcef74307c88f0c40853f130d591460c175aafbd6bd65fed9366df4a91317d138bacfa77b9d2980d5bfa41edb65 SHA512 2d0c196d0f8b6d11828f41e1ef8e4c132863469e1148b3f77ca569a713af91380a4d53eeadc242c5f82813b40f949cf7279abca96a9cae2d8a8b4c0581b83d64
+DIST ton.traineddata-tessdata_fast-4.0.0 947249 BLAKE2B e2cd14d26e07b7e5f88feba310c05333c6e1aa396acd7e29bede89c4b98cf94da6d3374818e26a5b967a1606f9cd147b6b56924f6b71d2f007493dc7e92868bb SHA512 b9f4ef0555663892e821cb876d50f3a091983ad83da375a6d17b9e705c1e0c7f08a5664782e44e7d42f357d379ca3094adb72daf01b39b37b4ea2ebd04130437
+DIST tur.traineddata-tessdata_fast-4.0.0 4550554 BLAKE2B 21cf610a7250be7f1136838b4d65a309c80a7c3c9e2bb3e86e3304947bc2d7a21cce74d46f7191ac84005b45e1b3c12e24d3f47587263793d164081505f5e3f9 SHA512 10470a411a4692aef1cc5a0465793844cd47f8a9079f72e9e7e0176e9556d13afa7e83ff3644d4a8b10a91bcc5698a8d377d4f4ad986ada72a0557a2c5617357
+DIST uig.traineddata-tessdata_fast-4.0.0 2794272 BLAKE2B b3820b7de241e598b3bfb2946bc23656b1abb1d46502f18bc687c55ee6da605880c90d59ed1567f8b6b39ff0c5c5494a1ff8c7c5747353a6dd46f04f738b65f4 SHA512 7ada280945562e828b59ad731d51682dfe3e0996eb30a02c134bd7be156a4604b4b3ea3480cf748fd9f9dc0c55a9b823ecb249b260b1718b2490f5addf89891b
+DIST ukr.traineddata-tessdata_fast-4.0.0 3825102 BLAKE2B bf263c354082cb3fdb5f0b63088bd6ab315e11df60c85a424aa534b8bf2be6ddf6e371c2b4ac3e248934e66e6198b0eb39a5b008a1264309ad71d81004f49296 SHA512 67056a9a25206321c0804ed40520a7b6b1b74746bcbf57c1488faf250d014288970de0ee73b7160dfd9fa509bc5fe59f8dcedc5bcbebf879ce87431e3c1fb057
+DIST urd.traineddata-tessdata_fast-4.0.0 1398718 BLAKE2B 51a3f61af80192fd02e8b32462012ef64d03d4435df525cf6ff6ff5a81938e8ab0eb6d93490aeda3e2bc676f96eedef51b07b2c5d5d6fe15bb2f56dfd51b776a SHA512 5f4ee46bd71624caa73aabe1b69d49781d96f49e9374c3edeb69c861f16d36640e3a2b698d75d71bd7b94d17c1aabdd742a3400964487414357b2baae89b582d
+DIST uzb.traineddata-tessdata_fast-4.0.0 6470703 BLAKE2B da7703c5340b795d202850f96d71f2ff3f69cfd57126ef76053b01246673d6abc7f16ff77b935e132dd193566f0b7772ceccf9402046e38d7664581e4437afab SHA512 f03c9a83572293c40ae8d119c1399953dfbc81503445db3867245fa6f48e0844a6b72b85c24b663e1169829576ed6eabd2c50d48384c2721a4036e040f164478
+DIST uzb_cyrl.traineddata-tessdata_fast-4.0.0 1563501 BLAKE2B 4a57310458de8bcb6dc5ca4b409f2858cdeaa268ff050de28b2c39d83e7fbc49eaa3fa2cc528f9b58d300c76fadee02f8b654456973ee97545734b478d411589 SHA512 ebe9107b7167d52e48030177a8fc301c1978f798282dfd33694dd5544f9970ba24330797a72ec02655f243369490b6ddb78df96bd28f299a1a9d50e69fcad483
+DIST vie.traineddata-tessdata_fast-4.0.0 531275 BLAKE2B 379070086dfd362ef888b8a467ce003d32653c844fb42fd89a5bcf383b58cfb7b9c170328e49c4800b4f43201600e43e26c7745f444e06f5ba7bb93e8fb98e72 SHA512 3a055b7ba07e38ce4a21be85ccbac26b27aab5f4104d4875c866030d0ac6d468e25c793301c2cbb4ab5ff92492bc5c02eefe083d638f6c081cf19ca452a05733
+DIST yid.traineddata-tessdata_fast-4.0.0 545606 BLAKE2B 96d06916e67e5712d708d6c4534b3a618211cf76b3825ea3b48ac04d8158633a5fd0584aecb2574fdf105d0ba8d9ed21861d3cd9e6fa186c273ed950b9382a1d SHA512 4ee1effed6fd9233d6341f62f5dfd0a4dfb25e7388c7152bc3bdc55dff0737198f35264fcff34d81c223e4a8be832417323f9e16c4c33245d0493d44eacbefc5
+DIST yor.traineddata-tessdata_fast-4.0.0 963400 BLAKE2B 38f84a1c331ef161cf3d6bb25e8586d1cd5fa0458fcd295fec3481f3c02cfe3f9f138c22731af3beec09471570b5d790917bb42ac40e5597dd5336afe2f55cea SHA512 da4d086f52534fbf01ac00dd996aceb2c646fc61b60199cf539cc7a223c050e69079ede591b95abbe1d3927a39ca7f9bedd68c558e6df54d949dff5c6428f449
+EBUILD tessdata_fast-4.0.0.ebuild 2207 BLAKE2B 008091b23ef5521d4da73bf2d7da1f41d7330740fd58c9eda2e51d19c94a5b1e8470e0e6e187174cc184f1b260ab9e7751237be63725e3cc3717c1951f595d01 SHA512 89d73e66b108243a9e86c11912a570c3cbd7fed23a3dcb7f91ed2defcff7200f7307d13b7de9fb6889a7682d5e675613583c63309fbe671441fde1ad552d4d62
+MISC metadata.xml 559 BLAKE2B a8bbc3bdea38cc1634f27ccfa49775eb7fd8457cd74bc57264b2f953c040c38f9094cda82f9119960f6a95e022616ba0258b26ed2c1bb83215d8c52fe7ff9518 SHA512 8e6c81101097d1449698ed7b751b74a942a9d88f2cffe6a2ca0669ecdb7a2d2a1619af18b539af1fb538456d5cc64ef0edf3519793baee37cf2bc5be6e025919
diff --git a/app-text/tessdata_fast/metadata.xml b/app-text/tessdata_fast/metadata.xml
new file mode 100644
index 000000000000..e7a3ff9d1634
--- /dev/null
+++ b/app-text/tessdata_fast/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">Fast integer versions of trained models for app-text/tesseract</longdescription>
+  <upstream>
+    <remote-id type="github">tesseract-ocr/tessdata_fast</remote-id>
+  </upstream>
+  <use>
+    <flag name="osd"> Enable support orientation and script detection.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
new file mode 100644
index 000000000000..f87d68977662
--- /dev/null
+++ b/app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN}/raw/${PV}/"
+
+DESCRIPTION="Fast integer versions of trained models for app-text/tesseract"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata_fast"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+osd"
+
+RDEPEND="!app-text/tessdata_best
+	!app-text/tessdata_legacy
+	!<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kmr-Latn:kmr kn:kan ko:kor,kor_vert ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# l10n_en provides the additional data:
+#	enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+	for file in ${A}; do
+		cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+	done
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/tessdata
+	doins *.traineddata
+}
diff --git a/app-text/tessdata_legacy/Manifest b/app-text/tessdata_legacy/Manifest
new file mode 100644
index 000000000000..138735c3b55a
--- /dev/null
+++ b/app-text/tessdata_legacy/Manifest
@@ -0,0 +1,129 @@
+DIST afr.traineddata-tessdata_legacy-4.0.0 7851157 BLAKE2B 90811d860f65dae25e0cd74855292394532e4f3059fa28dbe101111ee0a47eb5e662602b1ea797897001b839c701394124056d9c7cf360b0483be820ea00ef02 SHA512 8cf2ce289ea892aaa186fe26ffcd50ba4f7433874f1367e55fd337801f63f337d1719ecd3baa41575e6a22f834dbd3ac7b970942ae4e4dd730ea3bdc7a0f1b15
+DIST amh.traineddata-tessdata_legacy-4.0.0 8423467 BLAKE2B b4f3643981210e898b791ddb4fdf58287ee8d23c0e5822933e586ad34ed06de497e7e2de6a834c0178347ffc6e12589e85587c7da1d05fba32b36f2c16f7d6fb SHA512 675108f2a2df285a09a95b8a4a2fcbaabbb2123c85b68c2a5daf05e6dfefda6be7178a686ed2ca776e58f2cde58663e717bc9ca0913b41d58575be77166f42ba
+DIST ara.traineddata-tessdata_legacy-4.0.0 2494806 BLAKE2B b0297c8cdf13e7d87b1f65c04b55905154fb24c16a9c7e4a0cf76ace6cd8eeba83c1fc81ea098df566a55270735d14d819ba60f6dd5461a473350f4ff1767210 SHA512 333ddb480e60201039b926e8800324d46657ed4b7adf3365fa0b43317dd7c501e149410e3a749243e0fea1319cd152c960cf1ac8ea08e20c1931cd6c1598e1cb
+DIST asm.traineddata-tessdata_legacy-4.0.0 2045457 BLAKE2B 793a6cf489b5b115086952d424b062dce0baaa40456a5d4d4825ac6041d7d26b6f8b72bb95384aefb6441650d7b0e5793f6eb1f80a5c4a2497797d2e3f350cba SHA512 500b5be7e27d9f657b9eeff83d0c39d3fc85cc801958e92b899bfb8d3b30f5c78c820cd1529932cc4a3f20050cdf425cdd17e76dedf597413e2a16af4a199129
+DIST aze.traineddata-tessdata_legacy-4.0.0 10139884 BLAKE2B 608c5372ad3901af85505d432178dcd84b3ba68bb446b5169fd6a1e0db840e5ff27d4a4ef624a6316dc9d0c8362930dc575067de07efe7af9b58e2b8aa2d8ec4 SHA512 24cfc52e8d36495bcc2cfcdd41cde539582541e6a98d2e151311189db033a7749ee7f846e21ba504e511037284099f2d4da4d7909b15dae92375638d39adb74c
+DIST aze_cyrl.traineddata-tessdata_legacy-4.0.0 4726411 BLAKE2B b0fd32c05f704cbc13c7c5a832d2395b2a8c86922f8781d4d03d7ba177956ff050646db1a833ee80e7a209a119ee1e47a6adc2e8d90b57eb1d5fdddefbd6933d SHA512 160dc9fdb07deae92f00e6a00c23906d891a445ed78bf2046fe93d5779a64ace1ea6d134640f92aa91cfaff11244d9f0aa9f55ef735bcd760ff8d75e9cc9aa1b
+DIST bel.traineddata-tessdata_legacy-4.0.0 11185811 BLAKE2B 78be505c559865d8c81849a1acdb342fc05ae55f1a9a2a154203b11e13c7aafae08e53e9572760ec43aa24728ac38a0fafdeb458054c3150d399abf25760a617 SHA512 e5df0c9c0470ccf786eb8629ea525e945af0bf8487dc7ea13130d81120145bc1fe7dcac6d24cc3d26cb9992ef61d126c5920e35a22a7bfe5aa05428588c1f57c
+DIST ben.traineddata-tessdata_legacy-4.0.0 1789439 BLAKE2B 47db7752ff6bf7ed21b96dbce261786917c63cb931a2266000f299a1cd3ac2d8d5c7ceff45bfdda879b4101f5888959fb52a7ed406469865c5623ec433ab13a5 SHA512 e9ee3bd2ce1018d7f100d0c9ce1f504156d260d2c8d0fe14c3c614f058b9b512d8366a55d2919813b97854bebd5c296df90b9292994f35d21d12970360a05973
+DIST bod.traineddata-tessdata_legacy-4.0.0 1966470 BLAKE2B 6aaefbb8bf09a52f471c085eed1c311f05a60fd1e2b655255c7e66736f8004352f25ed187ec1c542070fd82b3650ede3b60179556b635e00ca71bacff0b510f1 SHA512 c6c1f05523a2a1a3f566521ca466c2658d792906a0d3115d3abc328b62f2644175abf0a649b72d6127dee4d665448a0e36532bd38fdcf694145f2ebe3a18bb10
+DIST bos.traineddata-tessdata_legacy-4.0.0 7930443 BLAKE2B f164434b6559ea68fd509044b418498a062c5e2ec5addd4e9bc73ca3520aafa1af6c49bac75d1b48272b606c5e50199e0b511f32a2feea9b2cbbc63b55f95580 SHA512 d4c76d60f0b56c15076b4ebabab0622a585869149fcc3f3252365adaa89c3b0a6aa0ecbdd59c11bf20cc51056f099b962b0c0e6a6d2ad3f3e9352177e109ee01
+DIST bre.traineddata-tessdata_legacy-4.0.0 6335020 BLAKE2B 5691702fe90ae6d5481fce8c2e59464c4f8301d7dff662de19e16ebfe270fd69fe97b16c831aca7fc1feb6fbdf6d75da37238e18ba94c4427eaf4cfc0ce7d117 SHA512 bab1bc966ed1ac4a4d305564fc99868ff0aa58f719c3b66643cc809acd2205ff8e2e04d02bf6ad60ace1a4ec0ae984df7fef94d1c29488693a49082004beed23
+DIST bul.traineddata-tessdata_legacy-4.0.0 8371797 BLAKE2B 6f3d3861c207df6abce0a502847040fd75355228088fe4c8d864f35883afc300a2ddca077fe1492da0d2c986b9286f1dedaaaecdd5fef441aa49f6040f5299c5 SHA512 c32939ee33af530d65481b5efe6b9edbb7ae272e06a2fbe05142de353634e947887c678aa09e4fc8cc62afadc99d290db9a1b7ccf2551ceb6ec99abf11bd1ace
+DIST cat.traineddata-tessdata_legacy-4.0.0 6502025 BLAKE2B c3c2d8dc074a5fedc7c9b1d69fb23db88801c97371ee666b1dad8153dfd50e387a5af6f995b0b6ed008b344e3400482e9be9783ad8aefe6f0d6b0474ff487a2e SHA512 ea28038ffb6d62a6c5255eaafdc9dbfe6c669e2193279aad300ca112bdce597df6375f26bc19d9dcceeec56641519bbf1595c9c038efcacdf7759f625253591f
+DIST ceb.traineddata-tessdata_legacy-4.0.0 2402839 BLAKE2B 930ca2a957bee72837a2dd312163f53d0894aee0e700c31f75594a220296d2e2feddc41ec80125bfc4dbef478a239bdcfbbf8ba67226b4d15354e160b6bca438 SHA512 17ee20837c77823e43c47627a6fd4d888c346e6f6204b855d45913def1802351fbe6c7973f0633f91ffc1d8a852c372130cd027be25605186d77b0da13e88128
+DIST ces.traineddata-tessdata_legacy-4.0.0 16238266 BLAKE2B 07ea65df7fc5052346d519602bfccbf404cdfc321c2bef90fe0a72042430eecfdc145db34e579495be48b17efc5bebbff289f62c6883fbbfa2c34869ec0a773c SHA512 b1180f4473ac5172f653b4ec957f8e9d7427e1dfdef1ee23c6f6d2fae8f7ddc6a3db40a070b00784647b1eb09e2b14b891e5c33c21c0ca4db4808cf0993e0a0a
+DIST chi_sim.traineddata-tessdata_legacy-4.0.0 44366093 BLAKE2B 9dda7c1c96020e2e26f9801a5692932ffcc8c023034749b5f5ac35bf75821e7f96a94a42efaf32f983106a79ccf345c683feaaddcd27cf135bd059fb3677850e SHA512 3281d2098c25bd5c34603216183c9d5dd949c2982bc4d357f09c56875328640a4f8f79619baf8872e3f6814cfe2368cbfe13b1f1526439964d087a8b0b675031
+DIST chi_sim_vert.traineddata-tessdata_legacy-4.0.0 2470991 BLAKE2B 5185759161703c0d48dabe2f0242c2c73521612b309ead0a9aa83edbb5c9d8b071937985d3c1a1fc1d1acfa37d12e998bb3461e0d3e29dc4ee8c4f7e69f48072 SHA512 b802f4cac91d16e6a1129f5cf553657731aaaefd9dfe1da797729515260cb5e76d182ec1d964ca7b780ea8e62bd03974b19f351c653314ce7dbfb00571d68814
+DIST chi_tra.traineddata-tessdata_legacy-4.0.0 59025073 BLAKE2B 6912a8357b43fa0e626871e838fc7be598478e24dddd3aceb0240360037fd7791ddfc4b2203bb910a7d777579f88d44cfad6e0a5983ec86ec58b6abe3badb1b3 SHA512 2f090ec33d31ad79905796e56c2d6de551e62441e86fbcea93f88c08bbfad6c51b27d92a8f0f45c967e5d25ccccd0e7fb67410f1a88f8774027cba376ca4cc84
+DIST chi_tra_vert.traineddata-tessdata_legacy-4.0.0 2368306 BLAKE2B 1611f6b986a225478882adf00b3e6108c4aadc1ef456fae2a9798a8af2589b38d772e2c027f0c7e5be73e9730cd38fba7147f3fdd165d4bd767313897a9c66d5 SHA512 b706508c402a898d63d781ae3d9d109996a41b896831cc3277cfce811d7892da5c433d9423e7e377fb114b86a05c1c597412d7e729d3865f6f00467cd866623b
+DIST chr.traineddata-tessdata_legacy-4.0.0 1458011 BLAKE2B d30cc84204f92bf270be75ee280374001fa73eef40a1aa1c8c3647365c6be594d5df446c32d84ca7c129d2374c458b4c0d86f08c83b767012dfd266f033f5010 SHA512 67606907a676c1d9b8aada52d341416d5e7001af430edb80b61e37fb78fc4f3854c97a63fc7d3644951f7016ab9aa3f97ac14600e8b18894bff83c44020edbce
+DIST cos.traineddata-tessdata_legacy-4.0.0 2299112 BLAKE2B fbcd7c6afcc2549b8d162e0205eb3e3808a83beee427ec682013694de475d905b13d01d2fdf63c6d35352f677dfa2c3565254bec82689ac2a8269bce77cac03e SHA512 f6d363ec553d9f3c52b090b2513f3500c01ef149696f718a39994a0eaeeb32c3bfd3e47ce6d009e010c543073332107fa27c03784f1025bd3efe18ce0b567420
+DIST cym.traineddata-tessdata_legacy-4.0.0 5998144 BLAKE2B dd085261b3a6e1060beb8bb8bc5dab1be23f5bdff31967ae056972f06e2f791b302010d665849cf165b6be8db02ec2a4d0890a6d889d415c5e65c14a35594d7d SHA512 b30cd745962da1cae6718362048aaa6006b0705e42372a5fea353ba5d600b7c3b4a2a55520418fc3d5ebb87b62d8b3f8bc33573b110899fcf62c5b57f80af3b2
+DIST dan.traineddata-tessdata_legacy-4.0.0 10578171 BLAKE2B 5221fad713af6c2021558c675f70e7f75057306c6376c4182477b6cb255d5e4f525dcfcb0d4f1d5a9e9235cd9ae70f032517431f7323809df190cc257f41a961 SHA512 97374bee706dedafcdade1eb7b93746acd94e4a5f0287f94987bee03e1dfa1b7bcddded60ba5776d524c8d5e6c33511c6755df4eccbe97c4b4b3a221a6c466fc
+DIST deu.traineddata-tessdata_legacy-4.0.0 15437534 BLAKE2B be973bfae962658d51f602b6b49da3d1dae3f00609360756847236d7110256522195272a163e222c048f5301388892c55ac2e13d2d6cf01fb3515b7821544612 SHA512 3f8396d12291476b37990f5ae54231e2d631b9fbf9cc8a61d2aac89f908ab9a857c53bd6c1fa59ba43db97c68f796057599853a755496b991be25f888970a0d6
+DIST div.traineddata-tessdata_legacy-4.0.0 1774548 BLAKE2B a98269d00897c750fee322adf0c5b93acc9f2a61c4eca0d7fb4ddfbaae6b705b15a96bdfa9543f878b533162e1f16b90fdbf5ae576fcf738c0e7135df100f39e SHA512 25730f236bff127454e3e05b61ae3ae81ec2f2a9f308a58729d0e406af5481a4881e8f0f156b08afd09b71c21370150d98997e5c68f1d75069707d08cb798f28
+DIST dzo.traineddata-tessdata_legacy-4.0.0 449626 BLAKE2B 633a8784d610bf588e6234bd958cbe3725625c08c4cbd745312a7b25b15e65bc6e66a64a4632d5a6eed9c38114ee13a0d1caf58b4df6e7e7890b3c8e060d9a02 SHA512 17d011ef9cd59fe64b618c395cbb6e26dd57127039db23e73c3dc41552b47e218f85d267fca95088e7239bd2475b78e00c66d694f8d6bc6361c406fa60cb0c25
+DIST ell.traineddata-tessdata_legacy-4.0.0 7543380 BLAKE2B eeeb1f62730bdcc09e007c6055466fdcb7227697801b38c7f059422f29ffaea2d24c121256aca45c17eccb5843731a96144cdcde16e82f3586b5d90780073b53 SHA512 42079b235b8aeffd86aa0a063d922b2018e75ede82a1136c99347bb3cbc7c2638c26feccdfb2cf6d42c3d5f445c14e598d5f0147f6af9e23107af27b3980c59f
+DIST eng.traineddata-tessdata_legacy-4.0.0 23466654 BLAKE2B 4df77ba3f80b0142509839e4d5af5523734930cf211712440cfb09fae6e76849f0a9ba79710cdbb5ebaa7c646fb5ce3c7aa31e09e318719a136fa0797eaad16a SHA512 bf1a730ce314fbafa065547e40703a1ffbe7f080557c59088a1b59944af3b94bd7da51cec0f322558d72ab3bdaec14ae96eb43aac705859ed5422702028a8b77
+DIST enm.traineddata-tessdata_legacy-4.0.0 5207312 BLAKE2B bd78dfa5d29622165fce0d6f5fb898b57a355046755797fdd1df7e781a6ea3a71b12fec45f746e190479e3ddc00ab51cd851c14bbc8e8737d1c64986d7c81fe3 SHA512 5e54eec9dfec915c427589fe46ea14a74e0c0a86a1be0abd23602cc1136304f34c3aedf4710b49615a1d52ab07a05e5f13f33346ae3fd3ba7cca651a9896def2
+DIST epo.traineddata-tessdata_legacy-4.0.0 11330444 BLAKE2B 13c59b70ec450576a711ae8df0f5fbaf570f9546eba4dcefd12e9a1e919ea2df7efe09506959455f82580612a0458aba7282de360f055bb5ea2d5b50aed06e11 SHA512 09ed23595a04fe0d22423cfdc6550a5b784e4bece7257ee175861030db32457631fc612d33227cab355a465622f2ff8d976f5cc8cf1698465f474a8f1105dfde
+DIST equ.traineddata-tessdata_legacy-4.0.0 2251950 BLAKE2B fd4d2a15d9a49bd60d429eec947f46a693a2b51bda4bf5aad9a38b2ff48fe323074f48a4103754efde1ce4b4eb48023bd2c24fed52e4815a2a6a2f9e818d085c SHA512 aa95d32330e3ee52cfedd4695246acb5b508f35b7a7e5cd5055f8f4d773cf5cede8d87b6877c4ed4fbe78ade748d45f91a66bcdef2e43c7d7311dd3272ea0cfc
+DIST est.traineddata-tessdata_legacy-4.0.0 15301628 BLAKE2B 68a8f656b1f910c3d30ae8be88461d721609a3451e402b1e9ec91a6bb2145d5e35ef7b25f4e04fdcfdc2f786d65820b426dc7772cc45a49c6401f986c0d5a08a SHA512 18abcb2ea4bd85a0083966b8fe9407c2098ab1a195dcf3681ea2f0be20b291a09598604b214e85f5e996983f3b4b15319a024d0cffe72caff9885c292ce2d889
+DIST eus.traineddata-tessdata_legacy-4.0.0 10145441 BLAKE2B e5cf454d86ddc97e9b7135b03996c2884354a6b362bdd8093fdb03d859c812341fc710fdd2ae5ffef9b51ea62645fc62c57a8536a63c95269985ccd05402ebb6 SHA512 e9e748331794808ab556132ef74bc24007148ccf197fdd56d4e3c85bd25cd116bcf1b361e33806f67d23108ff7776fdef55f8711fcfa8287faf92ab7503d5ce5
+DIST fao.traineddata-tessdata_legacy-4.0.0 3439785 BLAKE2B 26ffa4759f0d674c8c93bb9ff892446e422538a233f97762789a07a0604569cefc1705c6c30f9f5805c9662bb69511250d22e41f716e87a78dfe401ef57dc2d9 SHA512 029e9cb1203894de4ac4c9c65ec255dd371682e303b99e29332e8fc2b2842e6f558cd92f285e0df349f158cd6b14e6fd0a780c7d50ff3490704a0817e79ed7a3
+DIST fas.traineddata-tessdata_legacy-4.0.0 561272 BLAKE2B 39e024d95d2c4dc0144129832f49891740eb2d383f51e0a42b134d49ccfe1b88cfd02bf05863ba45e7a5d6521b66218b2403287c253bc67ed673f581610f76c2 SHA512 b1f36737de6d165b12505b88ad5707bec968d4b266f751fa1c0acb0bf2eac5fe4cfb37ca55ff84162f8d000eb32948c681a0cef141d2fb65d2ce2f3c67da83a1
+DIST fil.traineddata-tessdata_legacy-4.0.0 2509440 BLAKE2B 3d6b9c20a5043aca5ed05ca9d29068c64fab27804aa6c1225f0d3b834c0e4f2bcb8d3cc6b6d5582fb2775bdb41e5347831e7784798b77172cb6bd2b21b5cad1b SHA512 47a51bf468fb365c356774f68f14f1f78afa4a044b265e9622d054140121026c035ae475179069aeab7368c6ee050eb1faa8816e4c0559bb59fc174e4a1d98a5
+DIST fin.traineddata-tessdata_legacy-4.0.0 21140513 BLAKE2B 66c0370d90aa197780a56c501875aee79c04aed0adfbc86079d9e80cab7888f7866649ebef5180ff5a6fdc8728bb821ee93e0f2e51275fd45775f4883f938077 SHA512 788cf5c2679c8a5143cb579afb406eeda1c08f4760a72aa27512b62e8d2a4a714fe715e02c3463536a5eb466a843f2f9b0c5f66f787a25c1c650dad2dd50d6ed
+DIST fra.traineddata-tessdata_legacy-4.0.0 14213351 BLAKE2B 6f0eff67f9902704c74fa8bfb534d155ad97353c6c25241ed6d8d7d716db1d764e018344752d724aae9b9e9a326290cb67e8c48a4e0039395f7e7938efb27175 SHA512 abd84d1f0a9436ec4a9089ba288d9d21af8c6bd8897c3fc991c2ffdaa16224c084b6705606b91cd17152cc5e647fe2f781af0c5e392bb10f5693d7ebbda0838b
+DIST frk.traineddata-tessdata_legacy-4.0.0 22874034 BLAKE2B 9f04aa056191a488635bbe9f45f7a4e1bf1496982a176de4e7ce39dda13af0decb530c43f034a06c1e0f3889f6b03386f702124ddc0d1ed4ebc344aef648f1e9 SHA512 5cc1a97b6b3ad210bfab033bafa8ffaae5195958bc212e735aff6fbbe65509be71c3a790c9873819d1f93d9ce3c32a2bc3e8b5652e69335bbedd7cd5478bcd22
+DIST frm.traineddata-tessdata_legacy-4.0.0 17856636 BLAKE2B 045091157220016da84e5dfbf07e98c697b5f29a6719491f9059fec40216f7806c582e90bb19257f3b7e56ea5ae7c37a49a992ed6420001e5c0224e29426867a SHA512 08a88e0f1488a6ed471c5842cf8f39982e12eef397dcdeb2dbbe0902c9ced6af6e39e4a4142a9d97cfa5a6f75c5b609267bc8e4e4bb8db25d07a3ca922b4733e
+DIST fry.traineddata-tessdata_legacy-4.0.0 1906031 BLAKE2B 727ac1cba9ac269c091cbe9942161f2e7ef0f546b3164611a6b937c7ee6e18ee037056d2791530e91475e3508e6219f595024d55014679f85a1686be4e87a4b7 SHA512 6ed4797e0b8b01e50fc296ba58b1ff9fb9612cae479945e08e5273af3e9bcd75b52cde895cd026329c91dc0302571c89a6ee48e589a8712f616948c740759afd
+DIST gla.traineddata-tessdata_legacy-4.0.0 3068320 BLAKE2B fe7abefb18abe8673deda2ccb3a8c80139b4ff89c36385577a1624ad2425e0bdc4ed73af646a488d2ac37711b5e56a8358ff8cf263c65a9723987ec5f4edeec4 SHA512 db445b8c82c723c0b4ac6a5cbb306ca9d1edc6a10ca26992d2de710f710b908ef6fe2ac6c83d068752436fbb3f7721455e213d0ab998207586aaf5581d46c0a7
+DIST gle.traineddata-tessdata_legacy-4.0.0 4664254 BLAKE2B 13f8f2ad88bc72dabf54d3094c9840b8e42a7091040d4862ad4a2f4cc69070a768430c93087e82ff617cb4d1cd7a38fb2d011795a1d623ca2f796aa21f4f9969 SHA512 d535f20606fbe30c08994aadd2de4490c558b4c7cf5b75c069f556b66f5dee5ec306b9fd402f598ba73ba30d046c8410665163df1c0461c979f7f2e374177d0a
+DIST glg.traineddata-tessdata_legacy-4.0.0 8074927 BLAKE2B f334a814b2a016a5736f0ef72a43e78fdd90b9f2aaccf293c8c2d6b4b580497756c205893b7865fa209538a126ffed6040b0eb0fbe63b1afc26287348027f946 SHA512 43599e948012a3476c17fbf6ca836c92065c5b56b9d171e08eebf651c49febfa1af9d39d7cc63f9a1e66d7cd4a1ee8c9cf223384e33e931d0282b4871080ed51
+DIST grc.traineddata-tessdata_legacy-4.0.0 7428728 BLAKE2B cc1716ea2e53ea84b8865e5f50157ca2c448447b72dd21509cc056b38187dc639d777be38b9075f84281f626eb1d4a395f81b0ff945a5fc4aad32d824aa4ae26 SHA512 f8c8d7c5486b3106ff80fa01d9edc580acab589884078e6e816bfc4e965e9e8bab410630a1a9fb27b82e6a7b80d05c1eb788a68267563cb4460d850127ae4ada
+DIST guj.traineddata-tessdata_legacy-4.0.0 1963128 BLAKE2B 3915831f64becd782bc99883e3fa1dc188d25308fb8a41f7c13948a3a39df3e6821b35df08c0dd5cfc5eb4140df958211a2112acd4a88f757bc5f68082b92b0d SHA512 5b1f977a17b988fa90e9ccf019517ed8564c9644abb7bb7ac489ba42625ae6ae6007d30fd7298503bd1a42c4e93f91f26c6f93efb2fc5ef36964e4eba8d9b812
+DIST hat.traineddata-tessdata_legacy-4.0.0 3326722 BLAKE2B 927e0916425c1e9d1e17a884e4fc413217231c38a38e404360bbcdbc80f410d5bdac4ec752e365dc137fbfb6d48cc8b5d0d3da93c6f885fc8ec8758a58ad4c5e SHA512 bf5b5e80b32679201c1a65b8053473d2bcf987ace1b90297a619133ce58ed955d7b6b9249643092e6638e485ca3377c1918abff7746f3214ee004842167ed73c
+DIST heb.traineddata-tessdata_legacy-4.0.0 5413459 BLAKE2B 4b40eef30c0b81d52f8715541f64d61dd1c4a8e2910d86740c138598f2219768d724a27cb86c9156d4eb54179accba788396e720e75d038e5edd21758c9c90f9 SHA512 787cd3589e981d75941ff6298446cffcdda2e5cf508f8b07d074eca83274d644f7298c6b727a9d503a37ec589d2362e0eed891869c903ac52a28e14115ba1d6e
+DIST hin.traineddata-tessdata_legacy-4.0.0 1651010 BLAKE2B f0eb5c0c70c2d6d17609537ece87959032910d87f8e5366d863454984dc83d2f518f0604905712d100a924a8e5d8c2d10a186120be207e813054bfcef945de2d SHA512 684fe7c221abcc2094eac2545ff89b78d89fab5ec83564845fb1f039ef21efd42e013732dc1946cd75d03483ac22d263262de8486e6d9e42dba68018bca652a3
+DIST hrv.traineddata-tessdata_legacy-4.0.0 13797409 BLAKE2B e330a6ee95fb9fd1a4a8f276ced525a54db481a3dc6c5bcc893e139f3bae2e3b715c10e160d388e44b98bed0b43577fb8a5c52334e78d974cd77c85b7b5a8e1e SHA512 c928c3b6518fcb274e561e07af15fce06ccd23b70d02a9f44cdea4c3ab85b0875ff051c76eabb69ae2ebd7acb11a0545d8bbc83103735a62ddf8d7454dffa91f
+DIST hun.traineddata-tessdata_legacy-4.0.0 18051690 BLAKE2B b057b6cb60c7da9e2e91aeed0bb759053b29f439d3dd324422c4b61f68a9477fc572b45a5addb2b9495cd1e10d5d5cf204fabfd5277853c27fc0e98fd44ba7be SHA512 af9fa2b95a98e87b6ee252db924e9d9d5dd9266270c2a590ada000fb63a3de1bf4c5880e95c8f36179bf59472b56b98ebf84d628e893e13bbb6991cf38bc57f8
+DIST hye.traineddata-tessdata_legacy-4.0.0 3594112 BLAKE2B ceebec853e0e0ec60e6d12f14f4e98f785b6ade02f0efd206d97d7ba6a0a0e7b398fbd3c5afb54b7b7d3d49c4c897e950689e2c2a88ab92bf599af0fc3ce49a6 SHA512 76778410a15cf131ad713c18777fef30dcccdd8ede33ecf3b76d00e84f912ec5c304f8140bf04e3c0470f505be6a800ca461af196b131ff827b08e9e4312ea34
+DIST iku.traineddata-tessdata_legacy-4.0.0 3797385 BLAKE2B dbce72842aa93830da73b908d199da998b51d283c719800c76d6faf84d19d2b6dbcc02a15d4d7623d3ed484a5e230fdc0915758956381abc7e01e67482468e24 SHA512 6e5f22a85e6770fbdf95858bc52b57b0a28fe03c7b44bcd5ae44b27779cc7588b32873b9b81dff61740cb552ff58ba9f82230094a3cca52022cf660833e05ffe
+DIST ind.traineddata-tessdata_legacy-4.0.0 8279230 BLAKE2B c5472cf5f6cad2ab55dd2d1586b8e628485f3478160d97d5447f8819fcdd07cc38b59d8b5fb19186b2a0cce16ffc266c95d2a86f18bf93cc8d3d827821da4830 SHA512 d206270ea64055b1a59c9c226347ab89b1e3f7504cce398c9b3d3b7a74f435cc072aafc3e7d22c4c11527d5413f0e8d105628bd3fdcb0bf88399ea822b8cf603
+DIST isl.traineddata-tessdata_legacy-4.0.0 9037703 BLAKE2B 02d7687a0db86c06dbc42d0f08b5e9ffee0411c2891edbf25bc2a9be2cf1da28fbddee8e7557c5a28ec44090f2f6f14795f369f6aa615b0e1f4c285ebb2d92a2 SHA512 e0f9cfae50e0b443898dbae7ea5afe763c349a5598e1ba912a999da5457cb857897c3d7e3ecc5b9c384723ebb1fd8fb5fff066c386c0d3fe6d79226c8d5f054f
+DIST ita.traineddata-tessdata_legacy-4.0.0 15951701 BLAKE2B 92ce0e9b3929954813ad83635bc34f783022e7ed56c1a3ee031742071b7d8a0da437214135124f9d8f7dfc56c7b3937b22daf7956f8ed5fb4edbd1f4a80444fe SHA512 4e7add68461e20407e915169edd327dce36acda31867518c324e90d5f62e0a83c1e7dbaab6b98a1ca6c3140904f3affecd49df04fb8d1a92ace88fc4413881e9
+DIST ita_old.traineddata-tessdata_legacy-4.0.0 17345259 BLAKE2B 1dce88541aaf05a443a432d98880fb3d8ce8e430298eeb8e729e116d3c66cb2f48fee463b546d87a9d48d129fad1dc7493a407f7c294ea550564f097428e2ef5 SHA512 28cb79ff21ac720609953f62adedb927a5f044b7d72d40f5b9cae139b16181eacfc8af796f57df287f3d43cd82b6b9e1470b5509f9a15d4f8226a2bd45ce9af2
+DIST jav.traineddata-tessdata_legacy-4.0.0 7386965 BLAKE2B cfdb50b0b7bf47b0cfbfd8f19abab4dfa7fa9acc8b7c915d0b9e3726c1ac0555f252e7d63890ac35adad639a9e4d0911f8f48cb3f3272c0292c39784c5a9843a SHA512 9586b74df836a7a2328a34498ad201ce959f1e0481d3f9edad3de7dfe417f691f090e3a96804e216442fe5d69de35a73bda6af37f2c2f9d9a79c3a71b93a63b9
+DIST jpn.traineddata-tessdata_legacy-4.0.0 35659159 BLAKE2B 40e47b03cc350ea8c58e2b2c3eab6bfa0d7d5841bf8e5543d4e3d45523e0c5f10892d052341c728918280c469f843a02e4f735b6849a529ffbc891a68f87723b SHA512 6f9e77f0c4183c4bf1f21fc6b2cdd9e2201179d27cf2953f54f841b0b81c52560d7d63cf0a5cac64dbe663307f4428754789bb61d9e5063d07de7f256b34d78a
+DIST jpn_vert.traineddata-tessdata_legacy-4.0.0 3039939 BLAKE2B 47e6a0cc7514c79802426b0c24502675ece0e4c4ec135bd68ca36a50c55064d0277c353b5b62e66af90b7aa292a02ed76a6d09d22cc4cd669587d3972d2eb011 SHA512 4c90f329895f7e6859a591d7c81fbfae697d66b584d554429f2ea2280860ee604def3e88904285d411c6291c952005d3f69da41c7378abbd081747470083b65e
+DIST kan.traineddata-tessdata_legacy-4.0.0 3608311 BLAKE2B b0c2d817598bf175c731375f09b276f97ab23375c3b6969debeffea9752c719b8333b0071b3f6605205490b667c09c9c93d99656af938149c4ba6041840c649a SHA512 f6c6ba87e30276112a4e10852ba7c072be4badae35c9f4b65aa5aa6031c9b9faefca6cbd5f7b4bb0d97481a83a1d83ae0dd34effbdba51a8a3b9695c78de2c21
+DIST kat.traineddata-tessdata_legacy-4.0.0 8744377 BLAKE2B fcbf1e5553c01c6600baaa807676475f985a19b03264cf3280d63b665279c1603fc800303bb35e1fbeefe7efdfe41346c25145c1d723ffb23e74cb71522e08f8 SHA512 2f9a041c9b3f94a330379d98374fa319b0ad102db1eba81697740002ca55c49b7f0e560524b89d55e67ce697db37169bc43451fd86e0f3c7eb4cfe4d8a7ddc92
+DIST kat_old.traineddata-tessdata_legacy-4.0.0 1082383 BLAKE2B 727514691af5899967fa7b661db09445cc03abd1777e979b00bcbb6e0daf7902ea6f7e2613a04e7a06a23528b37850fef87ad7921dc5efbceacb479427235b9c SHA512 fa7de4dcf4aa91409b98888548b4f77722a7131c70ff47d09e05b9105ea11bb41ad1a2d641daa7a947683c16eeb8274607b4e9770c02f0c220d20e44d6fce653
+DIST kaz.traineddata-tessdata_legacy-4.0.0 9263539 BLAKE2B 13f28ade72bef4ed8034f333f80600f282a70336a861610d205d52a8fe10fb67cb4abd579a9d309348484805349301ec086ca19b80bfef964e2c4217bbbf5dd7 SHA512 b43c1c9c1c60b6c35aa2d5445c16bf67315421a7a6958afe0d4f6a279431f9227adf856d5045a1468d75510f97e5bb3979c670143cb60734160379c3a8ec5414
+DIST khm.traineddata-tessdata_legacy-4.0.0 1446906 BLAKE2B 1553d571b62dcda0cead50aa02bc207f11fa08bcd558f15ee6bfe0c1692386daf05ada9f9fea0da5c2fbc82503cf94836b3281b1ba3d6ea6a90d310bd1dceaa6 SHA512 61c2ef26c980be1233f36ddcf5a02ed470c1b2cc2153fd401f344dde8b61ade2dca20dfacc4ae573f7a870b909ece822efd6f0f97c1b5695df26736d131dc059
+DIST kir.traineddata-tessdata_legacy-4.0.0 15430595 BLAKE2B 8fc0eb32e826f1a35085843b76eee575575a2cbe2639a18979aec937d36fff8001378582da3b8bc1866720a16410353c449207bf3669984c684932a4363de41e SHA512 6fb9789315f164946b2c14a0bc7e8f9d97d1a7312db14ec56eeb0d70dcb0bcce94efcd23ad0e2dba424fe4c78f73ccf5e2a3d8fa523e076f64d1de83cd1668c2
+DIST kor.traineddata-tessdata_legacy-4.0.0 15317715 BLAKE2B c2142fb12f1417e0567db60595f813aad9a24caf4f9379e50826ea4194afd25d2fb893c7a602c01dee210dc72ddeeb47260284bd49d6999f2a6e8cb504367de5 SHA512 d20ebcd28fea5e97f42631b118708b4885a8a7db3d449a30abdf9f760bc717f8ce3f261041636877b149bddb4608083371e95bd179d99d5e17b72d8d1377c927
+DIST kor_vert.traineddata-tessdata_legacy-4.0.0 1128590 BLAKE2B 4c0dcf6b49c71cfaebed2143c0408621294f575f2baf87149f7e77b6134bae0744378790cdc64baa7d7077f3450120b11df98310d816deac0cd5eedc86b9d236 SHA512 e3ae0d1efa340a82365c32ad0f316a914bd844c3d26cb81774f6e6ca6ca574c1cd78c448de923344146ed8499635877caf56f82709f8570356b0549f672c82be
+DIST kur.traineddata-tessdata_legacy-4.0.0 2020594 BLAKE2B 6d21baf222e40260bb96be268a93d9e396c59a610ae4cbfe1ec4abf546ab36cb2c6b3c197a054fb3799f4dedc78e4ca3badd80d1b1d2b96ab21ffb83789bd0b6 SHA512 225c395149d9f6a4749283eca94ba644fab8bfb55be1b6388e563e8e810dc4e99b3ff4485f69db24583dac9256e94f66cbbb6ecb32058a3b332e037a92afce9a
+DIST kur_ara.traineddata-tessdata_legacy-4.0.0 3568645 BLAKE2B f127211276c2536d8fdfcc466aa70b65570add52f3f6f27ced06a1e48f5e2d29ddf54767d4e97b49e8991144030914f41b7dce9827480cd481d12c8c4409290a SHA512 5c4f3f28516e6090ba3669ca6fb704d122fcbe62b383dcbfbb66c29ca47c02626414babb1737aaa24b0570ee27590b696ae245f6b7a997053d6ee96d10c9b7f2
+DIST lao.traineddata-tessdata_legacy-4.0.0 7055204 BLAKE2B 5f17a38bc7117ce7dffc8e2ef3024a48fa0f2c92673d0a9c359e42b56db48d30351b364c3d61ec1ccc16a8018f4a3317efcf22ed41e16af07551a5630d23c1ac SHA512 61ae53fbf76c9ea3ff9017ba60944532ffff2522d17c90b091c0e5d3963d23381320883a31212173253f7649e1efa8502e9f55942782597045245bdde0387105
+DIST lat.traineddata-tessdata_legacy-4.0.0 9215366 BLAKE2B 9f603d9cdcc5cec787cd1c026a7520f78e2a98c5b04d00ae71d338c339e875a453ddf14d98b7fd0d1c5792fc7a485a8294c27f0a63e8dea7f8b33951a2a37d62 SHA512 66336c4ca8fed0f13b289848ae3eeb5e02f558bf79704c7986ca95eff34f169fc3048e439d2775c4709c187f43b4d38ba9ac9ccde1c77afd0fbc9af715ff6fb0
+DIST lav.traineddata-tessdata_legacy-4.0.0 10635271 BLAKE2B 102fa699465e1c304f947694cd790187d17ba30343fd6fbf071970dd17c38d263fdb084e61cd3ad35c2c3529ed2c2751df276f712c0934e62826dce3b60cb43d SHA512 5b12e36e1deaf826c7e2bc20d6dd1f9f88d60b89c6f1c36738f53e313a116c949c4d734be87cecf0a154653a363e8d917d92760af8d8ce237ae398db6f13aeb0
+DIST lit.traineddata-tessdata_legacy-4.0.0 12629538 BLAKE2B 5b0376beaac92db0a594b1859b5b634b8a909c10926c23d4eb2de9d6ae2286ed0740e01dd615e37faf797db198a436e483c179a0eb8cdd0924c2dfe514012f62 SHA512 a7ab5f21398dc3046cd74df5618c7df204fc2ca05750310620d3fceac33f42cc1eedc6a22929e0322d284a78e9cead157012d264cb07f093dbe4ed595397d8d4
+DIST ltz.traineddata-tessdata_legacy-4.0.0 2606439 BLAKE2B c69b4be54829ea84835ac93b5ce852d96d6e8b13450a9ffcfd3a8b19b0eb59587cd757f24752af0b9ddae4288f130dc770bf098fed971ee373ab25249234f57e SHA512 446278d370ab673a19f740db71ae9f33f44017038e7ab2f0ce4c178e651722523e597aefbf18a01d04fff4c947482543a054a31385501a183756dd0b8ab28a2a
+DIST mal.traineddata-tessdata_legacy-4.0.0 5953416 BLAKE2B 4c5e86a846e50bb8cf0dfcdfbf3c75bafcfc61c8f8c1476f815fb22b1bcc59218694f39bf5fc22181d831d5aa51e43feec1fbedc75f53fb48ccf89b644cc36ef SHA512 f209ee7dffd06d648be855a80557d010d7ccae92d954e199c187c686c0723dfe6400cfaf749c2d3858eec979562bbda61098c071d5c54ff351538581f22a75b8
+DIST mar.traineddata-tessdata_legacy-4.0.0 3193116 BLAKE2B 4ad543ccfa930c47554669f2a68c718fb28b7195bcc5a5026e6f09cd702f2e36daf3bf171f99262f18a326ed615db7f057cdeb1adcd4abcaf4260864f03605c2 SHA512 f4d69e3245ba7aa3a7540fab7511f97f4dde543a807499db3eda522c794d5565ff57281e3b577bfdc20f36318fcf1b708511df502824b02ccd6c6e157cabb798
+DIST mkd.traineddata-tessdata_legacy-4.0.0 5323418 BLAKE2B 9575e511f7f7dcbffbc2cf9107fc5b3ea9518c2976512cac7838bb4394eb78e552b95651fa877eee6fdda401ca63518e0b8b380ff02d0d26282d15737c80d595 SHA512 967dfcdc6cce687b967487bac6cf555457f60bcf82cb054fe1167b44ad914c0393821b7f0ba20016ddc57319f98fcd397e967b3a176b0a8aa4ec7f38e60db297
+DIST mlt.traineddata-tessdata_legacy-4.0.0 7426902 BLAKE2B 6338fa2d4749d2f3f64c82eb2b7d835ebe543f439f05f01feaeaf5788e3da5f86a72778f7dbda786947500fd1fcec1147f6ea9e2ead04ac2212bdbc765112e6c SHA512 4156e21a75d41417a9b9d26fa0147afc5b47e922575da3262e90a178309a6e5000ccc4561bc9b4e259b98cf772134ba421ef6ee06eeb7af9b6beeb722dc0bba0
+DIST mon.traineddata-tessdata_legacy-4.0.0 2137055 BLAKE2B c151ac6a1307bf7b539720bcafbf7467623262d3ca30b2a669bd08087506e33fbe9c163598130b2af4a5c3588efd85fef50d19b5106338aa62e30b16aee08abc SHA512 cc582790546ac8bbfbdb5d6f879362c4f8cf3f0fc3b9398e60b67ec2c0807ecdcb92099bd5c971a274191359aa20df5655d9841211787e1bcad1f60a37f97443
+DIST mri.traineddata-tessdata_legacy-4.0.0 862986 BLAKE2B e8ce893c9ecfb6a4e49928245b055dc9f3feacaa551f349456baa05cea2fcf32b3f37219958d95b6e0bcd34e4d704a988d123a433831c8090f86199056b474b9 SHA512 0e08d4e0788ceebec644c47b6d6b69b4743aa80c261de7804bcea0fdd8e1756129d868b78b3d294878c03e0ef62fc62f8d21404ff82348fd70b95fe4aa00c6d0
+DIST msa.traineddata-tessdata_legacy-4.0.0 8243366 BLAKE2B b06a668f8515730d3c873dfcb20c1998ef5bfbf5ce4d4753146d47e5d8d1c147c40a8c6a4def8a00a96ac4fe6f9b5b01b26b1da135e5cf0f113bb856b545b600 SHA512 36fff96739a767ccebc741b92fa32866833cff8aff37e00e8a4ec336ae596d4ca65f2adad60435669c6ae50b97b28725b188cb3289acf648f6a914a66e308687
+DIST mya.traineddata-tessdata_legacy-4.0.0 4640591 BLAKE2B 24688da81e42197183b6ec1ed8877504b1d065dfad9ecb0b06dcb618d34654031e49bff587d42ff15f0ffb948b7aa67742513c18123248cc1e04c0709edc33c1 SHA512 68160d622a8288237473f73f771c2ce64ff56558fb8a120ea4a4531ac54d127e4a2499fe544a26817d4aaa5df90efec6b0bc2062e5736c629c1cd45fa9c55ce1
+DIST nep.traineddata-tessdata_legacy-4.0.0 2189424 BLAKE2B b1ff71f0feade072dcb8f8ee8d0fd1fb5fe1dece972bf36338d68cb283611012ed429df38dd28566d09999ef8ea16f8792e7b4c6440cdef6178c288ec81c6c6e SHA512 7ae822c4dad21f95153b36d37f93303bf3752d7d9e971d40acf909184114db1fd9eb7e4d18c47c21d4dca29687fb72d6fc991452874cc3d1005df70f3292958f
+DIST nld.traineddata-tessdata_legacy-4.0.0 23163950 BLAKE2B fc0e3db470385e82614161e3c03ac9c4ddbfc81f643ce2776d9d5e57bdb67491ada2a937e8ea98a6095f1e4456e672da4677e44992d64765e07d8b64ab6bd04c SHA512 6ebd2f8a06cb60d480de2658745e2ffb84922ef6f81fa56cb4469ab265bb261c4f3bfd8c459cfbcc5a69ead2bbe7904fba64a74d5984f2b64037fb7e262abbdf
+DIST nor.traineddata-tessdata_legacy-4.0.0 12397893 BLAKE2B cb8fc93788347ff833e64b057964438478cc9515c644eb1b0759ae246162bec44eff1d29646a4071b56173183dec3b249bf0d3d7dd23f91cd7eaf591e2848d09 SHA512 54a9aaa6a531806cbc938bfb4326873011b052b3abfb29e4feea7c482f48d9f60f4d2726e89c1f3351b0527da07370843863ae9106d63e8bdcc50c5e61637eb0
+DIST oci.traineddata-tessdata_legacy-4.0.0 6322100 BLAKE2B 3d5a26be3809be19882f2bf060de87c65772f41a176f0bac2510071a3a3d708683d808cd3a4b0541656d9385b501be39a92d4144d0a588fb7da03fff234f212e SHA512 bae69918c03d678f0aeb66001b550ee708bbdd60cbb8ffbaec897f4854c87e7d730bcdb393590e5ffc5c1e49d53111c17d2423f42c015d806a27a71e0e00e0c0
+DIST ori.traineddata-tessdata_legacy-4.0.0 1480096 BLAKE2B b57e12c5affca922ed1299907b60e1594066d30fa3abb4a5fa06985fc9aa9094cdd7770af05fcc732af538b114db8d0ca51f71574834eb3092365a30a8ef6b8f SHA512 6272aca04b05ef0bdba6625c7842d6b701b0a84083348fc8328eb3142e78523776fc9a02a4c8f4154abf65782322c0efc583aacce0e29cbe44756aa68fc1941f
+DIST osd.traineddata-tessdata_legacy-4.0.0 10562874 BLAKE2B 469cb3d9aa62a1755a02e793c35f3c8148c5d7661c866483880d3f5b41e01ddf5621046ed199974a83f9488dafcfb23ff0d56c7f640fcc90dd165bd929d3e73a SHA512 4ac489ba6b1888ef5e5d33e2782b5b7d0638384445859c1e3fea8c149cd482089ca63c70bbdf12b58c2aca6182890ee01043133e6e9ed7183128025663998ac6
+DIST pan.traineddata-tessdata_legacy-4.0.0 1698789 BLAKE2B f49da1bab026e7cc370011d4188e9a135eaf8d77f6f2e80754a9ca824c3fd6e57cfad7833d033626180d1da7f66b6aea5d1f8355ba63762112c931ce25b77a9b SHA512 b51dbb4f9796c95703d122b9c8bec19265ae329675a48e8189e6f81ed773189e6cf74153e9a13342aa4622e8d0f2022aad5dfcde8ab530254b512ab244027dc7
+DIST pol.traineddata-tessdata_legacy-4.0.0 19344135 BLAKE2B c86bb54ddf85108f30b67216a6714e133036435b6fed4adcd69a0a66a7e285a53885e89d496f54acf3c82d629b3c25da35b2dc37781ad62116697b2a95adcbf5 SHA512 d203c7ad1a15eca2f3a823e167eb4dabc7eed8a6d4780662a2fa9b1b1e7d54cbef2073e35882b793324ba446ab7ee833e24ae94dfe7d8b77c8639a1d45d6cafe
+DIST por.traineddata-tessdata_legacy-4.0.0 15336931 BLAKE2B cc5a3669f5cd19e7d98597222ac364955532cede8fd9f993abfcd9823bec8a831c97d644305fcf1df34d63304cc9453990ce639ee0cb56cec2608f935a6ba396 SHA512 1a1bd641302c228cc05ff92ce6dc2d3afc5e0ee3f6b2ae2e564d309765b917a87bcdf10e70b7014ce7933705a35b275c2e76061644bdb3288fb46f5d29b918a8
+DIST pus.traineddata-tessdata_legacy-4.0.0 1772117 BLAKE2B 228aca8c6a7d8aca36b580da25e348549b3f2ed37cc570f76c0dfa9661b2eb3738c1f786a67f904d44a478408d957d43c0626fa9d63ff50d08d0e0d33316549a SHA512 afb0bb86294a8b88ef923370392f136abbd2da55abd36d83a77c23fd1b90b80d9d24d57e23b8a405744d8407ccba6713b1fe78b224f35fa15580c55805fabcf7
+DIST que.traineddata-tessdata_legacy-4.0.0 5026349 BLAKE2B 2020f4fdf5c195ce192f977dd1df4a37ae5f322c6fc4eb5690761b23ba6381189d48de7095652730eabd3e3e468e35989a9882819d78c691e69d512ed8476cc8 SHA512 7565c98b6e04006fa260b48574e48c3f30600ce192752e58371d36e061b7ddda6d1de3b21f45e3e9c2874a85611f8546561436c95116106249e06daaffea7b92
+DIST ron.traineddata-tessdata_legacy-4.0.0 11008634 BLAKE2B 71ea517305b88e55051358ec8a3ebc46b2088c0e55191d23471b752fc8c439c0962cb1d9447c813dd9c1d25c1829b8d8840401cff89f4b50c008b33f9cdbdebb SHA512 c459273275f219dc5e36c85b5cbb00f155d98256c5994c279c10224561eda4195ec405fe890babfcbaadf1b7f142c2ae31647872244227f2229afca759cde8cc
+DIST rus.traineddata-tessdata_legacy-4.0.0 19920885 BLAKE2B bf5d559e37c9517816abebe4a5134d4692a1788357e9dc42a65369a4810ef67fa940d54684f5d2e1ea9d7cbec84e00c381bc492f49f36cff799fffcfda869e41 SHA512 94d1ad9535dabf7cd923fa33d26bf05fa17e3d38b47edd521a84bde5467e719ddd497fb49dbf5a5f849c3381390ac9fd34c17e1f52065b5f88556f42371c3a3f
+DIST san.traineddata-tessdata_legacy-4.0.0 12404680 BLAKE2B 4668aa1fa3ce524a7129e270a6a74876c24c7f3c5caa45bd3bd57d41bcc92f8184d55173920ec35176a6b3e9cb294d3ee4ad18fee617c65e347d291a743e0277 SHA512 2fd2a3e378f6b5acc28b5a1508e1868a8e68d6299910396154fe44946f7ce013145d6235cb0e24b03a158fbb5ede561250fe1337931788f37b79af145f739f77
+DIST sin.traineddata-tessdata_legacy-4.0.0 1727443 BLAKE2B 2f6eed2afca25e23a54d752509b55d2dfbe2666d13f65b1d64cdd29398257dcddb41b0a429f7c2e77aca87049d4eed9a9da8608d78ef3deebe838f597b20d5c1 SHA512 c478f46123a2e90ec36db753fb1ad37e3cbd26b6c194fbfbf773d61d2d6b47b8d86499f87ceabeaf917cce5623c7b2f49dce3bbd0615a087fc8e6ce07194c81a
+DIST slk.traineddata-tessdata_legacy-4.0.0 14100356 BLAKE2B da6f8e93308ff9a22f6ae0f01e16cb61355025528fbebe6334fc36027c4e734b6651f314d68e905d43f09431a71b46e6354f5e9892cb2ce50539c11a1830d8cd SHA512 8a854565efa8f88a13210b6501ccedcc753f838416625db280a38d133f8cb57cb2de6ff11fac408283d2f5b57f72f734e3f5f1d920545aa11b1565f9af8903be
+DIST slv.traineddata-tessdata_legacy-4.0.0 9942454 BLAKE2B e4b380e24ed03dbf3179fa1281703b6d5bdd113d44e29dd681912609b9aa9f37f981d09f08754598012021c9cdb05813c4ca9c38185b709393c262e061457421 SHA512 e79f489ec396fcd1080d262b795030993bbd1b4a1c9b92df5b583bb32a29d6d657504b7094bbd8a001885d9800488df8425c5368ff569413ad10c450f0784a39
+DIST snd.traineddata-tessdata_legacy-4.0.0 1694065 BLAKE2B 218f87eb1df28b0c73ee1782de26ff082f5e0ad22193922b07e4cbda00c463d37c00042a43e9f34da065b4c5c4e772993faacae4e682ef47bfeb56e81bab3094 SHA512 6f4f32b7e16ab91502b91e8ebad5eb8b9d1865ac2c11dea41ba79e5a8124a495992a71ef8cb216977a4a6990dfd11388c640a16f98f3d3cce40d06daafb7406a
+DIST spa.traineddata-tessdata_legacy-4.0.0 18256019 BLAKE2B 85a8c3fef81d136173af05efe823bfd33de25a859539333e1cf165d41dd5491b5f33a440e22cfdde7502823f132dae6b497a14bdd559d373001b4c7ce4c8eb18 SHA512 12a861a78d38904663e189079083a9f2f7de05f084061e5b3208dddf31d7aca6f7b7e2c6c64d0c4df9e0824891dff5ce9433f49458bf7c239d702ef452f49fec
+DIST spa_old.traineddata-tessdata_legacy-4.0.0 19628379 BLAKE2B e8db08e2ec0b9d6ff81c94ff7ca0f1e54d3c1d21386596f53ec99b3a7e0ec0aea25ea570b603845c0b5001a738312d0d80669028e358c1454737d5add339a1ab SHA512 d0a230718ce4ff350874a0bc14ec268dbf9f0eebeffabfb4174fe958d0e3ac300a91baf2a4e483630402144104263163d651485f394f7c69aad758963bef7833
+DIST sqi.traineddata-tessdata_legacy-4.0.0 8575759 BLAKE2B 68765372c506ec6c63884c4bbd85d2fe2fe6f6eacabe359a65a54863c14dec7fee31bd206a79f585b921cc574cb6f4730db011d81c88184eeaaf9a978c8ef49d SHA512 cb02863a64aec599426229075209f2587584610410db03d3c8766c36d16a51b762e14c7a7364c527f47a4bd62053301da4cdcbb2798546e7ccc01bc6849e7a35
+DIST srp.traineddata-tessdata_legacy-4.0.0 7434267 BLAKE2B 1ec3d721944d55c6aae9fbd8693fe4cd0ceeddfd5ef077bbfd4266980e320d6fe7978b2b46ed50dfe7617b2e4940f7d8ebbdfdeb62ac7b38d70668ee3ce49ed6 SHA512 c93c7c49f39b9a23fe83ab92aef3cbfac3a21b694986dbd4b46d6462fceab8e1670ead8ecd0f8a5e0acc391d65670ea4ad4dad938602decac5731c750336d8a6
+DIST srp_latn.traineddata-tessdata_legacy-4.0.0 9375025 BLAKE2B dc38a6aad729748f62fd6170eacb39ab0dfbc351a577b4bd080a1958a96347ee11cbb63b0b6b81d86c1c9cd00fc9f54b5b6b0acdd6c8d9614cb511f947b71dba SHA512 6d91089875312a49bc21219ac84d551ca64f05022c03acc0662bb696661e2214c8404ae8edabeaa3dcd08994cf7ce927a5169641b542502a6a2d02480b04a70c
+DIST sun.traineddata-tessdata_legacy-4.0.0 1369513 BLAKE2B 6e9d37b08e977ee8e1eb442fbbed7d78db85132fc3e620f9da398fe0802eae29641ff693a21e1f4da1a38d37937cf57ddba40eb456cf4ab4a9011a128ff15e0f SHA512 a081a40722a60bd19fdec24b3a6a8f38921be212735f1c7cdbb268834a205206c55ea22b2e62413ab7486c1da28b8155a4459623780aecf6b0d749db43896ca2
+DIST swa.traineddata-tessdata_legacy-4.0.0 6029030 BLAKE2B a9095202b9a5c4702a844bcb0be9a9bde4f299855e3225bddfda81d347d3f52635af1178af70accacd7b5ad4046723fc2a10007e0170347c9e1a8d54a36a9a08 SHA512 df069547e62adb88e1f05385bd61334a8730053202d90abe248cf618286e018e24211893dfb3229574717b419b0eca5d97877ada885b0800d567163f40190ef0
+DIST swe.traineddata-tessdata_legacy-4.0.0 13627152 BLAKE2B 8701994a84c73c2099463687f22691387e40c64adb2cf0b8c9d87235bff793edc88f28d3be9b820040a7f4706118228d12b812215e582e4cb6f4a1ffc5642f16 SHA512 ea3fff9c1ecbf49bb83f98e809e465418bb81242db34acdc7789f19c706e8fb2ff49a7d8b67f7816cd469c58994139227631a3420b9116222bf55d6164c6b475
+DIST syr.traineddata-tessdata_legacy-4.0.0 2207238 BLAKE2B 07fe387bff87fd8f916e282dfc276eed985f06ae4ea9fc0a74b59f093de247fd7bf1cd3a7819ac44ee0f7e93cec8e567a9b6928f7fe52cb0a9e1f0986d4bc6c8 SHA512 cccf03ef20dc72ecd21dd95df841c3de010b3abb7dc1fbba833f70088ba34d89ffef98f29c0a76709e49ff17d05d16e87cff416f4da92da6fe569e8eb87f95f4
+DIST tam.traineddata-tessdata_legacy-4.0.0 3353079 BLAKE2B db69fcd37a202351db06477967f33f83f2cf3e4350ee7a7999d9dc2b71959ddb26b044e8fdd120ad1ea095e398466a1b729b5a76f85433a67e7bd43f99eca036 SHA512 7bc3546841f5a3f63491d31f13fb764ae6d17ad396f2c13b2a733aaa2c861d8aed637e0b1917443dce6f37998e09cbce587a8d5987a90d6acacbef7a6d6a69fb
+DIST tat.traineddata-tessdata_legacy-4.0.0 1072909 BLAKE2B e4c20650ac6ac2342918826275e0dadfb90f9d7813f25fe8d0185da719d62eb1f65ca29f66fdb36041cb674a1430d8d0aa934c4bdbaa76852f1e2c359bd86a7d SHA512 d5fddeb73658344e6f3b5acd9c38b773c71622faa326e1c6bd0dc936df14752637fe95d0e7b3024ced0e8cd251de8663805e376f7608fb63ddfe078b47739212
+DIST tel.traineddata-tessdata_legacy-4.0.0 3315170 BLAKE2B eccc32de8769e419c698e74cccddb33da0fcda925df77862a06675b60952fcbde2d2ee8f2eee2b84a42539430be9c880ff7856887653132bee30d14388049f39 SHA512 8ff5d43f23187b800e38e73a7321be4b1cb37328c662bb14613e4494f6d555ea0fa57e40a03aa951527fb900d30702978d6e019daca47db26c96e7747bf98d53
+DIST tgk.traineddata-tessdata_legacy-4.0.0 3721580 BLAKE2B 23b2f09dbb4e1c298e8db55574bed6f443ae6fa2323a023b6b3fe7c8e4cc6b277496fa2e2d1892fec540be8da4e5efcd486b41cb31827ff0a077ee54074d6a2f SHA512 1a246d672c9e9015eeacc31fabe3e4b325d4625a347a3521aa77b40b7c4afa9257de6078e5705c9cd517b9a012ab34bc8beb372a4836f7b2e85e18e3e07faf34
+DIST tgl.traineddata-tessdata_legacy-4.0.0 7321367 BLAKE2B c2db6985f3848dde3b43d5a229c729490de5b4e1f946a2d81d18756b6b8ed4a522041fd3dcaca3786ea719c35e70340fcdb61654b209e11e2f4242ebf3b83b52 SHA512 85e68b7cf449cd26b4bcfd36f81a6555f67143cce29dc86ca8407fb062546cfb89c151c62e13e8d5ebad758f92ff50d454e08111acf63eb904c28aa6a526113f
+DIST tha.traineddata-tessdata_legacy-4.0.0 1072519 BLAKE2B 1df91623565bb5f080162fcc2e53c5bda7824803525e6bd8a5b09414334a268382e59accda57c1286c9732a5862b2c1f5ff683d01c3923972766cbfa8a06c4d9 SHA512 3066aaa2c0844f25bcadda38f3315434ef86c2e0c41537c8e40b0efd63015c7fd4cb65b3bba60d9bfcd35b5d33370b64ef4aa04b5070e3bbc176e5899e698db0
+DIST tir.traineddata-tessdata_legacy-4.0.0 2184930 BLAKE2B 1efbd7fca5c40a6ce2fc36ce66d3ea69a3e48fe06a9ce7e65ea2254023b95265639a443d9869e1c6b33ef6a765e43046ae3cf7812a95c2ec9079fd6822ff4e3a SHA512 8c250460f18c5925b252f3d3c1e021c4275d034cc409af5a4c0d2014c72f286fbcdbe5f017bca057b7a720767fcdb85589ca4b3c848a539c3361a14d010b78c0
+DIST ton.traineddata-tessdata_legacy-4.0.0 947262 BLAKE2B 955deb71fd4e8a271d1c668addccbc357bcf02a8dc815b85aa96680c864c7c56144878618026b432edcd06c0f4a0a240a4e8dcc5b1c705da107839b2f2d01a46 SHA512 b5541c9ffb047d8315e66eb5003d364de8d5d82365cfd12af56dd75b3981bf12656be1cbdce6125250efbfc4af309e0daa74e54ca61ce78e3b516c6a30c83f63
+DIST tur.traineddata-tessdata_legacy-4.0.0 18750612 BLAKE2B 48872425cf8cd46fc19462e5f47f631d6094a28276f2f8648eba3a598484fabe8968dde71c732a654a1d11d6bb587ba2b6cb76bbe18cbe0a0a63574d44fc21ea SHA512 4dfe1049ca75034315c29ac57b6c69eb44a8a8265ffdc5eea37595406f41b7262a3acd85a882005946e34816f84523b0f53d43ecfd15b1b4c3db70799ca5a908
+DIST uig.traineddata-tessdata_legacy-4.0.0 2794302 BLAKE2B dd8fe55ca1dc19491323095f89543f027797c63e83aa960883327ec5dee16358c3d64ab5824a2d0efaf63d5c97066737fff5690bf8429916a3d6d850badae9f8 SHA512 53adc5566577b77600ae50a74e1ba84b4d8ddcfc3201b6544c20e45f01c9b00ceb6c1503d1c4c32642349eaf0ee5e93480d811caa1b2f60909b19f45890af1ed
+DIST ukr.traineddata-tessdata_legacy-4.0.0 12408644 BLAKE2B 0d0b6772f7cc8331b838852c096ae4514405c0cf3c368c413bec2340772e59e2bb6e08757b953898de76c5a78eb29d6ab63348ed848d90aa0b384a2bd4565c0e SHA512 d9579d2d1ce978a4f87b841b940853fe41f82c68d63e2d16dce3083ffdc3c9ec7794f92f33ba4edb123ff287bea52f12d2ae3784651d1ba73f54794787598c1f
+DIST urd.traineddata-tessdata_legacy-4.0.0 1398748 BLAKE2B 82b252bdfc69ff06bbed7816c4320acc45462dc7a4ddada5b85fb6caea9428465cc1db1d19f41ab006ced5a0a410575b726f8897273655f2baaecc57c8f72540 SHA512 f46ed527d2cc3e6bc4f9365e10018da502c44a7c975b68c072baffa1637c431637aeeeabc27eac76b3a847976f88bdb514ec68878b1b4d2f9eb3239963c542b7
+DIST uzb.traineddata-tessdata_legacy-4.0.0 10757098 BLAKE2B fbe49984a1050ff097c70e4ae86a96eac947e0e37513684f68bd4c1d9c3d57de2c0d1fb68dd4e03cbf2a39c7ec8dfcd2a1be891f8e1286bcf066faca645d0db1 SHA512 47f969a9579872883f6dadb388ac4619c934c9af7bb239c5f20e84b82bf74c9316069cdb9a2d5407e675f50d90d404a11b1e3461297048e8abf3ff35ce917814
+DIST uzb_cyrl.traineddata-tessdata_legacy-4.0.0 4905658 BLAKE2B c4db3337b7ad1c2f927cd92577f58700c55b00889a9a52982216ab1c8837874290919f9144bc1910232cdfda4243217199ce5a7557a8416f3988022d569facb0 SHA512 e79c2a24499f5bedb46c99971858f5401929304b661da2a12dd9443ad95ebf517a27e35fb830b032da477344748f2ecfec5aaf07267b6c68bf44f36f2c104bb5
+DIST vie.traineddata-tessdata_legacy-4.0.0 7763728 BLAKE2B b1a702f2fb2dbd08a115ac2d8cbef3a0e9cc2aa8b1ffd3e236f180d8faf2fce7c55305a6965a5380b276a454870e901c626954228b8fe5efe0c5199c8b2325fa SHA512 3c31b13c9177a07f2c0e3427bf5f22e7fdb6526905a068b6015a2bf2a8e9dcae5cf5effce3528197c778d2b8a9fb956465619779219d46b0372e24631a944ad2
+DIST yid.traineddata-tessdata_legacy-4.0.0 4882707 BLAKE2B aec63586bfa9d9f55a48f8f8ac885c4f8df4ec9abfed52a2a8ab58f3747df9a2eb60f872e492ab29a189c21c73cd33c64ac18c6910f10562745441e2e780fc49 SHA512 88986d01ff3bb8523b41b18c885477befd9d6690c5d517a5822fd8a6ef1b45a5790b3a5ff8f06172907dd2ccd3ef07d19d7e35d316d37fedcadb8df713a81749
+DIST yor.traineddata-tessdata_legacy-4.0.0 963413 BLAKE2B e4d16812ade81cac1f685587837b431c122ea29551bccd52ff1bef5a4aa8b316eb741aee3d0eb790c941d15401ea1c190850e225765a819d8899149e35af278a SHA512 4a04821d7e76feb0e71f31ff2ed794fce5a4e53ed98aeeecc06bd36d2c07301e8a7a86123ec5747b36d9df1d6d8e24d148f31f70093f944e83dfd3f2162661b0
+EBUILD tessdata_legacy-4.0.0.ebuild 2393 BLAKE2B c1faeda7cbd7e00bc807099520b0fdd4b505935f569b2b94ac708f9fdb496a39a468c29d25911e1bd60e65a9832ee49e24ab0e3cd7d3c440418e2f40f6bc9f12 SHA512 b8b203c57e318a4cc29381174faee00fd74f4f06436729f5eec64e28df59cde666cf096665a8dc59ab5474e969463d6ca7bea7e7054ba9208e597578247277d0
+MISC metadata.xml 638 BLAKE2B e7daff0af193b541948a3b3c9f8fbb8e8616cebeeacca49b3d18d76b6db557720692f6db146ad4fd729520391cde988a0ad2b8b0694b8846209e6883bac2aa77 SHA512 af5dfdd1061376f736f31e2e66d940fde11efdc6ab49075ef35e633e698c9bcb6d0388562c5063e6c3fdbe6cb1c41f853bca00121e21fc0dc5880209d6c248ee
diff --git a/app-text/tessdata_legacy/metadata.xml b/app-text/tessdata_legacy/metadata.xml
new file mode 100644
index 000000000000..79fe4f4ce09d
--- /dev/null
+++ b/app-text/tessdata_legacy/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">Trained models for app-text/tesseract compatible with the legacy engine</longdescription>
+  <upstream>
+    <remote-id type="github">tesseract-ocr/tessdata</remote-id>
+  </upstream>
+  <use>
+    <flag name="math"> Enable support for recognition of equations.</flag>
+    <flag name="osd"> Enable support orientation and script detection.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/tessdata_legacy/tessdata_legacy-4.0.0.ebuild b/app-text/tessdata_legacy/tessdata_legacy-4.0.0.ebuild
new file mode 100644
index 000000000000..4f5f083d3581
--- /dev/null
+++ b/app-text/tessdata_legacy/tessdata_legacy-4.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+URI_PREFIX="https://github.com/tesseract-ocr/${PN/_legacy/}/raw/${PV}/"
+
+DESCRIPTION="Trained models for app-text/tesseract compatible with the legacy engine"
+HOMEPAGE="https://github.com/tesseract-ocr/tessdata"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${P}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${P} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${P} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="math osd"
+
+RDEPEND="!app-text/tessdata_best
+	!app-text/tessdata_fast
+	!<app-text/tesseract-4.1.0"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}
+
+# List of supported Gentoo linguas and their upstream mapping
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bg:bul bn:ben bo:bod br:bre bs:bos ca:cat ceb chr co:cos cs:ces cy:cym da:dan de:deu,frk dv:div dz:dzo el:ell,grc en:enm eo:epo es:spa,spa_old et:est eu:eus fa:fas fi:fin fil fo:fao fr:fra,frm fy:fry ga:gle gd:gla gl:glg gu:guj he:heb hi:hin hr:hrv ht:hat hu:hun hy:hye id:ind is:isl it:ita,ita_old iu:iku ja:jpn,jpn_vert jv:jav ka:kat,kat_old kk:kaz km:khm kn:kan ko:kor,kor_vert ku:kur,kur_ara ky:kir la:lat lb:ltz lo:lao lt:lit lv:lav mi:mri mk:mkd ml:mal mn:mon mr:mar ms:msa mt:mlt my:mya ne:nep nl:nld no:nor oc:oci or:ori pa:pan pl:pol ps:pus pt:por qu:que ro:ron ru:rus sa:san sd:snd si:sin sk:slk sl:slv sq:sqi sr:srp,srp_latn su:sun sv:swe sw:swa syc:syr ta:tam te:tel tg:tgk th:tha ti:tir tl:tgl to:ton tr:tur tt:tat ug:uig uk:ukr ur:urd uz:uzb,uzb_cyrl vi:vie yi:yid yo:yor zh:chi_sim,chi_sim_vert,chi_tra,chi_tra_vert"
+# Fraktur data files (not installed):
+#	dan_frak - Danish
+#	deu_frak - German
+#	slk_frak - Slovak
+# l10n_en provides the additional data:
+#	enm - English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${P} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+src_prepare() {
+	for file in ${A}; do
+		cp "${DISTDIR}/${file}" "${S}/${file/-${P}/}" || die
+	done
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/tessdata
+	doins *.traineddata
+}
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 6bbc3171390d..8d42914c2c44 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -127,6 +127,7 @@ DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac89
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
 DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
+DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
@@ -144,5 +145,6 @@ DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4c
 EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-4.1.0.ebuild 1752 BLAKE2B 3585fbdec92bcc4ee4f8826a851b9c58cf03bbc8624c0af82528ba2f9cb900305d9816f3daf08a5343a3dd1623882ba34402b967843a84d0dc5f3f90055237bc SHA512 da8401d6628b45cf9e89c3d4703f53441b0ef789db81d841d3b657a3bc883b5622dfe651fe1827dd4530715858458d68694d2ef3fcaa241c3390c5469181d6f8
 EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
-MISC metadata.xml 1203 BLAKE2B 72b792649c8f504bc809dd7ba99cead07f74704a5743532bacf1e010fd4877b8e5c8c929830e04899362d26fb086fcbadbbddaec7dae0295b9e5f3f9de76bc78 SHA512 b92b597ee4a1597c59646d21e7a293a601b74a06266b61ca5ace001ba0a7cf2e8a6454c81215e4e5534109ca7bb81cf045ffa2584cdb114e810f41c9ae5f7b1c
+MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
index 90921345d113..c3f203799bf0 100644
--- a/app-text/tesseract/metadata.xml
+++ b/app-text/tesseract/metadata.xml
@@ -13,8 +13,7 @@
   1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was
   open-sourced by HP and UNLV in 2005.</longdescription>
   <upstream>
-    <remote-id type="google-code">tesseract-ocr</remote-id>
-    <remote-id type="github">tesseract-ocr/tessdata</remote-id>
+    <remote-id type="github">tesseract-ocr/tesseract</remote-id>
   </upstream>
   <use>
     <flag name="math"> Enable support for recognition of equations.</flag>
diff --git a/app-text/tesseract/tesseract-4.1.0.ebuild b/app-text/tesseract/tesseract-4.1.0.ebuild
new file mode 100644
index 000000000000..c7877cb2d442
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.1.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/tesseract-ocr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
+
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# scrollview disabled for now, see bug #686944
+	local myeconfargs=(
+		--enable-shared
+		--disable-graphics
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 3300ab6e2134..97cebcc0b3e0 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest
index 9fb5ef7514bb..5b48046676e0 100644
--- a/dev-cpp/clucene/Manifest
+++ b/dev-cpp/clucene/Manifest
@@ -2,5 +2,5 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183b
 AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722
 AUX clucene-2.3.3.4-pkgconfig.patch 871 BLAKE2B a108d0c4427159a09d2575b351bedfd38c6305219e01a7927b66aacfcab3587d3c08315f0a7e58a123e6779d2d8fec17fb06127de32dfd5782408cbc5c916ed5 SHA512 afcdf00537c8eb9c75ed569356520551ea194c8edc636f6e82bd0b1ef60e33396c1e2722b895aced2b58358950b3c5c1df2a914295074e9e99485ca6cee21c18
 DIST clucene-core-2.3.3.4.tar.gz 2241498 BLAKE2B e7c02d3976fd8d722a81ad4c6d43363b9af0073aa68edb8303cada495f8b8514cb8c86a85f398f8c9ffc1f78a49c0718cde5af4145c32869572d21e8af633846 SHA512 1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
-EBUILD clucene-2.3.3.4-r6.ebuild 1489 BLAKE2B d172230297deee80465c4853a696989880a4992081012db58e6c0d1f72b1406bf101555892b3d17d6afacb35d030574feb742645d950394284ccee9ce77301ed SHA512 e7769026a2f26ac1f3b6ee32a3204589671548c08db124c54bfa2f08db3988c5cbf596d29c02e18c528e16163669ca85e22f5a28ec7735d97fbea18c979a1beb
+EBUILD clucene-2.3.3.4-r6.ebuild 1485 BLAKE2B f5b0e814852fedd2a4c5862a6ae2907c4db3ad141edef6166ea6e9905880c5c150e7ff90c6d5f010c1fc59b56e8475b251c32336c940235a56426b7f7e0acdaf SHA512 698931807f8dc2f6896c0234906d9e34c2c3cf53bd85a50d53e39a7f79264ae18359b6169f9d02442fce5400fb663d3e9c611a314e38e0929e87106d94497b22
 MISC metadata.xml 242 BLAKE2B 42f16f7a7f490260e103b34652b1751b3163c9fa9654b5f8eb155b209d6c57b93634afcb3203b4fdfe45fc8ac2c3e13182750a2ccfd9c8e726bb5d2ea26c69aa SHA512 8408d869c113d8c878e461e3c796233d353df9869af2424361aae629888ee96876cd2a6a00ee8a39ae2069477821c1c9150ca8169723e46167165c39fbc4ba19
diff --git a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
index 4e0f4ab57071..1b2214fb3f3f 100644
--- a/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+++ b/dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/clucene/${MY_P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
 SLOT="1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="debug doc static-libs"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index b71970058725..8d8d09674f74 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 51f1d2da6d4b..3f921cd8e7a2 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,7 +3,9 @@ AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d58
 AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
-EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2816 BLAKE2B 38450ea224a5f0e960abc65ebce37121ed02d1ec0d5bfc7c2d7a124c9ffd77f10090247493eb0c758b991e40cb8a845fe13355ba8e32b64bb2ca90fa957aca76 SHA512 f5670d8174889c3ccc8b7693cdd97d39c1c0d597d5980c6a5d15317662bffebea1e3b6573c438b076362c8c46649dedf8f285d90ac4f5ffb4eed4d4db82b0378
+DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305 SHA512 8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
+EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2815 BLAKE2B 807069ea31a7c42ae6eba3d8c3d3ccb76f23741d7a4fae97655f76df674cda564487796971d36d12e909243492531f9cacbdff312e61e1bb1522e2221f3f5287 SHA512 40395fbe2f70b2e7e77c339129be309d343368e5b006f4b0fc86c5134e7993c309ef715ef4b7f2e3feae178111954d407e13f6db4070ae0530ec1e6b54e03215
 EBUILD mariadb-connector-c-3.0.9.ebuild 2318 BLAKE2B 3bfe94b1f26a60a13f8a9a9d83bdd387e9c2257a0f0502e1013c4dc4c7c06dae5c31af9efe1ac5b4ff543d9a1a2a6335b8b5b8465ac75bdf3170015696caf3cf SHA512 114a5963a7e1364f0f94063042bb98bc8d45664e6ef54b1cabfd39154b2b6815c41bd597e83ab376dc0d22d10b30e9be154ddc7908560089e4fba84c7271e18b
+EBUILD mariadb-connector-c-3.1.2.ebuild 2316 BLAKE2B 1766c9da2ff67920d51121c910f47955785e028eaf579d9da5a8d420f6f9e025bd20f5e4dc3b4e4e61c28474eee97793a6e5324cc18afaae546fba6ebb41d19f SHA512 6683d0b84194dfdfdefa3f24e3c913e121b48364f6f684517669db4450adb03aaad660f6f6f2162d450f6f89dfa7dfd69d014c9c7a19bedcf89314c9c0b2749f
 EBUILD mariadb-connector-c-9999.ebuild 2316 BLAKE2B 1766c9da2ff67920d51121c910f47955785e028eaf579d9da5a8d420f6f9e025bd20f5e4dc3b4e4e61c28474eee97793a6e5324cc18afaae546fba6ebb41d19f SHA512 6683d0b84194dfdfdefa3f24e3c913e121b48364f6f684517669db4450adb03aaad660f6f6f2162d450f6f89dfa7dfd69d014c9c7a19bedcf89314c9c0b2749f
 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index eedda9285fb1..f2f106102fe0 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ppc64 s390 sparc x86"
+	KEYWORDS="amd64 arm arm64 hppa ia64 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild
new file mode 100644
index 000000000000..2985ce7c2c63
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="git-r3"
+	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+	MY_PN=${PN#mariadb-}
+	MY_PV=${PV/_b/-b}
+	SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+		!gnutls? (
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+			!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		)
+	)
+	"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-layout-3.0.patch
+	"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+)
+
+src_configure() {
+	# bug 508724 mariadb cannot use ld.gold
+	tc-ld-disable-gold
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_EXTERNAL_ZLIB=ON
+		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+		-DWITH_CURL=$(usex curl ON OFF)
+		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+		-DINSTALL_LIBDIR="$(get_libdir)"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+		-DINSTALL_BINDIR=bin
+		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	if ! use static-libs ; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+}
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 402300522669..6920b6d52d7c 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -4,10 +4,13 @@ AUX mysql++-3.2.3-as-needed.patch 19502 BLAKE2B e3c65824c54c8bb0a06f88ab75a60103
 AUX mysql++-3.2.3-mariadb-10.2.patch 630 BLAKE2B ca95d9f9d62368b91ecab34a8a78a52240908bc27536430de6d8610361e69de95746ae6f1e3f9a7ace2e995fb21d41c06a9bceec668ae9cbdc7ba1ccd034d1ac SHA512 550e5adbdaf04dd6460aeafd0e6cad6cd29124c85f4222216574cc41c7df8559b33ce3eda484eba620a7b97c16bc63e56e744770feccf92348ff066173ad8297
 AUX mysql++-3.2.4-as-needed.patch 18441 BLAKE2B e752974f029ffbf0dba21d9dff5fc3979abef49a517900345ea4ed632f854cfe5fdbe1c41760df05c5e3109ff14ee7ce7bbd30ac37c27c4d42c58e2bf84fbb45 SHA512 789e07b85d3908cc7956b29e8135653eac280de0736002566377cdf3d81ac11a13c0c7a4899343e44fb260bd49c93bb4b04a0ce3f2324f95293b74ee6de487b9
 AUX mysql++-3.2.4-only-unit-tests.patch 331 BLAKE2B d3bee079ad466aa3f2e21d831a4ee77959c8a1f2d1ea9124f17dd081a7d39a99433c9c8dba10a8638fe72f4e0ccd8cf02751c3b036c9082a1351374a19e089e4 SHA512 02bb7a370a3f7eafd9111c01e6073a71d33f53d59eb7d8e04a40415ab2fc88011a1b2c79cba455b976b03613597d49f9256cdacfb3b984767959a707bf3ba7b0
+AUX mysql++-3.2.5-as-needed.patch 18594 BLAKE2B 39baa700bd643205974e1e96e48f0595eb001421a6701e8905a6f2f9394b93ee1d107d984cb2df99ac8b65a97651c152fee15d2c75a56e917a488ccf3b755159 SHA512 6ece46847bccbf9612d1575eafe995f48133860c942b7acd99cd459dcd3a4964bf767b7c1963596d1c68e6738eae2fa07b699a4ec775547ee6905fa682e383f3
 DIST mysql++-2.3.2.tar.gz 1627115 BLAKE2B 058ed41485474e4283a7200aa57398e85162f697f017ccfde7974b85457bb827d17bfdd522ef46818d42a75751a0eeb6ade39ded73e0265ee6811eb2769df3ea SHA512 b546c8369550e541c1a0b1b0e301fdd298a771cb709ad6c6ea3450a8f8bbe7533989a82d1c19cd9bf9a261d7a1fc4c3760919d3d5e3e43b5d698b75b7abf07f7
 DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b23d33983a719c892bbd1002f3986206df6cfef54316f11aa480f18dbc0a2cf6944f9572f3a7dca24cdb73099eb9 SHA512 b6b0a9856ede9e5e08be0f5ed1689b1256f8cf31c3afbb9c9e7f68d0734380e25909ef31cd04be6b253c86b2f881df10f3793a2d3e32042375dbbab4b0700d0a
 DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0 SHA512 69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd
+DIST mysql++-3.2.5.tar.gz 4748218 BLAKE2B ffceddb360cf6f0f38b7647f68e52ad9b659642c598c2aab7736813bf61d07316900d843749c2f9f4c753bd2087711ca712cc430f12b3a475c63ae3e5b11aff7 SHA512 5fa042a350322fa74afa28dc5e53f15cad32517001ab817493bf0d13a64e6559712f5e61184ef38a97bc8fe69f8732aaf436bc5d1663e4873f8baebee2e00892
 EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884
 EBUILD mysql++-3.2.3.ebuild 1556 BLAKE2B 8bcedbe3e000c0132610b7347329e62d0d82adc00be4b34e5333c274140ea682e3300b471dcf08a7e661e9df801fc6820b6771e7d41d0c74968856deb9375bde SHA512 4b04105492d20515ad98db286d9746b6ab1fe0d38a49c7de870cf19ab5d6dc2579303aa36b7216caeceb58ff17668fa4149b9a762612b0ca203adafda7145898
 EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2
+EBUILD mysql++-3.2.5.ebuild 1704 BLAKE2B dc150bed9777bbc18f38799121ed83f1cbf5c4c5be814a3e2b85664d5079adefafe2f3d502c4f9349a823db20723d95d039ef4b2e431e41299112be2ec06e1fe SHA512 2f784310eb4a015c67dd0c0566847c27f95dddd25e160edffcb28253a9cc545ed35e44fecac7242359c78ab05d0237242e8b548db0064fb0d63780e561304d48
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mysql++/files/mysql++-3.2.5-as-needed.patch b/dev-db/mysql++/files/mysql++-3.2.5-as-needed.patch
new file mode 100644
index 000000000000..71e188899820
--- /dev/null
+++ b/dev-db/mysql++/files/mysql++-3.2.5-as-needed.patch
@@ -0,0 +1,178 @@
+https://bugs.gentoo.org/635414
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -408,55 +408,55 @@ $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT): $(SSQLS2PARSE_OBJECTS) $(DLLPREFIX)mys
+ 	$(RANLIB) $@
+ 
+ ssqlsxlat$(EXEEXT): $(SSQLSXLAT_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLSXLAT_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_array_index$(EXEEXT): $(TEST_ARRAY_INDEX_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_ARRAY_INDEX_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_cpool$(EXEEXT): $(TEST_CPOOL_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_datetime$(EXEEXT): $(TEST_DATETIME_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_DATETIME_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_inttypes$(EXEEXT): $(TEST_INTTYPES_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_INTTYPES_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_insertpolicy$(EXEEXT): $(TEST_INSERTPOLICY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_INSERTPOLICY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_manip$(EXEEXT): $(TEST_MANIP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_MANIP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_MANIP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_null_comparison$(EXEEXT): $(TEST_NULL_COMPARISON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_NULL_COMPARISON_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_query_copy$(EXEEXT): $(TEST_QUERY_COPY_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QUERY_COPY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_qssqls$(EXEEXT): $(TEST_QSSQLS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QSSQLS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_qstream$(EXEEXT): $(TEST_QSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_QSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_sqlstream$(EXEEXT): $(TEST_SQLSTREAM_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_SQLSTREAM_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_ssqls2$(EXEEXT): $(TEST_SSQLS2_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT)
+-	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp -lmysqlpp_ssqls2parse $(LIBS)
++	$(CXX) -o $@ $(TEST_SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp -lmysqlpp_ssqls2parse -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_string$(EXEEXT): $(TEST_STRING_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_STRING_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_STRING_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_tcp$(EXEEXT): $(TEST_TCP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_TCP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_TCP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_uds$(EXEEXT): $(TEST_UDS_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_UDS_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_UDS_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ test_wnp$(EXEEXT): $(TEST_WNP_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TEST_WNP_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TEST_WNP_OBJECTS) $(LDFLAGS) -L. -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): $(EXCOMMON_OBJECTS) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+ 	rm -f $@
+@@ -464,76 +464,76 @@ $(LIBPREFIX)mysqlpp_excommon$(LIBEXT): $(EXCOMMON_OBJECTS) $(DLLPREFIX)mysqlpp$(
+ 	$(RANLIB) $@
+ 
+ cgi_jpeg$(EXEEXT): $(CGI_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(CGI_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(CGI_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ cpool$(EXEEXT): $(CPOOL_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(CPOOL_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(CPOOL_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ dbinfo$(EXEEXT): $(DBINFO_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(DBINFO_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(DBINFO_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ deadlock$(EXEEXT): $(DEADLOCK_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(DEADLOCK_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(DEADLOCK_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ fieldinf$(EXEEXT): $(FIELDINF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(FIELDINF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(FIELDINF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ for_each$(EXEEXT): $(FOR_EACH_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(FOR_EACH_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(FOR_EACH_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ load_jpeg$(EXEEXT): $(LOAD_JPEG_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(LOAD_JPEG_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ multiquery$(EXEEXT): $(MULTIQUERY_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(MULTIQUERY_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(MULTIQUERY_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ resetdb$(EXEEXT): $(RESETDB_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(RESETDB_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(RESETDB_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ simple1$(EXEEXT): $(SIMPLE1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ simple2$(EXEEXT): $(SIMPLE2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ simple3$(EXEEXT): $(SIMPLE3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SIMPLE3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SIMPLE3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls1$(EXEEXT): $(SSQLS1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls2$(EXEEXT): $(SSQLS2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls3$(EXEEXT): $(SSQLS3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls4$(EXEEXT): $(SSQLS4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls5$(EXEEXT): $(SSQLS5_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS5_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS5_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ ssqls6$(EXEEXT): $(SSQLS6_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(SSQLS6_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(SSQLS6_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ store_if$(EXEEXT): $(STORE_IF_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(STORE_IF_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(STORE_IF_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ tquery1$(EXEEXT): $(TQUERY1_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY1_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY1_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ tquery2$(EXEEXT): $(TQUERY2_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY2_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY2_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ tquery3$(EXEEXT): $(TQUERY3_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY3_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY3_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ tquery4$(EXEEXT): $(TQUERY4_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TQUERY4_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TQUERY4_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ transaction$(EXEEXT): $(TRANSACTION_OBJECTS) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3)
+-	$(CXX) -o $@ $(TRANSACTION_OBJECTS)    -L@MYSQL_C_LIB_DIR@ -L. -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@ $(LDFLAGS)  -lmysqlpp_excommon -lmysqlpp $(LIBS)
++	$(CXX) -o $@ $(TRANSACTION_OBJECTS) $(LDFLAGS) -L. -lmysqlpp_excommon -lmysqlpp $(LIBS) -L@MYSQL_C_LIB_DIR@ -l@MYSQL_C_LIB_NAME@ @PTHREAD_LIBS@ @MYSQLPP_EXTRA_LIBS@
+ 
+ Makefile: configure.ac install.hta.in mysql++.bkl mysql++.spec.in doc/userman/userman.dbx.in lib/Doxyfile.in lib/mysql++.h.in ssx/Doxyfile.in
+ 	bakefile_gen
diff --git a/dev-db/mysql++/mysql++-3.2.5.ebuild b/dev-db/mysql++/mysql++-3.2.5.ebuild
new file mode 100644
index 000000000000..d2d06d3ea223
--- /dev/null
+++ b/dev-db/mysql++/mysql++-3.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools libtool flag-o-matic
+
+DESCRIPTION="C++ API interface to the MySQL database"
+HOMEPAGE="https://tangentsoft.net/mysql++/"
+SRC_URI="https://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND="|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )"
+DEPEND="${RDEPEND}"
+DOCS=( CREDITS.txt HACKERS.md doc/ssqls-pretty )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.1-gold.patch
+	"${FILESDIR}"/${PN}-3.2.5-as-needed.patch
+	"${FILESDIR}"/${PN}-3.2.4-only-unit-tests.patch
+)
+
+src_prepare() {
+	# Bug filed upstream about deprecated std::auto_ptr
+	append-cxxflags $(test-flags-CXX -Wno-deprecated-declarations)
+	# Bad symlink for libtool in the archive
+	rm "${S}/ltmain.sh" || die
+
+	default
+
+	# we don't use eautoreconf to avoid dev-util/bakefile
+	_elibtoolize --auto-ltdl --install --copy --force
+	elibtoolize
+
+	# Current MySQL libraries are always with threads and slowly being removed
+	sed -i -e "s/mysqlclient_r/mysqlclient/" "${S}/configure" || die
+	rm "${S}/doc/"README-*-RPM.txt || die
+}
+
+src_configure() {
+	local myconf=(
+		--enable-thread-check
+		--with-mysql="${EPREFIX}/usr"
+		--with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)"
+		--with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)"
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	ONLY_UNIT_TESTS=1 "${S}"/dtest || die
+}
+
+src_install() {
+	default
+	# install the docs and HTML pages
+	use doc && dodoc -r doc/pdf/ doc/refman/ doc/userman/ doc/html/
+}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 47ddb7290c28..2ce9815a55b9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 7c4b6b236018..f21105278a62 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,3 +1,4 @@
 DIST freecell-solver-5.6.0.tar.xz 392468 BLAKE2B 9b8a22eca95da8675a252bec947dc5edad35a492ce9b04db5bf956e9a8c7051a9ca38902f9704e1f789fe28ce3326515690b2070cbb0318d299fdb8446ec9d1a SHA512 aac86e9bfb5849ffd99c669d8cfdd79272bc2f2a9a7f085e22f775b26fa45fc404efbb7520d23469e96c54c3596e776c8f459e679127de9ec0bc065c82bff246
+EBUILD freecell-solver-5.6.0-r1.ebuild 1046 BLAKE2B 31702eaf480bdccb3a3e3edb88de47036f2d9d8826a3372eb78e2d3d3f017ffe1c4ef84ef9b567e7ca9d24dc20c0a894e206faae39b153d272057d8320d06789 SHA512 875bf53ed93a52c03f76fb4006f424d61f2006ac344f743bc4900c9193b8488fda5bca7e4d4a743d5e4fcd823597145f495400e35ab61f1919c66e1e79ed94f8
 EBUILD freecell-solver-5.6.0.ebuild 1039 BLAKE2B 085ed7a82910b9840e9c7a1a6bea7857e61969c9ffe5e124b78440d3b33aa0575ac79246b0ebd5adbdafa86f835905a00d17380dd73c05913405b8b7c5f485b1 SHA512 bb1dbc40f0627815ddbd8ac4f50a2cb3ef8958c652205de6a247f8358333a267fda9ba54cf03065643b8316bff4826d8a15d39337c1743deb0406e5b14732ed7
 MISC metadata.xml 295 BLAKE2B 9e1e398d2fba90bd5e9a26ba2cb39ad2af9d9e67af9b3006bcb1d3e8374b82f20d3270ac50ee4fc02a04d84a3bbed61a7bfd394974f938025c6ec2f5c726532e SHA512 f3d83ba67322c1065e1fcfa040ffc0c532d86368fdb6552b30e1167058f355337055381407cab0bcc22f78bb451abdef1a3db4f1ffad6a5147ab26f969be1d28
diff --git a/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
new file mode 100644
index 000000000000..159cc4f198b0
--- /dev/null
+++ b/dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
+HOMEPAGE="https://fc-solve.shlomifish.org/"
+SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pysol_cards[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-perl/Path-Tiny
+	dev-perl/Template-Toolkit
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
+
+	python_fix_shebang board_gen
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBRARY=OFF
+		-DFCS_BUILD_DOCS=OFF
+		-DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3a83c8118a98..62bd7e2e5589 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index d7304cee6e59..a939bc475eea 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -20,7 +20,7 @@ DIST openjdk-langtools-8.222_p10.tar.bz2 2394871 BLAKE2B 376dd5d5cd86704b7cf6d02
 DIST openjdk-nashorn-8.212_p03.tar.bz2 2854888 BLAKE2B 3e5a1867d8a5db301fb3512ebdc4dea8f8226fe3308142d6f3f616795c9cee0d598a257ccd7e790ec440c966339399776d1118764dbf882a46a2daa32d81ddd5 SHA512 5c7fba1d567aa1d0602ef045b24a8624fed9ced72b3bae030ee15ea133ed2223e402cc08c996ff253c4792570da87b7713f351c84704b12556466349f6452f74
 DIST openjdk-nashorn-8.222_p10.tar.bz2 2859130 BLAKE2B d43b2e05dea1f97eff9e6d81ac0a6c8bfbe8cd444ff23df4b7d2fec29b678386893c169742a80fca6f0a785189796d2a6f29c10011a835cf5ac9e74001ae2b72 SHA512 453cefcd3f34cf6fca9bb14176145c9e4620e4188461b49049e5363cd62d87cc4f7703356369677dcd1e4862de0b5c16d1c505d66317944226a590af56026ac4
 EBUILD openjdk-11.0.3_p7-r4.ebuild 7394 BLAKE2B d82ea0a57aa97fb40887b7f4da9bc7a6c61b17c6bb0026eef979e9cb44937a7c253e0364c0487348d6274cd7e6f1f84d0a7a3e9ce710729992b1484b42b41531 SHA512 cfb17b2bcfff4a0d63dc4e1a180ad1b088c7d49cd1949ee0605e68342424e4d1e91468cb0c053937d535423d569d7f4164f99c05ffc1618ae996337d73c603d7
-EBUILD openjdk-11.0.4_p11.ebuild 7474 BLAKE2B e69da3340d2d49619cbce8083fe6e17ab1e6395f0bc7ee5a2caf1bbf052e2666fb0949e97a5ae6aac17d217b9999d1b1463c32390f3aab87c5618b313b32f941 SHA512 9585e3f0a3d4c7b0ee04ec7e07e9535deb8575e2cacb79b8af01c183fa6ef57b4bc53e75b8ae7b68af36b54346e3430095cb108e9192f18d45187a5872ed0c09
+EBUILD openjdk-11.0.4_p11.ebuild 7515 BLAKE2B a7fc8c6fe736d87f0d92ef6b1b7ccafbcce6da8d1397fa3562e6119215e123228906ee44e7a824b143f040e7a154862960f34075393898b9e2d7645310afb3ee SHA512 111db2827aa3eeb96e62efd4db9b551f22877b8740b5d7990b72cc3b3e52e3f9520d58decfe05f8d248dbc67c1690c5a48082c3aa5b2928528a27aa4ba21b70f
 EBUILD openjdk-8.212_p03-r3.ebuild 7320 BLAKE2B dc4a418d885c1db666dee134dd5fa73a041772dac925fe7249a24531ed7e38e29c8f1f8ea4d7aa41dcea7173cebb1ef110b6ffe8cffc8bb7b0166751e13e8c2b SHA512 c6b402eadf629322aaa9207cf8ebfcacbd3bb702ee565372200b2f74be8d26b4eb41ffdfc85feb945e8dc044c7f4c5c650172fe27cb59deb32daaa95be3e1063
 EBUILD openjdk-8.222_p10.ebuild 7405 BLAKE2B 4f2f21ebac598a3c8615eeecefecb54f440ee62eb1c6a2a167dd8d4431297c9949e8587bac40e2948151176150c8451e2cb4de610567af394633edcaa085e7c9 SHA512 ad09d11861fdbffe39b51c447ba5b8a0a4f2adf61c231dfdf95b1709eb35becc81a3db7724c6c47456328d02b070a855ac6f45feafc1c62cd0e1f63ce1aa5cf1
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
index be67385a6032..d9e47c67e52e 100644
--- a/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.4_p11.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 		x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXi
+		x11-libs/libXrandr
 		x11-libs/libXrender
 		x11-libs/libXt
 		x11-libs/libXtst
@@ -54,6 +55,7 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXi
+	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXt
 	x11-libs/libXtst
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ad4641fe8e7e..35f69b15426e 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9c4dbde2c989..0631199853fe 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,4 +3,4 @@ DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3
 DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
 EBUILD efl-1.21.1-r3.ebuild 6637 BLAKE2B e8846787fa6d2a5767468468625492bb0794fd76a53ae8b08a204c3ce6d2950a96ce15fb7fb2d7fd7f98313f7c06124ce97638909fd34e8d8c979e3382110f77 SHA512 67874905f334701605d886c5f75a82b027c4c418c87f8e495b1449b3d3b79d544172b5be8a180098656ee620eeb46eeb805695dbeaa242d2301a8ea0f8c4710b
 EBUILD efl-1.22.2.ebuild 6879 BLAKE2B f6d0200b055bfe235b08053982243b64e4cdaa5290e91c173e86918a839a69a45385256651b0d013f6c0a854ac9d7dfd6281c9d8a529ba175d54e410081b2f10 SHA512 914afb7338f7c9889a35fc1e72bf4699439496e3c37aac13b83635a8cade901abcb17b45ebd0fd899fd7c725d546d767fc2e0b7db6ac42e2a64bdadd380f4f9c
-MISC metadata.xml 2006 BLAKE2B 38ab4b1c584a3e44389d22fff8e44111f8c60555f6de2110e1689c5fdb460e5fe473c4e688a9807313f839c64f5689487fe4082c33c816fa8b1e7267b4f06e80 SHA512 f9b09075773de10f6ecb37a5e470065fdedf3cbdd9067289299d10d78b98c96c95f2bc6fef868ae211787ba15b10c1ea4d24a7555d8fd500220a71eb7686d9af
+MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 5920ddfb2a91..a67c1169284c 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>juippis@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
 	</maintainer>
 	<use>
 		<flag name="bmp">Enable WBMP image loader</flag>
diff --git a/dev-libs/librevenge/Manifest b/dev-libs/librevenge/Manifest
index c4100b2c3657..66df77f58a02 100644
--- a/dev-libs/librevenge/Manifest
+++ b/dev-libs/librevenge/Manifest
@@ -1,4 +1,4 @@
 DIST librevenge-0.0.4.tar.xz 421604 BLAKE2B 414674e4313f3062dac20a1ad7f1cf1c0a1681bb486f4edef109558fa70aaf8ee407fec8dfa93014db8c8746804e0a2bfec9636d75066b93d84e9bcbdc3f4dc4 SHA512 c4c2c98bac3522c8bd487058f4db19d85ad0d99159c4de4ffde91a10ea3adb7f995ebe8ccf6afcf533d81f50fb654bf265b9cd197508f85b5b68a101ca279712
-EBUILD librevenge-0.0.4-r1.ebuild 1118 BLAKE2B 3ea9ac17fe74e397607fd0bd8e1e54c45d639be430fe461fae03f46bee668f04a68b06bd41a9e59bee768a68cca3ecf8d5fb294d32ceb00a6f94f70cd1f05954 SHA512 781a27f8b5efd6ff3769e2a443e61a524dd59ccafbbf8a584a044521114ec31483722d2bca7cfa4eaf54a9cace3d3c7ee7be046547c459540ccdc29dbc5acebf
+EBUILD librevenge-0.0.4-r1.ebuild 1114 BLAKE2B 0d5a703c09ccc660be2162ad1a4439df6b23a4cff650012ee7af8ea476691bc85c10e3b144e1b786aee13c269c7e71096d00de24b40a9d59e5a6f54f191b93aa SHA512 902c7556c5385992cf0061e7795911ce262c59e35949c38b1895045ade0bb4256dcddcd06eb76da7e377ed6cf99f943220e4407316aac0d2ad394e776c7fd1c2
 EBUILD librevenge-9999.ebuild 1091 BLAKE2B f28e2ff7db9f1f741ee729f037799c432981e6acc86c67b57c8bce5a1c33343dcd0cd956ae79417491f873625b956a398bb095fda34e145a8debb3c0094a2c85 SHA512 5920bee7ae22c3ab194c19a9dad9194358577431c1ea40049a28356ceb51429374b7b6d855ae0e3c44fbaab3239c986337c6e525bb0a01334cce4017d01f269f
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
index fa647a541612..2fea73e194ce 100644
--- a/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+++ b/dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sf.net/projects/libwpd/files/${PN}/${P}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 fi
 
 LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
diff --git a/dev-libs/mxml/Manifest b/dev-libs/mxml/Manifest
index 8ca3435e5b52..c8459960e1ea 100644
--- a/dev-libs/mxml/Manifest
+++ b/dev-libs/mxml/Manifest
@@ -1,5 +1,3 @@
-DIST mxml-2.12.tar.gz 9112072 BLAKE2B 29e63abdd567c76209ca41adf608bd752863cdb2911d5bda482a2c6ac50ccdae2179941a3899d7e58480bab8903fee8a6c431619072d2861acd01f18d0eeb9e5 SHA512 49233a0087f3ef73a01ef71bb79511af36bb72027e3d9f6df919385e9ff0b03a489a3ccc590941bc4af1f558f82b2ed9bf8ff641863300a7791ce6dddfd56e77
 DIST mxml-3.0.tar.gz 9266886 BLAKE2B d5d3481cfd1d015c620ef897bfc21e839ad2a70f5ffd58973f8435e0e6a66abd477f8fcaacfab05ce608314fed27241702becb60b49b8492560bcc9418b317f5 SHA512 3c540348022226b122ce014f183368cda6631600a11d8f4d43c99c62fba2f3ca4b23dff4122082f63915b59a46a5475d1d12d0081f9315c65f5c044ac3c751d6
-EBUILD mxml-2.12.ebuild 1399 BLAKE2B 45f9336f240800aedee82bc14eae8aec5981235d577f72075a77885836fa0a7532d0970c4e58047081f22cbeccaf5752f1242e19195c04c73e6612c7df438b0f SHA512 c9b7c017c4d7b069e377ab2905c1aa5e444754d9cac89b4486c13dfbe8d702d8a5e4a8e209450701a98ea39694232408dff59603ea3370964905611e8f38575b
 EBUILD mxml-3.0.ebuild 1402 BLAKE2B 5ab3a112c010bd0a9a16ddc35c702138b22b88f4fc44dd0caa0f6227247ab19476978a81faf632753fba510e82fe2aa441e7e1ed81f041627c69dc9fb43d585b SHA512 1dbcf5b958c0e952d80c56079f0d3e21f91ab8a5b4e55dde68c71f152a0f4ea208f97b7f9fadd11178ef7379466c27df43674bac5e5f5cdaa08cc5645e2b0dad
 MISC metadata.xml 1498 BLAKE2B b0ff99450cec828ef5614c2b3819d02cc97e402b60ce7b9bca20962166c47a9e3053e2457eb7b29210886aa7b0297e97340b55cf74a0aabc20ecb4c451d576c6 SHA512 5ead3d76daa42879139a96cceb0a12a84a23df8372a8e2e9e9d1e38ede0266b480ca404f03047f4e66ed7d989171d37333051e2a111dfa0900b9cbba703b22d6
diff --git a/dev-libs/mxml/mxml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
deleted file mode 100644
index 1944085d2527..000000000000
--- a/dev-libs/mxml/mxml-2.12.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
-HOMEPAGE="https://github.com/michaelrsweet/mxml
-	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
-LICENSE="Mini-XML"
-SLOT="0"
-IUSE="static-libs threads"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-Os -g//' -i configure.ac || die
-
-	# Don't run always tests
-	# Enable verbose compiling
-	sed -e '/ALLTARGETS/s/testmxml//g' -e '/.SILENT:/d' -i Makefile.in || die
-
-	# Build only static-libs, when requested by user, also build docs without static-libs in that case
-	if ! use static-libs; then
-		local mysedopts=(
-			-e '/^install:/s/install-libmxml.a//g'
-			-e '/^mxml.xml:/s/-static//g'
-			-e '/^mxml.epub:/s/-static//g'
-			-e '/^valgrind/s/-static//g'
-			-e 's/.\/mxmldoc-static/LD_LIBRARY_PATH="." .\/mxmldoc/g'
-		)
-		sed "${mysedopts[@]}" -i Makefile.in || die
-	fi
-
-	eautoconf
-}
-
-src_configure() {
-	local myeconfopts=(
-		$(use_enable threads)
-		--with-docdir=/usr/share/doc/${PF}
-	)
-
-	econf "${myeconfopts[@]}"
-}
-
-src_test() {
-	emake testmxml
-}
-
-src_install() {
-	emake DSTROOT="${ED}" install
-}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 52ae0d1be66a..773ecb0657b0 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,9 +1,11 @@
 DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
 DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
+DIST userspace-rcu-0.11.1.tar.bz2 527799 BLAKE2B b81ab5b3fd23e5666d422c1f627bc3c2cd095770f4f054f5d0d4ea6bc0007f12a4c6b05446e179b7a33775f7603e3be8ebf2c844be77b47ed80305da208151ea SHA512 112f7be1b72edfbad61582bb9962e2cf3c83415d12886cecb8239ab3263d1d07310b097813ac206aa9d4622953099100f0f54375d5ba345a3c87159c4b27bdc3
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
 EBUILD userspace-rcu-0.10.1.ebuild 673 BLAKE2B 2524941a62c95d2511da008f6ee0ff4751e49e8321c93c2f24399f888e3d786ddb81251d76c89b75ecd119012626f81a784d5e3d29d34cf499f1b86af9b4ace9 SHA512 8dd0e48b45c781297f9bf37ec36677c8c995e623ade8c36a45a66b3043de5dd7c970919b8212efb65107cb87a23270d7eb09c3fc48248299cc74f6742517a425
 EBUILD userspace-rcu-0.10.2.ebuild 680 BLAKE2B 45f02f09faae2fd0a10eaf5bbe8b385e4bebe2af15e9aa9a9a65d4e7b7e25f13af41d150c363823a2d9914cc555b863f4547a457114afb931fc285ba619843f0 SHA512 e0d4eedaa1420a5e7d4a4f5c3cfefb28c47a8789c4a48711d541cd8204fce7958cca7de85599f25427cfeae8109d604977fd484bf5921a0f534de863f00edf2a
+EBUILD userspace-rcu-0.11.1.ebuild 680 BLAKE2B ebf41f7a87a238275ed19713fc52c8ea58e482e1a8e101eab2153dad8f32edf11506ff0854d3a5af87831c3ba3593b0fe836962b0267ad4d78c725568b86e860 SHA512 a0833a3953bb6be60a25eaa217ff970e713e63e15ff78445a2c880d8f54991e37cdafb7e7227b51b0d6e2e2adfa54f9a2b8bdd70144bf9ef903c822cb2f09fc8
 EBUILD userspace-rcu-0.9.1.ebuild 740 BLAKE2B b14e6a5df0fe84b42d932333de46b1c370ee594ddc37e33805ef00e6af75a42fc72df610ea083dd5b818e7b77d8177b86bab602f864e279fabbd99356943de77 SHA512 b12eff3a56fefb0fb9c1a181b47f25eb1278d171f919c1a0dae2f788f95437eb418d8ddb64cedba9e7b95b81f4ae9ea8b8b125fd07f816a2511871f692a69322
 EBUILD userspace-rcu-0.9.2.ebuild 746 BLAKE2B e47e73ff204d61dd97063ce7c00df11750fe27406ca7c3166d947e55c094eee04142658917841bca424b4d6614fd33694f932f16876182f963c53a50f251d1e3 SHA512 ff838cf89d63324f8a9741bf5064abe2fd814b5758930046cfec333ccbaad16fd0d682371978ea6382ae84772278409fa8e7c0822de379503eee852a828dc8a4
 MISC metadata.xml 346 BLAKE2B 102b7c38737d334ba2af338cc54d6c15706ee463446bc6b3722bdabaffb925a36d5f7baa851329d0e21410656462f3bfddeefcc607520a731c7e3f58f659b140 SHA512 c8f1e16f1ef58e202e5161e23eaa25ac5fc031b958abefe5b869eb7951223280eae1faec1984197de70ba5cb678fb385d86276a2375fa5dc17371be2c771adbe
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
new file mode 100644
index 000000000000..d69a055733c8
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="https://liburcu.org/"
+SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
diff --git a/dev-perl/Ace/Ace-1.920.0-r3.ebuild b/dev-perl/Ace/Ace-1.920.0-r3.ebuild
index 9b035a9c5ae0..e46cfba0c5e5 100644
--- a/dev-perl/Ace/Ace-1.920.0-r3.ebuild
+++ b/dev-perl/Ace/Ace-1.920.0-r3.ebuild
@@ -12,7 +12,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Object-Oriented Access to ACEDB Databases"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Digest-MD5
diff --git a/dev-perl/Ace/Manifest b/dev-perl/Ace/Manifest
index 681bb24e002a..2d43770f1f8a 100644
--- a/dev-perl/Ace/Manifest
+++ b/dev-perl/Ace/Manifest
@@ -2,5 +2,5 @@ AUX Ace-1.92-gcc-nonvoid.patch 729 BLAKE2B d98d4d2925f8f10f55f64c945ff61509c3ba9
 AUX Ace-1.92-glibc26.patch 749 BLAKE2B 261d699ab79bb625cf8590c900913ee35363b7cd7a70d3ec82a3866c9e06c33e70f760610b65e2591b1becbff5b58264c61917628cddbd8a2d490ea6c4911e0d SHA512 a383275a27abaf533174395040513dc47355a1c56d660d7221e4142ea90a1ca97957f8fd981476ec62744df7a65037b44ad957467962ce5aa730f2fba916f7d1
 AUX Ace-1.92-rpcxs.patch 819 BLAKE2B 2eb978b7bbced6b67976685d8102724f6357983459e90a14fdab1cb696a8e8c033093d3427cf7aec820aa27eb0f71c9d505962dc2aa62ca67455562b869a5179 SHA512 ae26f67a5a0b91652c90dbb4beea7553e3affc40a15db52247ba28e4171f150c4ffa70ce15b69ce3735176c810b36105b00fb5675f4320340354a929568b49d9
 DIST AcePerl-1.92.tar.gz 300163 BLAKE2B 4fac4d7f56d31f179a1a310688cde078371a1e6605b229016a5a2f3a32de01bf3421c459eeefcdfdd12df3baf34d6495c8e7998e1c66a47215ea2abd741303b6 SHA512 0db8392336dd48c58bdaf8d8d9ac6d1106124259f27fa95951aa8d496014e1e8b89ed87f6df276473e3bcb44a8d323f864178a9b84dd1e787d614bd0b8e93be9
-EBUILD Ace-1.920.0-r3.ebuild 2926 BLAKE2B c6ee969eaea5761d58588914b259bffa66f25380c5cc6448020ccd8d07328f7a604e7ec3050c6879007edafe14c7fbe412a8bd24de60b8ea9e6c85a5c7754ae2 SHA512 3c6dd7ec9f2c1caf39a8d0aa408b4ecb684d13874246399a22138c07645613ccb519eb2166674bcad59d0b80e2c4b886cfb0e3fbc28ff25edc2895fd37fcae4b
+EBUILD Ace-1.920.0-r3.ebuild 2928 BLAKE2B 3578aad242c68490d34192bbe1b903a2fca7d016bf97952fcdb1915068d463a33cb0e54209c1c8dd2c73836312d0a821dcfd72d89f6eec6cd86b9b202fba73ef SHA512 a5bf42540b42f46148f704f6c97f27f0e336ca1b23dbdb7ac6dda9319dbb7f7d25d610bf4846a7eb341d698c951a257585515b4555f1899cbb3594280fd672d2
 MISC metadata.xml 3416 BLAKE2B 4385d220ac60f2e41750bb1afeff4f9a9055526710db08c2688f1e3787a17f2d9943af22825c8ec554c832f2a428410578baf25044348cbc984114890adcc770 SHA512 aa3443c187165f3cf97e7110238cb039242345071f9e3f74ed40e39a9ce0720062706dd78539eff1553703ed5e8cf55d42b924ebae3cc992366358d300ec544d
diff --git a/dev-perl/Chart/Chart-2.4.10.ebuild b/dev-perl/Chart/Chart-2.4.10.ebuild
index edc9595009a1..cbf7477f3532 100644
--- a/dev-perl/Chart/Chart-2.4.10.ebuild
+++ b/dev-perl/Chart/Chart-2.4.10.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Perl Chart Module"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=">=dev-perl/GD-2.0.36"
diff --git a/dev-perl/Chart/Manifest b/dev-perl/Chart/Manifest
index 3537a4c55667..74a152881904 100644
--- a/dev-perl/Chart/Manifest
+++ b/dev-perl/Chart/Manifest
@@ -1,3 +1,3 @@
 DIST Chart-2.4.10.tar.gz 1698207 BLAKE2B 3802c5fe0247dc47747b0d6bbbdbe2af5fc772791f7f7b02adc2156759090f43fdac34aa45dec56652ab53aba4198f9232d9afef3faf6fc2a818c3dd8df27106 SHA512 e8327c46e0cbcea0ed8f723b7b369f4b694c0d7050d3fab35371e0717938292b5bacd3e367ed87e272dc258db020c378690405f93d23ba0ed546dc29dd59e37d
-EBUILD Chart-2.4.10.ebuild 366 BLAKE2B 32e255b23ab0b995ac02f4be2e7a0c2e1a480b1de92a910c86a5eb26e62fd4e8ac1a4950567a6c1b3ac77bbe9f45cc1720620bfab1873132f57e6a1ca8f4e36f SHA512 08cbffa1a2ec63857d9cafe5cfee56039806f7982de3cce606c56c65d6613b8b694c55b312268cb998ac27dac269e5e897842f01c649a32e60e8946159d02a81
+EBUILD Chart-2.4.10.ebuild 370 BLAKE2B a474c9d883bd1cd02403f851b312a9586612ec27d7bc23e993575df8b3ebbfbcd43b2dceafdefbd0e26b362adbd70467077e2126ff533e1a3fced1387ee1f778 SHA512 e286bbd44209c6ae5a83a35e334165156ed008bea3f6265ab3c357ab4a70496d8219fed0ba4d241eb3899e00feb3383e029db13b36d8203108833e9d9862073b
 MISC metadata.xml 1317 BLAKE2B 9867a224db2a023a4fe4d7660782feb78cf5b81f09b5422208f9ca01b86de09fa316367ca05cf6ecfa66c1ecd0e5c174508fa46a1642d8df4d0a772b412d2730 SHA512 c2bdb8598314f6fa8d3a55a665b00c049ab3e2a27588d8a205a907b34512ab249fcfc6e28f54653a3ccc2c4bf853503ab1c4908a7ce0aa9a0134732a3711e8e6
diff --git a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
index ef100077c4a2..75611708d433 100644
--- a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
+++ b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="GD::Barcode - Create barcode image with GD"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="dev-perl/GD"
diff --git a/dev-perl/GD-Barcode/Manifest b/dev-perl/GD-Barcode/Manifest
index 3c0a0098b919..ef77e438cdab 100644
--- a/dev-perl/GD-Barcode/Manifest
+++ b/dev-perl/GD-Barcode/Manifest
@@ -1,3 +1,3 @@
 DIST GD-Barcode-1.15.tar.gz 892881 BLAKE2B 4c1b8e7f97c01f8c2295e68d2ef2045eb2b65af7f4c5e3695263fab11d8065e09aef64df4d35cdf482269faf5695f0f2a8b97d468a9d5f69749487def8e4ee5a SHA512 3128ef0376f2d31b55bdf9e206a16982632a7e7e7eae6d0d846fe0f80f3998a893f22f910a7d053e15b9fd94a9408805a7b862d735e6be03e1fcb9ff7d4d5155
-EBUILD GD-Barcode-1.150.0-r1.ebuild 345 BLAKE2B b02d9a07153344a9bcb60f9e9239d9198b1a93098497431e9bb1bbfa1b7565e89ccd905cd3e59c385c2e6370646f8fbe7e07a73adf58fabc89d79101ae8b641c SHA512 850929609f0724c421ad4320c7d0a3ac658b8c83a05e697dda633b20cbe917145f018c9ef21a9054196d45edc8bebb9e19b3eda180555e9478aa8a9c319c859f
+EBUILD GD-Barcode-1.150.0-r1.ebuild 347 BLAKE2B 7d137ccda4a03cd06d9ec4449cce65c8cebc303f35cd5bf9bd6ba673fadcbfb59516aa21cd83a4262211f76f60c5c65bbf828aaf412546145ef3ce05b093458c SHA512 82619891a741fa42be02f3e7a113d73e9e4a6416722c33852ef64068fb691b886a11f39a93e4f02e0fe1438b82f7a14640038766977a47d974923cfd3b3c4aa3
 MISC metadata.xml 1187 BLAKE2B 812b8b5aa39946e0a696b8a43cb6be2ca04a8bae6a37e10b67a5bb4ab67124be883bb8839ae53646ffc1533d03b20ec2a88405a536f6da3e8c53b0a603ab04ae SHA512 fccbc94c5b90713c1cc0c726ca6610eacea68b92e5cc5274484c03f2f54628fc35dc6d5dd2698e5fbf7d88131a041a8e7d3b38bef6865a08e56996dd75c2ba00
diff --git a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
index 3c5664ebee61..b7704af45bb2 100644
--- a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
+++ b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Create 3D Graphs with GD and GD::Graph"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-perl/GD-1.18
diff --git a/dev-perl/GD-Graph3d/Manifest b/dev-perl/GD-Graph3d/Manifest
index 69efc8eb1752..3ed4afed809b 100644
--- a/dev-perl/GD-Graph3d/Manifest
+++ b/dev-perl/GD-Graph3d/Manifest
@@ -1,4 +1,4 @@
 DIST GD-Graph3d-0.63.tar.gz 97855 BLAKE2B db862650290970d8521dd9da2490a8eb10119dfb885f0100fd4d75a035c0fcb367614d7d483c6c9c650944fea671de181449917f8bb1bc44b519857ea364393b SHA512 4792461322e7f37a671c1ec87bceb4591f69a90d328d816b19b7fc1013c053c1d66de2f94511c010bed0a8cc6363ee46f928c864614703d399231e149012d559
-EBUILD GD-Graph3d-0.630.0-r1.ebuild 422 BLAKE2B 918fe6e92c9b55b0917806528a29aa32ddf1c30b30a269e403b921e82a89b2efecf1e5e5526f5f5049cf5886db8fbf5e0a3c60148baffd4c3eb12a637552f040 SHA512 b14fef868eb1b898fe3301a6987498f54ba101c66d494dd6d08ff0ab2776e5edb8c9829fc451680924c5ac9f46de22edf5a4c1110252efd9459319e7ec2c5082
+EBUILD GD-Graph3d-0.630.0-r1.ebuild 430 BLAKE2B 44212ca8d1c50a707975c0a766d70c2b0be88dbba17af55827a342f03a35327e93e3bf99efdc6dd4a22230fcb6666a38f9543b5202deeaae9c0aba1a54747f92 SHA512 13294c478038cd413f2560fcc304e7fd267c4d89194f4ad6f2e62057a78090e34f72abfc7607dcab7143d0a46054e2997ba2094d32dac8c984ea3f9c864aac96
 EBUILD GD-Graph3d-0.630.0-r2.ebuild 426 BLAKE2B 87207f9da11ae9d9dbb82b2de54f78fc21c9bbbf73538302d7460f308052233d8033eb9fb2b316f1cdbc8a0b73d2b068826ed0dd7c15600469b5c51af7ff3188 SHA512 bde10122287040a8c1f705a8e894a6ee606d7d5c64af17a1da0201bbbd5fb4a3bc058a94957b1bd3934d0400c6db6dcb158af5791937bc783c3966dbddd271f6
 MISC metadata.xml 786 BLAKE2B eb115ec38a3b39966717fa92eb04b5765932764cd0a36839fd1639ed424ad417cbeca6382ab2a6dc2ca32221c8ce299545c6715160dc0926f0c8c8c12412c2f6 SHA512 cbbea768f087b71d77f412542d2d7eaa85473b83ab39e01d1d21d77fda2efe928052384c88d53fa901b4cb226c0dccb61a26225c32c6879fdf2b4730f3eae6d1
diff --git a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild b/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
index 7c78773af6bf..6d34fc262a61 100644
--- a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
+++ b/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Seamlessly enable SVG output from scripts written using GD"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-perl/GD
diff --git a/dev-perl/GD-SVG/Manifest b/dev-perl/GD-SVG/Manifest
index b1e02b001170..de57f1d4802b 100644
--- a/dev-perl/GD-SVG/Manifest
+++ b/dev-perl/GD-SVG/Manifest
@@ -1,3 +1,3 @@
 DIST GD-SVG-0.33.tar.gz 46347 BLAKE2B 21b21491e9fa4ec7ed625cd6b318a96ec79060e36bf93a7a66c9ff088753291ff196affac74a42c99e3cc3da5e70cde810798fd5bdc228e2c637555d9b9bbd97 SHA512 2fc214b26448f381d8b97d14c5698b939c2ce8c6fd525a44d530da29f2deb5611c0111c75a577ba91273e97d0714220efbb709aedac67fb0dbbd82e6e4973890
-EBUILD GD-SVG-0.330.0-r1.ebuild 363 BLAKE2B dce83120cd0be5c803b7d26a7011c481b845e8916f4ef8ec65478584d66be16f39a74cbc4f3ab1a9f1847a56914ab5577d630effdddd346f276521a7430f4bc1 SHA512 615211b6bb776c4e615375b4f1c6659ebe6b4a253fd270d8a2326c11c9418425c7d79f0cdac19d1b84e2fd7e260c0a17ab8dde56df0222c17be8e758bdc2c4cb
+EBUILD GD-SVG-0.330.0-r1.ebuild 365 BLAKE2B 1d81e9e094fb04025c7a29542984743a6c7434333c652b55bae0a86717c06fea6f9fe696622d82415d65c261e1c4f7497e8ef0b095c081c6af1a19bb01855a1b SHA512 6f0e0cd018c2f2cbe752a1fa627e95975f6b098e0bb35b7932baacded43292e4a1802bbf74f10480cdb30b12144208382425dbbbdf9083a04f6bcd25279fdf62
 MISC metadata.xml 568 BLAKE2B dc2b0a5eae6502e61e72ce92ae16b9945563e7d48e24a6db7104a1c6e42d4bdc58931e20ae00274efe84d5e276c6ac17e607ad455e5b87628ae6aca66557f472 SHA512 2fed8c6464ddabccb0fc255711582f5daf886b730a74194f9e66b97b367f4003d3ac98ccb2bb705b986315dd1171a00c52b3ce90c5c7dbbb5e37aca20ed58c4a
diff --git a/dev-perl/GD/GD-2.560.0-r1.ebuild b/dev-perl/GD/GD-2.560.0-r1.ebuild
index 7541e8f80413..3ec3508cc81d 100644
--- a/dev-perl/GD/GD-2.560.0-r1.ebuild
+++ b/dev-perl/GD/GD-2.560.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Interface to Thomas Boutell's gd library"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris"
 IUSE="animgif gif jpeg png truetype xpm"
 PATCHES=(
 	"${FILESDIR}/${P}-rt106594.patch"
diff --git a/dev-perl/GD/Manifest b/dev-perl/GD/Manifest
index 2c0e10ae62b3..ebaa0d3fd5e5 100644
--- a/dev-perl/GD/Manifest
+++ b/dev-perl/GD/Manifest
@@ -1,7 +1,7 @@
 AUX GD-2.560.0-rt106594.patch 1253 BLAKE2B d7d05d2c492782a90e877932dd9a12aeedc5d206fa41a4bbf35b871c6d3fd27557f2d9e0606f39cddee92f4b132e6d57f0f83dc90d0c82689b52f36ae7ec5c6b SHA512 6bb62f4dd24076f1d99a99e6adbba8daba6c94366ac6e0bdd5a9c18758f7090d6a387d1405b8402fe0463a25825542100d46768f56f80d64d05f34a0b20f0881
 DIST GD-2.56.tar.gz 273441 BLAKE2B eb8d27a1a18f3ee8474138c82d1305b6bc8248e6b4ba4ab0bc4470d070eae0207a837e54e8f02c8f6c06e813663396561c0ac2d191e9884ea1f0ff65d23bc166 SHA512 51c4b46b199625a12ae1ad1003cafe4e66913d1e0c0b51d9bccbc7c14a86dfe29144caefbeca2927a66a44d4ba8b134550ee4a63eb86aceaa13513c46a4e71f4
 DIST GD-2.66.tar.gz 253000 BLAKE2B 1a1d5374c06fcb07849e504c8c5c6f00443890cfb728fd02b4c94838d754c2f04bbda80cfa8e2a7b08a3c07cbed32aa6a499468dfb044865f833b3486965d2b8 SHA512 37d3da70f4e0b89b0166488a1f8a48c508ff5e515653fe1b10602cb708ae0ce713c617dcae21c48ec795799fb0e061762696e6a65bb8ba359859223d15677c61
-EBUILD GD-2.560.0-r1.ebuild 1396 BLAKE2B 0a8e99500c6c6c7b213d6761c5f366beed09406d20a095d7b1fd034b97517adadafe4aa9e20766b7e39d3f40388095e00adb735ab664c06beaa0b6569e32175e SHA512 ef93b9903f710b9a90e6664dced741caeafa4acdd4f0dbf0d3e00ba54f6d0bdd3199f580877a870df7916dadbb0bfa4ba04c935c4adafc23409b5b191132bd8e
+EBUILD GD-2.560.0-r1.ebuild 1409 BLAKE2B 15bf5fd68476b26b7792ad10683800e71ee6716504c4631037dc20300d54036bbd8a159acc709200c04a6e5656be04d881e4a703788c50ea60cc11636af8adf1 SHA512 80b2040aac0840ec533e9f240b0b406757d45f76ecfd57a52f21e794ff4e47b57a52a70be7d7e611c9a4d9d70f03e6c678901abcdbd1930440109fbe6a0cc0c0
 EBUILD GD-2.560.0-r2.ebuild 1488 BLAKE2B 45c6b2078e79dd93bf26348d7ff7697d1053f45415c1efd32c4c93024bfc9465361802c40ea892cbdbb878c0603bd07a6a97a8f1937c72935cb2a4de6dfc4de1 SHA512 ab2616acfc2d466f98c8272cbb22eff269bd527cc06da45783e9d40fc5a03932efac31f1b03f3864482745a197312346f461a7aeddc2fd7b69280d487570830a
 EBUILD GD-2.660.0.ebuild 1517 BLAKE2B f712e46495d11359ab865b20355730a178862bc7214298f060e2f781d4be5b5754d4ce8f63390f033782047931a96185c4486743c51886041a8049db1c21bcf0 SHA512 5bbc50f783d91c015fa2bd7673c7121c380865d6013ffeab16b6576cf6227a0f9cd78accc1a6405b8d928579c3b2022531b8bd348df5ad872beaae933f081812
 MISC metadata.xml 852 BLAKE2B ab7abbcbf4d6d62266365794525899c41cb9119ac9173363eebb2573e682671c3e7b7cf032d450d90c19a9ba692915f2cbf706e2a90260c80f8e8eb251cee763 SHA512 7b5fe91b323a991d33efaa0b4eb5e4cb96ae8b279035e72a9d9937e08d64cfc7ae39d6ee720becabaa434d55088f05bb4352ff57e7abd63abe0c1949771a3f86
diff --git a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
index 5f727a29be0f..7019eb098c62 100644
--- a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
+++ b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Perl5 module to create charts using the GD module"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/GDTextUtil
diff --git a/dev-perl/GDGraph/Manifest b/dev-perl/GDGraph/Manifest
index 7ab58ec46e53..8decc90debd7 100644
--- a/dev-perl/GDGraph/Manifest
+++ b/dev-perl/GDGraph/Manifest
@@ -2,7 +2,7 @@ DIST GDGraph-1.49.tar.gz 155643 BLAKE2B da76c442d51713b8839ee89c22734345730121f6
 DIST GDGraph-1.51.tar.gz 156175 BLAKE2B d2cee141c9702c7584a90bf652f47670d5492ac8836c1c9d229010084ab606caba7cc12f0578e1b89b9b8f7c9b22a3f28d9c222777ed4a3df73576cb0857acad SHA512 c9cafdc90905fea8689cac32d0429ae987a933ae090de9894c9f70668db5c636e9363e76a656898df667dd0b0b4f593a64f3327f0b8a9738f74cd2cd937005e0
 DIST GDGraph-1.52.tar.gz 156349 BLAKE2B 93eefa2a1c342e0e8822bc3bd49837b9a5a882f15085aaf1888511631d064d5c6069b4c95ea11fa519edc3fb061dfe4a4e1dbf2d07cf4db1eba7dd20fe1bedb5 SHA512 9a213a5fb44608f3984ed763659fb0cb631bdbc34e89683eb3d4cb776de7fdd1cf4c9e339cf02e0035d4978bfd0d82723e1576c40720af917f50bb0363fd26e0
 DIST GDGraph-1.54.tar.gz 157158 BLAKE2B d427f135998c8e60e62ea0e94d1a8c2c48756fdd3d7fe2ab230f342657a684cacc3b3a9633cfdac16a5e65d01e2093043b5d8d4050082821e95b30ababc545e4 SHA512 0dd0da5fa0e879cf2addcbfdd02ee8e9e6af715b88b451dc29fe5028f30d7ba7fa0e126d07e7bb4f9a63e40b3be95a9cc0f6c061ea8644ba0ee7fdd2a7964fce
-EBUILD GDGraph-1.490.0.ebuild 415 BLAKE2B 5da9f13f1eb6937edea66615ad58a57f3e7ffc66584215bed2b052a109d060dcc85e171565291b04ceaed39ee6b1969b97e4f34e85ece475d6e760b3d749e89b SHA512 bbdb20e949a848760980990727ac4c6fadd11f1cc2ac093940d45ef92c61224fc87440be7b9999955e5fbf1582df571575c2089119a698b7c958cdbbf0c1f9c1
+EBUILD GDGraph-1.490.0.ebuild 423 BLAKE2B 15326fafb1ff339bd339beebafa753e1479cb9f7d99249568a990fb160d0e8c2e8dedd3c974292e7492bae9aae074db4592d3566dd1c002e7c7191efa24260aa SHA512 0fd2141a064e3ecd9c75656e3a6de0a8ed5f8b89c94781c7ed3d26b8e023f2d6b6c3097e499eff4334f9912618f1041e73c3fcd2a8a7e940640dc1073d0b714d
 EBUILD GDGraph-1.510.0.ebuild 605 BLAKE2B b0b38b233a16a44a868a7e078288638ab9997612d1f74779ab2c4fc52e5b3465f02be104c241ab16e49531905cfd5b5f71f6e9c19c6d2e3a64afa07ea85a563f SHA512 b5044eb924f1e305fcd3eafef945bd729a841f8ebc0f004162bd974c1a0d2f1786a35cfb4661d38ee06d06db174fbba1254fcbfb97cdaa712f85416412ab87ee
 EBUILD GDGraph-1.520.0.ebuild 605 BLAKE2B 569accc70df7c61f77fa3cbf475c3d22505515a74e07f862d709fd5e204184db2266a9c2670e9bc8bea584bc96e501d4e62063e4374d6ded234bd0656d6849fd SHA512 cff44bc6c279c9e07d6eafe2b68693aa15aff56eb53ac0cf1441b8568786e1a63578e35e7d65213a0e5725a456ef06565fdf0f60215c88351d3d0c10cbca1350
 EBUILD GDGraph-1.540.0.ebuild 609 BLAKE2B af42671f1ca223979c5ba22724ef7ebf0ae05a5178790897bad0ee5ee3912eb837c0baa07137fab25ee8be5978a33bbb821c1f42f754c4e179c993a77382a49f SHA512 9335ddaf0bcf1bec870e56e3ba1e7b24ef79e4f15925fbedda65bf63598387403c3e7da62f7cd8eb2242f3660cc7fea6728e61cd003b5f8c7ef42735682d13d3
diff --git a/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild b/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild
index a64ab297bb81..98b301915637 100644
--- a/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild
+++ b/dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Text utilities for use with GD"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-perl/GD"
diff --git a/dev-perl/GDTextUtil/Manifest b/dev-perl/GDTextUtil/Manifest
index 6e2608f0dbf6..e2117ccf7c57 100644
--- a/dev-perl/GDTextUtil/Manifest
+++ b/dev-perl/GDTextUtil/Manifest
@@ -1,4 +1,4 @@
 DIST GDTextUtil-0.86.tar.gz 64698 BLAKE2B 0438ae48901e8b64ba3a23dc878e801aaee125129f42ab88ade4602f654b625a949ef50a26e3ca9ed409dfff51cc32269c04156d1aa2edb03c6b5a139f1552ef SHA512 0c503df81249b0b53a8e87d65f684cf7ff01184ef1fc0166d2f295332d4cb553b6b714f42d6915cd0798f899213cd9cffef12bd30f5fcab0abfa4d0be97c8b18
-EBUILD GDTextUtil-0.860.0-r1.ebuild 362 BLAKE2B afaef18986efd0b71b075fdd5811b117023219d8dee01f61576892cc0f0953423aa5520a5206fb3f245d6f9a6e31e1be6f3b088eee581852176029d901c2ebfe SHA512 18e55e297f16afa21246e03c052bfc383b2e0e71777ddb8985c44457cc14de5f0d68a0605e9a80ac38827f44256a2a38e10893497168457c30d76b13c4e06b72
+EBUILD GDTextUtil-0.860.0-r1.ebuild 370 BLAKE2B 34bcbda3ce36af33286dcee9220e0fd1d994ab6e2b6f125258f48738446f896f20f384064c4624fc5376dcb0006a44254322b1b6660c47eb2706bc5ae6c43d76 SHA512 25ba021a01bfa65d924707a7c6c1b3721d1f40f68552b572ae259f5d7dd9b5b131a7f5c33ad11242ad1cc7a6fa4d12b43a6d025d65f8f4d5f5b0a3cec9077ca4
 EBUILD GDTextUtil-0.860.0-r2.ebuild 393 BLAKE2B 85a7c63568ebc6793d302317357fc90fa689caafbe909c693126005b1d9268f174136ef765bb852c3d0b4d609f79c5c418e5e110ba3f6368ccbb3ef5ada7e0b8 SHA512 f41abed494961d83d67324af604d8729f6a7a4761c35455de110208ca9d06b058284a9e5813580b0e8ae162f4c23e87c64a5e2f4a2531e4e0c92ab23652d8965
 MISC metadata.xml 512 BLAKE2B 5a8c285311ebe1b64aa390112c66028c267b5388ad6a32e5cc944a32416ddc6441f931f8123ed6edff303e325fe61b15820dbe7e833ef31b6cf33b70763c2e38 SHA512 0b5b05138d46b8181598fe3a875ef4d3abe7b1a80203b10952bef84301d0850c79473f6019e7045bc342c78bc99cf1ffd8bea46ecf8dc06720fbb6cdbd75b158
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 4f29b0f4ecdf..b6dd73135bc2 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Template-GD/Manifest b/dev-perl/Template-GD/Manifest
index b496eb6bd616..a9a0fa78f67e 100644
--- a/dev-perl/Template-GD/Manifest
+++ b/dev-perl/Template-GD/Manifest
@@ -1,3 +1,3 @@
 DIST Template-GD-2.66.tar.gz 12827 BLAKE2B f69506abfd9533c1aea95eff90c15f269373cf3d967d0d6c22851fb57563ded061cc39d1ffa933ebb992c5e0d7c863a9e61febe5b693b41cbbb9eda407dfb433 SHA512 676b9a2345dbdf65b276a2cf2e50033d91ad958fc579d4bd02516baf9994cb1ca64edbedd320da0eb58738783054f8a58e358bc1da5c128bea98d4f031b0c84c
-EBUILD Template-GD-2.660.0-r1.ebuild 484 BLAKE2B 43d27d6d24b8aca0505bfbec46d0c4e0b8950b6c6f64d56896e892d7ee5ea4c46158c2b382b3ae5114c467523afc60920ac5a47794f51d747ab3c16600844f74 SHA512 401434957e7bd1903b48d8958c68a01cc0ab3eae584a2a08467665f88c548e836dc9c77d29accbad035b227058897bd882ea0f945ce8dda1cce12b90af4edfeb
+EBUILD Template-GD-2.660.0-r1.ebuild 489 BLAKE2B 1804b8dde47d33eb960c497be872b5366874af794367f31f9569369ba2bd15a45a4ee1adbbf36c7cae568723b0ab5bdc7443687afbb7fc35c33fdf3669f606c2 SHA512 c21bf82eddc667c69c0ccd576b5101065a6b6832cb0daa730ea4361aa7c5e96707c69bd275e1e0be0422ef73c63fbc8ac15a28da72846ba03e41b038f2218d94
 MISC metadata.xml 1678 BLAKE2B 042a95db74d0b940890ee0ec2bd14d27416a74ea0f5fea3416f25597e7c6727667f0e37e7dd24b527395871a98b40a0873614d5e59f1faa17878c1dbad17abd3 SHA512 acf0ace53079ece9c44ff1f956a3d3f7ec533a6c22ec5ff6c06798d181216d43c6a1ea64c093ef857ea99bf5d1399fa29612f5cba2500c2c99bba695d6eb310d
diff --git a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild b/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
index b9b6752e24ec..0bc1bba2edf9 100644
--- a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
+++ b/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="GD plugin(s) for the Template Toolkit"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-solaris"
 IUSE="test"
 
 RDEPEND="dev-perl/GD
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 32d5043e27a3..e4853aa9b685 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
index cdc2d71a5522..6a7114699a6e 100644
--- a/dev-php/PEAR-HTML_Common2/Manifest
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -1,3 +1,5 @@
 DIST HTML_Common2-2.1.1.tgz 8664 BLAKE2B 2422d0d32f1ff55bf0e40cda5460d3e891cb9bc27001b8d72b7f52d43a2ed6ed2507593a780819550aa11b9aaff75b286995d013cf3e74051abb8700b9f96ac1 SHA512 3fc868c0c5d69a542d205cf853f8993fe6849eec58b35b080db44a7a788b19dfdc9cd669d269ddab70f37edcde763d1beff4c60f2befc2cf2548f63197634124
+DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864
 EBUILD PEAR-HTML_Common2-2.1.1.ebuild 425 BLAKE2B f7e96cde580f4fdfcaadd1f09b29d8e58b52cc2ba3b5ff2fa0c0883ac48ae90edfa1294aac32c283b369c192e50bf0bc6b119f612c131c4bc7b7e6fd2027cc7a SHA512 e8f6af67161d427842140359a5002ad059dad35857fdf905af35daa37ed37512c911656a519e6888b706ca468f8bfe3464efff19ab52c2e2b8ca7d250b3564cd
+EBUILD PEAR-HTML_Common2-2.1.2.ebuild 422 BLAKE2B 27a9003016c439990cf5d78a7ef4497d034e4303a710fd0ac9f89b24b331778a48c91d98c330b66df350d973061fa151f279cc9d8ae9a1390a7848878d4092e2 SHA512 b4c7598347fdb8103ff1f368b8bf1f90e302c3f270198714b59bae5f7be44038861e424519a6d468ec6d9e0c7f751d135ef5ad418b2a89b3e79851c65a90288e
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
new file mode 100644
index 000000000000..e03cc9eaca96
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+	phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 84fd25b4983e..b4f7de3f0586 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,7 +1,3 @@
-DIST adodb-5.20.12.tar.gz 464962 BLAKE2B 51b1bec4c9bda427988848cd0ff810058e159c75946ea4d14d1ab639545f0c95a8a1a2b8193c8c0403e37fc2e3b858f97b255b9b615b65786d1593269e9da731 SHA512 ac8f36dba459bac15f16ecfd1ece69edc922e67b6aec3641a0c8ffc50c6b1c437ecce2e5652c31f2e472f7abefb3ac5a8a2bef188959007442799784ab764c1e
-DIST adodb-5.20.13.tar.gz 465568 BLAKE2B 7acfe36586fcf0e0291ce9dd6446c6f0922b9c7144b86d8eb0d78db98247fc9ac6aa9b1623822628096c2be0e0e9c554e9c3acbc05d9ddcda1b5c598b8b3652b SHA512 0824de6abf73a8e3fbdde30ca1455264a49e3b711e81c8232bd82c082c0d3f255aea35a167685cd01e80216622db1167c17a518d57b1ed260eaa498cab0b9fca
-DIST adodb-5.20.9.tar.gz 464257 BLAKE2B 38a37e4a5b1ac86b37cbd164c79e2112c78fb22530a225d2cac4f916703d4c2bd300a47a214344d8ae9e5c94467ec34cab96ab36a10ad8dad581ec74c73ae111 SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f
-EBUILD adodb-5.20.12.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
-EBUILD adodb-5.20.13.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
-EBUILD adodb-5.20.9.ebuild 1443 BLAKE2B 6c0e8504d8e99042a95fdf9af07eeeea4bf9f3a3bd2e6ba156cd147eeda622fb9a71880f2e1ea19d01e82b7f44dd43adcdfdfb4ffe0b65ecde9aed02a21000c8 SHA512 258c809d092bc37c9e87e3501f3f95ce4ea85b8b1ac3e252b659a5834c831908ed1c61eebf7806486e3e3fd50c7799a596b9d495e896784fd8fd0c8906618540
+DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
+EBUILD adodb-5.20.14.ebuild 1443 BLAKE2B 08a0bc7762cc97a6d41cf4e0aece6398501b71aa3dcd447eb04a0208d8be710bb39a511e2bd51cbbc6dc4675dbda896bd52203bb4afec328ece9ce65fcdd1eb7 SHA512 14e9965d0cb36364c4065ffb04fade724ee301bf560a95ce5c8e2168901a43929399f2a27a5100588c9940f274c9881d6bfc2a2f2540698443f44107d36ccc00
 MISC metadata.xml 377 BLAKE2B 29889d626a5c0b8d16ae7cf02f45a0e6ebee2d633110a534bcc37c9539c4fc4b8ce15ecfd8ae3768b0f79ab34f088416b1bdb4403c7769f3c6e45477d0a2bf8d SHA512 f83ababfd8add084a2dcf96d74eadae96b35b5d71ea30a98a41b5ee3d222fcabcfb63607e4517be261bfa246d461684fd95b3bb01cb58464ff8f986d123aa23b
diff --git a/dev-php/adodb/adodb-5.20.13.ebuild b/dev-php/adodb/adodb-5.20.13.ebuild
deleted file mode 100644
index f6b55b30633b..000000000000
--- a/dev-php/adodb/adodb-5.20.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="https://github.com/ADOdb"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/adodb/adodb-5.20.12.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild
similarity index 92%
rename from dev-php/adodb/adodb-5.20.12.ebuild
rename to dev-php/adodb/adodb-5.20.14.ebuild
index f6b55b30633b..32b3343fd7aa 100644
--- a/dev-php/adodb/adodb-5.20.12.ebuild
+++ b/dev-php/adodb/adodb-5.20.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="ADOdb"
 DESCRIPTION="Database abstraction layer for PHP"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # If you want to be picky, we should require that PHP be built with at
diff --git a/dev-php/adodb/adodb-5.20.9.ebuild b/dev-php/adodb/adodb-5.20.9.ebuild
deleted file mode 100644
index b37e311bd855..000000000000
--- a/dev-php/adodb/adodb-5.20.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="ADOdb"
-DESCRIPTION="Database abstraction layer for PHP"
-HOMEPAGE="http://www.adodb.org/"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-# If you want to be picky, we should require that PHP be built with at
-# least one database driver enabled; otherwise adodb isn't going to be
-# able to do anything. But, the database USE flags for dev-lang/php are
-# a mess. What we would *like* to do is have a set of USE flags for
-# adodb that then propagate to PHP itself... for example, adodb[mysql]
-# could require php[mysql]. To do that would require that we duplicate
-# the database USE flag mess for adodb -- not desirable. Instead we punt
-# and let the user install adodb unconditionally. If he doesn't have
-# database support in PHP, it just won't work.
-RDEPEND="dev-lang/php:*"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
-	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
-	DOCS+=" pear/readme.Auth.txt"
-
-	dodoc $DOCS
-	rm -f $DOCS || die "failed to remove docs before installation"
-
-	insinto "/usr/share/php/${PN}"
-	doins *.php
-	doins -r contrib datadict drivers lang pear perf replicate session xsl
-}
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index a87266a395d0..99680929680d 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,6 +1,8 @@
 DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac566f1988025701258141a89afaa0e60c3d7166484fa37eda4ef08d94deeabdcc2ebe2a4f221dcf83aff20df SHA512 16c82ada278eac6996065d3c594237fbb8c1a7fe4e21828aa8af9ef98033cf6dfaf0fee90095e8116e946e620b551a6122238f85865a6c47d4d087f784cd54ea
 DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
+DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
 EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
 EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
+EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
new file mode 100644
index 000000000000..62a5bf128339
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+COMMON_DEPEND="
+	php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+	php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libbson-1.13.0
+	>=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )"
+RDEPEND="${DEPEND}"
+BDEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fd3925602014..e59add1ca7ac 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index c63b22645c40..93013c45fe68 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
-EBUILD aiohttp-socks-0.2.2.ebuild 497 BLAKE2B 445169127a0a6c717696eb9dc2a0778232cd32409883c8b4de4004bf6146da2ae7c03bac8ed21eb6bb946730946b7bb6fa9b6c66807406af899c35a014ccb197 SHA512 7c9c14773a5d5067c76813c452a61803e12fc40d12a97273c9b31c4bc1d7c92c5604c71f3d2615c5f23a7eeb90f5967cb557cd14ed3a043bb6e668ba2122c096
+EBUILD aiohttp-socks-0.2.2.ebuild 888 BLAKE2B 10672b4a1046b97ce88435f2bfb9cb9036c1b85c224e48a255b00fe02d2d48b9446261ac4715702b2b5829e105bb46f117b4e623729e3b49aba03bc18f95895a SHA512 303b7c6c7892d3248b3e86a463d059232060518163f51ca7b015643dd7bfdbbcdfd731fb956ff2e4b3a2714d2e46ab4937b5ba7c7190b732260636ad73fa3365
 MISC metadata.xml 391 BLAKE2B b2c143f0bebedd76ce3992254b7c068b9707bcc75c552cf994239fbcd32ecb39c981a1a61bd351c29627fc4a65124fb54b5c8533fba5f8638d17b253893e50b5 SHA512 4519a8f883d724ea786cb00023c8e0efae8d343d40c0988154efd27a2bdce7b73e6884f3f406109fabef54b9e2d62e8c07cda7e7d876b148cff0090ba38c2104
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
index 52758134c3e5..e38b826b03d8 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 
@@ -14,10 +14,24 @@ SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/${PV}.tar.gz -> ${P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
+# Tests require Internet access
+RESTRICT="test"
 
-RDEPEND="
-	>=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/aiohttp-2.3.2[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		net-proxy/3proxy
+	)"
 
-DOCS=( README.md )
+python_configure_all() {
+	rm tests/3proxy/bin/*/* || die
+	ln -s "$(type -P 3proxy)" tests/3proxy/bin/linux/ || die
+}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cjkwrap/Manifest b/dev-python/cjkwrap/Manifest
index 7846bfda5081..06870d282b01 100644
--- a/dev-python/cjkwrap/Manifest
+++ b/dev-python/cjkwrap/Manifest
@@ -1,3 +1,3 @@
 DIST cjkwrap-2.2.tar.gz 20995 BLAKE2B 35604e2d1aa24a75e1de0f0b17ba592e7588aade42d43e98864f5d83fe598eaa0ca566682cb7c7af566e66f79c9696ba2ae86b1579681688d6cd31469c07a3ff SHA512 c72ce67b10af46018f7aa5d65af030373e8889a28f533a59d55668e5c90a759ad7cb31708dd6ff35561f9e62115edef5bc0facc74b6a6e122d7399d9dc950624
 EBUILD cjkwrap-2.2.ebuild 484 BLAKE2B 06850e89b04a99d052b6efea0ccf7afc3c853f422c87ee1fa29a48ed7e0a7ff24349da47c90a115d885745921eed0dacde23af1f2f4ace7e58a40371340d246f SHA512 68327449ca54b0f730a7415fbf6dc99d9e6a323fbcf534534328a33785a93f2a7d7e0fecf654012034c721fef032ff4e3619c06b382bdd1ab5ab1ce741a293da
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index bce0484ecc06..d39cd6f21320 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,3 +1,4 @@
 DIST pysol_cards-0.6.2.tar.gz 17032 BLAKE2B dd93ccaf14ffeb9cfc8228d129005b0733ba96ea90fccb105f97ad92fa6077cae30876150f8a866cc6c977563f3ff81118ebf49e87a3db8bf6370afaec67121b SHA512 99ca6de08c1e1cbad0e57d54e1482d021ad8b7c9d4c956df0f199ed4d6a1a367ab5e821ba504f300f38f5ec329f67564aead99df728df0e498d733d55435c7da
+EBUILD pysol_cards-0.6.2-r1.ebuild 550 BLAKE2B 53e81e4eb57c9c4a3ca8ae9d12b52ab0f6a9fc5b319dce9be8cee8d97dfb2820c4b52504b3b096ad91e4447ac760f81a9613de4d36f0e7ce8ba1373d176b0ae5 SHA512 d1b9147da03b08cfeca3c88c18bcf0509074d09605752bbfd32468ca09285917b9875a98b3e1c4a46494e2238668212efda3061cd2919ac50cc44dcac054b428
 EBUILD pysol_cards-0.6.2.ebuild 543 BLAKE2B 16e124665a28f9dce7b5407e8ecc3fce60694cdd2690d1a054e229d7fe0917524a87af2f50de27b02239abaa2415da5f5ca70dfbfe3b123610e1faac915d441e SHA512 3fef3a353ecbe6b7b0234cdfed43860a324ca60af26706a05bb98c3107bbc99fa9d5a17355ffd8f574672e94bc7533fe3200cffe6b4c4e06fe7db9851e0aa77e
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild b/dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..fcf902452a36
--- /dev/null
+++ b/dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Deal PySol FreeCell cards"
+HOMEPAGE="https://pypi.org/project/pysol-cards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-python/random2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
new file mode 100644
index 000000000000..e29316569f90
--- /dev/null
+++ b/dev-python/pytest-asyncio/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-asyncio-0.10.0.tar.gz 13968 BLAKE2B 4e63d527b20c767b8f0777ed684a15abe54009be72db8a50ca3b37ef95dceb884168d8081c651e2bbd6d818529d6809bb3498055fedc7f951f5675d58f50e408 SHA512 78160d1918c5d3d2172f74fa07bf4bf6d0bc416666011dd5b83b3a7f385ec30fc65d49c01bba5dd0e16ad9dcd9d72d8ab062526f3268d60cd2e24a35b5a8f883
+EBUILD pytest-asyncio-0.10.0.ebuild 949 BLAKE2B 945bbebce007188839da358423aa11318088005a71d873cd4c223d83e0f99d0b2dba7db9bf8f8d6561de03ec144ae6320e407379df4755c191888c4d819f8b24 SHA512 9311b00325bf02b1ddb51925f1a3732b32db6d61ea4e95edf5293322f7637f95c81bfd3f5cb110ad7b7e0dc720061f784d4185b80579cf2cbf978e7f35ad1e4e
+MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-asyncio/metadata.xml b/dev-python/pytest-asyncio/metadata.xml
new file mode 100644
index 000000000000..266e3f19ca59
--- /dev/null
+++ b/dev-python/pytest-asyncio/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
new file mode 100644
index 000000000000..ee183d8b8079
--- /dev/null
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Library for testing asyncio code with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-asyncio
+	https://pypi.org/project/pytest-asyncio/"
+SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/async_generator[${PYTHON_USEDEP}]' \
+		python3_5)"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index ab3573d5a9a1..23ad2045c2d4 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -2,4 +2,4 @@ DIST python-efl-1.21.0.tar.xz 9544352 BLAKE2B b49fc0e0d795a0334f647f414673fdaf3b
 DIST python-efl-1.22.0.tar.xz 9523624 BLAKE2B b1b7573da8546f580dcd06be03e4746f2e991245c7bbc3477090c5a9365225bca663454a202f8e05ec6c73cbfb7496ee5f92bc2a9997900e6709b01017740db6 SHA512 27e29af764166e803ce6a833c8249a91226a4315dd658631cec57513befccdc9407b04b452054ceab3f77b429d899095b49dbada2e0fd1a63ff6059ef200e497
 EBUILD python-efl-1.21.0.ebuild 1741 BLAKE2B 6b272eac619e1d4a012beb36be641d999e49567646823db3acf62862574f186820f18a4d478595da955cb86b8eac0d5d51d53bdcdeface6609cac797b9457bc3 SHA512 5f4689c9ee6e4dfacc67e0e91c1e38b47692e786f73f8a0f53c2800fda98a60956a447a333500def9662aaf66c762f92bc24945565d04319d31e360065856c52
 EBUILD python-efl-1.22.0.ebuild 1638 BLAKE2B 55f150e9de16b83d09867ee015f24db08f78e967efe177d4756df7b1069e4b5a892da0f3ffe1c0becf21671605dde3dffa767ca908451787eef61bd50f709249 SHA512 0f6214cfd4a15256c8dc1632fe30569f63bafa0294f9028603b16f2f1a776800cd6d51f7a0ec8f9eeb08231fe5d45a8082fdf63553b70dde2b9a1a202a7af908
-MISC metadata.xml 678 BLAKE2B f63779daf5a74d59f8dc65002ae8ec55585ae58c2bb02d951fd1ced15fd68fbb4ffa18239b8ef48347ff18e5cf033faa4a141f8e4fd8898bed6d74a9fd18d065 SHA512 a618f3bf8c4eed0e00b889f2c1bc85d46dc5ef1118f393f4cf10857d0b1a75720c6a719ed97117e40420600059e34eff0be3771fa684b89d437459f012fb7c5c
+MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 1b546bfae6dd..126f2621e76f 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <longdescription>
     EFL is a collection of libraries for handling many common tasks a 
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index 3b568e44ec35..72a6c608a4c9 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -2,6 +2,6 @@ DIST rst.linker-1.10.tar.gz 8820 BLAKE2B 3615353dcce16652aa3528985997467e1501161
 DIST rst.linker-1.11.tar.gz 12569 BLAKE2B 5418f651322c28d8aff2dc735f8ff72325e895d8f2c12dae4985112112f74023c6103e344f4422e944b32b692713834ae5239bc4193edc76bfa85d9e0a674f4a SHA512 8e748330f60e2e1f859fa3ec3fad706d7bbafc78a402b0df242bda7caff1fad3f1b17873fa9ee749d3d214e094f24a35695c627cf9a8d8f08ca99ee6ad0e4e6d
 DIST rst.linker-1.9.tar.gz 7618 BLAKE2B b344495a217d7cd1c057256701130851975e46c45a740251ce20efa5131feb46a074fb1367a645e89b436b7e093baad1a484d06ca069ebc0f59eca8183ddd36d SHA512 b3e39b025f75bb6ff670f23ee7abd48dcc4e19343626c1ffadd2304a7e3285fe0b7369ace96e47094606e864672c8aeea967a02217b110762e53498dde64b8a7
 EBUILD rst-linker-1.10.ebuild 1450 BLAKE2B 2a35ac52674c3e3c05de9d613f4ba6de62325375122572674dde7ed97350f295286bee3d7e05f65d78c55e88835d944775cc350aa9c3a439f4816ba1b9bddec5 SHA512 4da5bfdf262e26a657898e89383cecaf8e4d3edd8af05cb7017f170fb71c620cbc84cb42d801efcf6adfc3176760ca8e18fb6ee700af40684ddf7118c530cea1
-EBUILD rst-linker-1.11.ebuild 1462 BLAKE2B 1b06c2c53403c8e3947337361b910693b5f3851d0c284ec58116a0d3eab151c3f67555f2b9cf8b4546f78f85e0d532665f89d89b4fce3c7a15ea42953dfdffe5 SHA512 42a0dfe9280b833294023fb735f42ddc584135720d52f4df693aafdc81d74c65b651f03675d18d666000486bda35b8e7d45971467393515926a60103f45a9264
+EBUILD rst-linker-1.11.ebuild 1469 BLAKE2B af2075924c9e8b640ebd6808f1fc2954614513591eea07e2b66cea92bc2f7796d336d2971e8ba1db2bfbc68f31e78ca300c782be890624d4038109ab0daf1c4a SHA512 dd7b3e58e4c241a4bf48d0d2921f091e0c8c06045d8268dae800493cb7421cc110b79eba40fc2d0c3dbb95b94e83c13180f4e1d396e25612e3ccc37cf23c1da7
 EBUILD rst-linker-1.9-r1.ebuild 1384 BLAKE2B 91b5b4ebcb375c07c021d7c3aff1c2f3c50fc180aa9917004ca4fbbe9b8addbabb50bd425d6e2fbcad2aa2691953d600545bbd21bb5a45e4e3fc10d159324f42 SHA512 217ca0094dbc59fa4d7e84050ba69a5b7b0f3c78f27ba06f476e308911c72b27bd2abe8d8eb0b8db0fd8aae147950eb32d4d7acbf7523b96e2501e74593e3df9
 MISC metadata.xml 440 BLAKE2B 01a949c99d2843942dd04dc1e3834552dd8b289a776d66acc4247c33064dd7a5c0591504a0c347558788642719fa78db8b95b5c5c06f12f5eb223df8f2343fd9 SHA512 6adc5406eeaf65eaa92644a56006d29909ef2e3cbf41753968d3efab6364a7d41bc98d9f03ed59a1f4c6ee8d2f6b4c75fa02103d04d4e9f065764fec6c0dd9b5
diff --git a/dev-python/rst-linker/rst-linker-1.11.ebuild b/dev-python/rst-linker/rst-linker-1.11.ebuild
index 169adff6c564..0cf673522ef6 100644
--- a/dev-python/rst-linker/rst-linker-1.11.ebuild
+++ b/dev-python/rst-linker/rst-linker-1.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/texttable/Manifest b/dev-python/texttable/Manifest
index e30fd5723a75..1745401d2413 100644
--- a/dev-python/texttable/Manifest
+++ b/dev-python/texttable/Manifest
@@ -2,4 +2,4 @@ DIST texttable-0.9.1.tar.gz 11074 BLAKE2B 465738a7b980f2a216d63b268044c1a1b8c0de
 DIST texttable-1.6.2.tar.gz 11450 BLAKE2B 8090914b20a93283ea3d533a8120d4d2c5f058a0e79550b29d4b9fa740db5e309d84a7983fb6665149e3624ba7039b67ff6a553b180b915a348e5b53e793d5cd SHA512 e59275c64813bd00fa5172c43491820122b6045e1a416c917576cbf595c1ec24d146e571708379f4b32775bda904f16ced0e9e15ab7b2dde78a214f26a1c4de6
 EBUILD texttable-0.9.1.ebuild 426 BLAKE2B e888f87140391d701eae59056abd2f60c30991efb1070234ebb2a9b2d39d1dd30a536c316f9088ba55e8cbd09d546a7d90009364498b94f77909a9419d378d1b SHA512 65182f08de9b8b952c60adf04fb87f02220f94ef6dd5c17980c57e7bf020161dd459831ae402a25bb7573c7f1717e83a948909743218ef8c9702708d676c38fb
 EBUILD texttable-1.6.2.ebuild 818 BLAKE2B ea52168c3b5b09ade19f3019f2e5127546f176f15ef7ed8b037cbe48c90113b037eb58a9e045ac960ee8716108ec62086668f6d0e09122fa7aad98779e7382fd SHA512 0bdb37f701ab1ff1706a5792fd2689242342d53f5bd5071e522c5f635b3c8c262ebac39db6f9e5d1815046579ea25fe365356a7271acec8c445b933283b50d8e
-MISC metadata.xml 420 BLAKE2B 8af873837a719776cd0b19be2e7dd63656a8620f65dbd81d8b2e68c35ba17fa7c4ddf95dd60e53bb42912b475f4bee9ebee02b8312fcde789922ae9f08b77b0a SHA512 4c300a07ec0a6062c79428596fb523a220376d603105f5ae25e27911967d3212c60885f7f58d11167afc02f9c63c1ee5d57d20597bafe57fbbda32ff3bcd0740
+MISC metadata.xml 330 BLAKE2B ee4c551d00203affdb9666d0d3f58541249543f6aa6a586fda4b028f3b9c5255e61abdc6ef9faf62d1c6dda4f60afed5c8af2090bf6c54d229681c567ff6299a SHA512 900e4bcdc1580e4dee2ab5298c2b1115e0942d95c410d76dbf6cb062f759fecb3d633d9e7f223e92d997ce88d98c2a3d719cdf7cdcc7625a78cc5b3294c3ddec
diff --git a/dev-python/texttable/metadata.xml b/dev-python/texttable/metadata.xml
index d96bfd447119..0c8b76627cee 100644
--- a/dev-python/texttable/metadata.xml
+++ b/dev-python/texttable/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">texttable</remote-id>
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 422de669f770..2cd67ea8e7d8 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index c565f9bc7415..12bd392c3198 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-prof-0.17.0.tgz 93492 BLAKE2B e573b77fb5f1134af99480efe3af706cade122c51bbef883cf0f915e359c695fe70485239fee7415288e99115146230bc803ec1976a39c6f5d743c10f0158744 SHA512 4e2a542420eced379a0326c0f48a041379a7a2aa06247e5cd9659f92b44ebcfca21d12a7bdf50f23ef0bdd6b37895b963a489a975ca84d487920c8fe52446d53
 DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b01161f4c4c7aa1f10a80b4080ac14f7adaa2c0340fe5c80f7352181d085d724dee66597ed29825ab7116d37c5e58 SHA512 1743bbd97789c9de66e9479384d204b0870e43a265471f0fbdf7a72bb19d77a30afc25da9d0ac66a921c28ce83d8a8d72279bdd9b23cf8505ccde952092dd9a5
-EBUILD ruby-prof-0.17.0.ebuild 1587 BLAKE2B b9c7a8498f62a71985aaf972f41cf2cd6c0077d5e5e76a0cf219410b1dd04b784f47daa91cec44e95a87b8dcc8155f1697d19ec47c5bba19ad533a797a0d53f7 SHA512 b4b76341a641dd4a197317dfb8c123e8b35b37828823a0e4ad11f954bf3d0d1ecd8596c80e671a51c933e7a8c6c788980b65bf540c8d454fae02968d9cc78bb7
 EBUILD ruby-prof-0.18.0.ebuild 1579 BLAKE2B 307f6bfd7e04f53b41ee151c3c7fcd4f52b443e52cb311ff725457c48298c9afbdc25d0cf7bd22a11a641a07815abe67f6e917faac125de81a33934ed959d069 SHA512 0fb3e2406efb366f147011304f7b6967d2ad9a9b577123255f194628accb9e64af6c311eb58573e2d2b76b65c6eb163818c34054291ed707982049a94afc7466
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild
deleted file mode 100644
index 2ed8c16306a7..000000000000
--- a/dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' test/test_helper.rb || die
-
-	# Fix a timing-dependant spec since its thresholds for success are
-	# too tight.
-	sed -i -e '/test_class_methods/,/^  end/ s:^:#:' test/measure_cpu_time_test.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof || die "build failed"
-
-	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	for dir in examples ; do
-		docinto "$dir"
-		dodoc -r "$dir"/*
-	done
-}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index a0c924038ef1..93d1cb61f7bd 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index b65cd156d468..c514f3dcb81f 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,7 +1,7 @@
 DIST latex-beamer-3.36.zip 4364333 BLAKE2B e2ec8a49cf6998c291c01224cb55ec727e9a28597fb0902c99af96db73e71dd8e4a08a9e2858e62feb7e79287bda8d95c24b8a21d003e216dd9051bb8e882694 SHA512 b93d91c2eb523d7e30ecee8fa1af625730bb465124da4f856f7708da32d31fc3bc68e5b57e120b8e39b8ed3b74fef0aeb208b92f4bbdf741c8bf377227fa84cf
-DIST latex-beamer-3.41.tar.gz 1007759 BLAKE2B 053c311df9f56dcde294a0ef627f99c8f6211e0b9503035aa6110e6d726c64ebeb13269815e4efda703ec07c8e3036d18c14d7ac6b08c9293e26997a3533b3c7 SHA512 4fcf49c03cb572b85f97d847d491571d1d400ed39fc3d82b8f01f893838215d4d1b045510ce9c59968974ae2132d29cfbdb288e1fc773a59827ab50641cd9fd6
 DIST latex-beamer-3.55.tar.gz 651620 BLAKE2B 31588a6201a91041341524629c63c071896d1ceb873aa78bf318074c6d46d4c035faf56347ac8421dfa370da44c3ee0d7558c1b71ebdfafbba69f40065f5a9a9 SHA512 59d1c209e9d51f6da2435c4958d29766c5d2678700040657396e327d514964b4cebd94f78400791cf6f97aca72b303ecf2aa19fb5d61757f19b91a85aa012102
+DIST latex-beamer-3.56.tar.gz 651927 BLAKE2B b63bbe0e2b392db8166a3b3465464457e761a35c8a3c7ade0803c905a42a4a35731b816c4cf24fa352a0da720a2f4aa0aaa475c7db577e43e354c3e6eeb5fc1c SHA512 b774923f65312d359eb843826cd96363e6f0d315a22c1f881a1a17ed7f307ed568e593a1489b47d4ef0b630248fcadcbd7df1d69b2c39ace13c385c4d53ce236
 EBUILD latex-beamer-3.36.ebuild 1034 BLAKE2B 1398e3ec44d1a8c34ae86c7ebd4fbbf0a796185dd2bc4d7e81491f94e80152dda298509e4541d65d92ac51f279e82439173779f71fce63c86c8937b56096a656 SHA512 7f1a8065bf4fde3a4e10ea15430bc9a608825f5edbe3d8913e15bed6d471071bb716d92416e35ba5e19925e80360d97b8f3cc63b25c87a2973aec4df2ca99ba9
-EBUILD latex-beamer-3.41.ebuild 1089 BLAKE2B e04151bc51960c62b1524fa21567b30063879afba620a8852135855a573795ee60bc61dda6ba646c73f12affe8cdffdba9b64daace41fa54ff5817a8a7afdfe7 SHA512 f16ba396324cca8ad8e119adfda536a2da7e0bb10758363056a51c1df4d255b7a48177256f2783e9abcc61d382e352d46830022db3b652eae672105cfcf13c4f
 EBUILD latex-beamer-3.55.ebuild 1014 BLAKE2B 8af07de012407b73f2b53e6f9e15b68d97adf3235c20babc527f50d2f86221488072f11aa6919f7d6f3933c66b5be9a84e298ee9c1b3f7ace49bdd97a0ae9604 SHA512 7db6604150c644cc0a74506e7e51f11724efe44bf9ff74376ef841d26b29753d3a0a6443e201c0e96de50bf214ab9582d60ec4c32aa2c337d9a124ff61c5cdd2
+EBUILD latex-beamer-3.56.ebuild 1014 BLAKE2B 8af07de012407b73f2b53e6f9e15b68d97adf3235c20babc527f50d2f86221488072f11aa6919f7d6f3933c66b5be9a84e298ee9c1b3f7ace49bdd97a0ae9604 SHA512 7db6604150c644cc0a74506e7e51f11724efe44bf9ff74376ef841d26b29753d3a0a6443e201c0e96de50bf214ab9582d60ec4c32aa2c337d9a124ff61c5cdd2
 MISC metadata.xml 333 BLAKE2B db108642b2e79b0221ae8c4a3750cfee95d6de31b9249889c2eb61cb6f2f178f75b4bfcf09167bce2c9cccaf429a51b6a5fef20138c58d6f03a46d897b064013 SHA512 3beec0899689b43ff66d65f0657af6ff194543f0d4567a2679c5b320f77a0751500e5b725136c5ae4bfd14583c035ba3a62558650285d8b8e4cfd8c0ff87ec0d
diff --git a/dev-tex/latex-beamer/latex-beamer-3.41.ebuild b/dev-tex/latex-beamer/latex-beamer-3.56.ebuild
similarity index 80%
rename from dev-tex/latex-beamer/latex-beamer-3.41.ebuild
rename to dev-tex/latex-beamer/latex-beamer-3.56.ebuild
index 6ba01c8c75de..abd87f4653dd 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.41.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.56.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit latex-package
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/josephwright/beamer/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
 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 ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
+IUSE="doc"
 
 DEPEND="dev-texlive/texlive-latex"
 RDEPEND=">=dev-tex/pgf-1.10
@@ -21,24 +21,20 @@ RDEPEND=">=dev-tex/pgf-1.10
 
 S=${WORKDIR}/beamer-${PV}
 
-src_compile() {
-	if use doc; then
-		cd doc
-		emake -j1
-	fi
+src_prepare(){
+	default
+	rm -rf doc/licenses || die
 }
 
 src_install() {
 	insinto /usr/share/texmf-site/tex/latex/beamer
 	doins -r base
 
-	dodoc AUTHORS README.md
+	dodoc README.md
 
 	if use doc ; then
 		docinto doc
-		dodoc -r doc/*
+		dodoc -r doc
 		dosym "/usr/share/doc/${PF}/doc/" "${TEXMF}/doc/latex/beamer"
 	fi
-
-	use examples && dodoc -r examples solutions
 }
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c5628b54ce27..ba7e5c0ee681 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 16009f14703a..d45471131487 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,8 +1,4 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.18.11.tar.xz 793112 BLAKE2B 8c1d40a13f6ce1bd804d7fb1300721485aea88b3ea2ad35c59c87f8fd85057cd26b1f40ea73d1919d45b8f0765610724fd3018c05d09e287554725f4425e146c SHA512 4c6c4b0e08115accaebed89fd5362842e6b8daaf9e1725684d0af1ad8cada7bd7aadce8640b766cfdd3a5784bb32ea177019781b2f13bb5da6b55389579ff07e
-DIST devscripts_2.19.3.tar.xz 810356 BLAKE2B af3f3e44d2f206226667bf6d3a0d1275ff2cc88e890817f2982c1c47bd8cbf8ca6a75357a4fa1dd2958be9ec97b870a2ee612c478a75bb23256c8aa5bae1f2fc SHA512 c5745e7aaa7ddac1be2f1da68b6c03c35e6b2ecde824a7c951ecf0fd0132315ebf40f62013de6da51f79ed473e3462634fd4057704236f5a1abd479b734c959b
-DIST devscripts_2.19.5.tar.xz 840936 BLAKE2B 790e31194f54513dd17ddb05cd1c94dfa1186ec2b4784c668c4119d0d10fb150061bd13362600b1955875cf33d36f38e1419735abec1a9fcc260baceea3e409e SHA512 23cfe9bd8288a9d3a2449a16f46a7c1960813a335cad99b8fcada074610837795be2a26768dab555dad84e4fb7cb7d99ba22979eda9c995b14d0297c7a1bb1c5
-EBUILD checkbashisms-2.18.11.ebuild 890 BLAKE2B 56e8be2ace145d6c7ef7d97a641cc2e5d51f508fe8ce015218df3e3311b6aca7de1488c4e1391ea5f267d56e970e94f3d9c6c271f13e175df0f5438268043520 SHA512 e1d82322e345aeb319842158ad409f62d6f5cc8489e6fb7079e92aab70e5d0eaa447fb89b067cc3dd4bb3b4b0ff9ec86ba377c458bd5f9f73cb9eeae39ace448
-EBUILD checkbashisms-2.19.3.ebuild 892 BLAKE2B eaa6bf69f04f49b27840c4c8ef3bdf514e62b135a628dc55a2bb76a9245d1d30327854fa1355ddb7535bfb26af1cbb9f6c1bdf5cea3acfe887d07cda3fd43ec0 SHA512 5a7247ffd1d196cce9fcd36e4279d1d052cee6edc14d259b1c3d118e7504ab4a5f7a7d1e515450c77e281d6d62327e5d4d69562268385a102b928a9489916fdb
-EBUILD checkbashisms-2.19.5.ebuild 892 BLAKE2B 07b1578c67cdf6a8e53005e9ecec39c1d2d854d50ae595b81079cfda2141023bd699f62dfa45824026e16496a9ff879c7397991b8038afa82bf394f7d39c8961 SHA512 186da6cbc20eba27c969e2b84a4896908c268675d6db9a53201ba31a1e5757e16ae5637182ec77e8ac8d2f320540a96927c7190f7492596b95262eaeafaca404
+DIST devscripts_2.19.6.tar.xz 844316 BLAKE2B 93eddc1d5ff78c579a28f8f54ce317cc251864917aa579094bd392f0811f07dc38447b3bd36a608431cb3d576b05c5e1f6cdc51a453b1c07389a5e1794f1acb5 SHA512 9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422
+EBUILD checkbashisms-2.19.6.ebuild 890 BLAKE2B b766261b04b2be48b2c9ed540c48e9f8e6a5de05498dd55f3a5740a89b27f2c9b713fe65c275ba21d791f985d9800d9dbd5c034b646f36bd9822e1d992e55c7e SHA512 3bce9e58d293dd4772b23674342bcc96af079aeace7512b04fcdcd51f20d07a739c8461669270d08d7da57c049b895f03ddc33d7f8d2f8d73d264253b79dd56d
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
deleted file mode 100644
index 326e6817dffd..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
deleted file mode 100644
index e48d94ca95a3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
similarity index 99%
rename from dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
rename to dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
index 6cbe1ced2479..425cf48b4740 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index 8a27b57741d9..d98efda43b64 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,3 @@
 DIST edi-0.7.1.tar.gz 736103 BLAKE2B f4c82246d66d2620cccf71bfd2b623d1ce95f28d2afb1f1077b53580eec6303748287a5332472c45a911ad83d573ffaadfd08bc0827e3b77909f1a041e0f0750 SHA512 5e7e88e547f2e8fc631d48999aa76e814735dc254381d3965f64f7c1d3006becb90f32305471cd54c4eec5f8b66a1e8595220f302bcebe25eb54e9b56c31767c
 EBUILD edi-0.7.1.ebuild 1269 BLAKE2B e16c7a3d18d92d1661575146ef4d9c93a259d84ccdf59f6d367401318e79892ce4277906b0cc1757271458141f5d780f8c22a5b8ca2ff56cddce29bd2ca802ca SHA512 4185d2aded7c8b946ce1ae988a85f491dd80a0fd120289b5150c33f6dd608cb1a7fe8398ab061d89c51803dbe29830dea6e71d896221fbc7fb610e9279769550
-MISC metadata.xml 499 BLAKE2B b79205914bede4f3e03ebb98fe231cef58336fd21d5d1b4884b61929af724f6758e8d0aeb1f4099ec9b2fbd4f00f52499272007ed10741e8e21b3a121ce840a5 SHA512 548df114fdb3d83fc0794e745ebdfc8e835a11a75826eb27b4e5da7bfb2fbd790a033905055799b81392b23f3aed41f20900a43331af205875507331e57cf86c
+MISC metadata.xml 409 BLAKE2B 7a44e226411a90d7104f1413fbb30bf85c2e99b2ee19bece2b4d61d93427e17d0a235a88beb874f117a016299b8bdf1d1897daa4d36fcc4e2e7b9d5e45d83873 SHA512 4e1748940fb40bf5ef343f82a57794d42d9d3733d544a122d3ad8200118869902e241a4adfb38c481c69842dba2915d6b30ec96713b35019ef4615fd1298a70b
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
index 8b902f0f90c5..9fbd2808478f 100644
--- a/dev-util/edi/metadata.xml
+++ b/dev-util/edi/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <use>
     <flag name="clang">
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 487edf2e1033..1333b10d8f55 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -4,9 +4,9 @@ DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
-EBUILD lcov-1.11.ebuild 570 BLAKE2B cb9e8c6a2bb8403b53b209d1b3de4f5976edc5db2839726d62b90d3774c6206b40704a91989a2ec8d6ca92472672120e07c0715a856793bad9c32ced47ab1756 SHA512 b53f801cb6260d5aff9c09326bbc6579b3c9e41ecddd6f8dd86abb662d387d585b40077693f9f8852b845ea9a57cfdde073e940dd5ca5a612cd31bb5e3806d03
+EBUILD lcov-1.11.ebuild 580 BLAKE2B 0ed1313c916479ad65f78326e2eb32a7380c700359717faeffe4c74a3f0c46c26cf785b0e17409d1df1200e9420fe0a50b106bb98adc748b60fc892bd9011eb0 SHA512 bc53dbc22fe8cc80b019434d961b17f2b56b60b4f3257dff2eef196991886a27cee898f666354e6bdbe183deff1fa127966be3fb8a60c803b1b6fdc40c8dda48
 EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
 EBUILD lcov-1.14.ebuild 825 BLAKE2B ad1c93c3934a96d2770094f84f5c80b6221e276da61a4f31051c646d04b4d91cca47ced68b2647ae9398cb8aa3717c3bdc65855b7ee09c31cc09912a15c126bd SHA512 28b0849fcd0af2961024d601f4bdeea2ca6a3810e2e574467c48185a2c9aa8064df905e1ca01625f02162fdcba206a409126265bd85e51e2a85ed3f5f5a423a1
-EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
+EBUILD lcov-1.9-r1.ebuild 594 BLAKE2B 8666da2ce96f3246753bce1ac0c1a93d41703ef9f2a670e5bdac20b5fcd56ff70a54e64c50e6045824714853eece9d6a7d26592664b48859985a3a1eefee450e SHA512 f6d824e2fae383bd0acdb63f14887a40d28fd3175f1520c58fd9f015779a56a2875858c4bdd11cd9f112017aa96eace796c242bbfdb41835f5ac07d52628f246
 EBUILD lcov-9999.ebuild 862 BLAKE2B 9dc955663b19754562a0d83dc061a73be71d4135f9fe6faf1517ba12af3008207b5a443128071c6fedd4db9d3d2af835e10ff3d6dac879a53982b5addbb6bd1f SHA512 a4997018d74ee18e3d9aa9a4ce2b17e5e2012f111021497835a5667f51e98c4d481e37b2d834a8c4b7abfb94b5bcbf120160a2fa9f0c92748c3dc98e3da01bdf
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index cb9b990b3e67..2914b905e0b4 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
index b1a3a8e89060..b8e716831cd0 100644
--- a/dev-util/lcov/lcov-1.9-r1.ebuild
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index e29b528a4938..52d502fdd088 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,6 +1,8 @@
 AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
 DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
+DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
 EBUILD makepp-1.18.ebuild 912 BLAKE2B f9d6509e66bc3e4a1acc4b701d789f7b69174362cdf1ab9076500913cc9098bedf741181ff5b9538ec6add4b6d941905a83d03f6d0e91f96b700c48389a44e1c SHA512 6705554e3809102e768fc571a7a6c14fc79236ae42ad7d470ade34be10f376ccd8936a222b8b4d076fe08ce3735eb6c71973de437daa0c59a2aa13e687178bbc
 EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
+EBUILD makepp-2.0.99.2.ebuild 1018 BLAKE2B 131975a8dcbe6b7ea2e514765c1d46ce61c58f70071aaa38d73bca6e3d8b23b4821a620be37dbb0a821fecc3ce8930453797476a225cb017ee2c8ffa010f9c9c SHA512 4d8c3b7f521fe3f0b0a2c8049852372545f4ff3f1413bab752ee974f43c0f6a0910a351ddb88a81a93b817c7fddc8161256d23bba635ecd370c9e5be017e982c
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/makepp-2.0.99.2.ebuild b/dev-util/makepp/makepp-2.0.99.2.ebuild
new file mode 100644
index 000000000000..38db184f93fb
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0.99.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl:="
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+	sed -i 's/^  my $gzip =.*/  my $gzip = "";/' install.pl || die
+	default
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 539148514ddf..685ef582535c 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
 EBUILD pkgcheck-0.5.4.ebuild 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
-EBUILD pkgcheck-9999.ebuild 1237 BLAKE2B 8db4fb82b419297cba762607febcdc2b2e1b4a8817873f91e3bbcc7e1bfb116314980291ff25171b9a363e2ab46ba879953d873a2f3fd46960e4d98d78031824 SHA512 7e0ca6ec6e6e3dbb066ea94e58a747ae2366d42e191ba847896df5528732371823802b8a0e53848f4c829d049d8284b12fc38957e5f820a4bffc811f59e074db
+EBUILD pkgcheck-9999.ebuild 1277 BLAKE2B a51bd3b1a5edf2635fa804a1bc8ae49488d3e5a9dc22e40741e879d44f27409474872a89d5501f39e73eb1379372f1646255a03aa6ac9b3817dddc9c3f1beb1d SHA512 beae01defca87158c5a00cad2e4f22a7e537c1fb96412e023ff6e581bdbe555ef5b67f6dd6f9a582b7aa57a98d98b8d0daa3b5d03acfe0373466626f41a3dfd1
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 22550d50d55e..75dc351a4f38 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -30,7 +30,10 @@ else
 		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
 fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 1b0fbf8506c4..29fab6fb6a56 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index f6c8d0f4fe31..1790ef6e38ac 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.15.5.tar.xz 158216 BLAKE2B 0f7fdf6cf700e09a7b3468163e65bbc314960531f6e6d73f599bae98f52f19287a25fc71bf4349dd27791de35a992235ae2a884950217640253e15ab6c92609b SHA512 fdcf1a203ca78f6f36e22fc8bbabb2ea8c3f3fd63d4ba6c37453ea6b32a41311347685be68454c25e4e238926dcc1b6cbdbeefaad3ed384b488054a6a4e0d54e
-DIST bluedevil-5.16.3.tar.xz 158552 BLAKE2B c65a460363bf7f69b332bca88346d4a2647c2415efcaf748abdfaf32e2ca814ece40e8f05f36c6e7a267b096fa5495e78417c108b05f2546ddcf49cb7766c9ad SHA512 a05a4df9b5c75ae0fe235d223107203c70a6e97fb669be6d6e7a0af8122cef691a9ee17c3558964630e7fd6fa17e4bb2b2cda80a7c42ab93634c80760a01fa5f
+DIST bluedevil-5.16.4.tar.xz 158340 BLAKE2B 54c443953bfeb8c1e88dabb1ebe649e00438b0e523bc36343e8d1d8f42cb24c151c44f163b8847e3c004d86320173b0923689de82aa9d3f0cd33ea4d949e1d57 SHA512 0a86024b75c81938d20dabb922324e8b39120553c1491dcced559f389ed974e65ed389a75db2bfc6425fa984f5ae6e540c053bfabca5365f5bdaa2773157ff41
 EBUILD bluedevil-5.15.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
-EBUILD bluedevil-5.16.3.ebuild 857 BLAKE2B 6799750b181547e7a98ad6f3cddc675b40b9ceeb84d2226ffa752cd1c10fd76c14f24245ab5a045c60cca4608a30c3747c41beca311c0a8c6378a49ed6db5602 SHA512 9eb659f90c92b1798c15b81ca801e56da628aa0f1826a0d0477e5528b5cd8f217463a112c9bb3a322cdcb7d9a2fe249d1bfd443368d8111981ee5a07d530d8a0
+EBUILD bluedevil-5.16.4.ebuild 857 BLAKE2B 6799750b181547e7a98ad6f3cddc675b40b9ceeb84d2226ffa752cd1c10fd76c14f24245ab5a045c60cca4608a30c3747c41beca311c0a8c6378a49ed6db5602 SHA512 9eb659f90c92b1798c15b81ca801e56da628aa0f1826a0d0477e5528b5cd8f217463a112c9bb3a322cdcb7d9a2fe249d1bfd443368d8111981ee5a07d530d8a0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.16.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/bluedevil/bluedevil-5.16.3.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.16.4.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 9870066f6a93..b2d1c49afe3d 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.15.5.tar.xz 3127888 BLAKE2B 0ee6733509a8e82e272e17ea6247dc3d32420e243c4989a04271a17b30e614d5b35f19a14aebc676fdffbcfe66130352ddde4b5c31acbb890e5a6aa8868d1db7 SHA512 fa95f67ab63382c12f9d5448fe114145c485b73ebc7eeefb4b3199c582707f88fdbc68dbd9c996a46d44004f0a0f759fe44b49d03391a399f8113b4494b64420
-DIST breeze-grub-5.16.3.tar.xz 3132748 BLAKE2B 6b2d53d24735caf8b69b47018740b552e9c1be3931e853eba0fceea06c20131f9adb722eb12fbc7e051cf88c87506b72bccfccb6f565c9d57d346d9736b62c95 SHA512 f54fba1472b9d192ddbd63408c83c7c438854a453486dca9c1980ec4d086457193afcdf22be65e8900029dd08cfd719a13cab5c82f7bc9b07b388d2f872bbf26
+DIST breeze-grub-5.16.4.tar.xz 3166128 BLAKE2B 15d885c59bdbe17836a61051bf5de7ff58c706a563792402b5c65bc3513c0933c1b4ff53a5badf08c5e1e34a77d30bb89ec5025ac515e2abecddf93d9954f744 SHA512 fffa785e2b3423bf55b45d051f17b5c1bbf8657ae4b91f772b3ed64608c68f2e1322b3a93356297073a75b3afd00bd2c7246545bfdaf85ace2ae6e8da9254ea4
 EBUILD breeze-grub-5.15.5.ebuild 399 BLAKE2B 03712756bec77cdd2ed02d4c1da83cc7c4efb71c492b14b70cad9c4911a8b662877c61692e0ea6ed0e24a1db490d5514c61619d4e47ae765e9670cd6abf28ff7 SHA512 e77a7122822f5805cb76bf40f336b08f3dc6f546cfac45dceff0f85a63d2c81735d07240f83b4ec5ecb26bef63b1a7d2fc9c846d4febfffa3c5ed599216d03f7
-EBUILD breeze-grub-5.16.3.ebuild 402 BLAKE2B 85bf08549b8819e1ba5713657f43d4062bd5b38d8a10acc1bd4b9dedee7b2e94c78cc3efa1305acfe9b38e16382ff8d78b09193cdbbad0b28b23090150ee0717 SHA512 9cad5052c680c5881c9227385adb693a9adca4a69f84db3512b19dc33678b3504d32458757919795fd43ecbd27472a9d418da726b5dea19eabc22173434e79f3
+EBUILD breeze-grub-5.16.4.ebuild 402 BLAKE2B 85bf08549b8819e1ba5713657f43d4062bd5b38d8a10acc1bd4b9dedee7b2e94c78cc3efa1305acfe9b38e16382ff8d78b09193cdbbad0b28b23090150ee0717 SHA512 9cad5052c680c5881c9227385adb693a9adca4a69f84db3512b19dc33678b3504d32458757919795fd43ecbd27472a9d418da726b5dea19eabc22173434e79f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.16.3.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.16.3.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.16.4.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index e518ab4526bc..1fb253c3aea1 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-gtk-5.15.5.tar.xz 47504 BLAKE2B 3a6d4c656e652004e1c3268978e31f476c08a78fcf27de178edd94c1b1f568fcef26b971e52b89037922eb7be86ff5eb6189e8816a6ce6dab5a50c7d951da84a SHA512 61416aa88b50cca55df03b6eb95f6d5f6f7700fb64730668d777155c5ec0a892d00b9dd659f8a4ab86ba0c857d7bb52954563cdb8df2498f8fdfbea95c1cdd59
-DIST breeze-gtk-5.16.3.tar.xz 47392 BLAKE2B c54569285697fcebcf5d706d962e8148c07283aa6537d2c38432b9208569ec3cf48b94a6d8150adf12517394b8caca3e4182a3ba8c80d545d38537f32fc7e17a SHA512 9818ac9e92c420b2629679f2953ae0bb65ee7e5641e9bb3017b23d249b889596209688298623a349d55221584088db32df58a0ff6f5e2fa1fce1dbcba3bf7cc4
+DIST breeze-gtk-5.16.4.tar.xz 47560 BLAKE2B 6bd7a4299f00cdf10b16eb9447b7ffb475971d99e41b5531afb0c675fb7bb8426ad313048ac3ce841108141d1e58fd99dd53da4996e26a6ab291329eac63380c SHA512 aae792d9b46034faf67539e9ba940119b4982b4ce76e881b5ce95c8c4079794a69d15e4b314ef37d91f804a5fbca2a4b0340bf657dba96c541fa253763e98c42
 EBUILD breeze-gtk-5.15.5.ebuild 613 BLAKE2B 53e90c7de4aaf18b8ca28b389c8778e8a1c9bff95f0ac8b12390a56309780ec8463073ecca20fe946da2c2c8277d4baf3cf5fc5c35cfb93a6eed76331246e46d SHA512 65f365d7b5d198981232627426a11441f3f0dbda52a832a27905e23292b647ae37a06c0d0fd1e103de96ea28e200fb73e76d58c0a1f311ebbcd0ce5d560c4e98
-EBUILD breeze-gtk-5.16.3.ebuild 616 BLAKE2B 3476eeb759816e4eddd8bea516d4d6b0ea9483ad9a8abcc89f71a64e27de36d89472b63363f9b49b745d7e47ea4b5fea16a1bc63c3a576d8b50ca62f9d8bd90d SHA512 062d1ff0e823d078181708e12c90eff06fecc4c23ace953cc459cca6ecb2802becd4e399b4c98dcb714895f3a4196483ca90fd40687081c8b9cf582e830cad2f
+EBUILD breeze-gtk-5.16.4.ebuild 616 BLAKE2B 3476eeb759816e4eddd8bea516d4d6b0ea9483ad9a8abcc89f71a64e27de36d89472b63363f9b49b745d7e47ea4b5fea16a1bc63c3a576d8b50ca62f9d8bd90d SHA512 062d1ff0e823d078181708e12c90eff06fecc4c23ace953cc459cca6ecb2802becd4e399b4c98dcb714895f3a4196483ca90fd40687081c8b9cf582e830cad2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.16.3.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.16.3.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.16.4.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 4a6aba54c201..b19321767790 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.15.5.tar.xz 105724 BLAKE2B 2ba7c8daf2997bf8f422e687ff5636398eb5d84867814177c73a2d004baacbc2a25131585757efd615069dabaadd23641d646806d884228b2ac95805576198db SHA512 74df266881cebf5f1378975f6768e43e73a3ca4f6d8f1d73a4026eb1d046b9386887d40e8e8ad59fb9c96c45a6f63aa9b6c41a8d1740eaab4db515ab4c5a5310
-DIST breeze-plymouth-5.16.3.tar.xz 105484 BLAKE2B b526eee5b938e2e23fb76db9fecffe7d02b091608997c753fd451390767d81dba4aa53591427d9eb94b530f3af3089dd1cc44e4d449264fb4904776471e96b35 SHA512 02f45b7bda9ae8ad609b9f946fd50264624ffe7b49fb636f70728f273819091cd5ed2e1f731159a6cd1ab143170e9c87ab066fcdff90be4baa9fbb2aa5d39af8
+DIST breeze-plymouth-5.16.4.tar.xz 105708 BLAKE2B f3007e7534a9d58f904d4f449a6db5197a96e23b54282fea209d04cec0d2555192bb4d78b6ca4ad1290cba29d02db4013aa5bb39b098859974b4c8bc352156da SHA512 8b39f62338c18f1e7c0506b2fde36e2c235f14003328eb44870f0aad041808e3c3247bf4d6368d7f520fdc95b6fc840c1df916a62304fc52fe09a84f4476a43f
 EBUILD breeze-plymouth-5.15.5.ebuild 496 BLAKE2B 019435f2ff2f1c3fcc1b8cdb4ef9f87e9e92c05ba6076a5a79224b3da19ae33be9ccc4787a7f8e0923ee98cb693bd028f108bb1e04409c7480f3988f762f3204 SHA512 a3348aa5226431aff0e64e3379ec7319ad8a5c05f94ee5ccedc6c63e167e2f09983677673d9fd0d944c129c20d07f0855aafce716e9d7112d500ecb8467d2d54
-EBUILD breeze-plymouth-5.16.3.ebuild 499 BLAKE2B 705edef310ca348127517e40c4e1ca6653187de5c002c9fff8a6cae10769e1c79cb559be63a23232c9852c6d247511f300aa40223f895c457db8820bcbacf6d7 SHA512 e4965983b73483e888c1086fd1669fe8dbb2c6ab644758c3f8d125f9a2e01161b839cd3540bc2e2deff87ab525ddd5dc5a0d4c311020149400243d30feb4ce75
+EBUILD breeze-plymouth-5.16.4.ebuild 499 BLAKE2B 705edef310ca348127517e40c4e1ca6653187de5c002c9fff8a6cae10769e1c79cb559be63a23232c9852c6d247511f300aa40223f895c457db8820bcbacf6d7 SHA512 e4965983b73483e888c1086fd1669fe8dbb2c6ab644758c3f8d125f9a2e01161b839cd3540bc2e2deff87ab525ddd5dc5a0d4c311020149400243d30feb4ce75
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.16.3.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.16.4.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index b99f0a9505a0..06d5be3b1952 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.15.5.tar.xz 25144812 BLAKE2B 00a477883384924cf9d77d659e9df4e31d442b94bbb2ad7b502e4cfd4aa5f40a01918654a738ef92db6ada834a10a7197d56ecb2994218a24d2ec0b0830f887c SHA512 a83ab125ed55f5da6b4e74ceecea5bbf5dc0f2b589b88764b2c0e501bfdc514e7b911e8a93b6e491f9ff0a22055fe8fa6611203f50b75fd624d7427e6c532391
-DIST breeze-5.16.3.tar.xz 16594572 BLAKE2B 2d73c630144e39cc44ed50fd676dbc0acd1e71e6e95efd8c21a467d39fdff78c890dd774b5b429fd7d70cce324ad5a0fa515527f00d2eeeb3289ab03819cf99e SHA512 631964510e49e4e356020c5513b36a09207d023d4a34799745a46caf2de9d28b98624ed6062447159bf893a80f439b0e76456e6aea038844defef1c0a8bd1cc2
+DIST breeze-5.16.4.tar.xz 16593792 BLAKE2B f8ade16340253fa28c8bc0b9061c7255050d2303e9ce8e4188e8c9f6688496bc3d6963f5086e6e10e2bc64796c9a44b21ee703f677716c215b1e14ee62463479 SHA512 35e0d06b2bbd954d261709cecb7e59cd30f3cfe848df2323e74637d7034e066c8bd19e06aa0b5bfa901b42df1060d1867c6de67632b4b68cb3a8cec8004d1d8e
 EBUILD breeze-5.15.5.ebuild 1147 BLAKE2B cb4dd4a77ad2127928d0ccc7d9c68c2157262d00be6dab67a23f69aefbee1e73292f3969841b09a6cc417b3f0b05687d502a882900a9cd4acb92db038016d900 SHA512 d65378322946d4cedcccd1e09b5146667cbb311785845da84936299d45d3187cf0451b5dd18ad4b698f2c1d006963555bcba2c8c27b2fea4275a89a18fd30e0f
-EBUILD breeze-5.16.3.ebuild 1150 BLAKE2B 839997e771c31e43b446f2d872837d998381d9ae287c8139860f6cd0f1919e353bac25cd9765f63388dc15ed63cebfb77e51e49e8f071dbadf546378d7404b58 SHA512 5c0e5a72ca0a2bc6a59293ac5e57440ca0c7a0aa6774ca553da7a77cd9135eee3b1579b1271959fa1ee1f6126d094dc3e829ebcb6553f6aaa57ec392de1309be
+EBUILD breeze-5.16.4.ebuild 1150 BLAKE2B 839997e771c31e43b446f2d872837d998381d9ae287c8139860f6cd0f1919e353bac25cd9765f63388dc15ed63cebfb77e51e49e8f071dbadf546378d7404b58 SHA512 5c0e5a72ca0a2bc6a59293ac5e57440ca0c7a0aa6774ca553da7a77cd9135eee3b1579b1271959fa1ee1f6126d094dc3e829ebcb6553f6aaa57ec392de1309be
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.16.3.ebuild b/kde-plasma/breeze/breeze-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/breeze/breeze-5.16.3.ebuild
rename to kde-plasma/breeze/breeze-5.16.4.ebuild
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 15fe411db899..17ae81224ce1 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,6 @@
 AUX discover-5.15.5-tests.patch 1208 BLAKE2B 287a2e6ac59f012577df87ea3358514813c958e085a6aaac552add865671bf02cbaba8bc770234b5e647c02d7f097c8749d8053a8e463d5605449686a03ad6b0 SHA512 a51541e75d056c1ea6cfa16a20aca221bb56ae8a940601ea4b1d4b5431366b807d5bf6832733a86028dae9901a4eca8aaf89929ffac896bcfc5fb20eec55d914
 DIST discover-5.15.5.tar.xz 10447644 BLAKE2B 456acc6bbbea216cde7a535fa591ef76316ee07f5ba57e6b3c6c20536b21877eb210f381cba8cc7c114110f3f7ffc4244163174bf8ae95cd022ca05a4be16bed SHA512 fc94bf3d93423d6327951c8ba76c2a08c7bd19aafbca7333e159af7500d1a78b464f7b5824b9168c522f052ca6cd322e9b5a26abd74657b99c734bbc7b864a3d
-DIST discover-5.16.3.tar.xz 10451984 BLAKE2B 0b6978eb37cc356f15c481e5824fe7de84882b2e27a39d34ed2ad8db22de37e408951bc1ecfaac1f1a852c2d82510a810ed89736df5570ca5b655f06dff7e9b7 SHA512 86219b218fc39164b8300369c2263697e5cd2db92ce37c653a3978264012886d28b333fe64a376b5325b5c1883dbdb9128068c3197500f02396c56c33f0021e4
+DIST discover-5.16.4.tar.xz 10452088 BLAKE2B 0c0632a900c7907d9f10b9470ebf291c7c47d50220bfc73c887d3689fd5f88e711751e4d7d45bd4132d986da9d0a986985aeed44a606b8e219235edba1986c29 SHA512 7fe80436f7998d7ae54143377b11dc909c1e14346dea55e7c6a5649331102812dcd69f3eb600a06ab28b83ac6827300a4fc3cbc0afc83187e418c6eef44a0262
 EBUILD discover-5.15.5.ebuild 1602 BLAKE2B b39611d39bd78d229a7bd5870ea61f6cc43c7a62a37ecc9c096fa74d38e781a3c5e97438b8da4c39329c6ba7bb5df7e93a14599e380669954f9c1d4945d0c004 SHA512 443155262ea5be8ee25ac4484e73c469b7c0192bae03ec1afd4cc80ee2330720141257b96fa6eb19a3b7edb1ba6e15fc9a4367b608f76e9f94b912431eac93a9
-EBUILD discover-5.16.3.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
+EBUILD discover-5.16.4.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.16.3.ebuild b/kde-plasma/discover/discover-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/discover/discover-5.16.3.ebuild
rename to kde-plasma/discover/discover-5.16.4.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index c28f8fde6e02..1657b864f0db 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.15.5.tar.xz 738752 BLAKE2B e0a48064a1881079f44c727a1bc08b9e8906b2c3e83a3def8b5fd406b6aa4d2982ebb885f3038692568293da2d933d521735724b34b40fbbcc96b139c1595740 SHA512 812206194f095a4862023a085ac2975c107e2774010598a6bf1b9b88b8dfa1e78819ac4012854d607a61bcba6dc954554ac178ccb3fd304ed27adddefa1fe8c9
-DIST drkonqi-5.16.3.tar.xz 745332 BLAKE2B aa9d7bfc8668237d4c7de22a0a2e42eba813be0aea8f91848d3643536e28a337f2f98daadaf66c29ae57a4760b27ed5bfe47e9b355cdb4291093616cde04cd9d SHA512 1adfadb015d4cfd552c4d787af802fd38c7806fd011b60220ece527dfdd92d9e66edf4bae1b147e1b580230e8071db5883109a1438e8b7fd4b5d6b65e56eb223
+DIST drkonqi-5.16.4.tar.xz 744380 BLAKE2B 550ba55d3e385c0c89347611d791af4280db3303ff8519c4a33346e7f43d3a8c149e5c96d0316e0d08e6998495d1c916e92dee1d5f02737d83886bbf394557e9 SHA512 8623981b26cceea0238c7aa265453125970093d7edefe2cf2865b2e9384f59f44bd2f103c64f05c074c3f49d6691c22735d1884f86bead59f564544064b39f15
 EBUILD drkonqi-5.15.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
-EBUILD drkonqi-5.16.3.ebuild 1342 BLAKE2B 85216515d8c91aec7461a95e0f988e0b4abf414b7ae0fd7a861099f55130300b1102ca0146e5c0cbabb40f22c51136929951a70769843d129de78ad98039fe10 SHA512 ddb22ec28d8da6ef2e42deb5187d295ad8a333f86bbec7705307d34708cfa8777921296eb9f3bf258af831593e1fe224cca7ce58a487c4a6923b721e28bc2ab8
+EBUILD drkonqi-5.16.4.ebuild 1342 BLAKE2B 85216515d8c91aec7461a95e0f988e0b4abf414b7ae0fd7a861099f55130300b1102ca0146e5c0cbabb40f22c51136929951a70769843d129de78ad98039fe10 SHA512 ddb22ec28d8da6ef2e42deb5187d295ad8a333f86bbec7705307d34708cfa8777921296eb9f3bf258af831593e1fe224cca7ce58a487c4a6923b721e28bc2ab8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.16.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/drkonqi/drkonqi-5.16.3.ebuild
rename to kde-plasma/drkonqi/drkonqi-5.16.4.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 6da3eafe6148..206c918a5517 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.15.5.tar.xz 84756 BLAKE2B de13492cec3c4bdb29a8be01777c21cfc5c36c7f644d6d6fd7ef2bc502620031be1c94397e5b7806095a93e9e5eae7a5acfa149c3bc809635f3f3f43b01b1aa6 SHA512 9c9c066ccf7b56ecb0816be5db82dec7d89f9a834ef75a0f96d073d0d15470a57a84f811c17feb4edbf262fc44275d943fd7e06ec2bdb53860a4f6a4ea1b64d3
-DIST kactivitymanagerd-5.16.3.tar.xz 84596 BLAKE2B c4d714b186829177a30501d722f8908932d696bc9508e5b0e8124955e8b8fab68d9bf309e0ec5550d6c9bb0f4388ff63d0031aba1898ade4cd89c5785c5fc0dd SHA512 5e036693f0bccf2e700a267a6e193dac8e3547ffc647f4b08822c30f3c520987ca1464ed4881bacac85245121b5ec59c13211f13bfe0f3fe40759e9263f7e851
+DIST kactivitymanagerd-5.16.4.tar.xz 84772 BLAKE2B 399d7f3268722fc81ef387b9bac084a542d7a9b81a4c3421436c62d85d3b02ec091902c3a914599ea8ccfb65f106fa2e686d567c2644798cbb0168d5f2a30520 SHA512 78e363c7c5efe2d64bb26006eb94f24893e80e17596aa0d64d47d2d7a749ce3f34b18d350aac08ec5d53780806e9be7c142126831c3b7505c2fe1f05f69a1d3d
 EBUILD kactivitymanagerd-5.15.5.ebuild 837 BLAKE2B 2a3cbe80bfe87d04be976a3d5cb0f9f3e3374620a76d1ac6c07933021a4f6b9d05294fbc9b7bfe088a2af491f6acc584e5b4896ecfacd4e8c309a67d0c2f129f SHA512 ce10a062c7f60a6b44691624dc82ccacb900ff43a88e812a2b1ee74304702b67412996a345dcf011a6fdcf905dd9d6c1c6785f4afc9b84d6e4edc6aa054dc1d6
-EBUILD kactivitymanagerd-5.16.3.ebuild 840 BLAKE2B a469d5ac05a1cc5b7448199695109c926d9ca4cd2b1345a24dd2b3eae084d558497b8d67932da9e7fe408023aff03b0ce64ed6a2192aa5630a17af269ce32d53 SHA512 b34f4f43a6e634ce802f66e8f05d99efd082a6ff439d8dbfc825d8ac18e1603a8735afe0ac3e68cef3d853b14cc47c489246f91c3805a9c3b87f1bc2cd8b5d8e
+EBUILD kactivitymanagerd-5.16.4.ebuild 758 BLAKE2B de633f25fcf5a353d2c4ec71df7189058f7da0e9b45f85c185d53ee39e67b4ac05add8c8380269445b364c48b7f25c9c36b5032a71b3db386a800a934a95b172 SHA512 cfc0dd56d75092faf0b9a3065020ddcf57a5cfeb6765f32ff85741bf7986fa0d7bb037519cda357aac6cf86ddecab09ab6dbdc5b609f10f76b78708bee3170f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild
similarity index 86%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.3.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild
index 63d219b8c165..0532eb4c192a 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.3.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild
@@ -10,7 +10,7 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+RDEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
@@ -26,9 +26,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtsql 'sqlite')
 	$(add_qt_dep qtwidgets)
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	dev-libs/boost
 "
-RDEPEND="${COMMON_DEPEND}
-	!<kde-frameworks/kactivities-4.13.3-r2:4
-"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index d738c3377212..efa843ee69e5 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.15.5.tar.xz 585788 BLAKE2B 67693b592af030aac0b130b4233fe770eee2d4d4b82c7ee1997770403e7eb9138f997681a564e349a16ba9e119e95ceb7dba037f39f950f48a0a01a63f447770 SHA512 f7f9f8af72e6fe421a22bde996b5abd5ab194b7fb6b7252e63761658b143b98e8f49783b2a53f15b45c16a6dba6b064293237bd51ef7a61371293bdaea9359ff
-DIST kde-cli-tools-5.16.3.tar.xz 587072 BLAKE2B bdb6b0d07fe9ac70375d176ce872215f75cec5e3c7a8f0f6e33d87b3ed361c404e176d8d699a53bc0e3f401deaa5f8dbfe12b1dc2198891b9dc9d26fbfd766e4 SHA512 a274512cb7e109181d262f4bdac3de4ebf7a7a3824ce8eea88c2f3d2cc74f352440d93abf34e997c686fc4f052ca1ca1a90f7de9cce9286cbaaeaf49d2183ba2
+DIST kde-cli-tools-5.16.4.tar.xz 587576 BLAKE2B cf34f95a72ec46f2c8b50de832e40dde56d5e064e000189fcf3c77305b934ecb1a082ebe4ed26cb3d9d347d68ea364b0776f0d95af09e313b6c451c0b8eb502c SHA512 6855b7640b2c272a2dd40f40a85dcedb75e3a83d09cb58f6d3ba3f966c3a0f7e534d5516e52e2387105cabeeec4cd8732d5cf8562d35a58a9fd7aa43c70a5827
 EBUILD kde-cli-tools-5.15.5.ebuild 1542 BLAKE2B d45ca4e837e59a2b0b26142c7d2f9dd28129d64c499751ec1a086edfc49edef97546b6fa914ade07c60da96b37d2da52152ebccb909650c6bde968d41e072fad SHA512 aa02bbf48bb5c79186006e68fde4d08120c6c5b0ec4ed973a52dfbfa53c756e571a7cc58f2fbd31462e66b487e5ff25ad40fabbee15bf7a0c0e8ea12fa3a371b
-EBUILD kde-cli-tools-5.16.3.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
+EBUILD kde-cli-tools-5.16.4.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.16.3.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.16.4.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 13ce6f216207..775c4bb894e6 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.15.5.tar.xz 156704 BLAKE2B 8c53c009c028ff15ab7ec1c8d8e5283c3b734ea92265962b3bb2459def86fbfe1f5b42af2b60eda1c92244e40b8ab5c0471e937ecdbd5564ab4551961400d78b SHA512 b783dd7451fe52a79e92e19c40f932456baa0522b81d982794f8677a26f0907bbf1f7817cf54c988d4aeb0e09f761e665e9f70dab270a7bacf54c391ff31f8df
-DIST kde-gtk-config-5.16.3.tar.xz 154068 BLAKE2B 7d22a972a38e8407d73c4af01d6a12a50d6ac71d363b7f1baba9d195afaf9b5728deeb0e4bcf81b054634515b9dd82929d6f94136abacfeec11ff7bbf2cba6b0 SHA512 a178d992b1c50aa0eb3ac6e66a2427ed4841e9a293b4230a1b154ad1678a22964dd046e8401635775afd33be838904872f071e98b857a03db7c51f5e5ff3f7ae
+DIST kde-gtk-config-5.16.4.tar.xz 154228 BLAKE2B d719d3eaf5d89a74dedf1752f7e2eafddd6fd382ac267e0198a5abea1615a681207fd1f1ef2992cdae1976b59bf3acfa697b335923cbcbfc10a128f7aff6afbd SHA512 e3ecadaf706fe27e7fec0248266c4aab50c15358c19e79f253816c373902613e70448f2878814ca938a8fc7e217d4782d3f72640a99a4326f44e2260b4cfff6c
 EBUILD kde-gtk-config-5.15.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
-EBUILD kde-gtk-config-5.16.3.ebuild 1248 BLAKE2B de32fe02e40e091ebbbdf3522f72e67c73327568d7d69c22c71660e399a31b0df151d17d9c6426d4e51712fe4ddafa15cde80a8eb6afe7efc48d075e8a82864e SHA512 24630089d989bed4293e731c40712c01f3cbfe22067b709ff1e7aff2931e11519852cc5b08d896d12ec203ef207334715b4694127c62e3bdbffe6099097b17cf
+EBUILD kde-gtk-config-5.16.4.ebuild 1248 BLAKE2B de32fe02e40e091ebbbdf3522f72e67c73327568d7d69c22c71660e399a31b0df151d17d9c6426d4e51712fe4ddafa15cde80a8eb6afe7efc48d075e8a82864e SHA512 24630089d989bed4293e731c40712c01f3cbfe22067b709ff1e7aff2931e11519852cc5b08d896d12ec203ef207334715b4694127c62e3bdbffe6099097b17cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.3.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.16.3.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.16.4.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index e8a61853a2c8..52577ad19780 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.15.5.tar.xz 42492 BLAKE2B c4b458e7b174b6ef395edca08e0c0d3787bb30596f76c538a8a537e31314f4f00f55751de92df80058e12ae0a3bc504af5c32aae7ee1b4664bb4495b71d4138a SHA512 8d004eacbf43726511eedfccd489eb91c2324aea948e9ecd111eb20b5bf89b4b88c3fefc237fe1d44029093e52bfa0cf58dcd641701364e51661b0ecff5f67e0
-DIST kdecoration-5.16.3.tar.xz 42604 BLAKE2B 99f3074dfa8a26110aa37261fb733815eb6d5e00ecf0a964215c585a7dab28cda20bc83bc77c48feb33251576d2f62aec7118a99f370a8a12cf5e2d8a71cc87b SHA512 2c64fcf79bc14f8942d349b90a3c49009014802049f74d9e12a5cace351796090b2e4b916149cd810f25eb989d393cf39c0379803b2d440f053c72a9f83d65f3
+DIST kdecoration-5.16.4.tar.xz 42784 BLAKE2B 9761cd12db3cc18857a8c19ad7e5f77b25778ec91c08d2690867fba6b99f4f140b533a0a1e7c5c16c291c840d3174670c30ca5a5a7af499d121b3cfdb9eac177 SHA512 c22e1e89ba11c18dede7dbab94f103a19e8956b2afb7b90464b44b2781297e355bb7aeb581b1ddfb735ae193fb48fdb8e2ae871029c3365212da9f26cf462311
 EBUILD kdecoration-5.15.5.ebuild 396 BLAKE2B def1e5cbd94c4458d72e54b32a30ca73db9e4874796fd410b62847c4127d300ad814172da1e2e11f14197ed186152ee784e89c8986a7ef1216f5eab2f3cdb783 SHA512 577f92c9bf3ac7da92fa8f493a2ad4995c27855b21ec36b1de4cc307fe1972dabbcfa72a60aed125017e4144e67037721860dbb170a3210b8e4b5c545732721b
-EBUILD kdecoration-5.16.3.ebuild 399 BLAKE2B 5c28f9d7bd472162787cee9838c0a54d2b416798fed701d08b9ac414bafa4a0c0b662678fdee46244de13d513295ab9dd53c85f5cbf1066a01a1bd1b36687ba8 SHA512 e9aaed45941f0256229df553e2b11f147f6c07e5985ae738e2c6df879f8d14f6bb8a998a0979b8380147ff91007bed2f2c55ef344e4cde3d2307e5bdd81b3087
+EBUILD kdecoration-5.16.4.ebuild 399 BLAKE2B 5c28f9d7bd472162787cee9838c0a54d2b416798fed701d08b9ac414bafa4a0c0b662678fdee46244de13d513295ab9dd53c85f5cbf1066a01a1bd1b36687ba8 SHA512 e9aaed45941f0256229df553e2b11f147f6c07e5985ae738e2c6df879f8d14f6bb8a998a0979b8380147ff91007bed2f2c55ef344e4cde3d2307e5bdd81b3087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.16.3.ebuild b/kde-plasma/kdecoration/kdecoration-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kdecoration/kdecoration-5.16.3.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.16.4.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 45a58065bb0c..6c9ab360243c 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.15.5.tar.xz 604584 BLAKE2B aab24f3f8fee18f4e54a7fdf4edbe35923bf96751f27a656d60b141987174f257ae19b77301dc9b77999ef0f8c439cc3cf71be75a2d4a0b9623e2d23e9ec66d7 SHA512 cc0dff694c71645072c6a56bedaa9067a4947906e5167cd55012868a1554beaa5278d2e4f41092be784c8cd9290c03b807f6622a24941dc0b0f733442355fc80
-DIST kdeplasma-addons-5.16.3.tar.xz 593620 BLAKE2B fb6935ad294610304169b94f3b4b540e73775c4d9c260fc7bc82c657c3305cdf6a651049b39c4be278f7d1410c191243a8e8736d32adf1d796a35c6d4d265de8 SHA512 9ee73b23adfa4a126fd05884cf81255942198da9fc2753afcc8eeffc131cf41afabd88fb163b43de0826bd605d5835e392b2bf6b7f24d3211ba66a2025dd1334
+DIST kdeplasma-addons-5.16.4.tar.xz 594756 BLAKE2B 84cab97dd0454304a3f2039fd80b81f4cedfa2188873aa202041dd9651d8523461a0008bd572bde4a23ad2d8f87a68883b49399a3f1cf73324f4e5cc36105038 SHA512 d32daa32f7ff85798f5e17c302a9e47f8350107f924e1caf5921d4c081f42c548594d5bdce79d13de37fe567881b0ad5f343fbc30e2290602839563b6b49d6a3
 EBUILD kdeplasma-addons-5.15.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
-EBUILD kdeplasma-addons-5.16.3.ebuild 1505 BLAKE2B 3d3971f25ec03a4a4e9c83f57995a891535bb79c79dbc35554cff926235e4450e2963dd3b2d2db9f2ac01347565429416dde37d8420719fad1854b10801fbaaa SHA512 d3c15de9936142b51903cf1d87d88bba3ac21475a7bf93616776a5212dab5c16fab5828cdc597a83ebe71f329e6bde5a01f6219c83bf6cf882fa692e7d57a944
+EBUILD kdeplasma-addons-5.16.4.ebuild 1505 BLAKE2B 3d3971f25ec03a4a4e9c83f57995a891535bb79c79dbc35554cff926235e4450e2963dd3b2d2db9f2ac01347565429416dde37d8420719fad1854b10801fbaaa SHA512 d3c15de9936142b51903cf1d87d88bba3ac21475a7bf93616776a5212dab5c16fab5828cdc597a83ebe71f329e6bde5a01f6219c83bf6cf882fa692e7d57a944
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.3.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.4.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index a45b7800129c..3b3210b7447b 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.15.5.tar.xz 79316 BLAKE2B 369445730b506756e0f18d0bf78106d1795ea2a426996c7e8f9cb8b335e26e427c5d0ce2f4abb3edf8948096058cb4f09e8a7ea82a22291c5bb2326dd01ac5f2 SHA512 fea6a5242aecf366b9c3e908b4d273efc8cae66ed0077d526d8e508425265cf4155503a999035ab5e73a646ed68131b783510634d553f653a964a5f8d8ac4fa0
-DIST kgamma5-5.16.3.tar.xz 79236 BLAKE2B 851f73e256eddd82dd621690f0cecea127382da11c7e68a33e9927be34f4e75e37de9e7da7d73ff561d1fd93e5ebfe49c42057142fe1f8825ef3d1b06c161449 SHA512 1fea00eaf58ac4419a6a9953861664b2243317c399fd38e527b62db1145486765b387ae16c4a1e7e465c06e96d61487799e9166da5f264f340652b2017568c53
+DIST kgamma5-5.16.4.tar.xz 79252 BLAKE2B 858bd9dbed0ed64f2896914d78da02fe2aab83d4954ba3cacdec2eb26ea38ef9290c3ef071fa00437cb2e25aa3e90325e6b11cc725e94b5cbcf808e9516275bd SHA512 633128b71a6a72a81b41697ac65a26f916e2da3272291a5197b7af2bf0059a9b900fc2bd8304519ced54015c71d7266c63ee628bd9d60265334fbca982ba3961
 EBUILD kgamma-5.15.5.ebuild 534 BLAKE2B b61bce78381c052fd20126557860beaade74fd4e71fb04ac2afd3d2d39a24d447cdd567fd098c9455f022f2fb7ddf4ae22fbd304d6590f5a4e2f4c4e3bfd0c07 SHA512 ab62a94185bb03aeef4ce999e01e937006b977ec4e2739590d6599b7fb4f775853bb6557db78a257312e5e2e66ebd101af36beb9fc6a9f14ef2dd187923f39a3
-EBUILD kgamma-5.16.3.ebuild 537 BLAKE2B 14670debd45ec35c56d3a1661fb6fe164211928d1c30b97170b1f284cab24e545932744c03f11d1a84f1d927f0e1233aac026b3d48f7ff78d2d3bf128510f8e2 SHA512 d9ea4e53f3e3a01661db05ae4abc408b09e55a1734531173f2035096f3ad97fb120224ce66e2238396fff4ec9561694aba184ddc6dceffac3ec9253ad4254a81
+EBUILD kgamma-5.16.4.ebuild 537 BLAKE2B 14670debd45ec35c56d3a1661fb6fe164211928d1c30b97170b1f284cab24e545932744c03f11d1a84f1d927f0e1233aac026b3d48f7ff78d2d3bf128510f8e2 SHA512 d9ea4e53f3e3a01661db05ae4abc408b09e55a1734531173f2035096f3ad97fb120224ce66e2238396fff4ec9561694aba184ddc6dceffac3ec9253ad4254a81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.16.3.ebuild b/kde-plasma/kgamma/kgamma-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kgamma/kgamma-5.16.3.ebuild
rename to kde-plasma/kgamma/kgamma-5.16.4.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 6de399944064..d8036fdcd7d8 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.15.5.tar.xz 1865968 BLAKE2B 109748767e2119b9b54d29eade0bda4d5c696e67b35c549b10d0de19b890dc07a24e4108c3877046ab7468a4f98b6fffa03a818da11c00febf1f168fba7cfec5 SHA512 ad6f99053d7be4c530233d5384f59cc77b3463e1864135cd45ca17ee3eb483f8d503c089963bb758905d0c9e80a3248331905af117e01bd10a24fb4a61be8f08
-DIST khotkeys-5.16.3.tar.xz 1865440 BLAKE2B 8541599eb3961b70713acfd5ef717774d276eb204aa9f19421d9f1d2aa47596d07dac858d0afdeff914f0e17c8489e5284e1db500ba3556a0de968a64a476cac SHA512 decfd1e14ead3e3e5f00aebea8e35f332fb1dc3a4b14638c6a02909a4234e1e04530c5c13d7ef86503dfddd28ee285235631e8580c339ec5ada70d7775abc0ee
+DIST khotkeys-5.16.4.tar.xz 1866004 BLAKE2B baa94056332ec4b06fed6085b01717c2c9c6a28a676dad7957099a248261b4b55cf7e710f7856e4e96a129fb21a3a27df4d1faf8e6bf1cfffa9fe658586343a7 SHA512 ea38d8822d83703ea6bb58d9a3ff1517c97b544ceba16094ef34eafff62fdc47bb8a2c02411699d34365ec077d41f02063cf28b9aecb5875833aa0eb117ad48f
 EBUILD khotkeys-5.15.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
-EBUILD khotkeys-5.16.3.ebuild 1121 BLAKE2B 9e2dbf7571f711170c6671b6c63b638593b66480010c24ecd499e35221d7875917f09144ca6382bd946d925f95cfed565a31fc2d297d098fe0694ff340f85ed1 SHA512 fbcbeb7b6ff60ace5124f594c828fa5f7c86d15fab82cf27fb14e426757ba4a2e6db1778cac8c9f0b72923512f54a25a14fad7e65a2da1fccf570ae3912b3719
+EBUILD khotkeys-5.16.4.ebuild 1121 BLAKE2B 9e2dbf7571f711170c6671b6c63b638593b66480010c24ecd499e35221d7875917f09144ca6382bd946d925f95cfed565a31fc2d297d098fe0694ff340f85ed1 SHA512 fbcbeb7b6ff60ace5124f594c828fa5f7c86d15fab82cf27fb14e426757ba4a2e6db1778cac8c9f0b72923512f54a25a14fad7e65a2da1fccf570ae3912b3719
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.16.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/khotkeys/khotkeys-5.16.3.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.16.4.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 373e6336d2e5..30d2594a58d0 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.15.5.tar.xz 1321684 BLAKE2B 51a3b49a5b724d187f58513c87f0618b1ee71d00e4ed51019017ae427602b7135d6bd9419714c431e3440f8a27152c4a72951d929b727f200c5cf1d72fc3ac84 SHA512 d75561edc65701097e4c9249f1cb7208e14ee1e99acbd6521606c99ac8e4ebe9ab42a804d8ef7bcde138d3189e3dbd9aaad088563ae6364418e6119639ac3974
-DIST kinfocenter-5.16.3.tar.xz 1323952 BLAKE2B b02c27fe1b679151e6eae799a8c71bf23eb33d7cf7c91d84e398c6f69a953a48db4387b126a9ba78f528fa3c3f5d8ae0a06da1e1082ee20521dab84992b06684 SHA512 feb1f395167310637007a2ff89839466a576edb8440a79b39bc6d07322ddb9bd5b310451e6bd3f5fd93aa2170b8eefa6223c3a2e93904f5d34b037fa4301ba9a
+DIST kinfocenter-5.16.4.tar.xz 1322888 BLAKE2B 4b4b605afac333c5ba8aa0dd08aeb025f0effe4a8e7d47ceb793a5d7a9903e9181441abcacd15066903ad9587a5140a3767b9ab3b717e03e089dad4b371281c3 SHA512 407686f5bba77c5907e550e0c83fb6dcdb2095c87ba9654f1483eb784847a67f58c26c9ceaed1844353ab495c01326f6bf840eb9c20f11a20dc48bed99e1c732
 EBUILD kinfocenter-5.15.5.ebuild 2589 BLAKE2B d3e7a577e5f2bc418f0dc3783efec94e0572b51e1844c78ccbbb810d6dd7c034274b11263068e70f855363a7d7c6c023f039de212c3289ebd1a1fbe323e95ae6 SHA512 7eb2535a79e4df4207a038870f5f6c2828ce57ca734ae34c3958017a9e1bcac99b9c015af1e6824fc3167e8235d536715140af9963448e6fc478b1411a38a754
-EBUILD kinfocenter-5.16.3.ebuild 2576 BLAKE2B cbbcc58ac4d02e5c2157cf3630e69d5ede215b81bd21e33a0a01c5a751033fcaa3c0e5184913768c02380297817e39b01e0078b0e1406bfb57187bdefc5cd594 SHA512 8191ee295791ece51d585179a008eb8651945ee32fb464e31ddb38545903eec10693702d6bc8ef89e54c896177ea4c21d6eb5ce921b27a8e521156a17d0dd15a
+EBUILD kinfocenter-5.16.4.ebuild 2554 BLAKE2B efd7faf08b9d74a9390131ef833d0bef15b935efe96fa56131ab4d8de871ab636b38c51c236216cf9f13815d3d575d507872a2b2e0d98904dc37108999acea19 SHA512 d8166cfce5d2c1292168788b5e9fe0694aa56965628dc4a1eb5890ee38fa69e9cd441389a8f88af1618182def0027a814d82356eb3f8519c0147630a4028bcfc
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.3.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
similarity index 99%
rename from kde-plasma/kinfocenter/kinfocenter-5.16.3.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
index 084102a9d35d..1324db9623c5 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.3.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
@@ -55,7 +55,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	$(add_plasma_dep kde-cli-tools)
 	$(add_qt_dep qtquickcontrols2)
-	!kde-apps/kcontrol:4
 "
 
 src_configure() {
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 1705be0cb1ce..e47f6ac9e9cf 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.15.5.tar.xz 810152 BLAKE2B 16471f36f678e628079901b66161fc81dc20ebef03d70d64716b618050068949ed790f2ab299a89c7a7f61534bb0fa325ac2277518a70f4a46de19bd9f5a03f0 SHA512 ef6883e554de54a3391653db8b9d307f39f2fb35401f3c1cca733641f0f2578d3dc0763c62ff4bb581b816b4699a693d9c5db6b52b2feaeece301f1777b9c818
-DIST kmenuedit-5.16.3.tar.xz 811164 BLAKE2B b07fe9d30a3a78cd3b47bafafc0c331161bd8821f61105bfbb729536252c3cbad3aa2f4ee0f88bbace63010f1ceb0d9e10574067c93f3082d9225a4a63e92cc9 SHA512 ff07c72b47138618b66da01c881692f6a69a761579bcd7ec60b372b07b4877446484e9046b131a80f432b0cd88250c6444b3d97d525df1f84d0d2e47515472a6
+DIST kmenuedit-5.16.4.tar.xz 811496 BLAKE2B feef1227149028f6c4626ac7e600fdcae0519cd56b20c01a79fe3b15777567c31380d83d70557c84b213722ae8693c08516ee2c36fc3e561da0f56a2bfac20ac SHA512 5eb55894e912281983fb40e6c0d524803c5941217d9446123941d3ef7667b2e87eb956cc941029968c10ed2a618e571243d4fd8e5b7716dea9a4dde307e8c5fd
 EBUILD kmenuedit-5.15.5.ebuild 1045 BLAKE2B 2b4171b9a7a27c95ac9337cfefcad9fef0ea9a28acb3ef39e4b2ebd16dc858762030b356e1298ff0dc98452d8833a591b214562355070b24acd10d6f0acf44ec SHA512 f1c29537e2356fd1b24f994b018e7cd7401470ea5162f13fde5c26e8ac6ede7f9b44a397d84fc45f410ec0b3aec14268e57c76d7d2f81420387b57ef635ab097
-EBUILD kmenuedit-5.16.3.ebuild 1048 BLAKE2B 33b5773bc483dea75151a025d1fc2079175730d16eb812a973d9d52cb5c3e1a8b32d663c21bf672dd7b1e040d138230f5a08bbc62251c0d59b4f3f08684b3aba SHA512 74443cee4c3d33a3d7da865dd6729983717025557748ce16be8b7943b9670813f64f1a62bcff883811e183c251c5fc4577e1c3637bafc75c1518e19e4c65c329
+EBUILD kmenuedit-5.16.4.ebuild 1048 BLAKE2B 33b5773bc483dea75151a025d1fc2079175730d16eb812a973d9d52cb5c3e1a8b32d663c21bf672dd7b1e040d138230f5a08bbc62251c0d59b4f3f08684b3aba SHA512 74443cee4c3d33a3d7da865dd6729983717025557748ce16be8b7943b9670813f64f1a62bcff883811e183c251c5fc4577e1c3637bafc75c1518e19e4c65c329
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.16.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kmenuedit/kmenuedit-5.16.3.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.16.4.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index d75133679987..30dc9e9a5c95 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.15.5.tar.xz 123736 BLAKE2B 038e67270053fcae648ed90a277c0b04455afa9dd788943b135ebad1d57bf7b0bc9d5c70629e530b900747454aec829e476245340f08c8d5aa855e677765318a SHA512 29776af422e5948f9563b94609472155e2c5ea762ba40d362cf76469f5f9347f56103b819ccbd2a4b9e8b88080c1d573adae6dd6648a36d817ba71eb93ade809
-DIST kscreen-5.16.3.tar.xz 122984 BLAKE2B cb362c21756c6d22f25d79afc1d105bf28808b066fd2e1a310c82c51ad9590853e7166d20935be008a97f8631cd8e86dbe69f01bc12eb4c387b74ceaa68e18ff SHA512 e195a761139b500a12d50353ba33c1b613075a9bf155b4e0068a4913f9aa3b2b869f704677b488930df83ee2412d17203b1e2452d367a23ccf6499659e0af001
+DIST kscreen-5.16.4.tar.xz 122644 BLAKE2B 42b94797a067cef30e0fa7a153cfd5e5edc396ee447c730f39c25780619f26419cbb74cde218e31475c9ca51254268bc791b6f7a4c52a29f00f9fd40d0010639 SHA512 2881f04df3dcb04fd4028ce43497efcc6d6d3d7ddb83f75077c7afbe0b0656064cc272868305a52116a2f3d5cf09c272b5fb034b0be5d4c792df38d15c81b012
 EBUILD kscreen-5.15.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
-EBUILD kscreen-5.16.3.ebuild 947 BLAKE2B 6a1f76d5d8db45cd7059ce70e1c081136a5c9f28fb0a40a9d92fdb942a4fab95df1720294e6bfde7a34e17d1d75ccee5b64eb1c74677642a842370848858cf0f SHA512 be541dd716d8226fb899acfd9de37190ff6e47d9532a18ba10ecb5d195d2648e8881e07c7002ff7eaec04902f530b26f6d0b07a01d123fe5773116038465f95d
+EBUILD kscreen-5.16.4.ebuild 947 BLAKE2B 6a1f76d5d8db45cd7059ce70e1c081136a5c9f28fb0a40a9d92fdb942a4fab95df1720294e6bfde7a34e17d1d75ccee5b64eb1c74677642a842370848858cf0f SHA512 be541dd716d8226fb899acfd9de37190ff6e47d9532a18ba10ecb5d195d2648e8881e07c7002ff7eaec04902f530b26f6d0b07a01d123fe5773116038465f95d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.16.3.ebuild b/kde-plasma/kscreen/kscreen-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kscreen/kscreen-5.16.3.ebuild
rename to kde-plasma/kscreen/kscreen-5.16.4.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index daed948d9cc3..ee1d1a20d0d5 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.15.5.tar.xz 122620 BLAKE2B bb9cc80585c74690227f2f72961ff2ee707778fd4eee541840df85d04da7b5a3e8f75c7378cc4de8e45c41e1b29b67725e9b23461a0e8ff4bb00aa046100f851 SHA512 95325d3ab07afea22a10e17a2bc0f4412d57b96385b6fc058d1b9785a07914e1ce89af7a8c773615f884263dc2136fd7c7eb112dcec9d516a267262c37d15d12
-DIST kscreenlocker-5.16.3.tar.xz 122228 BLAKE2B dc28537cf4def5132d24320b8fef44f34e7fb95eb9546162bd3de20f0d2d65df1ec721dafca3679a8513d471f83d5c5e53c2e12ec581c64e1416c35012a0aae6 SHA512 4c4c43d23a3684642461e760d004ea996ff01890503f3d317c757db138d2d114869b18c62c525570c39398176c44a211f54dd2f8581cfde8ee5d777a342998b4
+DIST kscreenlocker-5.16.4.tar.xz 122620 BLAKE2B aa45eaf40bcb45d31d2cac121bdda2b8cf628444f98060932ea6595493e940bc8bb29a3cce227ee13e1549c8ee5c7e02686d04a936c9382e67a0c509b7eb8054 SHA512 04c5d695d428fe0363277e8cc20a1d39b1fb662157ef42d0f74c3cf802bd39a8fd3ff35cc64bfa3ebaa5aa89fbe84d752809c24c8e3321b31abe8c2ebb7dc72d
 EBUILD kscreenlocker-5.15.5.ebuild 2135 BLAKE2B a14c5c11963076d1a03a4fbf1ba8985e102cf9c4e6e6b0b2b7f304e25d36c508d591e2926dd407478bb76618236a3e070b1a4c286bad0b9c15b52a8b44307311 SHA512 32322bdf390d97b2d110423055e4232e15fdaea889c30e9d84b808edab65f0e6515c110e9a9d8842fee2f94a55db25bc182ca14ab2c5439b4046156b15553e59
-EBUILD kscreenlocker-5.16.3.ebuild 2138 BLAKE2B a50326029f9ac096289a2188b747006fc645b7fb5182147db1df00d4a499b578d1ceec7550e05968d9cb6005feb4dfa2784c35dbb27afe0e1a1ccbd0ebb285f1 SHA512 ffbdcf42ebdd791a16d6c1351a739a2a8ca9e0322facaec57b7ae290667d10ef76f2d6460eec5d7328a9a07a11ddc95939c0746677c0336c9028010ec5c958d3
+EBUILD kscreenlocker-5.16.4.ebuild 2138 BLAKE2B a50326029f9ac096289a2188b747006fc645b7fb5182147db1df00d4a499b578d1ceec7550e05968d9cb6005feb4dfa2784c35dbb27afe0e1a1ccbd0ebb285f1 SHA512 ffbdcf42ebdd791a16d6c1351a739a2a8ca9e0322facaec57b7ae290667d10ef76f2d6460eec5d7328a9a07a11ddc95939c0746677c0336c9028010ec5c958d3
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.16.3.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.16.3.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.16.4.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index fb4e461200fb..69d4a955ea6d 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.15.5.tar.xz 21304 BLAKE2B 8664f783d08d789aab81e40cc6d0a7248f0fe25bab20803579ce0c3869a412d2fc8fecf709b4bfe7d900dc7b9af59042d4e648d5b5730a8fb7108f4ac39ba362 SHA512 296581dafc7068a0e536fb3f10dbd56bd288bec5b93f96e5f7d7b03be6cf9f279dbdeccc8c53da21316fa18d758e92513d8f5441d9e80dfee452c26ef1dddcbc
-DIST ksshaskpass-5.16.3.tar.xz 21304 BLAKE2B 8c39a5bd6f67aa1b7218340d51a1a90c14dd5de7503605f0f22d051359815601a5ec0d700020510a8e857ecd5ce95e6d06a03a4d8c1a3b36031576715ef0ef0d SHA512 cd08827870ac002dfb45362fcd2dbe0ee61e8a621cc7dc0c67d5e6f810e96db6055cd2a2dde3fe21f93c1342e8f014e25b9d5873f38da8eeea79fb08eae27bde
+DIST ksshaskpass-5.16.4.tar.xz 21352 BLAKE2B 3de1328110a9eb699f68ec99bfc1906f856e1518da212305beeca9feb8a85fe8ee757ca8006a7d66a0cc5d49788a1ebdfbd020c054ee97a26276858a68eaaf6b SHA512 4dbda2809cb6a8d5dad072200b48695e45014fdaee873eb4e078f80dcd230ae5509c5465cc492db117eac61a072a57a90fa75b7c79a61648dd8863763a4053c0
 EBUILD ksshaskpass-5.15.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306
-EBUILD ksshaskpass-5.16.3.ebuild 1211 BLAKE2B 587e6fc37bb3ecd4f9d3fe17b11cc22228f41dadf34f3fabdf51dcfae453f22dd2a0b63c18897763a62f2ebddf697e6e2ebfbd39429ce99f43efc63f91795947 SHA512 34b197bf82cf085c5fd9c2f5af3ae895260af6ceeaff95e95f46f41116762ef57376fe129ceb27a9c5cbe5cc8f212d9c897555df64a443ca22ca452a9f98fc67
+EBUILD ksshaskpass-5.16.4.ebuild 1211 BLAKE2B 587e6fc37bb3ecd4f9d3fe17b11cc22228f41dadf34f3fabdf51dcfae453f22dd2a0b63c18897763a62f2ebddf697e6e2ebfbd39429ce99f43efc63f91795947 SHA512 34b197bf82cf085c5fd9c2f5af3ae895260af6ceeaff95e95f46f41116762ef57376fe129ceb27a9c5cbe5cc8f212d9c897555df64a443ca22ca452a9f98fc67
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.16.3.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.16.3.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.16.4.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 8ea098ea7f64..3ff739244fc1 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.15.5.tar.xz 500116 BLAKE2B 1a22e419af79685e241265d392eed7502998df88168adc4292c8500a152a8d1142d56c4a34dee409b29745d8a07f889c241b3ab9ab8f09f3eec68d1ec5826c79 SHA512 ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
-DIST ksysguard-5.16.3.tar.xz 501376 BLAKE2B 210b05c62c50f78295a6e19a455bac6bf190f703ac9c5b515a0f251d250784ea853ebfc8481c0697d22b08a756f05f38a78fafab5f2b2f6d63e187d4260ccf13 SHA512 295566778727255b00aed2d686eaedc22cd51e7e7866ec5ca0ba9d6fbae73c66a6a49a8d7ed9e61b55d8402a11e6c80cc123fedde2b5f61d022256e1e745917b
+DIST ksysguard-5.16.4.tar.xz 500548 BLAKE2B 61f83de8dc95ab662b68b834b0cadb3ff2fea1dfbd9ebf3f928a8e6f4bfe0f551e05c32ad7738b71d0580317bce84d541ad691e6280cb15e99c03310a3aaec72 SHA512 177a6ca6b3937275959f2855184e805f09e643f04787ea077ef137d0561150e2deabbe1bd0388045640f0e88c01f031804a1060ad4df14bdafb91f7daed4c427
 EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B b111aeed28af34f6abec20f61a9fa7b3c6e3ea4705d50d351a726f3d7078885250f60fbe6b4dc82ee9971365eaf441030ea2ead6142e0f21532cd1b922e66b05 SHA512 3f84a0ef64d5b2741e31599d2fe79ce886967cb3e232a63faaffd07439567c1390804524be22353ed8f26c7bd90a64aadc1a2e99aacb2a5fca81035bbd47ac9e
-EBUILD ksysguard-5.16.3.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
+EBUILD ksysguard-5.16.4.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/ksysguard/ksysguard-5.16.3.ebuild
rename to kde-plasma/ksysguard/ksysguard-5.16.4.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index fb11f3cd4ef6..0e51d3e6956f 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.15.5.tar.xz 19332 BLAKE2B b5d552500584888d6fd2662e7332623f51ec4a90885c983f492fbff8768b144a5d0bfff8e7466f68b833bbea436b9424b55f221402e1c9ddc8626be63910b521 SHA512 4a1a0b6f4d607a71b2dee3317acd0af1c76991a628be50d67c8231d756255577fe90e0f938050c8f6d6f295d5299deb8a88afbd7eac28050d3b905267bfd7636
-DIST kwallet-pam-5.16.3.tar.xz 19568 BLAKE2B c44235c5c8dd50e556393fa8bc31e270e31376b1864b5cd239e386690f26bea008bbecfd8ca9a83dd7f155fefd7370e013bf1d2cbcafa1e293b69ad75969f699 SHA512 f5178e412c7802cf2b39139164fb2878e2765b51edd7bd26b2de156e7facb049cc1f299c7611d06abb308f7df9c79c4992abd6494cc2c60db0db7c2ef0c0fbc2
+DIST kwallet-pam-5.16.4.tar.xz 19644 BLAKE2B e40cbd3ec345b9fd3d43d2d1a53eb72d3c6dfd6413d787c5b4680566477a164a2f8bf0c2c82b0a6d8d71cc8bc6c5e06d171642cf1b60645c3a70482cd9bf9dc7 SHA512 5072afd940bc0fac823a6a050868c41bba27eb48a5a04b83e70a975c744dff64d23e1a1c2fcadcdd45712be94d0395ba13d6f8565abc9767d68eff6ede4fdcab
 EBUILD kwallet-pam-5.15.5.ebuild 640 BLAKE2B 1eb4773d6f5e02a860e49fa0582fe49067b89169479f41cbcaa4b2a27b39529d7e4a9ce2f7d882501aa8c19b7b6a89c7f814ea337602546eecf39f282cac5094 SHA512 be24e213ee8eda14bf0e4a2c49af3203755c4b3fe126500b4895270baf8aa3577473c0e58c2b800759761f5f6b4ce746776b5b5af33147f7691acb8a7526be15
-EBUILD kwallet-pam-5.16.3.ebuild 659 BLAKE2B 87db00836f71e415e22d55d4d3b41dd7430275056fce5f4b05f2a1ecf73479e2dc1289caa83d70e33d0127942ec4f164d128da9e8f362ab5d313e3c75464f559 SHA512 4aa973782be2130b979df7a3ee0af73ca8276ee0f79c3553d0cb25e02338d99bf13b4ca70a4d77a354f4c42ddc4d22eed7c40e882f4d37dcb53a83720c874245
+EBUILD kwallet-pam-5.16.4.ebuild 659 BLAKE2B 87db00836f71e415e22d55d4d3b41dd7430275056fce5f4b05f2a1ecf73479e2dc1289caa83d70e33d0127942ec4f164d128da9e8f362ab5d313e3c75464f559 SHA512 4aa973782be2130b979df7a3ee0af73ca8276ee0f79c3553d0cb25e02338d99bf13b4ca70a4d77a354f4c42ddc4d22eed7c40e882f4d37dcb53a83720c874245
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.3.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.16.3.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.16.4.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 62aba376da33..e44615ac6029 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.15.5.tar.xz 18820 BLAKE2B b71beaff2c0722e1d824f833d130e2577c48716302210bf34f74fc3b5c9defd5b7501998a7f3e3bf922ca488ec16c36a18a7d881b53aff46e8e6bc60f34a0d45 SHA512 87051e785cedaf373c36cd17519e7e86d3110e6cd6c08fbff27b8fe4a890c1a935dbd6d096291dad2788be849c1c4e17bdb8014fdeb3383678a6b36cd30bab1c
-DIST kwayland-integration-5.16.3.tar.xz 19204 BLAKE2B 8e53515731775b58d55f54c679c2bc75b41e1fdd6c24b6c295709916446f242fbce99c3f4cce1303b7dd48dcbbd8f0a32d2e172f96d53f1aff771fbeebb9c156 SHA512 dbe2d1ca463af84a4b4341aeda925997cc458c97f0aa9414c1f223b248991a23159e994fbf92b1297217edf3159692d19c26ceed642ae2ef755d991d3b95b366
+DIST kwayland-integration-5.16.4.tar.xz 19340 BLAKE2B 99a775daee2772bb5d1c1d8249f4efaf9af1599b96bd0c2a0c848c93ee6f23b66c552dbab6559713ac5e4f48a08e66700f8ddff212778139db61ae1eb7b8fca5 SHA512 055e74073dcea0559e2fd92c98433d6cc053ff4adf7a69384f09a4e8de73f71c58e6da4f32c5103166f4ad28cebf8f6dcbb63ea871040d3a3bebe79a8a400c39
 EBUILD kwayland-integration-5.15.5.ebuild 554 BLAKE2B d28247ea10e8f9f971e66720bf70d7ffb84f0707d8c8a301ec5b80b3944c1b58850f2ee4863f3525104f1fbe6504ab661711bed51e306e958dd39f8bbf82854e SHA512 d27d7657ffa91e210bcb979a02223146041c1b98dc8e67cb62db28de28d368203a0af2316cdda2d8c1d70c9feb6a4b21c07e0d4448551831d4942b4460f46a59
-EBUILD kwayland-integration-5.16.3.ebuild 557 BLAKE2B 9dbf387f99e3286af76e7acd3b1ccc6e7ad5d4052f9e5dc3fb033e8393de851c5be13d42c2d470aef691b5b876c9cc4ced2ab73e5fb4ae976f69aa7cc9ddd6a2 SHA512 ee90cb760a7240b6712179af0cc2f815b2d5f809a7aafd1259cc013cf92b6137ba2926e8f8056e1be7bf1a64a4f18c8c348b2980a1a097d815f606b02f1334b6
+EBUILD kwayland-integration-5.16.4.ebuild 557 BLAKE2B 9dbf387f99e3286af76e7acd3b1ccc6e7ad5d4052f9e5dc3fb033e8393de851c5be13d42c2d470aef691b5b876c9cc4ced2ab73e5fb4ae976f69aa7cc9ddd6a2 SHA512 ee90cb760a7240b6712179af0cc2f815b2d5f809a7aafd1259cc013cf92b6137ba2926e8f8056e1be7bf1a64a4f18c8c348b2980a1a097d815f606b02f1334b6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.16.3.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kwayland-integration/kwayland-integration-5.16.3.ebuild
rename to kde-plasma/kwayland-integration/kwayland-integration-5.16.4.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 11bc8d4d88cd..f239dee88b73 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.15.80-gstreamer-optional.patch 469 BLAKE2B a231355b487c290d69100212ff14a420c48dc68395bbf4cefe7e166c03ebd529e3ad4eb366cb05188759416ef09e180d92ee3aa4d47feb37b58b5f266d370dbd SHA512 c27fd413a279e46ebf6392b138a8916588a51747aa452dc1affa80aa261bd117e05c28029cc7dc57c5ca19fc4f2ed162ef25a527c89491b2ba22a73082335333
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.15.5.tar.xz 6237440 BLAKE2B 6e1b2bccb9450a15cccdf258c9b75e5651539cb05619dec72f4c02ba555ca3a98f57d8565d1ba59a0e85436bffc7e1960f36dff7b7945789f577c28892a5871c SHA512 2ea3af33cf79e7acde996c87507d277f114f2491ff3090cb0335ce6d026ae06c6ad83aa3fd5b86bbb01791cca747291ce801fc2d93d20e6d7b88f709893a3f53
-DIST kwin-5.16.3.tar.xz 6261116 BLAKE2B 049f961ce6eb6ad3cfe9fad401221a89b6fcf05d3b042049eef2b13f3a6fddf5ad81648ac922eea896290ee5056b4d2c99fe5c5ef676c41b55425bc386666311 SHA512 1c39901fe58e845673652ced1cfea29deea593d69dd3466b8c989769fb42d2f4baefad4475f591674ba390499bbed1b1d3b35aca24bebd631335271a254ee2b7
+DIST kwin-5.16.4.tar.xz 6262844 BLAKE2B 064f1409a3ee098f2c492b19ec185a56d36d2c65432f6d62bb750026760a846b75aa36413db6478a8061eb58c1c38c3f92d734ffad23c71ccaf86918f8762c10 SHA512 da008c2fb31e0aab23dcefbdc53d9d53b53ee0aed3546585a93e87e1857fc929be3d013c7e75b8aee5651c54249a798afb1612535d03c189aeed9ad3c6b528e5
 EBUILD kwin-5.15.5.ebuild 2628 BLAKE2B 1d431d6cde25c3e2b5aeca1d0bd3ae8a4cb55768a2807785119ceb51dbf0e2cb8cac9a8ac810b11983f6e0eb3ba29d2615d49d0cb1b9089d13c9f59e7bc5a022 SHA512 48ca659b58c3b2d027e2911cd7ad6a496879a32df4b7e477d841d2fedbaf7f27b64c3094da01b0262db06373d77a54276164934df16c9c2e60af77b081b9a311
-EBUILD kwin-5.16.3.ebuild 2671 BLAKE2B 89c7eb7c98743a157a39a4e659c9f12ce1587da57b79a0d40cd0177cd433542bbca344cdabb3e9bf4a736f17711c8606586dbb47df6937d6bee1dc4d1106548b SHA512 4692b3e2822765d0490803f0b3caf129f728db4abbb60d45d3db01f845ad2e9a48eced71bb2cb52c044176446378e62c964b34055d68b729a601bf3632150848
+EBUILD kwin-5.16.4.ebuild 2671 BLAKE2B 89c7eb7c98743a157a39a4e659c9f12ce1587da57b79a0d40cd0177cd433542bbca344cdabb3e9bf4a736f17711c8606586dbb47df6937d6bee1dc4d1106548b SHA512 4692b3e2822765d0490803f0b3caf129f728db4abbb60d45d3db01f845ad2e9a48eced71bb2cb52c044176446378e62c964b34055d68b729a601bf3632150848
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.16.3.ebuild b/kde-plasma/kwin/kwin-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kwin/kwin-5.16.3.ebuild
rename to kde-plasma/kwin/kwin-5.16.4.ebuild
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 52c44b0ea069..9af3966e809c 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.15.5.tar.xz 20024 BLAKE2B 58648cd5867f0a07636e2ed9e299cea98237ccb4845aa1cd9897cb910ede6baff6def2e2f4ad42b4c90de0b5117c0c269efbc69a44636690a80b36235916236c SHA512 0c59ac76a64a20e49e14681bdf7a67194749a84ebb2224bcf183943d29f4e3669198d2a82a156a9d86b4865e1110e542dd5243045844ebc0e0bfa98bd6134089
-DIST kwrited-5.16.3.tar.xz 19984 BLAKE2B 25bbbc8273714de67f08c45714bac8adffe00d950e851155ed07aa40f70f8c061eb8d7f24a5f92abfd6495cc12e32aa9f96bdff761dcd76a9b7e66db4f33eeab SHA512 9b826146bdd2fded4ada1f782a18070ca65f4fb172c71cdcfafc0093a56e708d043506344117ce14de5f85ad3e744816aec0c362d64b49cd8d6fba167bf03c51
+DIST kwrited-5.16.4.tar.xz 20016 BLAKE2B bc873b99ef79dbc9ed5cf592b335a8e54bccb322d9f40de7be7c5b95b918c5ad68b2d1bf28f1ffac8a26ee8e861f688cd7cc4ab7e2ce513b9cdc991c536ff4fd SHA512 7307d12f197033cf7cb820c5a0579cd33b872c7f5c55a48903dbee9fff7a8c547d3d8dfe8586fa227e25a8ae365c5d006c8c6d22a092c504c276d2eee4eb205b
 EBUILD kwrited-5.15.5.ebuild 480 BLAKE2B a6dbe8ff13271f2749d8be7b30edb1b95df36671f12a75886e10c11070d5886e6680a7387a9b3d484fab03eb88abf9c9dede01b0e66a945f5e5cccf5c981c277 SHA512 afa3ce11dc93eea3e08af463ff22af8f37350e774f1c967f4e80cc36cf4e0a5d9538834e9b455f131ba3c74471383ab286099b58334fb7e6100cfdb8ccfbb14c
-EBUILD kwrited-5.16.3.ebuild 483 BLAKE2B 08e0c850fae43382431b7d5bb3f913e2be9f51cbec877230144233807ef03af2a5bbdf4448779c9326416b6f6456c5e3e935130b450acc3b6e543478a927bc21 SHA512 6bdb6d91af25c404bdd7ca370b277d3a51f832ea8ab8ab42c7afa651513daefff89db63d19cedb134a62c0ed5bd3f227d286ca7486187e46c6379ea2a4dd560e
+EBUILD kwrited-5.16.4.ebuild 483 BLAKE2B 08e0c850fae43382431b7d5bb3f913e2be9f51cbec877230144233807ef03af2a5bbdf4448779c9326416b6f6456c5e3e935130b450acc3b6e543478a927bc21 SHA512 6bdb6d91af25c404bdd7ca370b277d3a51f832ea8ab8ab42c7afa651513daefff89db63d19cedb134a62c0ed5bd3f227d286ca7486187e46c6379ea2a4dd560e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.16.3.ebuild b/kde-plasma/kwrited/kwrited-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/kwrited/kwrited-5.16.3.ebuild
rename to kde-plasma/kwrited/kwrited-5.16.4.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index a636a10c72e9..432bfe2cf0fa 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.15.5.tar.xz 81000 BLAKE2B 53193ee41d81576c8f87053dfb388ff1e13c1fc7800956228e9f3d5e776789d4649e41f39829152bd51ba0de9a1ca6fe87b63e0870327947dea939da05488c81 SHA512 038ea60f534edfd1ceaf523a2d00ecb53f62b6f64ce9900b1313f9ab25b7099146167cbce50b31c799644fb0d5c9522a9bcbaad81e9022feb7532c911b2ec030
-DIST libkscreen-5.16.3.tar.xz 81024 BLAKE2B 37579d6306d761b96686564a3c9bb1f2b081e25737ca906bcb60c1644dd5256caabb1fd86e01aa8053a2a7a5869464d5a6bff303a38c08665d4c6ff9a05ab1ff SHA512 857e92a7d466d4dbea7cac17577b7db1e4b7c0791bf1e2c39db0923902b052f5accd8bc3eb1e7863084ffcca797bea8beddb987f91c60f6692d3f6cf229ac024
+DIST libkscreen-5.16.4.tar.xz 80988 BLAKE2B 56b76114e52e44c52656829f772e6301ed655f20998389b6c8a0b79f61e17358b7510c752ff0e998d058cafa39eff5473875b2ea0796f88159215d512efd8808 SHA512 84b7e0af12f95a385575ec71cbbd1dc189d463dd7ad189a2adc49b8dc665018e36325f86d0a949310e07b90e67bc8c5ff8f75e914947a013064377579862b9e7
 EBUILD libkscreen-5.15.5.ebuild 490 BLAKE2B 650b346825abe5e379592b4054ee2fdcc5f2bbe5ff081550a8179f2d48f6d85e47d8e960b9c3105cc8b9c817c519ff7774dd091e6e17d0ae20c3ff7caecb1084 SHA512 becc6a71c9cf15fd0ca4782dc6a7afbd94f938994ab33925401d5ce9d2d87b4389b2cbbb569f354d7dc6e16d06626decad627856b6405f5ed1572e7d0c854310
-EBUILD libkscreen-5.16.3.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
+EBUILD libkscreen-5.16.4.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.16.3.ebuild b/kde-plasma/libkscreen/libkscreen-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/libkscreen/libkscreen-5.16.3.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.16.4.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 5254c149e37c..b6f34d556e0a 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.15.5.tar.xz 575900 BLAKE2B 0ebe2ae85bce2b11f8be215112504fea728e9f60e272813b9f6d2c54e51b3d60a77885ea8c95eccadaade8f929353342249bd0e7148558c0c1965ebbf7e0aac1 SHA512 a87f58c6a9237261e05b4fb1c315383fb3eacb294279c3ab3b553c0dca5e7e416a31bd685d47da4a8cc777bbcc09d9bac076b26340cf6262c7aaee903baf127f
-DIST libksysguard-5.16.3.tar.xz 579360 BLAKE2B 9268534f1f8d71f92e576ad59f81f9f951ded57de99deb6be046ba48316d67340bdea5586f77a2d3cc7bcbd73fedb4aacc69acfe36b61ed5371068c802e032a0 SHA512 37cb944cdc7ea90f4a24f6aad7dbc8114e845d90803dc1b0c85710623f0a8ee99f39a65a17ea155aa2494f7e4280698ad78da56cfdd379f879cc0f2f01696036
+DIST libksysguard-5.16.4.tar.xz 580356 BLAKE2B 9dc8ad34fb8c5beb5a960c21d993cb488da80745607bf9be6d6c4ddd549f5a9e51339deb18c9044fb507b6f01db1cc7b3b2138d1c74320946713881502dc26ad SHA512 51143a73cc9c2fb0c13ba51dcaa430689cd1b6562c1af934972fd849d58492aab89b481c1ce91a00e25ac36b6a55915080432fc70cdac27d56a9d44ad62ff555
 EBUILD libksysguard-5.15.5.ebuild 1165 BLAKE2B f3ca2e5c826808b483398da5a851ba59d0f06b231cab2b57de6b6a628647feda3ee04be3ea8afc952bea4c3ed97d336e9b2b25183d4f96ab44b4fbc019aab8be SHA512 422afe6d04e6ebcda915a9b0dcebbf9c5889d80c61e3cf5e3f9a23e0c019134aa6343bbb6093076fb34a0efb412a4e4597def775ddbb3d3102ee14dcf4e5749d
-EBUILD libksysguard-5.16.3.ebuild 1238 BLAKE2B 0ee2706a766e4981ae4cb11c2c841f5d3dbb6724a78954d345bf5f4f1c7d67dacc4450679da4de10b020124b3cdcd1c1ddbaa25e03ae11d87f576826a219c6cf SHA512 a0c8e27d7924bc5ad3a77462a69f65f83629913abc8d82d2c80fce3d3f21af6255906223253c4cbc41a8aa5a7eba43e78462291cc2735a0238aa0a1ab4e25345
+EBUILD libksysguard-5.16.4.ebuild 1238 BLAKE2B 0ee2706a766e4981ae4cb11c2c841f5d3dbb6724a78954d345bf5f4f1c7d67dacc4450679da4de10b020124b3cdcd1c1ddbaa25e03ae11d87f576826a219c6cf SHA512 a0c8e27d7924bc5ad3a77462a69f65f83629913abc8d82d2c80fce3d3f21af6255906223253c4cbc41a8aa5a7eba43e78462291cc2735a0238aa0a1ab4e25345
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/libksysguard/libksysguard-5.16.3.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.16.4.ebuild
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index d8f97601be0f..b1063af7a93f 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,6 @@
 AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.3.tar.xz 4888740 BLAKE2B 5908b1d9d1c1aff2a7e3dad1461e8bc688bcef5d2177048e12c1f471e4396aafcbea89f470fef7e92d355fa448c23d8af9b09182a5a78e7035dad9278eaa9bb6 SHA512 347be076604b29234845978e3442653507e93d892c47c63a46f659bc11f692944fc9879391bb686893916a77f3be2f12048fb4f870e7de567c3c13f034ba5155
+DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
 EBUILD libkworkspace-5.15.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3
-EBUILD libkworkspace-5.16.3.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2
+EBUILD libkworkspace-5.16.4.ebuild 1272 BLAKE2B 85e7913af4bcdba91d15292e2bbc35f58fa84d65713fd356039fd2ab8023bcb0e90eb174363a1364ee6df7a48899ee2fac5b6e9de4313058fbec38c285887f88 SHA512 ffe9f2b168f20c9b5f8686170504d0714dbf3e082b628bc29934b325fc79f228a789b75a0b433d7c44fa37eeb85118353fb495285b5690123db14d298eae7df2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.16.3.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/libkworkspace/libkworkspace-5.16.3.ebuild
rename to kde-plasma/libkworkspace/libkworkspace-5.16.4.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 1527bff9840d..e50b5b7855db 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.15.5.tar.xz 57296 BLAKE2B 7dd8fa3da98836354072bd4eb67a92173d839ac0432da5bbedbbb3c68c3d1022cb572864e3c0b0335a36efd364676416d07b7258b0e5d17db6306884e8bacd82 SHA512 4b0a7a3edc1d50c64a226ae49e3660635838bd899939004d42a33492ba9f2255ef0c3575e2155f1ff7713c8396a95afcd8659bb61c48dee639962359a562565a
-DIST milou-5.16.3.tar.xz 57384 BLAKE2B a91daec88aaf1c90de70f3f5649b1187a75501182c721f7a6f756a361883efcd9c9638d4c15e8f48fb2b6381fe012c44a5c472e8c702b5574f3c0375fd7afc82 SHA512 6fe556c795b5a1730e4228ad3711ca4628241d58358002684ee70f8868d669d0ed20b23f773633988bf800e033e9a3e2ed4369e9a124e39ab0d2f372e3aeaa42
+DIST milou-5.16.4.tar.xz 57452 BLAKE2B ea75b4bb8fac6943a5ecfac881329b63682e1305a2e7303db4cec8f628855dd30d0f2fc479a2daa918dd7c032fd9ae251928f5e1502db695913639f4c4f5dfc5 SHA512 8093bda2a19137a7faffe308bd040c2b4574c4c2bcbe794b9340f33204a3dd200f8d31affde6fb592c288cdaa36d3e291b7dc42a294f1fe62ee4e5cd203a20cc
 EBUILD milou-5.15.5.ebuild 666 BLAKE2B 351ffaa6d72f89053cf4a167462f08ad39ac9064f9c1b93d2f09f0d402f9b0a6ae0c5a277e36ddbb2b2d0df52c7b202e536c79885d9db5496a8337a7fb2e16e8 SHA512 02413ffc787a664d9a23f07561942ed26943fd050967b7f51566bab98bb341b19811b24bc09332b53a5d7549e9f32c4d476d1ed61efc0cdbb4bbf3e9c6847360
-EBUILD milou-5.16.3.ebuild 669 BLAKE2B b818224c34f27697e7ac86cb4c17c183fe0c041a7f847ab7a70966a4e4843730daa82db0452b3d983a73502723b248a0e9d46d7d22a74a4711163dbd467b167d SHA512 27001ad5ef00737b43039cd77fb02c2507614c991aab955c71e023f6e73df1cdc2646e55927b498fb8576c5dd86236dfa83b606fe928257cd19ca74638974dae
+EBUILD milou-5.16.4.ebuild 669 BLAKE2B b818224c34f27697e7ac86cb4c17c183fe0c041a7f847ab7a70966a4e4843730daa82db0452b3d983a73502723b248a0e9d46d7d22a74a4711163dbd467b167d SHA512 27001ad5ef00737b43039cd77fb02c2507614c991aab955c71e023f6e73df1cdc2646e55927b498fb8576c5dd86236dfa83b606fe928257cd19ca74638974dae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.16.3.ebuild b/kde-plasma/milou/milou-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/milou/milou-5.16.3.ebuild
rename to kde-plasma/milou/milou-5.16.4.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 7b655d77a954..6975e6e66cb4 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.15.5.tar.xz 4473020 BLAKE2B 1c7fbaac142e80ba14b7fa99645590299b3b0dbc973ff12aa23114d50a4cf61fffc274c066ad90925e7796e3475a00752926b417f18705fe5712a5bb120b0c67 SHA512 fed946bf50e7f58ee247bd63dab2a5c371bf6d2c75cc64924e3de8e9b00faa003e2949dc78cc1babb352a043389d7f285d96731cedf0200b660d99131db0ecd0
-DIST oxygen-5.16.3.tar.xz 4468468 BLAKE2B 074e4d0abc622850e99a580e2d6231fff736aaa033ee9990a73fd2d6462b788624da5568fa32d892d8414f2984229a3bfff06428935b5fdeadf2fffc3751f632 SHA512 90dacddada4ffcc9dab398a08ffdbe0e40da43fd97870f74d962823f62d454836f685a55eaa0c34001aeb58095b9ec52177a22bbc18b40e316270d6989d26340
+DIST oxygen-5.16.4.tar.xz 4473512 BLAKE2B f1d61cb3c7bc127ac992d000bd0c38a03a7bea87957546f41d534cf3a7993e793a852458354f2727bdcbdc520bd859b09c58d9c6e2e6a975733cececeb8c6558 SHA512 86d52bb0b490331d10535c2b27d8279b82aabc68c6de8638cbe4f52d14a6b9b8206a95b0982ac3ec68026f522082b2733478bfddfc7566cc395690c4180a2d95
 EBUILD oxygen-5.15.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.16.3.ebuild 1076 BLAKE2B feff596c810b622049d8b155c6f101a29c8616372edaafa6529a3bf0562fb978eef0c8d55f414eff009eb6fea40292a66097292db70dda522097868bda8e5d30 SHA512 85299d2824ab0d4e436ab31897c051b735adabcb460d27ba501b14efe555a91873b7ed1d5960bdb46eb3a87156f61dfe95f36af09e22f21fc11ef9f2c7adea84
+EBUILD oxygen-5.16.4.ebuild 1076 BLAKE2B feff596c810b622049d8b155c6f101a29c8616372edaafa6529a3bf0562fb978eef0c8d55f414eff009eb6fea40292a66097292db70dda522097868bda8e5d30 SHA512 85299d2824ab0d4e436ab31897c051b735adabcb460d27ba501b14efe555a91873b7ed1d5960bdb46eb3a87156f61dfe95f36af09e22f21fc11ef9f2c7adea84
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.16.3.ebuild b/kde-plasma/oxygen/oxygen-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/oxygen/oxygen-5.16.3.ebuild
rename to kde-plasma/oxygen/oxygen-5.16.4.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 0753001545eb..b053b9576e04 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.15.5.tar.xz 118136 BLAKE2B fc5ead642b561ef383307fca9c06424ea17278fc951bb46f6555d31e7d9d7762a2e211054ba61a6ac83fcb817017745f9773402fdfb1a286fde5be301aadcb44 SHA512 c3f1ec7ebcb06ee6dc807e639cffb373cfe2d2eb549b18f7028e13991154107f474d923fcceea809399836bc3af6299993f91e7bfa85ce80e85c212640b1750c
-DIST plasma-browser-integration-5.16.3.tar.xz 122640 BLAKE2B 19b4b6686742224b3bdc488955e6a3f6d0e4d0dd271ed46b47392a882c4d62b7e1fe259f30cdb368c9160d1a1349c0fba7e90402f973e07ede4bbbfab5502038 SHA512 ddc04393207708c183eed6235ff1988bc6922008dfb82e8ca85a865cd3a07e8759794fe0b19f10e48a3287c62c9774dd41d822e0ad1852b74eace193b182afee
+DIST plasma-browser-integration-5.16.4.tar.xz 122968 BLAKE2B 49dd562b2875a1b05085ad0e1eba43930f07a47403607eafdfadfe50307586343e6bdc1b50e0cd446c6d067bf493d5a3faa5e32f6f6692bfb67521def3b92442 SHA512 c4225e351ac9f465ea4db635d2f982d1d8f0dc72f9278da28eb548ec535a0f3ee73050620455f40e89f19d9c11c9902516bdcf6248fcf1f829a4d0161a5ea216
 EBUILD plasma-browser-integration-5.15.5.ebuild 789 BLAKE2B 7ebacc54feabf28effc14b439a1f989d0092930984b4ed18ce5aa5d2ce41467b9c2fd64fa540a5ef765610d7270b9df4569a9942d90a61de1eb66a04b1f4829f SHA512 e22cd5349e52f11afb652c1add7b9964f67a7129709a9ae70429f9d84206c27aa36bd413f7e13269991cc63b64e8505162969af255cceca92f1baa2a58b22d01
-EBUILD plasma-browser-integration-5.16.3.ebuild 755 BLAKE2B 8ac1592ba992838e1f3600b922ef6c2951876fcae50de6670b521f7baf1219f6994bd07cbbfb97b6358662f876cd531e9244b9544ed0bb53121a0a29425a9a06 SHA512 4ca521c04651d590db676a9eef3d4b1634022edd68265f084de978b2c5610d73a2a82398a3950fca4c2e74dbdd915255ba0f41beeaf37eaf3355e113b5a78704
+EBUILD plasma-browser-integration-5.16.4.ebuild 755 BLAKE2B 8ac1592ba992838e1f3600b922ef6c2951876fcae50de6670b521f7baf1219f6994bd07cbbfb97b6358662f876cd531e9244b9544ed0bb53121a0a29425a9a06 SHA512 4ca521c04651d590db676a9eef3d4b1634022edd68265f084de978b2c5610d73a2a82398a3950fca4c2e74dbdd915255ba0f41beeaf37eaf3355e113b5a78704
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.3.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.4.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d1bbb340ca04..ca1cb1226538 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.15.5.tar.xz 9285792 BLAKE2B 27e44bf35b6c317e8e7d3074c089d1cf5106066e52d5be5fbec36096e1df86d5004fc84bc9693d8d396711f7a94ce5d709ee8c9a5b867ccdfaa5dd016ad14964 SHA512 ed7578d92a908bebc3bc42cd7900704253a7066f667deeed35d5efb291711a364a7026bf9d12510a8113f9d52d6e9297f500c5b04bd8f9522f071da0f240432c
-DIST plasma-desktop-5.16.3.tar.xz 9501752 BLAKE2B 4c1845b80eefa21bb0c5febd0a27e257900135fc057163a6a8bf0b647ec3ed7840bf19b6325f9e41ef182cacd6f4a6e11b6eceef1617ddc0b4e46c706bf0b183 SHA512 6df46fd1b76fdf64d406b08f2157cfde940352a07542c6a56128f11e0d4cb9a4f7f1be45cf181972447e02500eb85956e7c7369f88dc9bbe2fcd21e0c0623753
+DIST plasma-desktop-5.16.4.tar.xz 9493536 BLAKE2B 4b893891a2c484943996d251817011675747322103561756156de9d2a1975cdef1baa97bb7e0e0bd3ec14ed91e3f9f31006c17eb8942b01988f2d4dd17946590 SHA512 3f91cfd2519340e54f575707bb2c46a4a21e5ddbd55e554ae5c931bed412cfc48d9dc8c84baba26a909bf98e4e2586c692737efa8903fb4f22541209718937d7
 EBUILD plasma-desktop-5.15.5.ebuild 3776 BLAKE2B 67b884879ce313c04c6af99f6a78eecc54deef27dabb82173910f352d64d2995e45d017b2940707bbd0b9494f9a67d3f208f0ce7e213216ed6d15f2548f1a135 SHA512 8200a34a5bbf6ce047175099c7734c5122121950880460ed64a2a5bafa9a9d76601cdb93809d499bb8ffa85dd4c90d88c23617905bc7f992e306135f299ec2a8
-EBUILD plasma-desktop-5.16.3.ebuild 3818 BLAKE2B 5ebead272e552e075a6f8287e87d7d575c6c60a1d0cfd8350d5e468c3c1297e07206873427d4bc9695526f5b0b351eebf586e18602c1df5fc43798a695e62ddd SHA512 cd71e6db0207b65750cf2cd936e4d1004b51aa9cb2a3cabe74ee909c08e9a1c1fc364a2fec3e9f316fbf0242178906d82c9f2126f5309599f1cd663a8a274150
+EBUILD plasma-desktop-5.16.4.ebuild 3733 BLAKE2B 2031d2ec46488b30f64d8cf9f9bb1f2d05861beef58c83988c71a0c58e816f679391e5541fd2edba6fea8efd2e5fbc094f74f26485670d987bd542d64fc75b1b SHA512 6b4609a5602602ef4c93944931f076cd3f7419ea077296e8e15ecec91d10a83e7fd38765924180c3bae1d171e24b84cfd7e2b39c83296454aadc805c5eeebb5e
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.16.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild
similarity index 97%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.16.3.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild
index ab37870a75a0..efb25ab3770e 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.16.3.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild
@@ -109,9 +109,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtquickcontrols2)
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index f1fc5216520a..4ede400b9e6f 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.15.5.tar.xz 55380 BLAKE2B 8388641685477a1778d0ba455c4d2bbff36b0c64224c9a616e6174b1be4e7b7d1b800ac976f1ec90f84ca5945ec4ccac4db5c84d5a3862f6e485d55f8d134486 SHA512 544fce9aae17eb9bbf07267a6d05a8ca34bcb8d33fddb9021dd844e1f20f26df985ddc659b2996be01e49023650893c56748c7d5572810fab7e3e8b6d74b3837
-DIST plasma-integration-5.16.3.tar.xz 55676 BLAKE2B 53244709399bf575c96c9bd3ae56ad440b490c37cd43406f30114648cc7263e10a84e48f6fdab9e3ad4925d38a2b0cb633a623d8a17f1bdf333cbb831e5f1eac SHA512 8bf273c4348498c567eff5e3a185d24e8f2a04a1dbd8755e6cbfa5c62a59baf0c5ba367fca5fe1a1720c9fbbd8bba4c7d57aca73c119824f6ff6dd6d630b429d
+DIST plasma-integration-5.16.4.tar.xz 55812 BLAKE2B 03a22c27688ba1b2152ab45affd75b7cce5ed03af1b633fe4c96c66af0c40725b62895998e3ede2a620b7415687671ea370b7a39fe6b08ed2cabe5fab24363b6 SHA512 a106aa1fb36faeb022501361434c66dbdc68a9506c395df2246fbb263ab69753dc243690b31292c35da44505482373078dad60cbaa1d5169840edf31b5b8103b
 EBUILD plasma-integration-5.15.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
-EBUILD plasma-integration-5.16.3.ebuild 1061 BLAKE2B de6dba39b5478dfc17cfc75db01423227c38493b7121db0bc60eadbb32ef618ed4e465ad373b86e5e418db261e53f9b634e7b56c6e2e2ac3b8ea99f6fa6ff831 SHA512 acae6a3285cfb9813155eea32abb7593fcf80b547405de1e4603c7509df0078877df4e00c4d7aaceb74bcaba6b6df073214591e99328fc3cabcbb36714fa5bf2
+EBUILD plasma-integration-5.16.4.ebuild 1061 BLAKE2B de6dba39b5478dfc17cfc75db01423227c38493b7121db0bc60eadbb32ef618ed4e465ad373b86e5e418db261e53f9b634e7b56c6e2e2ac3b8ea99f6fa6ff831 SHA512 acae6a3285cfb9813155eea32abb7593fcf80b547405de1e4603c7509df0078877df4e00c4d7aaceb74bcaba6b6df073214591e99328fc3cabcbb36714fa5bf2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.16.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-integration/plasma-integration-5.16.3.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.16.4.ebuild
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index bb404cdc1bb5..5dd6c7dbcec8 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.15.5.ebuild 3832 BLAKE2B 19e6f30fca31b3a3c77b13628497ff1ef48e5048c7b3bb59a4fb77d0dfd777d28bf792886ac34ceb3750113880a618c43e4459b24d63dce2a7b4437c2ee7d369 SHA512 c98d716c46660212508f411bc13c747363f06112338c981d98bf014c802689136ad2395984a1e2141154832cbc0d803898c709c5c2a064ce7e868f2fd7316b10
-EBUILD plasma-meta-5.16.3.ebuild 3835 BLAKE2B 2d85741ad7485e1b9aab2c052884347263fa2166e7c34d41e2567b3e41639a4878db5551756646a37a01a9f6ba26854e3bcca7279d514941c21b58f656b30ca3 SHA512 611d6acf557233f5034ba03b31db8b871e31ca6cd745d3c16058867d200f3fc343716ed1eee9f890b2bf081ffb0ed1cb2ba00d6c78e1074825c8076a6da05a37
+EBUILD plasma-meta-5.16.4.ebuild 3835 BLAKE2B 2d85741ad7485e1b9aab2c052884347263fa2166e7c34d41e2567b3e41639a4878db5551756646a37a01a9f6ba26854e3bcca7279d514941c21b58f656b30ca3 SHA512 611d6acf557233f5034ba03b31db8b871e31ca6cd745d3c16058867d200f3fc343716ed1eee9f890b2bf081ffb0ed1cb2ba00d6c78e1074825c8076a6da05a37
 MISC metadata.xml 1917 BLAKE2B 065db6335ecc51b0de9a52c3b44c77c6936ce27e765c960d908ffa87a84e2d88d584988d14689277b0577627127def243252d5b827d81856717e4f57f4e67092 SHA512 16224a45e1475917b3618b19f0e00d537d4183efee8d7a98c73fd7b1736ecc9471a64a2e130d2a4b385a139be40623e61c9bac20ec1b64502bc85b2dd8a2df9a
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.16.3.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-meta/plasma-meta-5.16.3.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.16.4.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index f1875cf77b1b..fdacab1d1105 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-nm-5.15.5.tar.xz 777140 BLAKE2B d75ad6c04587f5bc115268f2bef50e0f6dd2b8b86957ab1f43e284988039fb7d9530cb03d86f5c49bdf6747bbb6ad123c7bc527643fe7461ed91efc93c63e563 SHA512 f3f78f40b754de5afbd63c5713e684fe3d37ae25af5a9e6ba808647e0d7d4f23456ed4b94aa8138e1fab99e7f7d7e0dffb697e0e46c99bd312bad5e2a7b9833f
-DIST plasma-nm-5.16.3.tar.xz 785208 BLAKE2B 0b1ec5312ee42a5b01400c72648ab298447545856a602bfdcde9776e38f6c900e43db3511cc838e0dbc2858be031e890bc549228f389527157d645fac1bc6701 SHA512 ad48ce3e2aac9900b7c14890379e53b6b6543bbca4fcf5de1af7e7fafa86572fdefca0b938537aa1e1d5c84685d8bcbeeb6de07e30010630d811c251cdd015da
+DIST plasma-nm-5.16.4.tar.xz 788152 BLAKE2B 4bcc58f365ebf428d80c85783e11e23916efcef697902daf966f7a959824e542333ff87c3e475eb76ef6cf61de6272629031267b25676d2a68411f0584f95d48 SHA512 ebc6864e533179bf8cb85d8010c85c4180d93954a1d97072c550db391167068c78e29e7529b3d1f323fd1131d8a375cf2bf542c02a7c2a2098d827e311ce4e9d
 EBUILD plasma-nm-5.15.5.ebuild 1982 BLAKE2B 56527f9910d7ed2ef8d8e3cc13564d4d99cdd5dfa8813f6e22e8ac309adff498a142c2cc7b00ea1e7efd696bc16a2d1a67e1ccbd0ca93e3a0ad0e3585ac8ff65 SHA512 97d12474943bfb5aabed75d3f385a11cf1c4b4d9c6f94fbb3e7c457e0a51cf3bb74f7ef2991199ab1ce026338c00cc57d403ac2576b20924d251cb14c8ef3146
-EBUILD plasma-nm-5.16.3.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210
+EBUILD plasma-nm-5.16.4.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.16.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-nm/plasma-nm-5.16.3.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.16.4.ebuild
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index cf7088934ad6..5a69237e5340 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-pa-5.15.4-gsettings.patch 20407 BLAKE2B 872458be40b049d415e24559f9d285554f5449d26bde238bf09488c6f1453c0e040561425e188cf926a76a15e3957da2e8ff106e5f8d074a19b7453d43cc91ed SHA512 19b42891eaf3f53ee582fb96d63b2def3e28c037252f11dabf17e2b00a7b84c763fefd71e779a421fc6706809fdad8800625e94b6ea276e03d6461d3e566dd66
 DIST plasma-pa-5.15.5.tar.xz 95964 BLAKE2B 5177f5aa9944d1c61058791e977b8c2dcd92e8b8d0efffe0a80eba9123443e13683e26ffd94ade01fd6be585a5598953f2d4bfbd3775944d9e81148bbac793cc SHA512 e66c9ac36c7964738f7f2947120f6a243191c75faef2c9b4831410487b6274da782f8a51d29a1f6d3b7ae81a96eaa6115d0629fded0700777856a9307a15b5f6
-DIST plasma-pa-5.16.3.tar.xz 100436 BLAKE2B c3a207710b9aa77ed519dd4245e91a90540181733a42a8df47e0a0364798c8b29a63f380860c5b4357915cfe7e3bf459533b98527023b736f84472581c7cf895 SHA512 c8a7118b6fdda623e67b08eea6d1d556eae2495c1f3b356fc34dff0b644c0c6a81f0c0a21c02fc55f60c37430b2d45a5d14127a12fee1eece2c5df59d90f36bc
+DIST plasma-pa-5.16.4.tar.xz 100748 BLAKE2B c604cc351095a045a941ed003b645f74c53388f8cf5ef3fed0e499e8213f4b7655b56347d6ee4cf3427b4ca00f258f195370f5efe6cb26a01b95c05101108988 SHA512 cb26f7b0ab9373a71f90a63a8baf5a9f7733e58377983b3b4403f528704dcc37b0ad5511028770cc036baf01816bc2a00c5fe831b1425f0eb4543585b3b5969d
 EBUILD plasma-pa-5.15.5.ebuild 849 BLAKE2B 544c6d525c4cd28d89448ecd32a33430be771a412727ebe51a26fba6fa1db407ee8c24bbf4272564a561f5884ffe3c0a17b1a22c6faa56c33853ad518dd5647f SHA512 79fd3a894b4912d685e258df6ae38400f15a8dc441a70b8737c480d4ee420e617bce00f92f491e4249a655364938b48bc694cfd135a73db5e6336a83122b95b4
-EBUILD plasma-pa-5.16.3.ebuild 757 BLAKE2B bb3539b4d519d0766c2f8dcf0e57893f9a1cfe23a752da06dd5bfb0e8f3527562c7db799bd6af6038089dc53af63cbf941e724ae969b057f9b34cc3a30b52fa3 SHA512 0496e13cdecfb82f7da72c0b44b16510f81166c8fa3ea23914fb1e2cd20b33f1881b5cf3a5ed1dd754c5b15d6086f65817e59838bb2ea9015466508d30dc5aed
+EBUILD plasma-pa-5.16.4.ebuild 757 BLAKE2B bb3539b4d519d0766c2f8dcf0e57893f9a1cfe23a752da06dd5bfb0e8f3527562c7db799bd6af6038089dc53af63cbf941e724ae969b057f9b34cc3a30b52fa3 SHA512 0496e13cdecfb82f7da72c0b44b16510f81166c8fa3ea23914fb1e2cd20b33f1881b5cf3a5ed1dd754c5b15d6086f65817e59838bb2ea9015466508d30dc5aed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.16.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-pa/plasma-pa-5.16.3.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.16.4.ebuild
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 99307b4ca335..ded9b0a52371 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.15.5.tar.xz 249732 BLAKE2B 305794c1c6098c2f5750dfd3b10506b5494e84256c6c1198b78668fa9d304d9af314e23ec026d4e5774f4c277a65911a109424839bd4b6c39f8a5fcfeb41eb3e SHA512 aff109eeb879b66b6e076ec333703f4e9202ea73f4c97fb05538755f1c0d96d41d2b01a2ff48c050632dbbd848cac4e528aa90be374fd4f2503140490a16753d
-DIST plasma-sdk-5.16.3.tar.xz 250308 BLAKE2B 0b72ef5e0c229abbdfca9b645e0569ae1f5eb84e36fed4d53d2f654f9f9e69683fb6243ad5f5196140ca20b602884e297f0457e790d6166fc6939d47fe6ecb08 SHA512 b51534412c0197fa84dc4e308aad25aa9e886eaaa2f3ae0a038ddddda43371d18cd142f4dc4ebbc5dc43fc0082b802a70b0dae3b55ece25a4084431d34a2b7b6
+DIST plasma-sdk-5.16.4.tar.xz 250456 BLAKE2B d8453be4398f1ebb69210ccc1c7fcdb87c7bbdba19448cfa3a5b104f7dbb7c3c7df1ef2e0b81c808ab7a13f6af4050bc981a6dc8167df780e31f7d52d10b2ab5 SHA512 872aa5436667e2d772bf149cb3bd40c1d2559559211907226ae3cb23728336c665870f1f9bcca49886ea3472eb012af2bb96ef20f1ec160c30f93c5aeb7e50ed
 EBUILD plasma-sdk-5.15.5.ebuild 952 BLAKE2B dc3bbcc3dde15d2dd670d560e1f528db474c979c79bbbdc4482d2e0a195f99eedfd99424249466181c837b231bacdccbc2630847c04cc097b7bad7b167790fda SHA512 572378e3210c1fd8793745e5dacafd8ae0df0dbd56c583334f27d58d53e889b735404cc6d023433d5a3d622a7868f7e32b3529cdc5b82a2956956e2dcfb50f97
-EBUILD plasma-sdk-5.16.3.ebuild 955 BLAKE2B 416777a1f2e77a4362238ebeb4fc6e19b74d23c777aec1440c23609500c808bf3c6ca837214d20b58278115e47db9438d700bd160bfd1726848dc993070f7bf7 SHA512 64b78163e0d3508fb7855b947b85cb02752619467e8c1b3d9de1f68f089f8311e2a11208b17f20106eebfa621b32d4dd9af2d95c5b6e38de8853f4e4f0a8a144
+EBUILD plasma-sdk-5.16.4.ebuild 955 BLAKE2B 416777a1f2e77a4362238ebeb4fc6e19b74d23c777aec1440c23609500c808bf3c6ca837214d20b58278115e47db9438d700bd160bfd1726848dc993070f7bf7 SHA512 64b78163e0d3508fb7855b947b85cb02752619467e8c1b3d9de1f68f089f8311e2a11208b17f20106eebfa621b32d4dd9af2d95c5b6e38de8853f4e4f0a8a144
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.16.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.16.3.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.16.4.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index d90e7b19b514..2dc2b70cd21a 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.15.5.tar.xz 123880 BLAKE2B d844b31bb0d40a61cc3df1a493730495a73adc2f7e9582279a4ca6d87aac15f45128340093c06b8e1c841abec7a0806acaa6a99525a1793202f3644359699ca2 SHA512 815f45163225ba692fb2b1745c7f99e1ae06509850e82f46807b17664728c2f3667844c42035000d04da6a360913a217edf6f6768bb50a910d316eb7770d929b
-DIST plasma-vault-5.16.3.tar.xz 126972 BLAKE2B 68b1107e2f6a1cd8091d9c6b77022a71c23b75bf337247449a205038fe84df6198633f246c91af263f8e01e26676ed66bbd2857de1b0d88315344cb7bce5721b SHA512 8a21232994d75b57c8f60d3ae34750ec63cd686f3e97ae38feaa064e89d46fda062543df5c5ebf6f905178cd63017f754e7b4af82a38e3aa27a6d6e12304bd05
+DIST plasma-vault-5.16.4.tar.xz 127008 BLAKE2B 6b66022e4037cb49bd4c733c2ff108e67a337bf52c77c6e89a5aa842fbd81ec173410a49bd9de85335893f107490becf0853e965e1d2fc675cb36593224e99fd SHA512 a782b92489edd0ec3ef8f582c8fa92c567365aae51c896f1166eaccb2ff250e5974be5186686824afbc5c74d0daaa399ea36ddf61d7d573473a9e360aced7852
 EBUILD plasma-vault-5.15.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
-EBUILD plasma-vault-5.16.3.ebuild 1080 BLAKE2B 3e12c53bf5ce48478cf6d3b88643de735e87bab5c385a2f09ebb40eb6385fd67e54216fd33ee14052ac8b1f821a10dd4de359b44f0921f0da10eaec8fd501c63 SHA512 43c76110fc2fd3b201ea3569621acfa0b0f3db82717be3fd8bae27d67b3336d0e1023b827313e693341a04385818f78c1844850d741e448132650d196fb84217
+EBUILD plasma-vault-5.16.4.ebuild 1080 BLAKE2B 3e12c53bf5ce48478cf6d3b88643de735e87bab5c385a2f09ebb40eb6385fd67e54216fd33ee14052ac8b1f821a10dd4de359b44f0921f0da10eaec8fd501c63 SHA512 43c76110fc2fd3b201ea3569621acfa0b0f3db82717be3fd8bae27d67b3336d0e1023b827313e693341a04385818f78c1844850d741e448132650d196fb84217
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.16.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-vault/plasma-vault-5.16.3.ebuild
rename to kde-plasma/plasma-vault/plasma-vault-5.16.4.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 0f861113cf89..df0e315d3723 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.15.5.tar.xz 24354892 BLAKE2B b3beb39f377d0fc8265ac2c2f18c07806b548b44cc0df6e3b69727d876235dd434019e2e4721168942454e08612f271e555bf76355f121edc1def03a1c4fa32c SHA512 088e22bea249be02c72c1fda974be1f9de3bfcfe009003de5bdddd256834679fe644ae4ff4e9090a99fd75d4c8b8681113e29f13b015bfdafe568a1871a43704
-DIST plasma-workspace-wallpapers-5.16.3.tar.xz 34171428 BLAKE2B cce4d2a1c46a8d2099d2d4cc2f11fbdbeadd5771c59c59726cc1be459232a0c984a091a50c157fbe7edb4e4a24492429ead56be226c3a0ba9399c51cb0297859 SHA512 de804ebf6756ecbd48e93d9e505c345b65360609ba70bd425bbec4344c29a3a77a0457315b4da71d39ec1cdc82de56129f9e284652763feccd7bd406d9ca54b3
+DIST plasma-workspace-wallpapers-5.16.4.tar.xz 34173424 BLAKE2B e57b5448ca4dab1a84ebfa6eefffd775d722d2669961a291ec758f17ca618b1e3ebc5f2c22f33e7661f93dccc227ad23ed4bc40856ac3bbda4c0a56c556914dc SHA512 9bf9e7d6380e145b28b6d67ff33df2096729fbfa492c5e467faae2468199727735c383abdd960a012aa00b555632b1497448f8150d7279aaa9557501e8d5d3fb
 EBUILD plasma-workspace-wallpapers-5.15.5.ebuild 352 BLAKE2B fc2880c1709d2536cd641f0834546470636e8939323eac5ac19e75dd9603e91129b82293912a06f695e08f3ec84d2eee79c5d49a594fe3a077b37395a32bbd51 SHA512 312a12f19ff9c33022f081630768e442a0f8d4440c7eb6b029d493003f0a18e8021030f930033a76f500ce2dfbf5d5c4d9b0020e86719ae2819dada1e12e224c
-EBUILD plasma-workspace-wallpapers-5.16.3.ebuild 355 BLAKE2B 316f4c1122c50aaea629d71d948f899e357b2dffbec7f8d2e505b046e7fb6cdd7481a250d089abc1b2291e90a37244cdc466eaf94edeab561560350657a33a06 SHA512 e92414131c34322c80cab7d7b3fc968810028af98c09143213cf9d7a9047ab7043eea60d1d80117b6d2b763696630be1359d4bfde548feb3aa0f832bb0674ee5
+EBUILD plasma-workspace-wallpapers-5.16.4.ebuild 355 BLAKE2B 316f4c1122c50aaea629d71d948f899e357b2dffbec7f8d2e505b046e7fb6cdd7481a250d089abc1b2291e90a37244cdc466eaf94edeab561560350657a33a06 SHA512 e92414131c34322c80cab7d7b3fc968810028af98c09143213cf9d7a9047ab7043eea60d1d80117b6d2b763696630be1359d4bfde548feb3aa0f832bb0674ee5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.3.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.3.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.4.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 1c98888735f6..d8e671765e9a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -5,8 +5,9 @@ AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d876d1c4c27f8221c9854af155fc4c0dc0c6cb591fc944f07c3196d64438011db6c2833b4030d0ef76e6a49752dcd1267a94e7686af06e5bda SHA512 e8de504db8b4f23ef6c09aae9d9fe88f88ed3623b6b5766e5cf57ccf72d5d31778f8f8ba5483ca200ad6d6fbae1346655f73ca1ef880d3eb1a5775f258501938
 AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd264e547ed1f33e2dcd21a501fe83638c56c51e3ea17502b7622b1d6829927cd1396f01356957f686fb76a825de272541afc7e67436d20a46 SHA512 69eaa3393b3e0dd0251df4a577002e4bcef4604b4293f08e5ad9a5ef98367a5ce67d2238e3f84acb8845e4fdd80d570a651ff5f475e43439763ad3dbc994241e
+AUX plasma-workspace-5.16.4-no-share-dataengine.patch 904 BLAKE2B ea9c8b6505e3bfd9b35a0ef02f4e6fcb4ba5ad011872bf3803ac12dd07115bceed58fce5d9a7b8042c0bd7c26a592561dc120e8f4f908cd352c46ff6f9d86db3 SHA512 bc79f69a50119d11035c0644a6d05281ea23ae29e662808a0a3384f3ec63049121b73bc1bb8c06b58c5b3f42fec8d5d45c9139e50466c628aa1261edb45b877a
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.3.tar.xz 4888740 BLAKE2B 5908b1d9d1c1aff2a7e3dad1461e8bc688bcef5d2177048e12c1f471e4396aafcbea89f470fef7e92d355fa448c23d8af9b09182a5a78e7035dad9278eaa9bb6 SHA512 347be076604b29234845978e3442653507e93d892c47c63a46f659bc11f692944fc9879391bb686893916a77f3be2f12048fb4f870e7de567c3c13f034ba5155
+DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
 EBUILD plasma-workspace-5.15.5.ebuild 4827 BLAKE2B c5650f76b65ed3307d8c523eb530d26275a7be8964ab86a24813b9ee449c866ecfc4231996594e6a41453d8b2496fa352c2c999d257aee83ff5af46b9cd0b748 SHA512 c83a13992946a5c4842bef073798616581e390b401ed69be32ca372240b442aa8a575c1fd1658876b4d8334c95aa51f69a13a0df3131239beb870e3283148f8a
-EBUILD plasma-workspace-5.16.3.ebuild 4704 BLAKE2B 3fbaaf94b7ecbaf92285d286de4f79dba7d416399676f599c421be9d6f10811e1fb74a33c4793d26111002ae22484812eb067bae98252675e52bdc576b9ca9c3 SHA512 a02ea8651d8494d0cbd7e58e78adee26581830e2906ce7cda64e43533d06d4dea02491c72cd519655ad0a1763d1e32bff5229022e6b7e87ff9704c13cb3f0288
-MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
+EBUILD plasma-workspace-5.16.4.ebuild 4699 BLAKE2B 85c1c7693cef26e646c52632f3caff10c30b6dff4a42f52ddf93cf75a6f6704a31a20f132406882d636ffab7a6f1d3a7543f0d5804dc06304196bd320a3aeb02 SHA512 24a7a337c7a03f3205ab80ca542e79e76b02cd359634d7e5e5eecc58451aaf8b159fb515c52a889341c8ee1c1d7e52995977516734bd0db510a030ccef85e4ca
+MISC metadata.xml 708 BLAKE2B f63263b1645f6fa916f39a52c20e88668cc97344aa5c35b9be7867522e19dd164486468ca236cd85df169a8d8936ec93efed6d2bda85378ded780b2880ef9e41 SHA512 f10a644861ab6f53bc23d77f95341b18561ef4dbebdee9682dfac62b06982d49f269ba7d35881e52d3cac6849abc643ea57cb60d986daa96b5b44e203563eda9
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
new file mode 100644
index 000000000000..dc5214b30361
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
@@ -0,0 +1,25 @@
+See also: https://phabricator.kde.org/D22691
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@
+ include(KDEPackageAppTemplates)
+ 
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+-                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
++                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet
+                     IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
+                     DBusAddons Wayland CoreAddons)
+ find_package(KDED CONFIG REQUIRED)
+diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
+--- a/dataengines/CMakeLists.txt
++++ b/dataengines/CMakeLists.txt
+@@ -24,7 +24,6 @@
+ add_subdirectory(time)
+ add_subdirectory(weather)
+ add_subdirectory(statusnotifieritem)
+-add_subdirectory(share)
+ 
+ if(NOT WIN32)
+   add_subdirectory(mouse)
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 7c6938f31a7b..cc387a9b356f 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,5 +10,6 @@
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
+		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild
similarity index 95%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild
index 80931e5994e7..cbfa3e41d201 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild
@@ -10,7 +10,7 @@ inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"
 
@@ -36,8 +36,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
 	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
 	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep knotifyconfig)
@@ -81,8 +79,8 @@ COMMON_DEPEND="
 	calendar? ( $(add_frameworks_dep kholidays) )
 	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
 	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
 	qalculate? ( sci-libs/libqalculate:= )
+	qrcode? ( $(add_frameworks_dep prison) )
 	semantic-desktop? ( $(add_frameworks_dep baloo) )
 "
 DEPEND="${COMMON_DEPEND}
@@ -119,6 +117,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
 	"${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch"
+	"${FILESDIR}/${PN}-5.16.4-no-share-dataengine.patch"
 )
 
 RESTRICT+=" test"
@@ -139,8 +138,8 @@ src_configure() {
 		$(cmake-utils_use_find_package appstream AppStreamQt)
 		$(cmake-utils_use_find_package calendar KF5Holidays)
 		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
 		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package qrcode KF5Prison)
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
 	)
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 275cf6b2268e..b77acabf2e76 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.15.5.tar.xz 39588 BLAKE2B e7e418dda806645a4d1ae47f817208faebda82ff5670c20473ed19b9a939cfc9ce0be8b29e4bb04b412ade09c6e8fae2a19170d26414f6a22043e64aeee1145d SHA512 f38af7e5fa715531f2515c4452dcc5534c63b8cd6bd444232527a1ba3c1011289ef8b0cb772d40594a040ebd044652de1f8d9e3fd1146e2688fbbe8882a040ed
-DIST plymouth-kcm-5.16.3.tar.xz 39832 BLAKE2B 866dc9b78caf2f48a6d5551bc9a92321491d61dcfadd8b624fa0465c130872ec5fc959cec2c15124b823f68b626ac28fed7f24be83c59cb35781046b6d90342d SHA512 762824c20485294dc7ebe9b42a9ec4cf1fb7c21ce305fd9df84c024c333d280bf5a364d1ec039601fd1eafbd2202e9862b98c4897921a6535a0bd0acd7dbd713
+DIST plymouth-kcm-5.16.4.tar.xz 40032 BLAKE2B 0b9c967efa9edcb99a67f7ce8c7bb6fdc8607bcd04ae16ae4087a7a7f0029ff32b316a385c70ad2015340805bd5935e0a1215fbbc10dcd1a80c613cd9a74dba1 SHA512 6137fc3868e07a8db7ecaba97d720471fc88cc77d5c29db1957b181d0fd892fd8919f704afe065b3eb73b9c0b1bb61115761c59d81fd89dc0c595d8558525a18
 EBUILD plymouth-kcm-5.15.5.ebuild 799 BLAKE2B 9860b4921f67b4fceff4fdee47b6f1e056cc567ff545de71c2e41f979e291a702db009705cd2f26f6c25263200cb350def1fd1f0f2e8838b28b8a25ccbe40835 SHA512 c53bc03e8707855afbeab7a4f73e0df4a43e553fba3c9e438ca33b7c4429166e0520ba9ff3e76cef2777dc17bc3874c825ef710277b44de1d57f883bd9e52524
-EBUILD plymouth-kcm-5.16.3.ebuild 802 BLAKE2B 4562d806b1e4922fc795bd504b96fa7c1cb478821f7beaca2480366a953783c084162671a6038de9ca019ce9e5b63fdb6e1f4e5c34118a8fac3ef533e03ba53e SHA512 4b67c4ae1e598a0e14d53a9be383af2d2aeeffbb73a8eccb993471aef07efda8540497b4469b817f105e6b39a9323266b062fa43a00efd7357994787461bbf77
+EBUILD plymouth-kcm-5.16.4.ebuild 802 BLAKE2B 4562d806b1e4922fc795bd504b96fa7c1cb478821f7beaca2480366a953783c084162671a6038de9ca019ce9e5b63fdb6e1f4e5c34118a8fac3ef533e03ba53e SHA512 4b67c4ae1e598a0e14d53a9be383af2d2aeeffbb73a8eccb993471aef07efda8540497b4469b817f105e6b39a9323266b062fa43a00efd7357994787461bbf77
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/plymouth-kcm/plymouth-kcm-5.16.3.ebuild
rename to kde-plasma/plymouth-kcm/plymouth-kcm-5.16.4.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 16d7f13884a4..87adc63c4b7d 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.15.5.tar.xz 42612 BLAKE2B 22ca9adad609eb5603aa7d50fbfcbf6cf17d96dc3f822acdd91d79b855396b32fa2261086269548a302cbd116cf3eb848a5bf1dc08640bbf678428044baee711 SHA512 030bbff94517a02f40bfdbaf0142834d95fc5299fcb126f3014268233e24598aecbad8b04ac1b6c4d3a0d4821a73b10ecba84f2e80af53782bf137e151455ed9
-DIST polkit-kde-agent-1-5.16.3.tar.xz 42912 BLAKE2B 54b65a687aebcc9d9961cd2bbca09d2bd8eb7eff05c015eb7e713e5dd2d68b942f7959d84303320c81b951b8df75b9c7399a6587f8fc734bcadf9490a03617fc SHA512 7ad45d3f203997ba96ee1731b578d7ae94011775013eeac4bedc1f1d21adc27a94bc06cfd72e510f18c078329d7109c103c44c917efadffb0b6629ad2dc7b3aa
+DIST polkit-kde-agent-1-5.16.4.tar.xz 42988 BLAKE2B fd5b5d4257bfd91fa80a35b5acf8d2ba7fe040b232fb872be0419597e4d9c0897adf0f8618c376e53c8a0d20e32b576ff2bc44f71c74148e93138a912a6d6686 SHA512 b85dc7a7883d98014681ad12c9d2f79e8deeb8df6f29b1bdcd5f0e4048cfa7188140e4f7808dba4db9392cf5fe49bda79f4b52caca8d8c4f51953166833046da
 EBUILD polkit-kde-agent-5.15.5.ebuild 712 BLAKE2B 114708a883034888a022880199334ed832eadd2f965e332c4627b4bca7292a217a17afc972678a8f106fd0ad294ee7b8bf9e2d615a29cf58ef4ccf5af9ced829 SHA512 c3572e743514d78ca99982a369a95833cc70de75ce17f7b5e0584fc3a38c1b5db15c05bba07764a29e061392464029385c811f62675f9f6d16cfc19d25ea9200
-EBUILD polkit-kde-agent-5.16.3.ebuild 715 BLAKE2B 468285db38d019eaab18683a64f021ceb2a86a19877bebae3e9bceb2170d68e8b27bf7d1863deb13869063a49b5342834d74047085d1997c5fc19e8dafaf04ba SHA512 c74535d244d94d93168413505be31ac82cde27e55ffc03d06d60d611465d6b133970d9660485258dff93badc2057aaa3cb63ab158a6e5abd8ccba71282bfb403
+EBUILD polkit-kde-agent-5.16.4.ebuild 641 BLAKE2B 0c9cf84ffd74210e0cae963299a907aeac85d3720f60e0c07a0f1fda52363762df1ae5e5206997f5790f823567581e00e0315bf0ca8df515b7661c5021bd6cba SHA512 09be8a6b2a2fdff05387237c80ff23382000d1a92a431de89293d89df4f8765b1ce7553c1bc9024935b0dae1104b4e2cabde404bcd831ef320854fbeb58f98fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild
similarity index 86%
rename from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.3.ebuild
rename to kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild
index 52e249db44a3..3a7ae6ac0aba 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.3.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild
@@ -24,7 +24,4 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
 "
-RDEPEND="${DEPEND}
-	!sys-auth/polkit-kde-agent:4[-minimal(-)]
-	!sys-auth/polkit-kde-agent:5
-"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 400887ba4ced..7b6da870b109 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.15.5.tar.xz 599676 BLAKE2B baf8789982b640f8b09ddd66f2f5722df1da2c570267218e1216b8c4fec8160dc933da3cc2355d45ff475de4a5d0357f00ed84d1562f91a0534636bb092c863e SHA512 bc0a1af8eff7da7801b6644a2d28ff595b3052ebe0d59aa808c51dc1c3c3c787c7d7569cc59cca216757e57a67a4a957845792af78aeafb9a71d4ce37723b3b3
-DIST powerdevil-5.16.3.tar.xz 590188 BLAKE2B 1716f797cead3ed4d78d8170aa26d29d81f6664c3dbef096ab06e4bd1d8bdf426d59b0ac942caf8bbdd3d532ee0fecc32e32ec7a5faaff2723e9ceb25d0f2c8a SHA512 0dcc552a5c68e53186e5d4cf507f4064e5c255c59a59ed8f8bc3e9154fa47bf8e24e47c32b07ce9b945c1ede93b54f23933ee39f97240d3399e76f0f64d58cbd
+DIST powerdevil-5.16.4.tar.xz 590444 BLAKE2B 583496575c2604128face46ef84312857b012024d93059ecd77c8ade703339548d5b4344e3459b041c722f01999df9e089e293066a87856425696faeea6e9c6f SHA512 15c7c2d4bc7eba68a59c538f8ea62b3fde8e62320dd9144e96534aaccafabc5cea5bb38900cec90a4946b0b531c83cd7c59db7d0d1fc186b216916b5a5d6a743
 EBUILD powerdevil-5.15.5.ebuild 1610 BLAKE2B 1c5abd49c4a29990610e81283c61035476d1916317df0c0886f0b087a2b2e324b229851b9688f1c3a199ba35b451513ba1c7dcf78ad97209f89c377efd170a2e SHA512 31b011a765e18c30b6ad9fd7c3a7d38b4eb79fad9c7cc94c6e973e65cd5fb29d4f22a408fc899b295b4fceae9f6ae0fe858099aaefddc004fa7db0ba6b5b1cd4
-EBUILD powerdevil-5.16.3-r1.ebuild 1621 BLAKE2B f45dcc968dca774d1dd09c34dad6075e9dc9c6d86cb489332f085f28920f8259f814173c4ddd7e05c962ee9d2998d7020948e2ef169db1d8adf942e785a6e141 SHA512 560de643f89cd2c5605f6f39cf6969d60fd535b109e08b14e0a537177565b7ee016677c3bd3962bed1c4481311660cd6d8ed70cb83e4ee4b94e1f4eb6b863e0a
+EBUILD powerdevil-5.16.4.ebuild 1613 BLAKE2B dd905191e73a3acae0274851476ec84a38a70df68e723e162d09537125fae8943fd6655b103bfb3865f94978a0a2698a8c86167d45909a8abb1f17854ed70c4b SHA512 dc85fbc9424eae8ab96dd5b51d62511bf1b6d61210dfe3903db2d736a0256ee43cb742828a03966006e761a4106ee48ba6fe61c3b46a2507adb3ac3f37b7ff35
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.16.3-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.16.4.ebuild
similarity index 94%
rename from kde-plasma/powerdevil/powerdevil-5.16.3-r1.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.16.4.ebuild
index 9d7b0051fec0..752e8c8dbc3b 100644
--- a/kde-plasma/powerdevil/powerdevil-5.16.3-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.16.4.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 	$(add_qt_dep qtx11extras)
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( >=app-misc/ddcutil-0.9.1 )
+	brightness-control? ( app-misc/ddcutil )
 	wireless? (
 		$(add_frameworks_dep bluez-qt)
 		$(add_frameworks_dep networkmanager-qt)
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
+		-DWITH_DDCUTIL=$(usex brightness-control)
 		$(cmake-utils_use_find_package wireless KF5BluezQt)
 		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
 	)
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index eec5f839dfb8..43d21adafe8a 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.15.5.tar.xz 61728 BLAKE2B 358de0f9a3e39f7bdc4f5ea46bb9f7f5fad6601a0eee91bcdb939313bfb24dd84e5df46fb8d9beaf97e3030f63cb0622ab5d3e1a1ec9452937a72661ccbc61dd SHA512 728dedc49670e2b80f48719f3b9f20407cfb580723e1b443eee789c0908d1b7ca70b6d083244df0c4d9db29a90707df50a148f775568abae417c4dfa53607535
-DIST sddm-kcm-5.16.3.tar.xz 61884 BLAKE2B 1bb4f255c1ac0e19b37e30603fe29b9522751644acea626bc6877d864e2958731c60415e8d6f443b9753a6797f75d65162f4daeab4ebdab567d461fb02bed79b SHA512 6c16063b112179c7dcdcbcac601c8d16966c45f8ad8e5990e68d2347f4b30763674b602c6092af0b0852bf86dfb0df81ab5a3531574a2a56c45f068506b8bc3c
+DIST sddm-kcm-5.16.4.tar.xz 62176 BLAKE2B 9ebdc6c5fbf804adef736cdcea04d6f599372da0c179f18ea77927cdea4155d46f3f2047add6ab90e567dc30b03fa5ce451625025e4b83847d00e5db4dfd7658 SHA512 30811b0f6906578fce7cb497468fc0e0c7828f58222fde28fa9129b043a3adcd87e45b7ab4b207d795fcdd6a713391788717e1b36e227920fd8f8bbc9e1da2b2
 EBUILD sddm-kcm-5.15.5.ebuild 886 BLAKE2B e23150a39b9958ed42d574d19bcf2e7bd6be18425d4fdde741b4c9b4eed8ab7373bb816c6d028e2e21fa2a9d539560324785538f4ec881b668e42682a098fb2b SHA512 f1dc68580e781468ba23e3bc69d6a4fd885b0d5380faf073a57a5c17cdef696aea8569afa5eecf1fef51dceb4b62156dabfb2fe492cf72b5729833f0111ceee9
-EBUILD sddm-kcm-5.16.3.ebuild 889 BLAKE2B 9cf76771e6bafac8173613f5817cdf682a38946f3583d0d1b8288c895b3355b899db6f83fe2965b13cf1b344b1ec904634e5826a290690b94c4499d8a4cadb6e SHA512 acacc72361d37c860e3f038a21a3e1b234896148b8c4f07e8448d2bb1ad5e9941df73cf7efa1388a5e73854aa2a58041aeb424957114b69c9287d336741c6b64
+EBUILD sddm-kcm-5.16.4.ebuild 889 BLAKE2B 9cf76771e6bafac8173613f5817cdf682a38946f3583d0d1b8288c895b3355b899db6f83fe2965b13cf1b344b1ec904634e5826a290690b94c4499d8a4cadb6e SHA512 acacc72361d37c860e3f038a21a3e1b234896148b8c4f07e8448d2bb1ad5e9941df73cf7efa1388a5e73854aa2a58041aeb424957114b69c9287d336741c6b64
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.16.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/sddm-kcm/sddm-kcm-5.16.3.ebuild
rename to kde-plasma/sddm-kcm/sddm-kcm-5.16.4.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 771edec78693..d51a398b5fb0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.15.5.tar.xz 182452 BLAKE2B 215706f06d842a4be26e5032087ab6eca7b19a93ba998eb46d90593796b351bde893234d7cb097326a58d78a30584312eaae9e0ce3addf44ecfee0553e6075d7 SHA512 9bf486096c8e22779354ce1cf1028f7e55c1dae98da2bd9fcfe496c761e819d26756490d75e531049e519c0ffc0eeb643577004e022c0b0a988730d833ce6ec7
-DIST systemsettings-5.16.3.tar.xz 178012 BLAKE2B 716647b085e19c7239d11e3cbe6bb2171b00f990ba44b0e4c6b8d050b50ce75b498727a5c7ed16de643a22618a9af2da08c0d718a35d77006727f1cd8d414d9c SHA512 2a67c8d94f54dd277f4bba148387fa31a1bca90376b0f219cebf2fae01a8f686267f18a71c933b0751e7746ed1257be3f45b31e0994be964ab2b002b25421ded
+DIST systemsettings-5.16.4.tar.xz 178620 BLAKE2B 3fbe153d14fc945cdeace3fd6ad8e19c60ead651f7b1d26a0f96c4228f285d3e16f122702b4e880f2a71c920a8398d34ab44696357220ade3ded38bf8652f3ba SHA512 8bd4ffbda585e76bff8b42a588b6ce476ca46671e258a34b294859aea2d0a00e40425f783ee39ca139f54f858067c5ded109f8280193bd22e19ae01904744ae8
 EBUILD systemsettings-5.15.5.ebuild 1492 BLAKE2B 05805262ba9a7c1cd84a9fdec25abf7d929fba64d084bb7a462a55ad07717d4a01d882324a16d752676593b4c590968c5c2d0095b5c924a590677af3df6d127f SHA512 9615a4a30efafacc73e646775e06b166423d27ee0b2961b573b5fc9bc546abd1cadffd16bd9606c08fe927b05fac7f1fb9f206dc50c151eddc128e3bcbb9973f
-EBUILD systemsettings-5.16.3.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
+EBUILD systemsettings-5.16.4.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/systemsettings/systemsettings-5.16.3.ebuild
rename to kde-plasma/systemsettings/systemsettings-5.16.4.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 54d80e36e738..08984ebd7d46 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.15.5.tar.xz 546156 BLAKE2B 9b37eee3f88ce182aef023efedf288aed43edd7fa3212ba6549c2cc659e891f45cf20ebc8b573286c5b52cdee42d5367835c06c74d31fdb2d6eb7f20fe9a81f0 SHA512 7a8cc2e37fdfc0f99c317db4f4433559e662f0ae03faae9844d4c51b298fcc8906efd457c17898193687c088664008e41c1e158e64fd0af0c581bbb1f98a924d
-DIST user-manager-5.16.3.tar.xz 546676 BLAKE2B 8d9a20172e1f73b23d3d724dec01a51c56abcfb9dfdfc9b669613b83d8c1df9b508fb80731f7850ce748afcac042c7ad4fc3003c8b4829742ff5df76a312d00a SHA512 ecac566d56ab829289382ac0972e9d7a0938b60200205235981bb76b963e7f39884f3ff489b7eaf7824fc61eb5e6b511e66687333546d0f2f270f46f25125f0a
+DIST user-manager-5.16.4.tar.xz 547132 BLAKE2B dbaa24aca37e131a64aa8833f222fc53d42a41b785984ad2432b2669529ba0a34d568e5b0d4f418ede4d18162480c586fd7440c667a126742874ee38a1d7ed64 SHA512 38ebbbd3683df30d1146e8d58b5f4f980edb8cdb3fd54617b2b21cfe5a9d07cd190d86dcd2567092000d92213a8024529ebdeae5c1869b340d3ccef7395cbb64
 EBUILD user-manager-5.15.5.ebuild 698 BLAKE2B 47ff0768c259489898cfb2c38dc9597f0fa98c058c6daf70fce8ad4b033e2d230df2af6ec317770a60585fac97f3003bcff051c182380f876f6bb5c95478a5f6 SHA512 0de5e8cb97e348b07195f1e6780d688fcd51521a47a810dfcae8eb87ed2a07d8778963b6eaffd692c2168139f33660b0591e12c7f6feef6b90d2ad66e6435191
-EBUILD user-manager-5.16.3.ebuild 701 BLAKE2B defe57c9c19dec67b10a08ec033c69da01a059227fb8e6a2ad67c1b5e7eb1629bf1ad2cd85d4ffd6e4ff8ed71ae3ae28b65d8c8bae6c5d5c82dcb62ee0447d08 SHA512 9c7ac4d55f49829bca31a7f82a416dad2a9d1744bd35401637624a783c3c63184be551ff8f5ab619411ea670539f80b89439f59af17b52a67e094f4202e5df97
+EBUILD user-manager-5.16.4.ebuild 701 BLAKE2B defe57c9c19dec67b10a08ec033c69da01a059227fb8e6a2ad67c1b5e7eb1629bf1ad2cd85d4ffd6e4ff8ed71ae3ae28b65d8c8bae6c5d5c82dcb62ee0447d08 SHA512 9c7ac4d55f49829bca31a7f82a416dad2a9d1744bd35401637624a783c3c63184be551ff8f5ab619411ea670539f80b89439f59af17b52a67e094f4202e5df97
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.16.3.ebuild b/kde-plasma/user-manager/user-manager-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/user-manager/user-manager-5.16.3.ebuild
rename to kde-plasma/user-manager/user-manager-5.16.4.ebuild
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index c29d7fb1f966..ca470bd9cdf5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,6 +1,6 @@
 AUX xdg-desktop-portal-kde-5.15.5-appchooser.patch 2385 BLAKE2B c8917416ae9ed68910e6e19e90116c36ceeb4bf04faa4a9c4fbdfceb39d034bf05961559f8f672c8e75fe16b524aab5a811e52f2ffa10a5a308bd6041f9a2b89 SHA512 de598d043539fee25d29f11439003eda5babcde7fe8b017f4eea975334b297c5faf7f9d21bf49d247415bdf1d953df4187a627cbffa2b2cd0f8774c6bd9cadeb
 DIST xdg-desktop-portal-kde-5.15.5.tar.xz 60292 BLAKE2B 5e0f07ec5e57d978c444fc65e1aa70b04dea458d34d9c091da5699501995499fb877e90ae0272634fc7dd62fa192a99d7f800bf7627612e2eafb6763e3f732ca SHA512 f575c9a5273cef3ab34a7eb4be520cdec3344fd6729f79d4475f200a177fba40b265815136c4af18ce6e48c9736bb835af4d972c5563171ead2e4390e938fcbf
-DIST xdg-desktop-portal-kde-5.16.3.tar.xz 61560 BLAKE2B d6c3c58f9f75295693fec28634bfc317b3a9d100208090a536b1be44e4e7498dff97ba34066dada9780514036112576abccb2d07cdffd83f3167a7b74dbf5001 SHA512 98ab00255ebd535525f909008304d10f6c94edb9be6a32488bc943279d0169bb70c48c05863795045568d0b404d1b088f298b80d869fbacb502ff812fd772732
+DIST xdg-desktop-portal-kde-5.16.4.tar.xz 61804 BLAKE2B b32366b815c076b24350c65fd86ad7cbbf0063c9167b5694b897257b4dc1aa78fd9e4bd2be34027d9f9b8f3514503334802475fb1e6410e8c60c0240b055ce76 SHA512 401d25bff09c844f9f214234bc8a2ce0975f03adc959079744a4550f56e4b2d38db2105e1392559c681ff04eb9e586d1916cbf7fc59ba6758e610eba927c8009
 EBUILD xdg-desktop-portal-kde-5.15.5-r1.ebuild 914 BLAKE2B 3130c056671cbd57b0272fef327b809bc2318fbc98264278e21d5132f4fc6e60aafaa7a31d74141b5e2b41339c76a061f8cdb2513f02c81a46a3ff78e910c37c SHA512 67660f2388e54c873ac53058810ea298373c5f67f936cf2651986c20d6b17b8e0e4874e5fd32dcaa28bab7d5ff3467d9ca56308b0b9e665e52ed110bce15d784
-EBUILD xdg-desktop-portal-kde-5.16.3.ebuild 1198 BLAKE2B 03d8bc1f7dd7e87e39cddba9417cdbfc6631f7b2fa404aede5ae8f6bb4cf3dde0407cb91a0b2beacd151d86f245b816082db832ccd86bb52abe7fae0f8fbb063 SHA512 4e113157da73948ca36e24a88ba34141e92b446484265ee01d6ecda72e301e9bff840e3ad4c9cf4cfd69a26bc87a2eca8c15eb228c5dbf585a3199ff95a29bdd
+EBUILD xdg-desktop-portal-kde-5.16.4.ebuild 1198 BLAKE2B 03d8bc1f7dd7e87e39cddba9417cdbfc6631f7b2fa404aede5ae8f6bb4cf3dde0407cb91a0b2beacd151d86f245b816082db832ccd86bb52abe7fae0f8fbb063 SHA512 4e113157da73948ca36e24a88ba34141e92b446484265ee01d6ecda72e301e9bff840e3ad4c9cf4cfd69a26bc87a2eca8c15eb228c5dbf585a3199ff95a29bdd
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.3.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.3.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.4.ebuild
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 85a8eb05171d..2f2b562c1a4b 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
-DIST plasma-workspace-5.16.3.tar.xz 4888740 BLAKE2B 5908b1d9d1c1aff2a7e3dad1461e8bc688bcef5d2177048e12c1f471e4396aafcbea89f470fef7e92d355fa448c23d8af9b09182a5a78e7035dad9278eaa9bb6 SHA512 347be076604b29234845978e3442653507e93d892c47c63a46f659bc11f692944fc9879391bb686893916a77f3be2f12048fb4f870e7de567c3c13f034ba5155
+DIST plasma-workspace-5.16.4.tar.xz 4896860 BLAKE2B fb3f6c89db5bc5142ccb68ab6ebd13d7e0d878c999160301385d163fba0e97bfcfae9bda38dc07547171cfe8823b4375815f1371958ba35c8c9a69272dbaf572 SHA512 d597738c1122fcbe327a1917706e86ed0acc550ddbe2ef4eb776f1a064b09095c0f5d634675787353b90b8b37d24bbd454fa1d8354078bd4ceaa3875471a3bb4
 EBUILD xembed-sni-proxy-5.15.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
-EBUILD xembed-sni-proxy-5.16.3.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
+EBUILD xembed-sni-proxy-5.16.4.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.3.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.4.ebuild
similarity index 100%
rename from kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.3.ebuild
rename to kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.4.ebuild
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e191e01d72bd..a58b8574df13 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index 01efd19f4e83..b974d19b4150 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,16 +1,6 @@
-AUX milter-regex-1.9-gentoo.patch 1074 BLAKE2B 2a5d23b52327ec538ca2c59cba79569c8ba376d2ed0cf8a72bb0cda669de0db143baf59b5f62ac7d896e3e8d7158af88c47f32e09cbc454fdc4601b00c66341f SHA512 d7311e3da08aeb39b2706c110c67a1aaf3f114aeb3fe94a73f8c10a8327e1865cb911f992a887fb518a6c500a4bae5d4e8c39955820436b21dab8f3820dd27cc
-AUX milter-regex-2.2-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
 AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b
-AUX milter-regex-conf 177 BLAKE2B 9a05241608c171c8cd0ff3c34962718baa94b5f67692758b01247de2386e3142f6cb4704b32b47427f2f45b222685ec9205227b4d99dfcc0c41f82f194c3c8f9 SHA512 b4fa346684bf2184021adad76c44fbf38e3127299792d5a3b0f0052019a6046deaab19b56bee2b44b7f4fced9c309f440cf4be18f8190d661fc08bedaadbc2e8
-AUX milter-regex-conf-2.2 274 BLAKE2B 6622d3f5bee56d25a60ba2e9826bcbdf82a8ffaefab4ab94a9d45d8bb9d8d4c9dbba554589d608cf4d80d44d982f1cdd1d2edc35dccd5f7bb89f27b042aa13bb SHA512 5c16d1d121cd17b15520fb7d8bf6e06440e4b87c4214a2fc1587317d0927d96ba04d89610ee4c5db3b6fdfa2fe5ca536149e782081138e2b0b8c93826febcab5
 AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c
-AUX milter-regex-init 842 BLAKE2B 052aee4916608c42f5d664a9bb46eea5c839456f69b71c6f4c9f737abd88eb86cc0a8e8814cab6391264c084967dd90c64117bbc2db55d79c82b37f79a991a89 SHA512 63ba6f37fe387179c12c6b938985cfd37d5a9ea470d90666636d14d5bac53fe42ee11e559513db6cd3f21066a9adc0ee3ef59c361bc5e65364fc9a41525ff2c8
-AUX milter-regex-init-2.2 409 BLAKE2B 16b13cdd120a283918f7b7bf7802f3114c164776760a08a03158968347a757ea6db1d18ae957c0736def7ae08a47ca3d7c4c6c36fafc4cb624ff7521fc591a5f SHA512 4cb777e506304a0460da9ed13ad94257737a1f8d7346e0d0b6dc30b496da7863861c3d3184ed10e577e1b7ab234e210da70cc42a497c0111538f5a03ac21fc98
 AUX milter-regex-init-2.6 438 BLAKE2B 36f12dc620dca2f1dd2bc0d471c76355474fe0d50c2cb87559cdf0f6b19f9058bf12b085fa0737e32d02509994752c567f719ec7dbb42e9bf5d48b55c862b718 SHA512 a6754fefd61f884733fca4d0bdb9fc7ed057b4d87d37e63dc473b06aa270da0b6cb4df7b95ba59e6198e9a013f959a052e426b0df987eb4690122528bea819b8
-DIST milter-regex-1.9.tar.gz 19880 BLAKE2B 8934eb4f78f168b6f4f93b3a7e70b896c6518cd1228ea8fe387184a718a002f051f5084a7a7f4d07c9e7832fe1c9e9bc907661c4e765dde938b7c6049c8772e6 SHA512 55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148
-DIST milter-regex-2.2.tar.gz 20496 BLAKE2B 75cd668e8f75a62bb16d1e38d089465e1e9b49a7441594cb8f77279c9e29f1b90c7b452595f8653b81167fbed8f10e8322ccec51374446938ca43b245cbfa440 SHA512 c2f94d1d9897e2a3f62639343ff9272d28c044f25c59e10f12f37250aa0e5426174cb2a74850993246628e828d21f5cba8567de65a225235eac1969836e41f28
 DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657141e19c249e97bf5c847ffa01d6c76f42b6c8413f957fbeb9843ad38281ba8257aef10d0f1bd414726c416533da SHA512 33afa9a314ff2a2f14a301a85fa142e6e4166ffb77e8d18632b094c7873397e037ee6c5d3d1c248bfbb23037c45a15f21fb0cebcbb0f90c69b3d985aad37f169
-EBUILD milter-regex-1.9.ebuild 1629 BLAKE2B ab1894e178101a82f0770c7a55fb010c2edc07a62ade4992870be338a5e9d2b17e704e6fdb31beb3338c78013c6b6102ce813144b0de1a7d1e06d923aee25221 SHA512 f58ccd7fe3c43aaaea5508f5ef653c6a00d336cb130fef4b124d4402f1e7bf3c0e30d3720e5a2ccfabee41b8fcd21f2d302d955a74b8db75f14ce7960790dd75
-EBUILD milter-regex-2.2.ebuild 1270 BLAKE2B bd58fe31035c9dcb7e4e2a45c28875c1acdfc532501d082148277cc5238fef566123004e5b3a95578e72e5055c08efb736d9e6669aed5690fcf60f6122238a28 SHA512 d30adc300ea4e186a202befef8cde5a22a5acbb4e9208ef4ee8abfc3353a5693b3ce33231713833a9b38ed321e5f00570da5a3d5dbfad9295e9ec35a0d869647
 EBUILD milter-regex-2.6.ebuild 1268 BLAKE2B 34c4321f989434b0e3c0eda399ab1c6d55b5283c4cc654d75d54153ccae399c19c8b07d7da083d26022fa1c1977bf388d422f20fe9ba3d9e0d5f6af14aa1d742 SHA512 adddee9bc0c7003c138a49db2dd595e83a911f536183af12f0988921022e88457f5c0ed9a82d901d741e80cd216054b4d783476da6e01840fd47b7a86a543c34
 MISC metadata.xml 696 BLAKE2B b6735f8b042cd7f064f4f7edc2b0ac8293e0c1e4641090e8890e13ea8b9642e1f3bdd892e629261006c607216b71c9a912b8b48a24c568ec1b1a1f15ff2a5de8 SHA512 df7e66be229bc3c32ab7d0b7ee8d035840d7b09df8f9070f0a2239a063e6fa7a67b4ff25926b57211b3b7b9d3da43cb96b9e1355ac2f0d693abc248eac3b96d6
diff --git a/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch
deleted file mode 100644
index 38ba17af0d88..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.linux	2011-07-16 16:51:34.000000000 +0300
-+++ Makefile.linux	2012-08-05 18:15:30.906378968 +0300
-@@ -6,28 +6,27 @@
- # see milter-regex.init for an init script for RedHat/Fedora
- # (contributed by admin@2ka.mipt.ru)
- 
--CFLAGS=		-g
--LDFLAGS=	-L/usr/lib/libmilter -lmilter -lpthread
-+LIBS=  -lmilter -lpthread
- 
- all: milter-regex milter-regex.cat8
- 
- milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o
--	gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS)
- 
- milter-regex.o: milter-regex.c eval.h
--	gcc $(CFLAGS) -c milter-regex.c
-+	$(CC) $(CFLAGS) -c milter-regex.c
- 
- eval.o: eval.c eval.h
--	gcc $(CFLAGS) -c eval.c
-+	$(CC) $(CFLAGS) -c eval.c
- 
- strlcat.o: strlcat.c
--	gcc $(CFLAGS) -c strlcat.c
-+	$(CC) $(CFLAGS) -c strlcat.c
- 
- strlcpy.o: strlcpy.c
--	gcc $(CFLAGS) -c strlcpy.c
-+	$(CC) $(CFLAGS) -c strlcpy.c
- 
- y.tab.o: y.tab.c
--	gcc $(CFLAGS) -c y.tab.c
-+	$(CC) $(CFLAGS) -c y.tab.c
- 
- y.tab.c: parse.y
- 	yacc -d parse.y
diff --git a/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
deleted file mode 100644
index 14efd964f843..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile.linux	2011-07-16 16:51:34.000000000 +0300
-+++ a/Makefile.linux	2012-08-05 18:15:30.906378968 +0300
-@@ -6,28 +6,27 @@
- # see milter-regex.init for an init script for RedHat/Fedora
- # (contributed by admin@2ka.mipt.ru)
- 
--CFLAGS=		-g
--LDFLAGS=	-L/usr/lib/libmilter -lmilter -lpthread
-+LIBS=  -lmilter -lpthread
- 
- all: milter-regex milter-regex.cat8
- 
- milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o
--	gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS)
- 
- milter-regex.o: milter-regex.c eval.h
--	gcc $(CFLAGS) -c milter-regex.c
-+	$(CC) $(CFLAGS) -c milter-regex.c
- 
- eval.o: eval.c eval.h
--	gcc $(CFLAGS) -c eval.c
-+	$(CC) $(CFLAGS) -c eval.c
- 
- strlcat.o: strlcat.c
--	gcc $(CFLAGS) -c strlcat.c
-+	$(CC) $(CFLAGS) -c strlcat.c
- 
- strlcpy.o: strlcpy.c
--	gcc $(CFLAGS) -c strlcpy.c
-+	$(CC) $(CFLAGS) -c strlcpy.c
- 
- y.tab.o: y.tab.c
--	gcc $(CFLAGS) -c y.tab.c
-+	$(CC) $(CFLAGS) -c y.tab.c
- 
- y.tab.c: parse.y
- 	yacc -d parse.y
diff --git a/mail-filter/milter-regex/files/milter-regex-conf b/mail-filter/milter-regex/files/milter-regex-conf
deleted file mode 100644
index 51846a214e4e..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Daemon user
-USER="milter"
-
-# The location of the Unix socket
-SOCKET="/var/run/milter-regex/milter-regex.sock"
-
-# Regular expression rules
-CONFIG="/etc/mail/milter-regex.conf"
diff --git a/mail-filter/milter-regex/files/milter-regex-conf-2.2 b/mail-filter/milter-regex/files/milter-regex-conf-2.2
deleted file mode 100644
index 382a5fe1d978..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-conf-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file.
-MR_CONF="/etc/milter-regex.conf"
-
-# Process and socket owner, socket group, socket permissions.
-MR_USER="milter"
-MR_GROUP="milter"
-MR_PERM="0660"
-
-MR_RUNDIR="/run/milter-regex"
-MR_SOCKET="${MR_RUNDIR}/socket"
-
-# Additional options for logging etc.
-MR_OPTS=""
diff --git a/mail-filter/milter-regex/files/milter-regex-init b/mail-filter/milter-regex/files/milter-regex-init
deleted file mode 100644
index 7528e625d2d6..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns logger net
-}
-
-check_cfg() {
-	if [ -z "${USER}" ] ; then
-		eerror "USER is unset"
-		return 1
-	fi
-
-	if [ ! -s "${CONFIG}" ]; then
-		eerror "configuration file ${CONFIG} doesn't seem to be valid"
-		return 1
-	fi
-}
-
-start() {
-	check_cfg || return 1
-
-	# Remove stalled Unix socket if no other process is using it
-	if [ -S "${SOCKET}" ] && ! fuser -s "${SOCKET}"; then
-		rm "${SOCKET}"
-	fi
-	
-	ebegin "Starting milter-regex"
-	start-stop-daemon --start --exec /usr/bin/milter-regex -- \
-		-u "${USER}" -p "${SOCKET}" -c "${CONFIG}"
-	EXIT=$?
-	[ $? == 0 ] && chmod a+rw "${SOCKET}"
-	eend ${EXIT}
-}
-
-stop() {
-	ebegin "Stopping milter-regex"
-	start-stop-daemon --stop --exec /usr/bin/milter-regex
-	eend $?
-}
diff --git a/mail-filter/milter-regex/files/milter-regex-init-2.2 b/mail-filter/milter-regex/files/milter-regex-init-2.2
deleted file mode 100644
index 57c5988babb1..000000000000
--- a/mail-filter/milter-regex/files/milter-regex-init-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/milter-regex"
-command_args="-c ${MR_CONF} -u ${MR_USER} -p unix:${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}"
-
-depend() {
-	before postfix sendmail
-}
-
-start_pre() {
-	checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR}
-}
diff --git a/mail-filter/milter-regex/milter-regex-1.9.ebuild b/mail-filter/milter-regex/milter-regex-1.9.ebuild
deleted file mode 100644
index cca5c424b6c4..000000000000
--- a/mail-filter/milter-regex/milter-regex-1.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="http://www.benzedrine.cx/milter-regex.html"
-SRC_URI="http://www.benzedrine.cx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -f Makefile.linux milter-regex
-}
-
-src_install() {
-	dobin milter-regex
-
-	keepdir /var/run/milter-regex
-
-	insinto /etc/mail
-	newins rules milter-regex.conf
-
-	newconfd "${FILESDIR}"/milter-regex-conf milter-regex
-	newinitd "${FILESDIR}"/milter-regex-init milter-regex
-
-	doman *.8
-}
-
-pkg_preinst() {
-	enewgroup milter
-	# mail-milter/spamass-milter creates milter user with this home directory
-	# For consistency reasons, milter user must be created here with this home directory
-	# even though this package doesn't need a home directory for this user (#280571)
-	enewuser milter -1 -1 /var/lib/milter milter
-
-	fowners milter:milter /var/run/milter-regex
-}
-
-pkg_postinst() {
-	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
-	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
-	echo
-	elog "If you are using Postfix, you'll need to add this to your main.cf:"
-	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
-	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"
-}
diff --git a/mail-filter/milter-regex/milter-regex-2.2.ebuild b/mail-filter/milter-regex/milter-regex-2.2.ebuild
deleted file mode 100644
index 5b060fbb4e9a..000000000000
--- a/mail-filter/milter-regex/milter-regex-2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
-SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" -f Makefile.linux all
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /etc
-	newins rules ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}-conf-${PV}" ${PN}
-	newinitd "${FILESDIR}/${PN}-init-${PV}" ${PN}
-
-	doman *.8
-}
-
-pkg_preinst() {
-	# For consistency with mail-milter/spamass-milter (see bug #280571).
-	# While the milter process requires an owner, a home directory is not
-	# necessary because no data is written.
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-pkg_postinst() {
-	elog "Postfix configuration example (add to main.cf or master.cf):"
-	elog "  smtpd_milters=unix:/run/milter-regex/socket"
-	elog "Sendmail configuration example:"
-	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
-}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 2071504f2220..5ef5cbc7b440 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest
index a29fbbb1f78c..2fbd080981c6 100644
--- a/media-fonts/fontawesome/Manifest
+++ b/media-fonts/fontawesome/Manifest
@@ -1,7 +1,9 @@
 DIST fontawesome-4.7.0.tar.gz 2672776 BLAKE2B c20474c0167665d82fcbe74984ad9c44fa1155a2a5363222981d6c32f40a3bf13bfc2c582d78e8d36e57939f8af3810fa823f2241d1924a83a05c79ed08cface SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d
 DIST fontawesome-5.1.0.tar.gz 10505651 BLAKE2B 0ec84cdf36855ba43e5858b2e8b12a93c9ec950216b64fa307e1fa058e05f83f08c820e4a3b95432e30c33ee4efe5931bee7077ff182d52725068c53bf387b6f SHA512 1f35f0d326e1f896b606d851577fe99639c164101f236c47966289a8a7e3b1e64fea3f1338d12f327777db56ec35b1fcb5d6de250276bcb468fec114d4c3928f
+DIST fontawesome-5.9.0.tar.gz 10407351 BLAKE2B 2e55f8237033c0daad7028a2e10d5f893b03aeb3c49c26c367c5e8107c2c17900694d424ca76e262f15750e21a74d5a747798da4e21a5c69a809bb89594d755f SHA512 6347f21fb47d779f2a39b9205e8edbac09b3feef88cee103052d5bbba7f857d97e485c659c69edd6053f9af7561f0b260b38eb90b570a3d0a74fe634d723c0cf
 DIST fontawesome-free-5.0.6.zip 21098097 BLAKE2B 981220261e29dc9894eee1b829af4815176d566ce6309a3d356fdb8c5e5e9a1f4ccadd522c70f51088aebfcbb4c85ea593916ce09a129a85ef9ebf711f253ccb SHA512 cb5ad12b2b40687bca0624e9424ff483e5af4c7da1ef032b58698d00bb32c5385c0d5fe40892c252af66a5470843a092442aa14d7936cb6af30066efd07b53b5
 EBUILD fontawesome-4.7.0.ebuild 605 BLAKE2B a2ab612d6c2b1ef834dcb384391383f1bcce2df7d3ad01e9349f50f604b510d3e782aa3dafdb6e45dc9b5ddb29c7666fa1c291f1853ecbaa7f16b85ae2a554ce SHA512 35d1c23ba8a514c33424b9806a142059cc522ed99e1ae69df543b81482bb09f97cd056e037f7862abb777b557c8cf464c1c89fc90100e52e39aabae463afef6e
 EBUILD fontawesome-5.0.6.ebuild 790 BLAKE2B b6fe16fc5ef3ac0ec831760e68fad46861037149282551a162ec608e8fee867c33cca1d030a1ec7dfa3133dd24c42d88bcecbbf72c0fc7039b8aa94c6d6ba172 SHA512 43f42587eac345820ea069905d5c5ed3d843157397b72f08cd62f02ea5cedccb4163535b8dd6562416eba99140e01d3d96aaeee91e2cb98a1e453eab632814ff
 EBUILD fontawesome-5.1.0.ebuild 693 BLAKE2B 7136a16eda143e81654f40f4da627e2860a9e0fa44a3fe448a469b57c71861aacfd55b678023583b163b6973daf9b8ca30a5369be01d4b66d551a735ab68ef06 SHA512 394d61d25dc52ef6a224f2a4a44d2db372980e583ec5f5f48003c2e1ec60fab5d299419f77cb85977fb0f96f06c3cea368f4add6a93d8fed53207b3e18d0b82b
-MISC metadata.xml 621 BLAKE2B fefcdf06ea11f267a41d7749056954e7e2f16ba1554fefc8d54ce4cbe3bf2c35177a79ba0c795b898fefc62ccb3d79da346bc938b22423c0b238e8d6d234b77e SHA512 5709fc280c0d0d1fd5c266cf4f4985446682ac955fcb94775298e4c2fe0c352d94a6b863c3e0b1b73aa70ba5c815460f786deae7cc43ccdce6cdf7950246910a
+EBUILD fontawesome-5.9.0.ebuild 668 BLAKE2B 561c5d1ada4ce06a8d5691e247d7d400eebea4b9f3e6ab8d55f9ccd7ccdea043c47b77432fa69b45b4e8c96d3a694443377799815bffc52389ffe0d298081491 SHA512 a2f60fce3c14edfa6367b3a95e2475cc905043213fbb153c84add6fa97b9d397540de6c70dce863a63253517bfa399ab0cb66ff378a4b14eab8f674db23fad13
+MISC metadata.xml 757 BLAKE2B 0052f352b2dd2ecf94c93033fb785bffac4f9d002257f7e6ecd5119c0df2c79add5cbad191ea4a2e1299ff52d045ed7e393344e15a4bccc59f8eb38be78266b3 SHA512 5527f5537b93e9ded68263ac22ad8f959efd923c221cfc882dc8f77bb5ed87e2657f01eabe18b7019fd5556927574c576448d08f65db473f47c2df3a3fcf0e4d
diff --git a/media-fonts/fontawesome/fontawesome-5.9.0.ebuild b/media-fonts/fontawesome/fontawesome-5.9.0.ebuild
new file mode 100644
index 000000000000..18ae5f0a3c4f
--- /dev/null
+++ b/media-fonts/fontawesome/fontawesome-5.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Font-Awesome"
+inherit font
+
+DESCRIPTION="The iconic font"
+HOMEPAGE="https://fontawesome.com"
+SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 OFL-1.1"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+otf +ttf"
+
+REQUIRED_USE="|| ( otf ttf )"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	if use otf; then
+		FONT_S="${S}/otfs" FONT_SUFFIX="otf" font_src_install
+	fi
+	if use ttf; then
+		FONT_S="${S}/webfonts" FONT_SUFFIX="ttf" font_src_install
+	fi
+}
diff --git a/media-fonts/fontawesome/metadata.xml b/media-fonts/fontawesome/metadata.xml
index 9649fc4d5942..c568b9c213b9 100644
--- a/media-fonts/fontawesome/metadata.xml
+++ b/media-fonts/fontawesome/metadata.xml
@@ -5,6 +5,10 @@
 		<email>hilobakho@gmail.com</email>
 		<name>Mykyta Holubakha</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bernardo@standard.ai</email>
+		<name>Bernardo Meurer</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
@@ -16,4 +20,5 @@
 		<flag name="otf">Install the OpenType version of the font</flag>
 		<flag name="ttf">Install the TrueType version of the font</flag>
 	</use>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3fd6f231b431..67c3bba8876e 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index 8f34c86a96dc..47e74c4e5c5b 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,3 +1,3 @@
 DIST ahoviewer-1.6.5.tar.gz 227653 BLAKE2B 691a9eaa62b55d91b2d215d41ce402c39ca7490a44506a489061aaadd97fac2ac84aa1b28a7d1b4c097d69153ffe146fac105e9b086adc6b66b9f459e6b98eb5 SHA512 30309cff22008d444eec113bd5d79bdc0e9ff1bbc1b117bd3ecefabfdef79773fd17347766115bb0a192db76dbb24f30c853b27123f0a333c8625b94dc2a8775
 EBUILD ahoviewer-1.6.5.ebuild 1750 BLAKE2B 6c4d365732f480ce61f4d99b0b7a505bdc8bf8698b6698d48c8f9656bb73a3ab5548f715a165fc594be1ca6d7c920bd6a357743fe04746e02e306656527c6246 SHA512 73d6616d4ff8413091a45d867e02e373f6b6a5112ae4d8ee1278c90ac45def3649655f92871a939d5f8854d6b8a962182cd3d177f9e29249eaf0d14730b6bf12
-MISC metadata.xml 532 BLAKE2B 03de1e92365b5abb2e277362cd7e4914e798f98eba5c4f7b1d0a3bd238f1bd35357045b41d96fc979f238c746acd31f35a4557e1251c8786e20420b016648fe4 SHA512 f5a47485137a9721ad98a363167214118f92391f83c75ea66b51c87dfddc5d7585162adc20b23147c6d42781be8c830204af5552fd365d317b7572e2f4fdd260
+MISC metadata.xml 410 BLAKE2B 1344e377cacd46abde3ab09e9aebd4c35390e6f403dc856cf4f04f4f1d9bff5b51930a89f94060d183853e6c98d2dd9c0d7dc31947e5752fd015e8b2276827f5 SHA512 784da6432d4f8d0f574fe17507cf49dee620a685de39f806d5455baa9e6625629d1aa0ca735706193d4b3cdf03696328a4ebed4bc3692efcf22d899eaa5258dc
diff --git a/media-gfx/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
index 9f11884bf0ed..4ff39418e751 100644
--- a/media-gfx/ahoviewer/metadata.xml
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="libsecret">Support password storing using libsecret</flag>
diff --git a/media-gfx/ephoto/Manifest b/media-gfx/ephoto/Manifest
index 7f4c6a124412..b8b3f6c252b0 100644
--- a/media-gfx/ephoto/Manifest
+++ b/media-gfx/ephoto/Manifest
@@ -1,3 +1,3 @@
 DIST ephoto-1.5-1.tar.xz 327004 BLAKE2B 73b6f72085c845e3bc39a70f1a5b087741ee9d2b6d0a7678af90b78dd08cd68defd7256a12e4ce2f9acab1fc93aafcfcac0f2ee689e9ef0b68f8837446fbf58d SHA512 2c56103e6018ef0252dd5efcb0996e9346c383887b6d272f4fddc0b22e0f98dc032049c8521bca6707f1a5d172abc2d6c8e037104f4aa7a5f920fd55a2fad23e
 EBUILD ephoto-1.5.ebuild 564 BLAKE2B 4de5f23ddd9eacc9b5adc740e639c32470e1d2fd2d287fd612a8794f948e5cc32bc82eb699c9f7057101923e7ba8996dbea224b019f203c7b11f6660fc1212ee SHA512 b12b92b4f309aac575f03e91a9b8fa1a8e7d61a08a0cb8235e78c72a4d0f6af9033bdbc1fd0e840396be3d13fe48495a92d12e570e4366ded35b81124df716ba
-MISC metadata.xml 1203 BLAKE2B 81c54ec20b38cfbaac1af938c254c1b4a7a4f05f930c49221e4a7069dafa072c28dac491f314043b5df20cb459e068e9082ae10f4a8f84371127d842d5033ef1 SHA512 54f5e200874bfe2a33343f147f320960be3cfcffb710ddf20e4721c446f1d3cc67a87185d4347c64ba80ecae1836cff757e2d44bd368d96c7459776b67b411d7
+MISC metadata.xml 1113 BLAKE2B 26731e35dd88df506debdf22fe037093433f03f3639a87ddff42770b63309b3c69e5a2caed1cd717043f7b353d1d6da7f2f3a7c3a2bd8bd922e86c6f6eec9784 SHA512 d044c92df38d066afc19253852fed55696aa6d4cd5d7bb227040a4d35f3a297348073834b75c177abf4a75602ebfbee525f74e5c0cb308cedff96263ad187bdf
diff --git a/media-gfx/ephoto/metadata.xml b/media-gfx/ephoto/metadata.xml
index 997099762b2c..b0fdb75d8ad2 100644
--- a/media-gfx/ephoto/metadata.xml
+++ b/media-gfx/ephoto/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <longdescription>
     Ephoto is an image viewer and editor written using the Enlightenment Foundation 
diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest
index 95b87a9f6397..e488afff7d1e 100644
--- a/media-gfx/geeqie/Manifest
+++ b/media-gfx/geeqie/Manifest
@@ -1,5 +1,7 @@
 AUX geeqie-1.4-exiv2-0.27.patch 2052 BLAKE2B db7bb4d2631d566e4c9dbc89cad262cfb173df96b92ea83a690bdcdbbb7d3c873e9e5bd5a581c45b3a4af42c3c7711c65080e1822eaa31be97632b57d4e34713 SHA512 b8108f9a77022f1a0d1354883d1f7a1981a8079e675e765aa67fac16606ed42ecc169ad5cb8a6baf86e919d6ddf018ed54bf5950b9601d2cd1ff647f7fa47bca
 DIST geeqie-1.4.tar.xz 35881152 BLAKE2B 2932ac379abaee2b742b66daff544f29d7bf0aac82ff97f92e10ac7902ad874badcbb143f562c665d94f6297331090d0746373979a745f338a738078b72538a4 SHA512 a88b6dcf30847e38c109f5bc6436d93f6b4e1336a094c6b8a45db117830117120bf58f390afcd8a4b7aaf2934f995c3f75ac33a7faf56bfc2bcc9bd4eebfb205
+DIST geeqie-1.5.tar.xz 1585780 BLAKE2B 6dc0a30c26f25988cbd3fa81a916642504e9f6f280b03d78c820cbf5b453d8a392d3c8da8d482de24b3c39e7e9ba0663879d651c60a8061b8034d2c526007944 SHA512 2b87d543d8d77a4fec331fd1b73ca2038912362fc1f94c9b0f163dcc7c2dd58118e175c5540aecafb0581708ea5c2a5a321dde09f644e2322bd4ca5c0284b722
 EBUILD geeqie-1.4-r1.ebuild 2396 BLAKE2B 4fe4b8aee881eb138f5b8bf2a7199c18858d45586220c549173d13d8ab5e200b143e8aca3ab623bb9e507419d6b5e5027c63a47d72d4606355a3e9adc03381ea SHA512 5b4b13476620aeee811cd06f357c2fc49a1e732f68a0508715ba113b02688440738edb4799f53adf2a79c713e22c3ed19ef376981b2aed9be884bedd70880bf0
+EBUILD geeqie-1.5.ebuild 2277 BLAKE2B da3871fd0cf5af559c1443bb711c2b4a2b78402c4b7b1310930dafdeb41775adfee11862471bbb829531901d5f0bc518de56933880507d6de1aebf713163e2f4 SHA512 b1106f2714c659432ccf384671bd15a0f39cf5bd5d1a883088a15f0bac57ca2749184ed795103d21e6ff48e45818c6330b91702724deb37cb06033cd36f8c87b
 EBUILD geeqie-9999.ebuild 2269 BLAKE2B 719319e9805f58a4f1dfaea869c911f1ade15e762ba46add49975f17b38a6e3909b74e0db223082c06ae55c0aa655389ab5a10e75d4d1dc85552e55105fe29d0 SHA512 8435b9882a9a767af7592bfb59e32d47f0f01e932eac23f920bf0933ae1ae3044302205dd6902fe490c6f995d669b1eaf62b141cc66538444bd5d57d39d896b4
 MISC metadata.xml 923 BLAKE2B 49de6dd7b0380b1cc74ccabbc8f84e2c55144b80612e04c4e55c82d052027882cc293a70a52f857bded73246ccbb5351df53dc1e1e08b8c2c08e630bc24f9882 SHA512 752280a5fefc097c5ca8b1fc2e9f05220aa809e45484560edca7baa68d95b0d91fa14973c321aefcdb76052dc02e405e2fb4a32e6322f04cd8223afaa6734d58
diff --git a/media-gfx/geeqie/geeqie-1.5.ebuild b/media-gfx/geeqie/geeqie-1.5.ebuild
new file mode 100644
index 000000000000..5323596a4a94
--- /dev/null
+++ b/media-gfx/geeqie/geeqie-1.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A lightweight GTK image viewer forked from GQview"
+HOMEPAGE="http://www.geeqie.org"
+SRC_URI="http://www.geeqie.org/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp"
+
+RDEPEND="
+	virtual/libintl
+	doc? ( app-text/gnome-doc-utils )
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	gpu-accel? ( media-libs/clutter-gtk )
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	lirc? ( app-misc/lirc )
+	lua? ( >=dev-lang/lua-5.1:= )
+	map? ( media-libs/libchamplain:0.12 )
+	pdf? ( >=app-text/poppler-0.62[cairo] )
+	tiff? ( media-libs/tiff:0 )
+	xmp? ( >=media-gfx/exiv2-0.17:=[xmp] )
+	!xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="gpu-accel? ( gtk3 )
+	map? ( gpu-accel )"
+
+src_prepare() {
+	default
+
+	# Remove -Werror (gcc changes may add new warnings)
+	sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking
+		--with-readmedir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug debug-log)
+		$(use_enable ffmpegthumbnailer)
+		$(use_enable gpu-accel)
+		$(use_enable gtk3)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable lua)
+		$(use_enable lirc)
+		$(use_enable map)
+		$(use_enable nls)
+		$(use_enable pdf)
+		$(use_enable tiff)"
+
+	if use exif || use xmp; then
+		myconf="${myconf} --enable-exiv2"
+	else
+		myconf="${myconf} --disable-exiv2"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f "${D}/usr/share/doc/${PF}/COPYING"
+	# Application needs access to the uncompressed file
+	docompress -x /usr/share/doc/${PF}/README.md
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Some plugins may require additional packages"
+	elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)"
+	elog "- RAW images plugin: media-gfx/ufraw"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/springgraph/Manifest b/media-gfx/springgraph/Manifest
index 56de24b5849f..38116df68fe1 100644
--- a/media-gfx/springgraph/Manifest
+++ b/media-gfx/springgraph/Manifest
@@ -1,4 +1,4 @@
 DIST springgraph.pl.88 29818 BLAKE2B d203bce543b0d6d8bd8519a24c3592a852971fb18219b0b34dd207724ed1db2859befcd6f69d7b00e2c6492fdabd5a8edf75bee634682f0a56a5361c9e832651 SHA512 51d7a840778478498c23d61af7e0ef0bd795953110850d0a1ec403146ce843c6eb5efa5c0c55d84a9995aecadf7657bc253dbf5a72354207d38a6e269b2f1325
 DIST springgraph_0.82-5.diff.gz 3110 BLAKE2B 8459ffffe80cba463e95677ed264030ff150375bf2a163c081e719274b0f92cba27e5d8e5bc80923e433f332ee58773a7cbd053fc9680676193e7b852b4803bb SHA512 dcfc214c116cc8040b7eedf9a4864e84bc7c0b1f036fafb6322d9433564762135d1e845bb75891a380907059f7ebba7ed72efafb733a83a517f14af327d32e9b
-EBUILD springgraph-88.ebuild 894 BLAKE2B 186bb3fb4be074d0ffe04aad45c178c68bfeb4072c4a92ebabfe8d9b30f029c6bb8e917f343fbc576ec6b564447c724dda0c1024ae035edcb4004497e658977e SHA512 f2238d0f7cd754cad397efb1de8ffc29e7d6fff24affbdba59a19e0809680dc63922efbd8a97073504899d49c8f8832f8131fb148db334ce282dfe76ae6c210a
+EBUILD springgraph-88.ebuild 901 BLAKE2B f06389a12f1b54ef4f8804ce93a5ae8a9668eddbb568891e766cb4963a1e57f1c1f0d0514b664c32dd402d61b330baf427f2a9e80d5ac4cf236be3bc17a5bdeb SHA512 51bd108b211d07c3f083a88a25420b7e3deecc9f0f40dd040a0412aac6b259084d9ef8dca37f41295a66bb73514de393fa254fbd2772457c138d2d53527ed7ac
 MISC metadata.xml 709 BLAKE2B 73334cd9360f91db9fd8a0064edcce559dcd700771b8bc1a1f73c013bd71f56a9c6aea18bd30e2d908fff63c2bca27389c11a81edff03879342db8efac191be3 SHA512 f0dca73c130603698093f900d702c6d9d8fbc6bdde5cb95369d24f0dca7b5f35ff68d773b8056b5cf7f0f8f3bd41b5a55bbd68e4323f32d4d6a74eaaba4d72f5
diff --git a/media-gfx/springgraph/springgraph-88.ebuild b/media-gfx/springgraph/springgraph-88.ebuild
index 8b15f006c874..31742ab52d12 100644
--- a/media-gfx/springgraph/springgraph-88.ebuild
+++ b/media-gfx/springgraph/springgraph-88.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.chaosreigns.com/code/springgraph/dl/${PN}.pl.${PV}
 		 mirror://debian/pool/main/${PN:0:1}/${PN}/${SRC_DEBIAN_PATCH}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-perl/GD"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 1d990c1808e3..36ba4ac76b4b 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 4d7dc10cdefb..730d011d511c 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2-1.5.1.tar.gz 1020701 BLAKE2B 33213a49293fba9e86cfec312d3cd8018c2284d60040b63899778d2fa65bffe173926eb14bc893c1a80e1472084a711423f77f6288779486512074e75d92acfd SHA512 9872aa3c4d45b1e9cbb0b1d0a7d5b47256e35f01a4fe19d84d276096c2da053c55bd28554441f92464d19edf1222b427571ba7b06d716031021ff1f9b4bc9656
 EBUILD imlib2-1.5.1-r1.ebuild 2170 BLAKE2B 8b9ab6c0fe358e9459771bcaa3bdf9e0621d261501893c87260be3fa79e00ecbf3569bd9d0a1fdf94d998f49ff87317410f606ec62c6464e5a3b1ce96fa634da SHA512 3368d44f6cafc9e1f17d837b47542258d002eb7298d77ab8c910183c9f8313c0452f053b9a10f72a0a5761d83e24aa3d956dbf90352ea68ff6e26eb7bd996f25
-MISC metadata.xml 2534 BLAKE2B 5f49ea63a52648dc587ea6409cd8030efc1ed82a3bd8c77f4b37c388e17e0faddd2d841616bf073c63aaf5440a9954c62bff07d9e94a6302d9285cad211180c9 SHA512 fb6cdef2cce2f36b2c772f54c81353e319223f45bfff52490165905e03a6ffd2c36c86e199f4bfd99b0450c3c1a23af371a12bee9c230308751362d1627791e5
+MISC metadata.xml 2448 BLAKE2B ca27be2f23b000d1121343dfe8d21c93062ca12cf358860b30be062744e54df49a0ba108c991f090de5f84945189e02fa1e936df081e564c777a880421e36045 SHA512 659e2887be742527de8386577bbcb0c0544b1526089e67d5bf99745b0c63eb9634f6daa4b09d31bad81bae12ec9d7c227b687ebcec2c34d052e60b9e65bd05c3
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 01e33b1417ed..7f1dafcefc66 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>juippis@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
 	</maintainer>
 	<use>
 		<flag name="shm">Use MIT shared memory support for X image transfer.</flag>
diff --git a/media-libs/libpagemaker/Manifest b/media-libs/libpagemaker/Manifest
index 55d0aca6233c..b890b44df724 100644
--- a/media-libs/libpagemaker/Manifest
+++ b/media-libs/libpagemaker/Manifest
@@ -1,4 +1,4 @@
 DIST libpagemaker-0.0.4.tar.xz 306496 BLAKE2B 9928d5759c35359c4983724477e432b6876fa4d6e3039296a880661a4587de612ce93908a93d1d2dfbd033c6478748a4329a1682e327db528ddb7dc0947374ef SHA512 d9d9436622ae378da2a3c8e50a35b6133582a595c9ff0fe0e3b124fd0b83f1f12afdfc6a27d16b509ca9bab33067215d7300e505d4bf6b280be7e4bf46da6c64
-EBUILD libpagemaker-0.0.4.ebuild 967 BLAKE2B 4252a8234bf5346dfd2413aa7d751f0538dd7f95341522ac86a11445a166c903c8193ecafdd2a6c05d3c917abdf03540207bc034256871c57ba39494287b0b24 SHA512 8158046266acfd271c6bc4c91b27194c48e423c2386b2c19c1adfd35fa831341e5f024397407e3f54638d4749065b97eb4471fef3d7b55a980b39f4bc37c966f
+EBUILD libpagemaker-0.0.4.ebuild 963 BLAKE2B bd7058b441a96b4888dbc446cfcb08b978903132f8177830cc0d782dd28df273918a41c72c55aa9d8205806a04d23b9db7b0072ff18600fb006e8e6cad983bf4 SHA512 0d292c6474ac837be80f508ab584956b66a573d5d1f0cb281c70a485d4491a6e9b801a380f35926f5990587484c941eb796af0cdd4237f39f73d3da43efff2d7
 EBUILD libpagemaker-9999.ebuild 964 BLAKE2B 84883f3284ea13c357ac2fdd2cb825810618db084123a883b64d894e11885e41203d497bf5a8f9c798f2566c7eedf67f88c3d15167e3a25fa268bb2d179a2f1c SHA512 7c02bb4f8fe43d9a7ddcdf218e3be98a40e966b547f49751a430a8e41e0b27870e48082c56641dd20264033401795cac9e41b382879457c7344b3d7fd7294851
 MISC metadata.xml 346 BLAKE2B 3957184c53e81e9b9727c3da9593b8c4e9c3ab4b59c03f4a6deeae528d397affac28282108c760ac4ddd0c6699b3027158ba33abb0540d12aa15c56302b3110d SHA512 2585fb6fd9ef4008842e0a5c7b1db3d86f152e2d012fdddeba02d1ca0c6e1e457f10c01c8e76b030a0316807f38f6a6853c0111790d7cb6a93437259dbdf503c
diff --git a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
index 60251afb91c8..52f9c783e3ea 100644
--- a/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+++ b/media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
 RDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 7731f00a8637..17f4a986fb7e 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/imlib2_loaders/Manifest b/media-plugins/imlib2_loaders/Manifest
index e1e33e9b2b0c..d0b405ccae8d 100644
--- a/media-plugins/imlib2_loaders/Manifest
+++ b/media-plugins/imlib2_loaders/Manifest
@@ -1,3 +1,3 @@
 DIST imlib2_loaders-1.5.1.tar.gz 378169 BLAKE2B a65dabb8fb537489fe77fdc7c197ce4fa91dc13a86d1a5bf5aae4fbc9ac65a4194b57de8d49bb0dc2d906b20b7c79aa458d0ba668aa947a847414f377fd3b540 SHA512 a94996091a7f9f1271c19d24e6edebeb34977a4e67b8300897de0e5afd06bb9b209e404dd86ab3f397c6dec64f4985a515986b6b048d2c13416265eb2058a8a6
 EBUILD imlib2_loaders-1.5.1.ebuild 819 BLAKE2B 825cddbc8441e509dc0401be4a005c7bb448bd29f301ae6cdac11499ad457d7a844b5948100995ba5061c8eb59fe0ad451e0617146ba1f8d0817ccf75c3edd1b SHA512 d21e088f2f59033c12a16ee767c3a35d1e692cf491e6d088b3774c6ca05f29a9edccbe025554d5180832e77516f19e08efb5ae8105558a2f51c1efa308f44921
-MISC metadata.xml 922 BLAKE2B 6f1e856106a42159a968188e7638f70f8a5b0570f452c0fec6f917f50fa86e1be0ab9b3688dd1917c4db62968cecaa1c658bb403c7a55a08223566fb403d1468 SHA512 18ff6fed6da1e8e9657eca8b04c05b509c2f968f4798a2f5a54d54d6827c4a11f22ee4efdb174c5008816b9fad8b496a3cf2e6561efd8c55e23b9031de2becbe
+MISC metadata.xml 832 BLAKE2B 24df1b4810fd5d8b8492c4d42543f48123ea2906e85ea8109f7d434be992142193aabafbdf1e564c5df3ea63a7c73c13267312b812928154f14a360803cbd78c SHA512 70242dcb527186844975b2eb9e8a6a041627efbbdd2cd94fc31123b0d883e563161189e06666eb4ef53bbb4eb84d4b8aee7c53d32607db373bb640d000f5a09d
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index f427414f57c9..ea6a70be15ca 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <use>
     <flag name="eet">Enable Eet image loader</flag>
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 6279ac21db5f..2df13893daad 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index a1cc4b15973e..fc384e5f70af 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -2,8 +2,10 @@ AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41
 DIST devedeng-4.10.0.tar.gz 1884153 BLAKE2B 71b86ae206dfd8798d54304eb68b488fd7d5e6ca76d76691682bd106e28de7a75833fdf57499841d1aa970e35e336cf50d568fb5e3fc34a40eb685c8b503a561 SHA512 4230e0395b4add0b53921137c9d32ebcf7efb1d2e8e8298c57bc11e82e06783b9a4f4fdcec41b1bcfdb358a35d1ce03c14fa3448551ad7289684ad35ce76cbd2
 DIST devedeng-4.11.0.tar.gz 1884388 BLAKE2B 2871d3d8d094be0cd32007859ea65a6567884970b32d93ef3838ab7ad1c31e25fed8f8c1a6719e5ca0f685596b74551301ef9397ad2315d7563da6015546686c SHA512 3a6f5bc780e9f4b248ce731324462ec4df2982256b77c837b53e2de1fa4668c8df73af5471f3878af80c0feeff7ea2238d9d68b21915bd6cd4c70be9f61efa52
 DIST devedeng-4.14.0.tar.bz2 1759759 BLAKE2B 1ebdf68e41d1554b7a4d477616ab7700f5a48ed533f8662d4baf3e1b7ca98bdaf92ddbee438ab22ed6b431623bc4c54e1f1bd610806e0fb1676d58df6b73e436 SHA512 2afbc69b9bbfaaab2b2123319bacb87f023e789e118bc3025132cd6a71f91373c80e6a5a35d83291f085ee3af03cf776bbd8f513c557174413b269ecf3c220cf
+DIST devedeng-4.15.0.tar.bz2 1759602 BLAKE2B 31f08dec66623f68fba17bbaf657d5865796ca63b37f3e0a72213692ac1fa79fd14123d33112dc4713c42d682fb216fa61b971454efa4304ec7ce10015af4c99 SHA512 90a1dd5f2e7dfd78bff38fb682e021e6bb489a0ca16cc29b533926b242e4a3322372ad383acf61338dea7873448f649534fe9a2ac9e22294de490b95df55a4f0
 EBUILD devedeng-4.10.0.ebuild 913 BLAKE2B 94629aa65626217a623dfdb07210520e72e5ed0988e8894b18d0b03725b66391394f4939b64d4504c20f803c10d26a4b93642f4649999946d271f541038fc66e SHA512 665c2ea734cf3cf0f49d234afe1f75a50d8406b0dc4bbe3b66eec870d8fc567eb919676538b048430b166db0edab7a1ed0bdfac35d33131fadf2fa0ca14385ed
 EBUILD devedeng-4.11.0.ebuild 928 BLAKE2B d6b0cc81b73626e4253f353e363d9b67350392c22ee46079c3dde0c07a55761c5414dd7a37e37e100cebfcea6cdde5d09b4f7608f6d4efaa381b84824f5afe6b SHA512 78dabd85ecb76dc7979c961c58ef0bf97341235f64fc28bdd28c249412c812fbeb2785ae05e6d569980ef22291eaab3efd83b8d1c1e9c185ef7348116461200e
 EBUILD devedeng-4.14.0.ebuild 1259 BLAKE2B 71a900e3606cc4976afa01bd2349c33079ab5bb5830c1415cf13140cd4996105d64f5e9e6f047e46c8fd2f1e537023abe9135b31a8ed66605e1b14a8e54548f0 SHA512 e8b3f02f07e4f1646f15283dc967d351bd00092e6481f40dbd26544846f2c3804654f6c7d71e3ddb483b336566398a8067d75fc4de626fb0aab13eef580e147a
+EBUILD devedeng-4.15.0.ebuild 1267 BLAKE2B f2b046673112dbac5d91024cc98c41109c2a46cbdbee928ec55aa0f2fcf384e9b18b3d1d8fd86a6457892dbb0d23459351c743bbf8bfed12e8e9da19be308879 SHA512 592d029b4d9c2c4bb10d2d87b631876c977fb84dd907a8c4d28e8ed202af51aeafc467143bc453e087192fa25a5d8632c789a36b1818c8aeaae31eeaab90a3ab
 EBUILD devedeng-9999.ebuild 894 BLAKE2B a1e93a8d4cf4c013ca4bcf74677f231c9b528c91b8f3f8643f1a82d11fbd792b08c3f55a243cb2fec5c385b2d5df356d5b656338f5a12184d0e928df18b28bae SHA512 bf0af6a2b4f1b6cabb58d717039c4f7f473f6a7e1d881bc8fd3652b95fe028438b951477b53fa9c9fec9d57d403b096f8f537aca1a4ddebd6261048a109c8e4c
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.15.0.ebuild b/media-video/devedeng/devedeng-4.15.0.ebuild
new file mode 100644
index 000000000000..29da18849893
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.15.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )"
+
+DEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch )
+
+src_prepare() {
+	default
+
+	# Documentation path
+	sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \
+		-i src/devedeng/configuration_data.py || die
+	sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die
+
+	# Desktop icon
+	sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-video/vcsi/Manifest b/media-video/vcsi/Manifest
index 9f4d7669129b..a9375758d1ab 100644
--- a/media-video/vcsi/Manifest
+++ b/media-video/vcsi/Manifest
@@ -1,3 +1,3 @@
 DIST vcsi-7.tar.gz 18350 BLAKE2B 840f17db49a0b538a53bc0c3cd426e117d6a29d4b6f7b1ab7bf2f3a1697ea903a908f19b798c5898abf3cb0d308b34aeffc863517c682b8b9a114f5f9dcefb42 SHA512 5b5a3b9db76003c364aef0574a1b43c1177f5b7dae1339be981d6358c38102f0e7f275c9ec074e7cdd6b042ae30b982cfbbffa35c67eb8e2fc887c00073f2e48
 EBUILD vcsi-7.ebuild 838 BLAKE2B e69d6df7d2cef9aa4e90f1a155fb0b94fe4881ba2774a16a398832c39f93395731b83c59264ea13d5a65c3b75db4d8cdec6ec748eec413fcd58f82ddf3d4620f SHA512 56a8a184e13fd049a02dd58d32e935bd5ec7702fc95c66f4d2545a4c54f715b125711221234c963d32226a9deecc7f8ffd31a887ee91259b40abcd0edf71b66a
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/media-video/vcsi/metadata.xml b/media-video/vcsi/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/media-video/vcsi/metadata.xml
+++ b/media-video/vcsi/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 5bd511601c9f..102d75205c1a 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 d86338d7f7bd..407ac8a95bbe 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Jul 2019 14:09:00 +0000
+Wed, 31 Jul 2019 05:38:57 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4e7b5646cc47..02bd3a2be071 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-07-30T14:09:03Z
+TIMESTAMP 2019-07-31T05:39:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1AT39fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1BKXVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnnRAAhAbYi4GxcgDtzvPfIvmCAY8CaGPYXiywNgNaQ9/8+n9EHMkS/CPJ/+Tc
-D4zoJiQvgS9F/Gw+X80DENiPYfIsrFWOmhq0niK4dtjo485RN7Y9CgRB2kLT/3oe
-8hm5rNjS058AYNph4ZCzIyLXPdY/Cu6wO+8vWgPMnn3jiMzywZF9NTDFI40ks3IV
-eA7XHMttTv6SdNILshRztJqNNuhF6h1UT97puhzezh8vb7cV59CVh9nS918QedzF
-GV1w5AuvQfprEfOBrVbowqiiyJO9mqxLE3X8fZwLxymjdg5Cf+ZXIp7aCrU1tobE
-BUjpxDOVAAVCf5VPr+aKKurVSd4289uEQRPNhh7jDmPP6h5Tzi7VGYay4njVK7yh
-t5EPTHpI5J3Z/2rXpR61jJEnX2WTdiBNSH+tVFd5GSoZX5XKtJ2kovBdBJEU3TMJ
-X9ySEDstmR9HteVMyyCH1rQ3CZ4cg0FeARTqFyNrIhrw+pUYbkzjIk5jivt8gr7o
-68d4gXojfBOPK745ctF/nRxLcrxmQx2euKeu2COWK4Sa0n4Im+vH06UIHqHSiDaS
-aWMnoXAab+pS3h44zfZN57lasAAfa/6DnMqtuyKY/YND/gJSQO6eFhEHep5JrC/C
-KBqlPNFGwOPrOVJzU5BMSqgKMXN8oiEaRP/Wt/xsatSPFqEf7AY=
-=zK/D
+klDpfw//SiPzAIoHnBLYX2TbYKP0WKFbzENLVJqhRYEA7PBcfi1Qb6/F9LSqRnTy
+j/NKBE2U7ZAFJDMAKsb2iFJ4qpcHu+mj24srJJiCFIhi5C73dVmL/cmmylUxKWm5
+sEQbP0fvaochVpW/R0UVE16aiEErqFy54oLrx8rYFKl9k1bqzJPwU5KNUuVSuP7e
+gmwhYiFlgzPD9wzW+ela1xHTryVz63+XFWawWBX1ju5zuacYoxENYdLeL76/Rra6
+G80Ncieb2jAW1r/B5At8DHGbNfFkZoD/LPC+frUtOLp6xdZRHy5EHnPgkpRIj6ik
+yKXjKQr6C18yLW3mG83sHkhwCJKV7hYlssRgQCw5fRzkoojRI1Z3F3/YXepIVVq5
+Ly84hSYvXQdv80eTp+Y+Ue1mW4MEJRfAwG1v1twynqdeQAgebTQuUwqFaG2T8N98
+UWCo8h7ERqWt8FrawCkZzFJcOZufxg32Jw+FG9vQACkoKTScly+bfzqjyiraHmdM
+PeKvGw2biXm24Ee8how/qG7TJsWNfgZJcEgTpU4AOlxP+zP19N+Z02JwuWdDIdpT
+sxUJq5TSkfUOnisFf47aRbdxyRE7gwQGq3hvZ5QmYA/TgsKkMa9RdW8+Itr3cynJ
+l8gW/AyVs+2t7aTBlK4nV9HLbO+OycCbl7TOKINy+qObrE6RQsA=
+=24oe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d86338d7f7bd..407ac8a95bbe 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Jul 2019 14:09:00 +0000
+Wed, 31 Jul 2019 05:38:57 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 1b6d73e58597..bede5dff8607 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index b7770187638b..84926ed73e15 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/reportmagic-2.21 b/metadata/md5-cache/app-admin/reportmagic-2.21
index 291e937f83e8..c218a4999a20 100644
--- a/metadata/md5-cache/app-admin/reportmagic-2.21
+++ b/metadata/md5-cache/app-admin/reportmagic-2.21
@@ -4,8 +4,8 @@ DESCRIPTION=Makes usable statistics from your web site log file analysis
 EAPI=5
 HOMEPAGE=http://www.reportmagic.org/
 IUSE=truetype
-KEYWORDS=amd64 ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=http://www.reportmagic.org/rmagic-2.21.tar.gz
-_md5_=53888ff2178564058d91f769f406fd17
+_md5_=d37399b5d43e9af6b4864c1fb83e09b4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 99a0a4576023..45e3362949a6 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/kup-0.7.3 b/metadata/md5-cache/app-backup/kup-0.7.3
similarity index 92%
rename from metadata/md5-cache/app-text/kup-0.7.3
rename to metadata/md5-cache/app-backup/kup-0.7.3
index 9ec8486e4397..41482c085197 100644
--- a/metadata/md5-cache/app-text/kup-0.7.3
+++ b/metadata/md5-cache/app-backup/kup-0.7.3
@@ -7,8 +7,8 @@ HOMEPAGE=https://www.linux-apps.com/p/1127689
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgit2:= >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 app-backup/bup net-misc/rsync >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/libgit2:= >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 app-backup/bup net-misc/rsync !app-text/kup >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
 SRC_URI=https://github.com/spersson/Kup/archive/kup-0.7.3.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a830ac280039591492d952a60ed2dec4
+_md5_=d560a94751e0b03530c163cdb3883d18
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 3b4a9224e276..427d9b15a4e6 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/free42-2.4.2 b/metadata/md5-cache/app-emulation/free42-2.4.2
new file mode 100644
index 000000000000..a350f5ac3ea9
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-2.4.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=7
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=+alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=http://thomasokken.com/free42/upstream/free42-nologo-2.4.2.tgz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=4ef2b02d75dae732ae0735d7e7481587
diff --git a/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2 b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2
new file mode 100644
index 000000000000..d37746fd1824
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst prepare
+DEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+DESCRIPTION=User-mode networking for unprivileged network namespaces
+EAPI=7
+HOMEPAGE=https://github.com/rootless-containers/slirp4netns
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= dev-libs/libpcre:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/rootless-containers/slirp4netns/archive/v0.4.0-beta.2.tar.gz -> slirp4netns-0.4.0_beta2.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b4daad259ce5f3543c015e66badf71c4
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 60440a673133..6591ade69797 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/elasticsearch-7.2.1 b/metadata/md5-cache/app-misc/elasticsearch-7.2.1
new file mode 100644
index 000000000000..de8208c73ef7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/elasticsearch-7.2.1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst prepare setup
+DESCRIPTION=Open Source, Distributed, RESTful, Search Engine
+EAPI=7
+HOMEPAGE=https://www.elastic.co/products/elasticsearch
+IUSE=x-pack
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )
+RDEPEND=virtual/jre
+SLOT=0
+SRC_URI=x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz ) !x-pack? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz )
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	f8dcb46ee7b0bcdec51dac1ef4bfdfc9
+_md5_=113f0d8e85d6af24ff35448fb9831e1e
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 97f66b810486..2388e544630b 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/libabw-0.1.2 b/metadata/md5-cache/app-text/libabw-0.1.2
index b920c74f649b..8eae8fba287d 100644
--- a/metadata/md5-cache/app-text/libabw-0.1.2
+++ b/metadata/md5-cache/app-text/libabw-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing abiword documents
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
 IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.2.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95145fb9f497f4756965b68172d83be1
+_md5_=b515022d1b69d8c5cdb1ab2e44ccca2a
diff --git a/metadata/md5-cache/app-text/libebook-0.1.2-r1 b/metadata/md5-cache/app-text/libebook-0.1.2-r1
index 723fed50b0d4..139f79baac11 100644
--- a/metadata/md5-cache/app-text/libebook-0.1.2-r1
+++ b/metadata/md5-cache/app-text/libebook-0.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing various ebook formats
 EAPI=6
 HOMEPAGE=https://www.sourceforge.net/projects/libebook/
 IUSE=doc test tools
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.2.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3462e0be0112f8f486bb79fbb2da211e
+_md5_=d6288f080dc7e8e38ad23b0eeb087c3e
diff --git a/metadata/md5-cache/app-text/libepubgen-0.1.1 b/metadata/md5-cache/app-text/libepubgen-0.1.1
index 893a537bcfe0..1fc65e07e95d 100644
--- a/metadata/md5-cache/app-text/libepubgen-0.1.1
+++ b/metadata/md5-cache/app-text/libepubgen-0.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=EPUB generator for librevenge
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/libepubgen/
 IUSE=debug doc test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
-_md5_=e4869c84dde1d3e00ceadf4f7952500d
+_md5_=ff9ecfa018974a2cecb853e6c8e3a426
diff --git a/metadata/md5-cache/app-text/libexttextcat-3.4.5 b/metadata/md5-cache/app-text/libexttextcat-3.4.5
index 0999e7c4d8a6..b66a60e81869 100644
--- a/metadata/md5-cache/app-text/libexttextcat-3.4.5
+++ b/metadata/md5-cache/app-text/libexttextcat-3.4.5
@@ -3,8 +3,8 @@ DESCRIPTION=Library implementing N-gram-based text categorization
 EAPI=6
 HOMEPAGE=http://software.wise-guys.nl/libtextcat/
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.5.tar.xz
-_md5_=889a6a03ca8577d89f0c9ce463413e41
+_md5_=022046fe6de13659b04ce0e5bae59f2f
diff --git a/metadata/md5-cache/app-text/libmwaw-0.3.15 b/metadata/md5-cache/app-text/libmwaw-0.3.15
index e84fd6caf913..c565c83c2b7a 100644
--- a/metadata/md5-cache/app-text/libmwaw-0.3.15
+++ b/metadata/md5-cache/app-text/libmwaw-0.3.15
@@ -5,9 +5,9 @@ DESCRIPTION=Library parsing many pre-OSX MAC text formats
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
 IUSE=doc static-libs tools
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/librevenge sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.15.tar.xz
-_md5_=5f85b25aa70d2562e1c7245d7d106aa9
+_md5_=85fe98d3420a71563c6004cb4285fec3
diff --git a/metadata/md5-cache/app-text/libodfgen-0.1.7 b/metadata/md5-cache/app-text/libodfgen-0.1.7
index 908512ccf366..47ddce24ece5 100644
--- a/metadata/md5-cache/app-text/libodfgen-0.1.7
+++ b/metadata/md5-cache/app-text/libodfgen-0.1.7
@@ -5,9 +5,9 @@ DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
 EAPI=7
 HOMEPAGE=http://libwpd.sourceforge.net/
 IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.7.tar.xz
-_md5_=f5a3eaaf41f9b65bed269a55dfc994ea
+_md5_=517fd3a789ad3b7771d52fede7d73752
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.2 b/metadata/md5-cache/app-text/libqxp-0.0.2
index 5252b29e7927..3862707c5423 100644
--- a/metadata/md5-cache/app-text/libqxp-0.0.2
+++ b/metadata/md5-cache/app-text/libqxp-0.0.2
@@ -5,9 +5,9 @@ DESCRIPTION=Library parsing QuarkXpress documents
 EAPI=7
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 IUSE=debug doc test tools
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge dev-libs/icu:=
 SLOT=0
 SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.2.tar.xz
-_md5_=75cfb7b722fc07d1a10d0360a91788b5
+_md5_=4bf86724f6450ecb112a6f92d9a06d3d
diff --git a/metadata/md5-cache/app-text/libstaroffice-0.0.6 b/metadata/md5-cache/app-text/libstaroffice-0.0.6
index fcc132ea6275..79b66181635b 100644
--- a/metadata/md5-cache/app-text/libstaroffice-0.0.6
+++ b/metadata/md5-cache/app-text/libstaroffice-0.0.6
@@ -4,9 +4,9 @@ DESCRIPTION=Import filter for old StarOffice documents
 EAPI=6
 HOMEPAGE=https://github.com/fosnola/libstaroffice
 IUSE=debug doc tools +zlib
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
 RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz
-_md5_=cf59211a9f818c4b68e5f9bea4faf6d1
+_md5_=c2a114706acbe549dd37d6d0c25e315f
diff --git a/metadata/md5-cache/app-text/libwpd-0.10.3 b/metadata/md5-cache/app-text/libwpd-0.10.3
index ff93d30352d7..13e59fb27564 100644
--- a/metadata/md5-cache/app-text/libwpd-0.10.3
+++ b/metadata/md5-cache/app-text/libwpd-0.10.3
@@ -5,9 +5,9 @@ DESCRIPTION=WordPerfect Document import/export library
 EAPI=7
 HOMEPAGE=http://libwpd.sf.net
 IUSE=doc +tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0.10
 SRC_URI=mirror://sourceforge/libwpd/libwpd-0.10.3.tar.xz
-_md5_=8926ce437594b7180eb6d4f917181fb3
+_md5_=a77176f276311e5c84852c7e4eb3748c
diff --git a/metadata/md5-cache/app-text/libwpg-0.3.3 b/metadata/md5-cache/app-text/libwpg-0.3.3
index acd5069d70c6..2a931c546c51 100644
--- a/metadata/md5-cache/app-text/libwpg-0.3.3
+++ b/metadata/md5-cache/app-text/libwpg-0.3.3
@@ -5,9 +5,9 @@ DESCRIPTION=C++ library to read and parse graphics in WPG
 EAPI=7
 HOMEPAGE=http://libwpg.sourceforge.net/libwpg.htm
 IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge
 SLOT=0.3
 SRC_URI=mirror://sourceforge/libwpg/libwpg-0.3.3.tar.xz
-_md5_=b5ebc1c39fb8bb1e46ec7fe4b1303f41
+_md5_=cc11c8182de02ed7cc400f71b4b097c7
diff --git a/metadata/md5-cache/app-text/libwps-0.4.10 b/metadata/md5-cache/app-text/libwps-0.4.10
index 3d801083b419..a0455d2d9dbf 100644
--- a/metadata/md5-cache/app-text/libwps-0.4.10
+++ b/metadata/md5-cache/app-text/libwps-0.4.10
@@ -5,9 +5,9 @@ DESCRIPTION=Microsoft Works file word processor format import filter library
 EAPI=7
 HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
 IUSE=doc debug static-libs tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=mirror://sourceforge/libwps/libwps-0.4.10.tar.xz
-_md5_=c335bb0b613e788c2e82a03843c2d2f4
+_md5_=3af8ef67af2a605592d3ade480e7565a
diff --git a/metadata/md5-cache/app-text/mythes-1.2.4 b/metadata/md5-cache/app-text/mythes-1.2.4
index 5d2a087f52d7..5ceafd8a8523 100644
--- a/metadata/md5-cache/app-text/mythes-1.2.4
+++ b/metadata/md5-cache/app-text/mythes-1.2.4
@@ -4,9 +4,9 @@ DESCRIPTION=A simple thesaurus for Libreoffice
 EAPI=5
 HOMEPAGE=http://hunspell.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/MyThes/1.2.4/mythes-1.2.4.tar.gz
-_md5_=0b5b800b853e0aae8098805a26a83170
+_md5_=c854686a421bd824bd74b8c973ea8b90
diff --git a/metadata/md5-cache/app-text/tessdata_best-4.0.0 b/metadata/md5-cache/app-text/tessdata_best-4.0.0
new file mode 100644
index 000000000000..fe13596ed421
--- /dev/null
+++ b/metadata/md5-cache/app-text/tessdata_best-4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!app-text/tessdata_fast !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
+DESCRIPTION=Most accurate trained models for app-text/tesseract
+EAPI=7
+HOMEPAGE=https://github.com/tesseract-ocr/tessdata_best
+IUSE=+osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kmr-Latn l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-text/tessdata_fast !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
+SLOT=0
+SRC_URI=https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/eng.traineddata -> eng.traineddata-tessdata_best-4.0.0 osd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/osd.traineddata -> osd.traineddata-tessdata_best-4.0.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/afr.traineddata -> afr.traineddata-tessdata_best-4.0.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/amh.traineddata -> amh.traineddata-tessdata_best-4.0.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ara.traineddata -> ara.traineddata-tessdata_best-4.0.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/asm.traineddata -> asm.traineddata-tessdata_best-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/aze.traineddata -> aze.traineddata-tessdata_best-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_best-4.0.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/bel.traineddata -> bel.traineddata-tessdata_best-4.0.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/bul.traineddata -> bul.traineddata-tessdata_best-4.0.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ben.traineddata -> ben.traineddata-tessdata_best-4.0.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/bod.traineddata -> bod.traineddata-tessdata_best-4.0.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/bre.traineddata -> bre.traineddata-tessdata_best-4.0.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/bos.traineddata -> bos.traineddata-tessdata_best-4.0.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/cat.traineddata -> cat.traineddata-tessdata_best-4.0.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ceb.traineddata -> ceb.traineddata-tessdata_best-4.0.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/chr.traineddata -> chr.traineddata-tessdata_best-4.0.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/cos.traineddata -> cos.traineddata-tessdata_best-4.0.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ces.traineddata -> ces.traineddata-tessdata_best-4.0.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/cym.traineddata -> cym.traineddata-tessdata_best-4.0.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/dan.traineddata -> dan.traineddata-tessdata_best-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/deu.traineddata -> deu.traineddata-tessdata_best-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/frk.traineddata -> frk.traineddata-tessdata_best-4.0.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/div.traineddata -> div.traineddata-tessdata_best-4.0.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/dzo.traineddata -> dzo.traineddata-tessdata_best-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ell.traineddata -> ell.traineddata-tessdata_best-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/grc.traineddata -> grc.traineddata-tessdata_best-4.0.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/enm.traineddata -> enm.traineddata-tessdata_best-4.0.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/epo.traineddata -> epo.traineddata-tessdata_best-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/spa.traineddata -> spa.traineddata-tessdata_best-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/spa_old.traineddata -> spa_old.traineddata-tessdata_best-4.0.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/est.traineddata -> est.traineddata-tessdata_best-4.0.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/eus.traineddata -> eus.traineddata-tessdata_best-4.0.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fas.traineddata -> fas.traineddata-tessdata_best-4.0.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fin.traineddata -> fin.traineddata-tessdata_best-4.0.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fil.traineddata -> fil.traineddata-tessdata_best-4.0.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fao.traineddata -> fao.traineddata-tessdata_best-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fra.traineddata -> fra.traineddata-tessdata_best-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/frm.traineddata -> frm.traineddata-tessdata_best-4.0.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/fry.traineddata -> fry.traineddata-tessdata_best-4.0.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/gle.traineddata -> gle.traineddata-tessdata_best-4.0.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/gla.traineddata -> gla.traineddata-tessdata_best-4.0.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/glg.traineddata -> glg.traineddata-tessdata_best-4.0.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/guj.traineddata -> guj.traineddata-tessdata_best-4.0.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/heb.traineddata -> heb.traineddata-tessdata_best-4.0.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/hin.traineddata -> hin.traineddata-tessdata_best-4.0.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/hrv.traineddata -> hrv.traineddata-tessdata_best-4.0.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/hat.traineddata -> hat.traineddata-tessdata_best-4.0.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/hun.traineddata -> hun.traineddata-tessdata_best-4.0.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/hye.traineddata -> hye.traineddata-tessdata_best-4.0.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ind.traineddata -> ind.traineddata-tessdata_best-4.0.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/isl.traineddata -> isl.traineddata-tessdata_best-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ita.traineddata -> ita.traineddata-tessdata_best-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ita_old.traineddata -> ita_old.traineddata-tessdata_best-4.0.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/iku.traineddata -> iku.traineddata-tessdata_best-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/jpn.traineddata -> jpn.traineddata-tessdata_best-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_best-4.0.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/jav.traineddata -> jav.traineddata-tessdata_best-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kat.traineddata -> kat.traineddata-tessdata_best-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kat_old.traineddata -> kat_old.traineddata-tessdata_best-4.0.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kaz.traineddata -> kaz.traineddata-tessdata_best-4.0.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/khm.traineddata -> khm.traineddata-tessdata_best-4.0.0 ) l10n_kmr-Latn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kmr.traineddata -> kmr.traineddata-tessdata_best-4.0.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kan.traineddata -> kan.traineddata-tessdata_best-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kor.traineddata -> kor.traineddata-tessdata_best-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_best-4.0.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/kir.traineddata -> kir.traineddata-tessdata_best-4.0.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/lat.traineddata -> lat.traineddata-tessdata_best-4.0.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ltz.traineddata -> ltz.traineddata-tessdata_best-4.0.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/lao.traineddata -> lao.traineddata-tessdata_best-4.0.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/lit.traineddata -> lit.traineddata-tessdata_best-4.0.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/lav.traineddata -> lav.traineddata-tessdata_best-4.0.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mri.traineddata -> mri.traineddata-tessdata_best-4.0.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mkd.traineddata -> mkd.traineddata-tessdata_best-4.0.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mal.traineddata -> mal.traineddata-tessdata_best-4.0.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mon.traineddata -> mon.traineddata-tessdata_best-4.0.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mar.traineddata -> mar.traineddata-tessdata_best-4.0.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/msa.traineddata -> msa.traineddata-tessdata_best-4.0.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mlt.traineddata -> mlt.traineddata-tessdata_best-4.0.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/mya.traineddata -> mya.traineddata-tessdata_best-4.0.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/nep.traineddata -> nep.traineddata-tessdata_best-4.0.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/nld.traineddata -> nld.traineddata-tessdata_best-4.0.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/nor.traineddata -> nor.traineddata-tessdata_best-4.0.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/oci.traineddata -> oci.traineddata-tessdata_best-4.0.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ori.traineddata -> ori.traineddata-tessdata_best-4.0.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/pan.traineddata -> pan.traineddata-tessdata_best-4.0.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/pol.traineddata -> pol.traineddata-tessdata_best-4.0.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/pus.traineddata -> pus.traineddata-tessdata_best-4.0.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/por.traineddata -> por.traineddata-tessdata_best-4.0.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/que.traineddata -> que.traineddata-tessdata_best-4.0.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ron.traineddata -> ron.traineddata-tessdata_best-4.0.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/rus.traineddata -> rus.traineddata-tessdata_best-4.0.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/san.traineddata -> san.traineddata-tessdata_best-4.0.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/snd.traineddata -> snd.traineddata-tessdata_best-4.0.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/sin.traineddata -> sin.traineddata-tessdata_best-4.0.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/slk.traineddata -> slk.traineddata-tessdata_best-4.0.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/slv.traineddata -> slv.traineddata-tessdata_best-4.0.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/sqi.traineddata -> sqi.traineddata-tessdata_best-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/srp.traineddata -> srp.traineddata-tessdata_best-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_best-4.0.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/sun.traineddata -> sun.traineddata-tessdata_best-4.0.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/swe.traineddata -> swe.traineddata-tessdata_best-4.0.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/swa.traineddata -> swa.traineddata-tessdata_best-4.0.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/syr.traineddata -> syr.traineddata-tessdata_best-4.0.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tam.traineddata -> tam.traineddata-tessdata_best-4.0.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tel.traineddata -> tel.traineddata-tessdata_best-4.0.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tgk.traineddata -> tgk.traineddata-tessdata_best-4.0.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tha.traineddata -> tha.traineddata-tessdata_best-4.0.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tir.traineddata -> tir.traineddata-tessdata_best-4.0.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ton.traineddata -> ton.traineddata-tessdata_best-4.0.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tur.traineddata -> tur.traineddata-tessdata_best-4.0.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/tat.traineddata -> tat.traineddata-tessdata_best-4.0.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/uig.traineddata -> uig.traineddata-tessdata_best-4.0.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/ukr.traineddata -> ukr.traineddata-tessdata_best-4.0.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/urd.traineddata -> urd.traineddata-tessdata_best-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/uzb.traineddata -> uzb.traineddata-tessdata_best-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_best-4.0.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/vie.traineddata -> vie.traineddata-tessdata_best-4.0.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/yid.traineddata -> yid.traineddata-tessdata_best-4.0.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/yor.traineddata -> yor.traineddata-tessdata_best-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_best-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_best-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_best-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_best/raw/4.0.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_best-4.0.0 )
+_md5_=5129f483e3f058432c98161b1f4aaa07
diff --git a/metadata/md5-cache/app-text/tessdata_fast-4.0.0 b/metadata/md5-cache/app-text/tessdata_fast-4.0.0
new file mode 100644
index 000000000000..d6294fe893f4
--- /dev/null
+++ b/metadata/md5-cache/app-text/tessdata_fast-4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!app-text/tessdata_best !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
+DESCRIPTION=Fast integer versions of trained models for app-text/tesseract
+EAPI=7
+HOMEPAGE=https://github.com/tesseract-ocr/tessdata_fast
+IUSE=+osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kmr-Latn l10n_kn l10n_ko l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-text/tessdata_best !app-text/tessdata_legacy !<app-text/tesseract-4.1.0
+SLOT=0
+SRC_URI=https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/eng.traineddata -> eng.traineddata-tessdata_fast-4.0.0 osd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/osd.traineddata -> osd.traineddata-tessdata_fast-4.0.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/afr.traineddata -> afr.traineddata-tessdata_fast-4.0.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/amh.traineddata -> amh.traineddata-tessdata_fast-4.0.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ara.traineddata -> ara.traineddata-tessdata_fast-4.0.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/asm.traineddata -> asm.traineddata-tessdata_fast-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/aze.traineddata -> aze.traineddata-tessdata_fast-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_fast-4.0.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/bel.traineddata -> bel.traineddata-tessdata_fast-4.0.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/bul.traineddata -> bul.traineddata-tessdata_fast-4.0.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ben.traineddata -> ben.traineddata-tessdata_fast-4.0.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/bod.traineddata -> bod.traineddata-tessdata_fast-4.0.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/bre.traineddata -> bre.traineddata-tessdata_fast-4.0.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/bos.traineddata -> bos.traineddata-tessdata_fast-4.0.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/cat.traineddata -> cat.traineddata-tessdata_fast-4.0.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ceb.traineddata -> ceb.traineddata-tessdata_fast-4.0.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/chr.traineddata -> chr.traineddata-tessdata_fast-4.0.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/cos.traineddata -> cos.traineddata-tessdata_fast-4.0.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ces.traineddata -> ces.traineddata-tessdata_fast-4.0.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/cym.traineddata -> cym.traineddata-tessdata_fast-4.0.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/dan.traineddata -> dan.traineddata-tessdata_fast-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/deu.traineddata -> deu.traineddata-tessdata_fast-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/frk.traineddata -> frk.traineddata-tessdata_fast-4.0.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/div.traineddata -> div.traineddata-tessdata_fast-4.0.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/dzo.traineddata -> dzo.traineddata-tessdata_fast-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ell.traineddata -> ell.traineddata-tessdata_fast-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/grc.traineddata -> grc.traineddata-tessdata_fast-4.0.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/enm.traineddata -> enm.traineddata-tessdata_fast-4.0.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/epo.traineddata -> epo.traineddata-tessdata_fast-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/spa.traineddata -> spa.traineddata-tessdata_fast-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/spa_old.traineddata -> spa_old.traineddata-tessdata_fast-4.0.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/est.traineddata -> est.traineddata-tessdata_fast-4.0.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/eus.traineddata -> eus.traineddata-tessdata_fast-4.0.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fas.traineddata -> fas.traineddata-tessdata_fast-4.0.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fin.traineddata -> fin.traineddata-tessdata_fast-4.0.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fil.traineddata -> fil.traineddata-tessdata_fast-4.0.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fao.traineddata -> fao.traineddata-tessdata_fast-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fra.traineddata -> fra.traineddata-tessdata_fast-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/frm.traineddata -> frm.traineddata-tessdata_fast-4.0.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/fry.traineddata -> fry.traineddata-tessdata_fast-4.0.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/gle.traineddata -> gle.traineddata-tessdata_fast-4.0.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/gla.traineddata -> gla.traineddata-tessdata_fast-4.0.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/glg.traineddata -> glg.traineddata-tessdata_fast-4.0.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/guj.traineddata -> guj.traineddata-tessdata_fast-4.0.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/heb.traineddata -> heb.traineddata-tessdata_fast-4.0.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/hin.traineddata -> hin.traineddata-tessdata_fast-4.0.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/hrv.traineddata -> hrv.traineddata-tessdata_fast-4.0.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/hat.traineddata -> hat.traineddata-tessdata_fast-4.0.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/hun.traineddata -> hun.traineddata-tessdata_fast-4.0.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/hye.traineddata -> hye.traineddata-tessdata_fast-4.0.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ind.traineddata -> ind.traineddata-tessdata_fast-4.0.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/isl.traineddata -> isl.traineddata-tessdata_fast-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ita.traineddata -> ita.traineddata-tessdata_fast-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ita_old.traineddata -> ita_old.traineddata-tessdata_fast-4.0.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/iku.traineddata -> iku.traineddata-tessdata_fast-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/jpn.traineddata -> jpn.traineddata-tessdata_fast-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_fast-4.0.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/jav.traineddata -> jav.traineddata-tessdata_fast-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kat.traineddata -> kat.traineddata-tessdata_fast-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kat_old.traineddata -> kat_old.traineddata-tessdata_fast-4.0.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kaz.traineddata -> kaz.traineddata-tessdata_fast-4.0.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/khm.traineddata -> khm.traineddata-tessdata_fast-4.0.0 ) l10n_kmr-Latn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kmr.traineddata -> kmr.traineddata-tessdata_fast-4.0.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kan.traineddata -> kan.traineddata-tessdata_fast-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kor.traineddata -> kor.traineddata-tessdata_fast-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_fast-4.0.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/kir.traineddata -> kir.traineddata-tessdata_fast-4.0.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/lat.traineddata -> lat.traineddata-tessdata_fast-4.0.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ltz.traineddata -> ltz.traineddata-tessdata_fast-4.0.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/lao.traineddata -> lao.traineddata-tessdata_fast-4.0.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/lit.traineddata -> lit.traineddata-tessdata_fast-4.0.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/lav.traineddata -> lav.traineddata-tessdata_fast-4.0.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mri.traineddata -> mri.traineddata-tessdata_fast-4.0.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mkd.traineddata -> mkd.traineddata-tessdata_fast-4.0.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mal.traineddata -> mal.traineddata-tessdata_fast-4.0.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mon.traineddata -> mon.traineddata-tessdata_fast-4.0.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mar.traineddata -> mar.traineddata-tessdata_fast-4.0.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/msa.traineddata -> msa.traineddata-tessdata_fast-4.0.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mlt.traineddata -> mlt.traineddata-tessdata_fast-4.0.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/mya.traineddata -> mya.traineddata-tessdata_fast-4.0.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/nep.traineddata -> nep.traineddata-tessdata_fast-4.0.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/nld.traineddata -> nld.traineddata-tessdata_fast-4.0.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/nor.traineddata -> nor.traineddata-tessdata_fast-4.0.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/oci.traineddata -> oci.traineddata-tessdata_fast-4.0.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ori.traineddata -> ori.traineddata-tessdata_fast-4.0.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/pan.traineddata -> pan.traineddata-tessdata_fast-4.0.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/pol.traineddata -> pol.traineddata-tessdata_fast-4.0.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/pus.traineddata -> pus.traineddata-tessdata_fast-4.0.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/por.traineddata -> por.traineddata-tessdata_fast-4.0.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/que.traineddata -> que.traineddata-tessdata_fast-4.0.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ron.traineddata -> ron.traineddata-tessdata_fast-4.0.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/rus.traineddata -> rus.traineddata-tessdata_fast-4.0.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/san.traineddata -> san.traineddata-tessdata_fast-4.0.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/snd.traineddata -> snd.traineddata-tessdata_fast-4.0.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/sin.traineddata -> sin.traineddata-tessdata_fast-4.0.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/slk.traineddata -> slk.traineddata-tessdata_fast-4.0.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/slv.traineddata -> slv.traineddata-tessdata_fast-4.0.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/sqi.traineddata -> sqi.traineddata-tessdata_fast-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/srp.traineddata -> srp.traineddata-tessdata_fast-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_fast-4.0.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/sun.traineddata -> sun.traineddata-tessdata_fast-4.0.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/swe.traineddata -> swe.traineddata-tessdata_fast-4.0.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/swa.traineddata -> swa.traineddata-tessdata_fast-4.0.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/syr.traineddata -> syr.traineddata-tessdata_fast-4.0.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tam.traineddata -> tam.traineddata-tessdata_fast-4.0.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tel.traineddata -> tel.traineddata-tessdata_fast-4.0.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tgk.traineddata -> tgk.traineddata-tessdata_fast-4.0.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tha.traineddata -> tha.traineddata-tessdata_fast-4.0.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tir.traineddata -> tir.traineddata-tessdata_fast-4.0.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ton.traineddata -> ton.traineddata-tessdata_fast-4.0.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tur.traineddata -> tur.traineddata-tessdata_fast-4.0.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/tat.traineddata -> tat.traineddata-tessdata_fast-4.0.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/uig.traineddata -> uig.traineddata-tessdata_fast-4.0.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/ukr.traineddata -> ukr.traineddata-tessdata_fast-4.0.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/urd.traineddata -> urd.traineddata-tessdata_fast-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/uzb.traineddata -> uzb.traineddata-tessdata_fast-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_fast-4.0.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/vie.traineddata -> vie.traineddata-tessdata_fast-4.0.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/yid.traineddata -> yid.traineddata-tessdata_fast-4.0.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/yor.traineddata -> yor.traineddata-tessdata_fast-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_fast-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_fast-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_fast-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata_fast/raw/4.0.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_fast-4.0.0 )
+_md5_=a6f83cfa0c243b7537e19b3d87143f96
diff --git a/metadata/md5-cache/app-text/tessdata_legacy-4.0.0 b/metadata/md5-cache/app-text/tessdata_legacy-4.0.0
new file mode 100644
index 000000000000..14e0188d44de
--- /dev/null
+++ b/metadata/md5-cache/app-text/tessdata_legacy-4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!app-text/tessdata_best !app-text/tessdata_fast !<app-text/tesseract-4.1.0
+DESCRIPTION=Trained models for app-text/tesseract compatible with the legacy engine
+EAPI=7
+HOMEPAGE=https://github.com/tesseract-ocr/tessdata
+IUSE=math osd l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bg l10n_bn l10n_bo l10n_br l10n_bs l10n_ca l10n_ceb l10n_chr l10n_co l10n_cs l10n_cy l10n_da l10n_de l10n_dv l10n_dz l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fil l10n_fo l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_ht l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_iu l10n_ja l10n_jv l10n_ka l10n_kk l10n_km l10n_kn l10n_ko l10n_ku l10n_ky l10n_la l10n_lb l10n_lo l10n_lt l10n_lv l10n_mi l10n_mk l10n_ml l10n_mn l10n_mr l10n_ms l10n_mt l10n_my l10n_ne l10n_nl l10n_no l10n_oc l10n_or l10n_pa l10n_pl l10n_ps l10n_pt l10n_qu l10n_ro l10n_ru l10n_sa l10n_sd l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_su l10n_sv l10n_sw l10n_syc l10n_ta l10n_te l10n_tg l10n_th l10n_ti l10n_tl l10n_to l10n_tr l10n_tt l10n_ug l10n_uk l10n_ur l10n_uz l10n_vi l10n_yi l10n_yo l10n_zh
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-text/tessdata_best !app-text/tessdata_fast !<app-text/tesseract-4.1.0
+SLOT=0
+SRC_URI=https://github.com/tesseract-ocr/tessdata/raw/4.0.0/eng.traineddata -> eng.traineddata-tessdata_legacy-4.0.0 math? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/equ.traineddata -> equ.traineddata-tessdata_legacy-4.0.0 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/osd.traineddata -> osd.traineddata-tessdata_legacy-4.0.0 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/afr.traineddata -> afr.traineddata-tessdata_legacy-4.0.0 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/amh.traineddata -> amh.traineddata-tessdata_legacy-4.0.0 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ara.traineddata -> ara.traineddata-tessdata_legacy-4.0.0 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/asm.traineddata -> asm.traineddata-tessdata_legacy-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/aze.traineddata -> aze.traineddata-tessdata_legacy-4.0.0 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/aze_cyrl.traineddata -> aze_cyrl.traineddata-tessdata_legacy-4.0.0 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/bel.traineddata -> bel.traineddata-tessdata_legacy-4.0.0 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/bul.traineddata -> bul.traineddata-tessdata_legacy-4.0.0 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ben.traineddata -> ben.traineddata-tessdata_legacy-4.0.0 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/bod.traineddata -> bod.traineddata-tessdata_legacy-4.0.0 ) l10n_br? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/bre.traineddata -> bre.traineddata-tessdata_legacy-4.0.0 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/bos.traineddata -> bos.traineddata-tessdata_legacy-4.0.0 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/cat.traineddata -> cat.traineddata-tessdata_legacy-4.0.0 ) l10n_ceb? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ceb.traineddata -> ceb.traineddata-tessdata_legacy-4.0.0 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/chr.traineddata -> chr.traineddata-tessdata_legacy-4.0.0 ) l10n_co? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/cos.traineddata -> cos.traineddata-tessdata_legacy-4.0.0 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ces.traineddata -> ces.traineddata-tessdata_legacy-4.0.0 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/cym.traineddata -> cym.traineddata-tessdata_legacy-4.0.0 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/dan.traineddata -> dan.traineddata-tessdata_legacy-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/deu.traineddata -> deu.traineddata-tessdata_legacy-4.0.0 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/frk.traineddata -> frk.traineddata-tessdata_legacy-4.0.0 ) l10n_dv? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/div.traineddata -> div.traineddata-tessdata_legacy-4.0.0 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/dzo.traineddata -> dzo.traineddata-tessdata_legacy-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ell.traineddata -> ell.traineddata-tessdata_legacy-4.0.0 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/grc.traineddata -> grc.traineddata-tessdata_legacy-4.0.0 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/enm.traineddata -> enm.traineddata-tessdata_legacy-4.0.0 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/epo.traineddata -> epo.traineddata-tessdata_legacy-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/spa.traineddata -> spa.traineddata-tessdata_legacy-4.0.0 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/spa_old.traineddata -> spa_old.traineddata-tessdata_legacy-4.0.0 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/est.traineddata -> est.traineddata-tessdata_legacy-4.0.0 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/eus.traineddata -> eus.traineddata-tessdata_legacy-4.0.0 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fas.traineddata -> fas.traineddata-tessdata_legacy-4.0.0 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fin.traineddata -> fin.traineddata-tessdata_legacy-4.0.0 ) l10n_fil? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fil.traineddata -> fil.traineddata-tessdata_legacy-4.0.0 ) l10n_fo? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fao.traineddata -> fao.traineddata-tessdata_legacy-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fra.traineddata -> fra.traineddata-tessdata_legacy-4.0.0 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/frm.traineddata -> frm.traineddata-tessdata_legacy-4.0.0 ) l10n_fy? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/fry.traineddata -> fry.traineddata-tessdata_legacy-4.0.0 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/gle.traineddata -> gle.traineddata-tessdata_legacy-4.0.0 ) l10n_gd? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/gla.traineddata -> gla.traineddata-tessdata_legacy-4.0.0 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/glg.traineddata -> glg.traineddata-tessdata_legacy-4.0.0 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/guj.traineddata -> guj.traineddata-tessdata_legacy-4.0.0 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/heb.traineddata -> heb.traineddata-tessdata_legacy-4.0.0 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/hin.traineddata -> hin.traineddata-tessdata_legacy-4.0.0 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/hrv.traineddata -> hrv.traineddata-tessdata_legacy-4.0.0 ) l10n_ht? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/hat.traineddata -> hat.traineddata-tessdata_legacy-4.0.0 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/hun.traineddata -> hun.traineddata-tessdata_legacy-4.0.0 ) l10n_hy? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/hye.traineddata -> hye.traineddata-tessdata_legacy-4.0.0 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ind.traineddata -> ind.traineddata-tessdata_legacy-4.0.0 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/isl.traineddata -> isl.traineddata-tessdata_legacy-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ita.traineddata -> ita.traineddata-tessdata_legacy-4.0.0 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ita_old.traineddata -> ita_old.traineddata-tessdata_legacy-4.0.0 ) l10n_iu? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/iku.traineddata -> iku.traineddata-tessdata_legacy-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/jpn.traineddata -> jpn.traineddata-tessdata_legacy-4.0.0 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/jpn_vert.traineddata -> jpn_vert.traineddata-tessdata_legacy-4.0.0 ) l10n_jv? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/jav.traineddata -> jav.traineddata-tessdata_legacy-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kat.traineddata -> kat.traineddata-tessdata_legacy-4.0.0 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kat_old.traineddata -> kat_old.traineddata-tessdata_legacy-4.0.0 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kaz.traineddata -> kaz.traineddata-tessdata_legacy-4.0.0 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/khm.traineddata -> khm.traineddata-tessdata_legacy-4.0.0 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kan.traineddata -> kan.traineddata-tessdata_legacy-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kor.traineddata -> kor.traineddata-tessdata_legacy-4.0.0 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kor_vert.traineddata -> kor_vert.traineddata-tessdata_legacy-4.0.0 ) l10n_ku? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kur.traineddata -> kur.traineddata-tessdata_legacy-4.0.0 ) l10n_ku? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kur_ara.traineddata -> kur_ara.traineddata-tessdata_legacy-4.0.0 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/kir.traineddata -> kir.traineddata-tessdata_legacy-4.0.0 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/lat.traineddata -> lat.traineddata-tessdata_legacy-4.0.0 ) l10n_lb? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ltz.traineddata -> ltz.traineddata-tessdata_legacy-4.0.0 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/lao.traineddata -> lao.traineddata-tessdata_legacy-4.0.0 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/lit.traineddata -> lit.traineddata-tessdata_legacy-4.0.0 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/lav.traineddata -> lav.traineddata-tessdata_legacy-4.0.0 ) l10n_mi? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mri.traineddata -> mri.traineddata-tessdata_legacy-4.0.0 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mkd.traineddata -> mkd.traineddata-tessdata_legacy-4.0.0 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mal.traineddata -> mal.traineddata-tessdata_legacy-4.0.0 ) l10n_mn? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mon.traineddata -> mon.traineddata-tessdata_legacy-4.0.0 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mar.traineddata -> mar.traineddata-tessdata_legacy-4.0.0 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/msa.traineddata -> msa.traineddata-tessdata_legacy-4.0.0 ) l10n_mt? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mlt.traineddata -> mlt.traineddata-tessdata_legacy-4.0.0 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/mya.traineddata -> mya.traineddata-tessdata_legacy-4.0.0 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/nep.traineddata -> nep.traineddata-tessdata_legacy-4.0.0 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/nld.traineddata -> nld.traineddata-tessdata_legacy-4.0.0 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/nor.traineddata -> nor.traineddata-tessdata_legacy-4.0.0 ) l10n_oc? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/oci.traineddata -> oci.traineddata-tessdata_legacy-4.0.0 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ori.traineddata -> ori.traineddata-tessdata_legacy-4.0.0 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/pan.traineddata -> pan.traineddata-tessdata_legacy-4.0.0 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/pol.traineddata -> pol.traineddata-tessdata_legacy-4.0.0 ) l10n_ps? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/pus.traineddata -> pus.traineddata-tessdata_legacy-4.0.0 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/por.traineddata -> por.traineddata-tessdata_legacy-4.0.0 ) l10n_qu? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/que.traineddata -> que.traineddata-tessdata_legacy-4.0.0 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ron.traineddata -> ron.traineddata-tessdata_legacy-4.0.0 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/rus.traineddata -> rus.traineddata-tessdata_legacy-4.0.0 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/san.traineddata -> san.traineddata-tessdata_legacy-4.0.0 ) l10n_sd? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/snd.traineddata -> snd.traineddata-tessdata_legacy-4.0.0 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/sin.traineddata -> sin.traineddata-tessdata_legacy-4.0.0 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/slk.traineddata -> slk.traineddata-tessdata_legacy-4.0.0 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/slv.traineddata -> slv.traineddata-tessdata_legacy-4.0.0 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/sqi.traineddata -> sqi.traineddata-tessdata_legacy-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/srp.traineddata -> srp.traineddata-tessdata_legacy-4.0.0 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/srp_latn.traineddata -> srp_latn.traineddata-tessdata_legacy-4.0.0 ) l10n_su? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/sun.traineddata -> sun.traineddata-tessdata_legacy-4.0.0 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/swe.traineddata -> swe.traineddata-tessdata_legacy-4.0.0 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/swa.traineddata -> swa.traineddata-tessdata_legacy-4.0.0 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/syr.traineddata -> syr.traineddata-tessdata_legacy-4.0.0 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tam.traineddata -> tam.traineddata-tessdata_legacy-4.0.0 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tel.traineddata -> tel.traineddata-tessdata_legacy-4.0.0 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tgk.traineddata -> tgk.traineddata-tessdata_legacy-4.0.0 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tha.traineddata -> tha.traineddata-tessdata_legacy-4.0.0 ) l10n_ti? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tir.traineddata -> tir.traineddata-tessdata_legacy-4.0.0 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tgl.traineddata -> tgl.traineddata-tessdata_legacy-4.0.0 ) l10n_to? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ton.traineddata -> ton.traineddata-tessdata_legacy-4.0.0 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tur.traineddata -> tur.traineddata-tessdata_legacy-4.0.0 ) l10n_tt? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/tat.traineddata -> tat.traineddata-tessdata_legacy-4.0.0 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/uig.traineddata -> uig.traineddata-tessdata_legacy-4.0.0 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/ukr.traineddata -> ukr.traineddata-tessdata_legacy-4.0.0 ) l10n_ur? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/urd.traineddata -> urd.traineddata-tessdata_legacy-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/uzb.traineddata -> uzb.traineddata-tessdata_legacy-4.0.0 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-tessdata_legacy-4.0.0 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/vie.traineddata -> vie.traineddata-tessdata_legacy-4.0.0 ) l10n_yi? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/yid.traineddata -> yid.traineddata-tessdata_legacy-4.0.0 ) l10n_yo? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/yor.traineddata -> yor.traineddata-tessdata_legacy-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/chi_sim.traineddata -> chi_sim.traineddata-tessdata_legacy-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/chi_sim_vert.traineddata -> chi_sim_vert.traineddata-tessdata_legacy-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/chi_tra.traineddata -> chi_tra.traineddata-tessdata_legacy-4.0.0 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.0.0/chi_tra_vert.traineddata -> chi_tra_vert.traineddata-tessdata_legacy-4.0.0 )
+_md5_=d1b3fc9cac1046ab088d0ec1489143ca
diff --git a/metadata/md5-cache/app-text/tesseract-4.1.0 b/metadata/md5-cache/app-text/tesseract-4.1.0
new file mode 100644
index 000000000000..7b0b1b4eb7d7
--- /dev/null
+++ b/metadata/md5-cache/app-text/tesseract-4.1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) app-text/asciidoc app-text/docbook-xsl-stylesheets dev-libs/libxslt doc? ( app-doc/doxygen )
+DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
+EAPI=7
+HOMEPAGE=https://github.com/tesseract-ocr
+IUSE=doc jpeg opencl openmp png static-libs tiff training webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) || ( >=app-text/tessdata_fast-4.0.0 >=app-text/tessdata_best-4.0.0 >=app-text/tessdata_legacy-4.0.0 )
+SLOT=0
+SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/4.1.0.tar.gz -> tesseract-4.1.0.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=dcded4c46a79fa5d5120e826fed3bcbd
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 19eca0d4f335..74a88ea11b09 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6 b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
index a4b1e2e2fa23..6eef52ac8532 100644
--- a/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+++ b/metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, full-featured text search engine based off of luce
 EAPI=6
 HOMEPAGE=http://clucene.sourceforge.net/
 IUSE=debug doc static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( Apache-2.0 LGPL-2.1 )
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://sourceforge/clucene/clucene-core-2.3.3.4.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=a58cb2f73b52a332d256cad2733708c4
+_md5_=3bfbc90e7b5d221c22eaa5bc7f8eadee
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 33a71c050d17..888812a3f93c 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
index a5e1ff5372c5..91f1deace1cf 100644
--- a/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=6
 HOMEPAGE=https://mariadb.org/
 IUSE=+curl gnutls kerberos libressl mysqlcompat +ssl 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 arm ~arm64 hppa ia64 ppc64 s390 sparc x86
+KEYWORDS=amd64 arm arm64 hppa ia64 ppc64 s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=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(-)?] virtual/libiconv:=[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? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[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-crypt/heimdal[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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl: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(-)?] ) !libressl? ( dev-libs/openssl: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(-)?] ) ) ) mysqlcompat? ( !dev-db/mysql[client-libs(+)] !dev-db/mysql-cluster[client-libs(+)] !dev-db/mariadb[client-libs(+)] !dev-db/mariadb-galera[client-libs(+)] !dev-db/percona-server[client-libs(+)] !dev-db/mysql-connector-c ) !>=dev-db/mariadb-10.2.0[client-libs(+)]
 SLOT=0/3
 SRC_URI=https://downloads.mariadb.org/f/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz?serve -> mariadb-connector-c-3.0.6-src.tar.gz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=72a54c9d686b902cd8ba4923e44d2c47
+_md5_=e1ff20b389c03eadfe1a6a8b3443bb80
diff --git a/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.2 b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.2
new file mode 100644
index 000000000000..fb4a1033bb69
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mariadb-connector-c-3.1.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)?] virtual/libiconv:=[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? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[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-crypt/heimdal[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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl: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(-)?] ) !libressl? ( dev-libs/openssl: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(-)?] ) ) )
+DESCRIPTION=C client library for MariaDB/MySQL
+EAPI=7
+HOMEPAGE=https://mariadb.org/
+IUSE=+curl gnutls kerberos libressl +ssl 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 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=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(-)?] virtual/libiconv:=[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? ( net-misc/curl: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? ( || ( app-crypt/mit-krb5[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-crypt/heimdal[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? ( gnutls? ( >=net-libs/gnutls-3.3.24: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(-)?] ) !gnutls? ( libressl? ( dev-libs/libressl: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(-)?] ) !libressl? ( dev-libs/openssl: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(-)?] ) ) )
+SLOT=0/3
+SRC_URI=https://downloads.mariadb.org/f/connector-c-3.1.2/mariadb-connector-c-3.1.2-src.tar.gz?serve -> mariadb-connector-c-3.1.2-src.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0dbdcffbb1562516c1dc5c1782b65b91
diff --git a/metadata/md5-cache/dev-db/mysql++-3.2.5 b/metadata/md5-cache/dev-db/mysql++-3.2.5
new file mode 100644
index 000000000000..7c70d76e13bf
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mysql++-3.2.5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )
+DESCRIPTION=C++ API interface to the MySQL database
+EAPI=7
+HOMEPAGE=https://tangentsoft.net/mysql++/
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2
+RDEPEND=|| ( dev-db/mysql-connector-c dev-db/mariadb-connector-c )
+SLOT=0/3
+SRC_URI=https://www.tangentsoft.net/mysqlpp/releases/mysql++-3.2.5.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=abba98d429621bbdc72e7ba7abd83466
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index f09c4770b4ab..b8cb86b38600 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1 b/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1
new file mode 100644
index 000000000000..afb56a80c8f8
--- /dev/null
+++ b/metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-perl/Path-Tiny dev-perl/Template-Toolkit
+DESCRIPTION=C library for automatically solving Freecell and some other solitaire variants
+EAPI=7
+HOMEPAGE=https://fc-solve.shlomifish.org/
+IUSE=python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/pysol_cards[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-5.6.0.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=c2fba97d90a8dbee866655740754501b
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7f2f35dd6c77..454c1875573d 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11 b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
index d6376ca7a47e..96d52bfd14fd 100644
--- a/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
+++ b/metadata/md5-cache/dev-java/openjdk-11.0.4_p11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11 ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=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 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) app-arch/zip media-libs/alsa-lib net-print/cups x11-base/xorg-proto x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst javafx? ( dev-java/openjfx:11 ) || ( dev-java/openjdk-bin:11 dev-java/openjdk:11 ) >=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 >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 DESCRIPTION=Open source implementation of the Java programming language
 EAPI=6
 HOMEPAGE=https://openjdk.java.net
@@ -7,9 +7,9 @@ IUSE=alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nspl
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
 LICENSE=GPL-2
 PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RDEPEND=media-libs/freetype:2= media-libs/giflib:0/7 media-libs/libpng:0= media-libs/lcms:2= sys-libs/zlib virtual/jpeg:0= systemtap? ( dev-util/systemtap ) >=sys-apps/baselayout-java-0.1.0-r1 !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
 REQUIRED_USE=javafx? ( alsa !headless-awt )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/jdk-11.0.4+11.tar.bz2
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	check-reqs	2c6f909675083dce8430b648bf737cb0	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	dd352559d0e143500ec878acc74da909	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	db85a3c508cf82c45f24b2723791cc93	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=d66ec0f0497858c062ea44d9c61391fc
+_md5_=f5d16edf24330bc638ee2488d27bf895
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 332f54fec088..0b1412146884 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/librevenge-0.0.4-r1 b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
index a27813795f3b..e665d2d679a3 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A helper library for REVerse ENGineered formats filters
 EAPI=6
 HOMEPAGE=https://sf.net/p/libwpd/librevenge
 IUSE=doc 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 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=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(-)?]
 SLOT=0
 SRC_URI=https://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c41add6d422fb397b4b79a998e01b72
+_md5_=89986bb7eb21a9c8e282c68acb992826
diff --git a/metadata/md5-cache/dev-libs/mxml-2.12 b/metadata/md5-cache/dev-libs/mxml-2.12
deleted file mode 100644
index 430f857cb501..000000000000
--- a/metadata/md5-cache/dev-libs/mxml-2.12
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare test
-DESCRIPTION=A small XML parsing library that you can use to read XML data files or strings
-EAPI=7
-HOMEPAGE=https://github.com/michaelrsweet/mxml https://www.msweet.org/mxml/
-IUSE=static-libs threads
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86
-LICENSE=Mini-XML
-SLOT=0
-SRC_URI=https://github.com/michaelrsweet/mxml/archive/v2.12.tar.gz -> mxml-2.12.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=ff5015e723826c764c908dd27eb89285
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
new file mode 100644
index 000000000000..730b32b7019e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure test
+DEPEND=test? ( sys-process/time )
+DESCRIPTION=userspace RCU (read-copy-update) library
+EAPI=7
+HOMEPAGE=https://liburcu.org/
+IUSE=static-libs regression-test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+SLOT=0/6
+SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.11.1.tar.bz2
+_md5_=8d625798b8d97d341893ac298e390c6c
diff --git a/metadata/md5-cache/dev-perl/Ace-1.920.0-r3 b/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
index 570bc8352bea..7f0eec81037b 100644
--- a/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
+++ b/metadata/md5-cache/dev-perl/Ace-1.920.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Object-Oriented Access to ACEDB Databases
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/AcePerl
 IUSE=test examples
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Digest-MD5 dev-perl/Cache-Cache dev-perl/GD elibc_glibc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/AcePerl-1.92.tar.gz
 _eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=18987427b41d64557a8be37160d71535
+_md5_=413ddbdf417e064c13e5c7502dd75d7e
diff --git a/metadata/md5-cache/dev-perl/Chart-2.4.10 b/metadata/md5-cache/dev-perl/Chart-2.4.10
index 0c34363dd86c..2cfbeb07f8ea 100644
--- a/metadata/md5-cache/dev-perl/Chart-2.4.10
+++ b/metadata/md5-cache/dev-perl/Chart-2.4.10
@@ -4,10 +4,10 @@ DESCRIPTION=The Perl Chart Module
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Chart
 IUSE=test
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-2.0.36 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=9b6dd4cfb962bc3abfab498aaf0fbb81
+_md5_=dc12a5659aba8b81190266f5c65c8a4f
diff --git a/metadata/md5-cache/dev-perl/GD-2.560.0-r1 b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
index 368527d9a544..f33ae47badc3 100644
--- a/metadata/md5-cache/dev-perl/GD-2.560.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-2.560.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Interface to Thomas Boutell's gd library
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/GD
 IUSE=animgif gif jpeg png truetype xpm
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Math-Complex >=media-libs/gd-2.0.33 png? ( media-libs/gd[png] media-libs/libpng:0 sys-libs/zlib ) jpeg? ( media-libs/gd[jpeg] virtual/jpeg:0 ) truetype? ( media-libs/gd[truetype] media-libs/freetype:2 ) xpm? ( media-libs/gd[xpm] x11-libs/libXpm ) gif? ( media-libs/giflib ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/L/LD/LDS/GD-2.56.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5
-_md5_=6ddd1ed9ab675d4d874e0dce5fc33c19
+_md5_=ede950e13ae216d9e12340062a1c7244
diff --git a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1 b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
index 60ab5ff3bc67..7ebeee0818fe 100644
--- a/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 DESCRIPTION=GD::Barcode - Create barcode image with GD
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/GD-Barcode
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KW/KWITKNR/GD-Barcode-1.15.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=421d375836db0eb658711903e5590aa0
+_md5_=cd15679ac388157b59c05de5510dd600
diff --git a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1 b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
index b487a714220b..be3c02282415 100644
--- a/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/p
 DESCRIPTION=Create 3D Graphs with GD and GD::Graph
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/GD-Graph3d
-KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/GD-1.18 >=dev-perl/GDGraph-1.30 dev-perl/GDTextUtil dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WA/WADG/GD-Graph3d-0.63.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13357a38e1531c56493eb85cae0d0ba7
+_md5_=d492bec408c337ac7c0c4410a01c119a
diff --git a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1 b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
index bc9dd60a8605..9e890fbea5c4 100644
--- a/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+++ b/metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/GD dev-perl/SVG dev-lang/perl:=[-build(-)]
 DESCRIPTION=Seamlessly enable SVG output from scripts written using GD
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/GD-SVG
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/SVG dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TW/TWH/GD-SVG-0.33.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=78f4d9cd59e8b8d7fc18e4dc6ca143be
+_md5_=a403ce7e3db1c2d76d4572234223f023
diff --git a/metadata/md5-cache/dev-perl/GDGraph-1.490.0 b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
index 89441f78d6e1..e8fa528ba27c 100644
--- a/metadata/md5-cache/dev-perl/GDGraph-1.490.0
+++ b/metadata/md5-cache/dev-perl/GDGraph-1.490.0
@@ -3,10 +3,10 @@ DEPEND=dev-perl/GDTextUtil dev-perl/GD media-libs/gd dev-lang/perl:=[-build(-)]
 DESCRIPTION=Perl5 module to create charts using the GD module
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/GDGraph
-KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GDTextUtil dev-perl/GD media-libs/gd dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.49.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3c32ee04f31064782e51f7672a48c5e2
+_md5_=39df831735eb060975609e251aa9c542
diff --git a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1 b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
index 7bf7900107d7..86a2a469c997 100644
--- a/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+++ b/metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 DESCRIPTION=Text utilities for use with GD
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/GDTextUtil
-KEYWORDS=alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3e43f73187fa5d787ec0c68381cbc26e
+_md5_=09749572f32295a41274477f7e671b34
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index d49d9f5fe682..2202134bd48e 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1 b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
index 1033c0139e9b..2dd990689c28 100644
--- a/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+++ b/metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=GD plugin(s) for the Template Toolkit
 EAPI=5
 HOMEPAGE=https://metacpan.org/release/Template-GD
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86 ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph dev-perl/GD-Graph3d >=dev-perl/Template-Toolkit-2.15-r1 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	f2e3420aed32cf1abe33b4129b842636	perl-module	71c828c354a4cddced2641dda2695de5	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d8851206446033b097c5cbdfe16baed8
+_md5_=b5d6b4bd40d33d4bf2a8408adce6d618
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 70aae7ec665e..ea83288e563f 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2 b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
new file mode 100644
index 000000000000..6e03702fd3b0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm test
+DEPEND=test? ( dev-php/phpunit )
+DESCRIPTION=Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)
+EAPI=7
+HOMEPAGE=https://pear.php.net/package/HTML_Common2
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-php/pear-1.8.1
+SLOT=0
+SRC_URI=https://pear.php.net/get/HTML_Common2-2.1.2.tgz
+_eclasses_=php-pear-r2	479e8a084e98f4d730da647bba3e589e
+_md5_=1e11ebb790a634db246624a0703b731b
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.12 b/metadata/md5-cache/dev-php/adodb-5.20.12
deleted file mode 100644
index ba7b95f31c40..000000000000
--- a/metadata/md5-cache/dev-php/adodb-5.20.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=https://github.com/ADOdb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD LGPL-2.1+
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.12.tar.gz -> adodb-5.20.12.tar.gz
-_md5_=cc98ab2cba67533ca7cc4765b9d010f5
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.13 b/metadata/md5-cache/dev-php/adodb-5.20.13
deleted file mode 100644
index 1738d18db06f..000000000000
--- a/metadata/md5-cache/dev-php/adodb-5.20.13
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=https://github.com/ADOdb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD LGPL-2.1+
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.13.tar.gz -> adodb-5.20.13.tar.gz
-_md5_=cc98ab2cba67533ca7cc4765b9d010f5
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.14 b/metadata/md5-cache/dev-php/adodb-5.20.14
new file mode 100644
index 000000000000..2722c889848c
--- /dev/null
+++ b/metadata/md5-cache/dev-php/adodb-5.20.14
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Database abstraction layer for PHP
+EAPI=7
+HOMEPAGE=https://github.com/ADOdb
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+LICENSE=BSD LGPL-2.1+
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.14.tar.gz -> adodb-5.20.14.tar.gz
+_md5_=232ac49202a15de90b2e66c778230e56
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.9 b/metadata/md5-cache/dev-php/adodb-5.20.9
deleted file mode 100644
index 835aaab961ad..000000000000
--- a/metadata/md5-cache/dev-php/adodb-5.20.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=http://www.adodb.org/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.9.tar.gz -> adodb-5.20.9.tar.gz
-_md5_=8b153c7c8dcc5468bd742f0bc9219181
diff --git a/metadata/md5-cache/dev-php/pecl-mongodb-1.5.5 b/metadata/md5-cache/dev-php/pecl-mongodb-1.5.5
new file mode 100644
index 000000000000..3beacd5ac01f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-mongodb-1.5.5
@@ -0,0 +1,15 @@
+BDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) >=dev-libs/libbson-1.13.0 >=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=MongoDB database driver for PHP
+EAPI=7
+HOMEPAGE=https://pecl.php.net/mongodb
+IUSE=libressl sasl php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) >=dev-libs/libbson-1.13.0 >=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/mongodb-1.5.5.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	php-ext-pecl-r3	a59741d3df8ea9f17afcdcfb7edaee6d	php-ext-source-r3	637effc08278f9652b9c14911810c5cf	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=566d9a0ff123f6bf0fde2ca8ae878890
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 9f85f2cebdd4..01eeffaf1c97 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/aiohttp-socks-0.2.2 b/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
index ce289abb8c68..36d693cf3a11 100644
--- a/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
+++ b/metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
@@ -1,14 +1,16 @@
+BDEPEND=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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/aiohttp-2.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest-asyncio[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] net-proxy/3proxy )
 DESCRIPTION=SOCKS proxy connector for aiohttp
-EAPI=6
+EAPI=7
 HOMEPAGE=https://pypi.org/project/aiohttp-socks/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/aiohttp-2.3.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/romis2012/aiohttp-socks/archive/0.2.2.tar.gz -> aiohttp-socks-0.2.2.tar.gz
-_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=f9d8671a3aa3912d3c03660b4130400b
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=45c528e9413119149abae98d658cb7e4
diff --git a/metadata/md5-cache/dev-python/pysol_cards-0.6.2-r1 b/metadata/md5-cache/dev-python/pysol_cards-0.6.2-r1
new file mode 100644
index 000000000000..da6dadc6fcf7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysol_cards-0.6.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Deal PySol FreeCell cards
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pysol-cards/
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0 MIT
+RDEPEND=dev-python/pbr[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/random2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pysol_cards/pysol_cards-0.6.2.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b2c6ffc095587b36e134b7ade2f1a392
diff --git a/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0 b/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
new file mode 100644
index 000000000000..1bb53ff413a1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
@@ -0,0 +1,16 @@
+BDEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-python/async_generator[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) dev-python/async_generator[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/hypothesis-3.64[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Library for testing asyncio code with pytest
+EAPI=7
+HOMEPAGE=https://github.com/pytest-dev/pytest-asyncio https://pypi.org/project/pytest-asyncio/
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-python/async_generator[python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pytest-dev/pytest-asyncio/archive/v0.10.0.tar.gz -> pytest-asyncio-0.10.0.tar.gz
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=f4277297db7f86a5297f65d4ebdf4d77
diff --git a/metadata/md5-cache/dev-python/rst-linker-1.11 b/metadata/md5-cache/dev-python/rst-linker-1.11
index 0e60f593cf72..0645152fbe4d 100644
--- a/metadata/md5-cache/dev-python/rst-linker-1.11
+++ b/metadata/md5-cache/dev-python/rst-linker-1.11
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/rst.linker
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
 LICENSE=MIT
 RDEPEND=dev-python/importlib_metadata[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(-)] dev-python/python-dateutil[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(-)] dev-python/six[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(-)] 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=mirror://pypi/r/rst.linker/rst.linker-1.11.tar.gz
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=886bca8d38bfa306b872ebefb2b1c64c
+_md5_=8e99eab69d718ab3ff539db098350e16
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 54dbc0f32762..2b3ca731035a 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0 b/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
deleted file mode 100644
index 3178791cbbf0..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby24? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby26] dev-ruby/minitest[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
-DESCRIPTION=A module for profiling Ruby code
-EAPI=6
-HOMEPAGE=https://github.com/ruby-prof/ruby-prof
-IUSE=ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
-REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
-SLOT=0
-SRC_URI=https://github.com/ruby-prof/ruby-prof/archive/v0.17.0.tar.gz -> ruby-prof-0.17.0.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	1d91b03d42ab6308b5f4f6b598ed110e	ruby-fakegem	f2b7caee23dbd528a62d0839d8c26c34	ruby-ng	a28f4a400304e633468f10ad1b9e2f6e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=e94cbd7d1d935b55c2cd13b723dff98d
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index cb6e8b1e85ce..368bfee6cef4 100644
Binary files a/metadata/md5-cache/dev-tex/Manifest.gz and b/metadata/md5-cache/dev-tex/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.41 b/metadata/md5-cache/dev-tex/latex-beamer-3.41
deleted file mode 100644
index ea662cfb20d7..000000000000
--- a/metadata/md5-cache/dev-tex/latex-beamer-3.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=LaTeX class for creating presentations using a video projector
-EAPI=5
-HOMEPAGE=https://github.com/josephwright/beamer
-IUSE=doc examples
-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 ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
-RDEPEND=>=dev-tex/pgf-1.10 dev-tex/xcolor !dev-tex/translator virtual/latex-base
-SLOT=0
-SRC_URI=https://github.com/josephwright/beamer/archive/v3.41.tar.gz -> latex-beamer-3.41.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	latex-package	17f13abe0de88340745e52e6b627aee7	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6390e95a74890e8f4392a5cb8d1f4678
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.56 b/metadata/md5-cache/dev-tex/latex-beamer-3.56
new file mode 100644
index 000000000000..f458dde8e856
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.56
@@ -0,0 +1,14 @@
+BDEPEND=virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=dev-texlive/texlive-latex
+DESCRIPTION=LaTeX class for creating presentations using a video projector
+EAPI=7
+HOMEPAGE=https://github.com/josephwright/beamer
+IUSE=doc
+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 ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
+RDEPEND=>=dev-tex/pgf-1.10 dev-tex/xcolor !dev-tex/translator virtual/latex-base
+SLOT=0
+SRC_URI=https://github.com/josephwright/beamer/archive/v3.56.tar.gz -> latex-beamer-3.56.tar.gz
+_eclasses_=latex-package	17f13abe0de88340745e52e6b627aee7
+_md5_=e0755f7b893b6bce30d46fe9fb81584f
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 93fcc8b0610d..3ebb25f129b6 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.19.3 b/metadata/md5-cache/dev-util/checkbashisms-2.19.3
deleted file mode 100644
index ecfb6f7ff25a..000000000000
--- a/metadata/md5-cache/dev-util/checkbashisms-2.19.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=6
-HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.19.3.tar.xz
-_md5_=f7bfc4495620bdc37a00de6240301b9d
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.19.5 b/metadata/md5-cache/dev-util/checkbashisms-2.19.5
deleted file mode 100644
index cbf1efdf894c..000000000000
--- a/metadata/md5-cache/dev-util/checkbashisms-2.19.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=7
-HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.19.5.tar.xz
-_md5_=47a162006d9013616488b3c1d6373ff0
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.18.11 b/metadata/md5-cache/dev-util/checkbashisms-2.19.6
similarity index 75%
rename from metadata/md5-cache/dev-util/checkbashisms-2.18.11
rename to metadata/md5-cache/dev-util/checkbashisms-2.19.6
index d9e6d5c93613..fca7453d6501 100644
--- a/metadata/md5-cache/dev-util/checkbashisms-2.18.11
+++ b/metadata/md5-cache/dev-util/checkbashisms-2.19.6
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=6
+EAPI=7
 HOMEPAGE=https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl virtual/perl-Getopt-Long !<dev-util/rpmdevtools-8.3-r1
 RESTRICT=test
 SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.18.11.tar.xz
-_md5_=eeb95c53af194f37c026154d6e1b0566
+SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.19.6.tar.xz
+_md5_=270ca65a03e8190bf65018cb29dc5e73
diff --git a/metadata/md5-cache/dev-util/lcov-1.11 b/metadata/md5-cache/dev-util/lcov-1.11
index 2c4afd29b0f1..1316a8951001 100644
--- a/metadata/md5-cache/dev-util/lcov-1.11
+++ b/metadata/md5-cache/dev-util/lcov-1.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.11.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bf93e92e1d4ce0c7e256f8d84e4398fa
+_md5_=b1c797272349846081f36fddd5549447
diff --git a/metadata/md5-cache/dev-util/lcov-1.9-r1 b/metadata/md5-cache/dev-util/lcov-1.9-r1
index 6c9d121a20ae..69e73b43bb3c 100644
--- a/metadata/md5-cache/dev-util/lcov-1.9-r1
+++ b/metadata/md5-cache/dev-util/lcov-1.9-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A graphical front-end for GCC's coverage testing tool gcov
 EAPI=4
 HOMEPAGE=http://ltp.sourceforge.net/coverage/lcov.php
-KEYWORDS=amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/perl-5 dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/ltp/lcov-1.9.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=442b8898adb2b7c8d5f56ae1c934b462
+_md5_=71ac724ceeadbeeb8a2fc44de0735775
diff --git a/metadata/md5-cache/dev-util/makepp-2.0.99.2 b/metadata/md5-cache/dev-util/makepp-2.0.99.2
new file mode 100644
index 000000000000..3c5653a933ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/makepp-2.0.99.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=GNU make replacement
+EAPI=7
+HOMEPAGE=http://makepp.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/makepp/2.1/makepp-2.0.99.2.txz
+_md5_=e14438f0a2b9cded92bbfa28f46fdc44
diff --git a/metadata/md5-cache/dev-util/pkgcheck-9999 b/metadata/md5-cache/dev-util/pkgcheck-9999
index 9775d10b0903..8b51ea214858 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-9999
+++ b/metadata/md5-cache/dev-util/pkgcheck-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] doc? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-vcs/git-1.8.2.1[curl]
 DESCRIPTION=pkgcore-based QA utility
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=doc python_targets_python3_6 python_targets_python3_7
 LICENSE=|| ( BSD GPL-2 )
 PROPERTIES=live
-RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=~dev-python/snakeoil-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ~sys-apps/pkgcore-9999[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] 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_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 _eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	git-r3	562b380fc59ae6a8622171d0acb777d1	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fa56cf06d6cfc2ca252a4dae4668b2c3
+_md5_=0585c250486e652804d8070c349f18f4
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index b62212abb906..dffb3ff86c9f 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.16.3 b/metadata/md5-cache/kde-plasma/bluedevil-5.16.3
deleted file mode 100644
index 2ba34efd015e..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/bluedevil.git
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/bluedevil-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=782dec248c87f9c5ade54a841a6573d2
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.16.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.16.4
new file mode 100644
index 000000000000..38c2d5bd89a0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Bluetooth stack for KDE Plasma
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/bluedevil.git
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=782dec248c87f9c5ade54a841a6573d2
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.16.3 b/metadata/md5-cache/kde-plasma/breeze-5.16.4
similarity index 53%
rename from metadata/md5-cache/kde-plasma/breeze-5.16.3
rename to metadata/md5-cache/kde-plasma/breeze-5.16.4
index b750780ea6df..649d178f0f2d 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.16.3
+++ b/metadata/md5-cache/kde-plasma/breeze-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/kdecoration-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.58.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.58.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/breeze.git
 IUSE=wayland X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.58.0:5 >=kde-plasma/kde-cli-tools-5.16.3:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/kdecoration-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.58.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+PDEPEND=>=kde-frameworks/breeze-icons-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.4:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sci-libs/fftw:3.0= wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/breeze-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5ea5a0fdc4f698843de4e13e567b2328
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.3 b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
similarity index 93%
rename from metadata/md5-cache/kde-plasma/breeze-grub-5.16.3
rename to metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
index 027a5e1c67a6..770cc59fd786 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.16.3
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
@@ -7,6 +7,6 @@ HOMEPAGE=https://kde.org/
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/breeze-grub-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c1397ee150e575dfdf9715d37001416e
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.3 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
similarity index 88%
rename from metadata/md5-cache/kde-plasma/breeze-gtk-5.16.3
rename to metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
index 9f2c9469a820..68d58f305801 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.3
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
@@ -1,4 +1,4 @@
-BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=kde-plasma/breeze-5.16.3:5 || ( ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pycairo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pycairo[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=|| ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 ) >=kde-plasma/breeze-5.16.4:5 || ( ( dev-lang/python:3.7 dev-python/pycairo[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/pycairo[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/pycairo[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ) dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
@@ -7,8 +7,8 @@ HOMEPAGE=https://cgit.kde.org/breeze-gtk.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/breeze-gtk-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=642f317748abb40b5172164bbba9db0d
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.3 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
similarity index 88%
rename from metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.3
rename to metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
index 16b113ac1fa1..475a88dcb896 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.3
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
@@ -1,4 +1,4 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.58.0:5 dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Breeze theme for Plymouth
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/breeze-plymouth-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=51aafba18dd66339fee3dd7f8425cd16
diff --git a/metadata/md5-cache/kde-plasma/discover-5.16.3 b/metadata/md5-cache/kde-plasma/discover-5.16.4
similarity index 52%
rename from metadata/md5-cache/kde-plasma/discover-5.16.3
rename to metadata/md5-cache/kde-plasma/discover-5.16.4
index 91cf24e12b42..b309fc06ea09 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.16.3
+++ b/metadata/md5-cache/kde-plasma/discover-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kirigami-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma resources management GUI
 EAPI=7
 HOMEPAGE=https://userbase.kde.org/Discover
 IUSE=+firmware test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kirigami-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.58.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 firmware? ( sys-apps/fwupd ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/discover-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/discover-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=13b2c79f7888c5107c7144fed9306ac8
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.16.3 b/metadata/md5-cache/kde-plasma/drkonqi-5.16.4
similarity index 50%
rename from metadata/md5-cache/kde-plasma/drkonqi-5.16.3
rename to metadata/md5-cache/kde-plasma/drkonqi-5.16.4
index d84978ffb109..619e50a99e7f 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.16.3
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlrpcclient-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlrpcclient-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlrpcclient-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 X? ( >=dev-qt/qtx11extras-5.12.3:5 ) !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/drkonqi-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=efa4d0ee095d923b3590b5cdfdd126e8
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.3 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
similarity index 50%
rename from metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.3
rename to metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
index 529e51580dda..f5d3f701581c 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 dev-libs/boost dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 !<kde-frameworks/kactivities-4.13.3-r2:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kactivitymanagerd-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=5ead27403a910770be3be14608fe0d77
+_md5_=ec61d473a7e4d3d395bcdcb9533c4689
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.3 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.3
deleted file mode 100644
index a7a90b6ca7f5..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.58.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.58.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kde-cli-tools-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=65f4ac6f53c89a70ad3ffcd9aef2f290
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4
new file mode 100644
index 000000000000..6fb78c969686
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
+IUSE=kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 kdesu? ( >=kde-frameworks/kdesu-5.60.0:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=kdesu? ( X )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=65f4ac6f53c89a70ad3ffcd9aef2f290
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.3 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
similarity index 59%
rename from metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.3
rename to metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
index a0c73776938d..b048a9a2eb4b 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma systemsettings kcm to set GTK application look&feel
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kde-gtk-config-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=3fffc5ccee58c335225f968074303a61
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.16.3 b/metadata/md5-cache/kde-plasma/kdecoration-5.16.4
similarity index 76%
rename from metadata/md5-cache/kde-plasma/kdecoration-5.16.3
rename to metadata/md5-cache/kde-plasma/kdecoration-5.16.4
index 863d09e72251..e1a1f1504313 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/ki18n-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kdecoration-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=cfcfbce9a8811ce32a25d7afdb475c38
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.3 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.3
deleted file mode 100644
index eb35ad982d71..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kholidays-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kross-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kunitconversion-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.58.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=share webengine debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kholidays-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kross-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kunitconversion-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.58.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.16.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kdeplasma-addons-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=b9be198e1b585f7a418f6a4621464670
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4
new file mode 100644
index 000000000000..ba7af4e80fb0
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Extra Plasma applets and engines
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=share webengine debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kholidays-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kross-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kunitconversion-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 share? ( >=kde-frameworks/purpose-5.60.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=b9be198e1b585f7a418f6a4621464670
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.16.3 b/metadata/md5-cache/kde-plasma/kgamma-5.16.4
similarity index 66%
rename from metadata/md5-cache/kde-plasma/kgamma-5.16.3
rename to metadata/md5-cache/kde-plasma/kgamma-5.16.4
index ad99410e51d4..c7075c1044ca 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Screen gamma values kcontrol module
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kgamma5-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=37866a53682eaed00e96acd9c8729631
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.16.3 b/metadata/md5-cache/kde-plasma/khotkeys-5.16.3
deleted file mode 100644
index c28413fe66c1..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5[X] >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5[X] >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.58.0:5 >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/khotkeys-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=42282941e91d0a51ffddbcbe31e39792
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.16.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.16.4
new file mode 100644
index 000000000000..85172d6ca132
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma workspace hotkey module
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5[X] >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.60.0:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=42282941e91d0a51ffddbcbe31e39792
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.3 b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
similarity index 52%
rename from metadata/md5-cache/kde-plasma/kinfocenter-5.16.3
rename to metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
index cba039b9dfb0..0334df17f9bd 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.14.3 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.14.3 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.58.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.58.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-frameworks/plasma-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Utility providing information about the computer hardware
 EAPI=7
 HOMEPAGE=https://kde.org/applications/system/kinfocenter/
 IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.58.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.16.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 !kde-apps/kcontrol:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.12.3:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.60.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kinfocenter-5.16.3.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4ecb805a2b7df2514aaad671c9df940a
+_md5_=1707b0e3ea3e5eee1f941877ed6ed45c
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.3 b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.3
deleted file mode 100644
index 46e9d062e131..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.3:5 ) >=kde-frameworks/kinit-5.58.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/kmenuedit.git
-IUSE=+hotkeys debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kmenuedit-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=23e04be0c60b77627c041cb1b5cc2b07
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4
new file mode 100644
index 000000000000..c5623d91df04
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.4:5 ) >=kde-frameworks/kinit-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma menu editor
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/kmenuedit.git
+IUSE=+hotkeys debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 hotkeys? ( >=kde-plasma/khotkeys-5.16.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=23e04be0c60b77627c041cb1b5cc2b07
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.16.3 b/metadata/md5-cache/kde-plasma/kscreen-5.16.4
similarity index 54%
rename from metadata/md5-cache/kde-plasma/kscreen-5.16.3
rename to metadata/md5-cache/kde-plasma/kscreen-5.16.4
index 3483b2d2be8a..e23c10fabfcf 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-plasma/libkscreen-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma screen management
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kscreen.git
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-plasma/libkscreen-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kscreen-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=68bc237dd39fa2690430f359e9f7e06c
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.3 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
similarity index 56%
rename from metadata/md5-cache/kde-plasma/kscreenlocker-5.16.3
rename to metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
index b8be27b3eecd..0d3045334666 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
@@ -1,17 +1,17 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Library and components for secure lock screen architecture
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=consolekit +pam seccomp test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.3:5
-RDEPEND=>=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
+RDEPEND=>=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms consolekit? ( sys-auth/consolekit ) pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 REQUIRED_USE=seccomp? ( pam )
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kscreenlocker-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pam	756a09f72c4cdbb55f2694c95f1e0860	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=1bdeec799f1b31a8f70b3276bcf84352
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.3 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
similarity index 66%
rename from metadata/md5-cache/kde-plasma/ksshaskpass-5.16.3
rename to metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
index c80ce686eefb..0efdb6a4815a 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.3
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/ksshaskpass-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f9cb019a4dbd4584cf783d473f7ce246
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.3 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.3
deleted file mode 100644
index 95558917342c..000000000000
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kinit-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libksysguard-5.16.3:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Network-enabled task manager and system monitor
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=lm_sensors debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kinit-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libksysguard-5.16.3:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/ksysguard-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=40e3968294808b72b8a2ac450a213bf4
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.16.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.16.4
new file mode 100644
index 000000000000..505d0b2b3b03
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Network-enabled task manager and system monitor
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=lm_sensors debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5[-minimal(-)] >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 lm_sensors? ( sys-apps/lm_sensors:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=40e3968294808b72b8a2ac450a213bf4
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.3 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
similarity index 79%
rename from metadata/md5-cache/kde-plasma/kwallet-pam-5.16.3
rename to metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
index 623a29306541..95560709dfdf 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwallet-5.58.0:5 dev-libs/libgcrypt:0= virtual/pam dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KWallet PAM module to not enter password again
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kwallet-5.58.0:5 dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kwallet-5.60.0:5 dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kwallet-pam-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e2051dff384d95e1d000a33414fe58ef
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.3 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
similarity index 74%
rename from metadata/md5-cache/kde-plasma/kwayland-integration-5.16.3
rename to metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
index 6d919cad30f5..792bdf68961e 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kwayland-integration-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=29355b48aa1e394727d2739f2ce2fc62
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.16.3 b/metadata/md5-cache/kde-plasma/kwin-5.16.4
similarity index 52%
rename from metadata/md5-cache/kde-plasma/kwin-5.16.3
rename to metadata/md5-cache/kde-plasma/kwin-5.16.4
index ee66e96b049e..fe5ff0425335 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kwin-5.16.4
@@ -1,16 +1,16 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5= >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5= >=kde-frameworks/kinit-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5[X] >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-plasma/breeze-5.16.3:5 >=kde-plasma/kdecoration-5.16.3:5 >=kde-plasma/kscreenlocker-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.12.3:5 >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=caps gles2 multimedia test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5= >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5= >=kde-frameworks/kinit-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5[X] >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-plasma/breeze-5.16.3:5 >=kde-plasma/kdecoration-5.16.3:5 >=kde-plasma/kscreenlocker-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=kde-frameworks/kirigami-5.58.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5= >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5= >=kde-frameworks/kinit-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5[X] >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[gles2=] >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsensors-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtvirtualkeyboard-5.12.3:5 multimedia? ( >=dev-qt/qtmultimedia-5.12.3:5[gstreamer,qml] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kwin-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kwin-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=bdd4ba638c1e1dfa88ee58564acb435a
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.16.3 b/metadata/md5-cache/kde-plasma/kwrited-5.16.4
similarity index 67%
rename from metadata/md5-cache/kde-plasma/kwrited-5.16.3
rename to metadata/md5-cache/kde-plasma/kwrited-5.16.4
index fcdc1e15ae00..c6ef620414b8 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.16.3
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpty-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma daemon listening for wall and write messages
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kpty-5.58.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kpty-5.60.0:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/kwrited-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=17ca5b495175260eb01d3a14e3e56b1d
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.16.3 b/metadata/md5-cache/kde-plasma/libkscreen-5.16.4
similarity index 81%
rename from metadata/md5-cache/kde-plasma/libkscreen-5.16.3
rename to metadata/md5-cache/kde-plasma/libkscreen-5.16.4
index 71f5f16ed038..9a0fabd45969 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.16.3
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 doc? ( >=dev-qt/qthelp-5.12.3:5 >=app-doc/doxygen-1.8.13-r1 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kwayland-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+DEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 DESCRIPTION=Plasma screen management library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug doc test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
+RDEPEND=>=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5 doc? ( >=dev-qt/qt-docs-5.12.3:5 )
 RESTRICT=test
 SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.16.3/libkscreen-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f8f0fc93f3156992d134e0844c745986
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.16.3 b/metadata/md5-cache/kde-plasma/libksysguard-5.16.4
similarity index 63%
rename from metadata/md5-cache/kde-plasma/libksysguard-5.16.3
rename to metadata/md5-cache/kde-plasma/libksysguard-5.16.4
index a2546bf1cac8..3a557669c60f 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.16.3
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.58.0:5 !minimal? ( >=kde-frameworks/plasma-5.58.0:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.60.0:5 !minimal? ( >=kde-frameworks/plasma-5.60.0:5 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Task management and system monitoring library
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=minimal webengine X test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebengine-5.12.3:5 ) X? ( >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/libksysguard-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=e88562caa48cb72e459e333f44237299
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.3 b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
similarity index 67%
rename from metadata/md5-cache/kde-plasma/libkworkspace-5.16.3
rename to metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
index 8156079aa064..b7843add61f4 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.16.3
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.16.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-plasma/kwin-5.16.4:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Workspace library to interact with the Plasma session manager
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau !<kde-plasma/plasma-workspace-5.14.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=03c08687ce46483b4a170d9d76b67aad
diff --git a/metadata/md5-cache/kde-plasma/milou-5.16.3 b/metadata/md5-cache/kde-plasma/milou-5.16.4
similarity index 65%
rename from metadata/md5-cache/kde-plasma/milou-5.16.3
rename to metadata/md5-cache/kde-plasma/milou-5.16.4
index 5303d2a569fe..b3a968d72ff2 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.16.3
+++ b/metadata/md5-cache/kde-plasma/milou-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/milou.git
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/milou-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/milou-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c2843d0adb9d136761b9e191c4a0e5fd
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.16.3 b/metadata/md5-cache/kde-plasma/oxygen-5.16.3
deleted file mode 100644
index 5d6cfa916de3..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.16.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/kdecoration-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.58.0:5 ) >=kde-frameworks/kservice-5.58.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/oxygen.git
-IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.3:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-plasma/kdecoration-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.58.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/oxygen-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=0558aaaf80ddca07264138174bfded5c
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.16.4 b/metadata/md5-cache/kde-plasma/oxygen-5.16.4
new file mode 100644
index 000000000000..cbcb6a64475c
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.16.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kservice-5.60.0:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Oxygen visual style for the Plasma desktop
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/oxygen.git
+IUSE=wayland debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-plasma/kdecoration-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.60.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0558aaaf80ddca07264138174bfded5c
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
similarity index 58%
rename from metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.3
rename to metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
index d03ac8118c0a..f9fd147de4e1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-3+
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-browser-integration-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=d7a5a4ea5f04cf7355dcf9d5e57cea13
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.3
deleted file mode 100644
index 3d703774b344..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.58.0:5 >=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kactivities-stats-5.58.0:5 >=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kbookmarks-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcodecs-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/kemoticons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kparts-5.58.0:5 >=kde-frameworks/kpeople-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=kde-plasma/kwin-5.16.3:5 >=kde-plasma/plasma-workspace-5.16.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.12.3:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.58.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.58.0:5 >=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kactivities-stats-5.58.0:5 >=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kbookmarks-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcodecs-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/kemoticons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kparts-5.58.0:5 >=kde-frameworks/kpeople-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-frameworks/sonnet-5.58.0:5 >=kde-plasma/kwin-5.16.3:5 >=kde-plasma/plasma-workspace-5.16.3:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.12.3:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.58.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.58.0:5 >=kde-frameworks/qqc2-desktop-style-5.58.0:5 >=kde-plasma/breeze-5.16.3:5 >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-plasma/oxygen-5.16.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 sys-apps/util-linux x11-apps/setxkbmap !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !<kde-plasma/kdeplasma-addons-5.15.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-desktop-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=235858f69589c5e9f7ef79688eee0976
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4
new file mode 100644
index 000000000000..c6ec00bed2a1
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.12.3:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma desktop
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/attica-5.60.0:5 >=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kemoticons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kpeople-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.12.3:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/qqc2-desktop-style-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-plasma/oxygen-5.16.4:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 sys-apps/util-linux x11-apps/setxkbmap !<kde-plasma/kdeplasma-addons-5.15.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=f564c4d6b8288b6feb88b4e4d98baae1
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
similarity index 51%
rename from metadata/md5-cache/kde-plasma/plasma-integration-5.16.3
rename to metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
index d681560c2d34..0c268f415934 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
@@ -1,15 +1,15 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/breeze-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/breeze-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/breeze-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5=[dbus] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 RESTRICT=test
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-integration-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=f8d185bb96c568d5569f5644698e8c2c
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.3
deleted file mode 100644
index ea5c4cee0abb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=7
-HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.16.3:5 >=kde-plasma/drkonqi-5.16.3:5 >=kde-plasma/kactivitymanagerd-5.16.3:5 >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-plasma/kdecoration-5.16.3:5 >=kde-plasma/kdeplasma-addons-5.16.3:5 >=kde-plasma/kgamma-5.16.3:5 >=kde-plasma/khotkeys-5.16.3:5 >=kde-plasma/kinfocenter-5.16.3:5 >=kde-plasma/kmenuedit-5.16.3:5 >=kde-plasma/kscreen-5.16.3:5 >=kde-plasma/kscreenlocker-5.16.3:5 >=kde-plasma/ksshaskpass-5.16.3:5 >=kde-plasma/ksysguard-5.16.3:5 >=kde-plasma/kwayland-integration-5.16.3:5 >=kde-plasma/kwin-5.16.3:5 >=kde-plasma/kwrited-5.16.3:5 >=kde-plasma/libkscreen-5.16.3:5 >=kde-plasma/libksysguard-5.16.3:5 >=kde-plasma/milou-5.16.3:5 >=kde-plasma/oxygen-5.16.3:5 >=kde-plasma/plasma-desktop-5.16.3:5 >=kde-plasma/plasma-integration-5.16.3:5 >=kde-plasma/plasma-workspace-5.16.3:5 >=kde-plasma/polkit-kde-agent-5.16.3:5 >=kde-plasma/powerdevil-5.16.3:5 >=kde-plasma/systemsettings-5.16.3:5 >=kde-plasma/user-manager-5.16.3:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.16.3:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.16.3:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.16.3:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.16.3:5 ) discover? ( >=kde-plasma/discover-5.16.3:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.16.3:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.16.3:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.16.3:5 >=kde-plasma/kde-gtk-config-5.16.3:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.16.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.16.3:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.16.3:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.16.3:5 >=kde-plasma/plymouth-kcm-5.16.3:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.16.3:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.16.3:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.16.3:5 )
-REQUIRED_USE=?? ( consolekit elogind systemd )
-SLOT=5
-_md5_=9b58dad38a115af2496063cd559baf72
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4
new file mode 100644
index 000000000000..99aa6ec8ce17
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.16.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=7
+HOMEPAGE=https://kde.org/plasma-desktop
+IUSE=bluetooth +browser-integration consolekit crypt +desktop-portal discover +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam plymouth +pm-utils pulseaudio +sddm sdk systemd +wallpapers
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.16.4:5 >=kde-plasma/drkonqi-5.16.4:5 >=kde-plasma/kactivitymanagerd-5.16.4:5 >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-plasma/kdecoration-5.16.4:5 >=kde-plasma/kdeplasma-addons-5.16.4:5 >=kde-plasma/kgamma-5.16.4:5 >=kde-plasma/khotkeys-5.16.4:5 >=kde-plasma/kinfocenter-5.16.4:5 >=kde-plasma/kmenuedit-5.16.4:5 >=kde-plasma/kscreen-5.16.4:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/ksshaskpass-5.16.4:5 >=kde-plasma/ksysguard-5.16.4:5 >=kde-plasma/kwayland-integration-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/kwrited-5.16.4:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/milou-5.16.4:5 >=kde-plasma/oxygen-5.16.4:5 >=kde-plasma/plasma-desktop-5.16.4:5 >=kde-plasma/plasma-integration-5.16.4:5 >=kde-plasma/plasma-workspace-5.16.4:5 >=kde-plasma/polkit-kde-agent-5.16.4:5 >=kde-plasma/powerdevil-5.16.4:5 >=kde-plasma/systemsettings-5.16.4:5 >=kde-plasma/user-manager-5.16.4:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[elogind?,systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.16.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.16.4:5 ) consolekit? ( >=sys-auth/consolekit-1.0.1 pm-utils? ( sys-power/pm-utils ) ) crypt? ( >=kde-plasma/plasma-vault-5.16.4:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.16.4:5 ) discover? ( >=kde-plasma/discover-5.16.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.16.4:5 x11-misc/sddm[consolekit?,elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.16.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.16.4:5 >=kde-plasma/kde-gtk-config-5.16.4:5 ) handbook? ( kde-apps/khelpcenter:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.16.4:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.16.4:5 net-misc/networkmanager[consolekit?,elogind?,systemd?] ) pam? ( >=kde-plasma/kwallet-pam-5.16.4:5 sys-auth/pambase[consolekit?,elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.16.4:5 >=kde-plasma/plymouth-kcm-5.16.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.16.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.16.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.16.4:5 )
+REQUIRED_USE=?? ( consolekit elogind systemd )
+SLOT=5
+_md5_=9b58dad38a115af2496063cd559baf72
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.3
deleted file mode 100644
index 1471e7cb51bd..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/networkmanager-qt-5.58.0:5[teamd=] >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.58.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/networkmanager-qt-5.58.0:5[teamd=] >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.58.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-nm-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=08dc318254e933973fdcf79d4a10c06c
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4
new file mode 100644
index 000000000000..e1441c1dd131
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma applet for NetworkManager
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=modemmanager openconnect teamd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5[teamd=] >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.60.0:5 >=dev-qt/qtxml-5.12.3:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.12.3:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=08dc318254e933973fdcf79d4a10c06c
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
similarity index 69%
rename from metadata/md5-cache/kde-plasma/plasma-pa-5.16.3
rename to metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
index 6db43c1bcf75..dff0d37321d8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Plasma applet for audio volume management using PulseAudio
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.58.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kirigami-5.60.0:5 >=dev-qt/qtquickcontrols2-5.12.3:5 media-libs/libcanberra x11-themes/sound-theme-freedesktop >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-pa-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=910085d7450eca13315356742b4efb5f
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.3
deleted file mode 100644
index bf020a3355f6..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktexteditor-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktexteditor-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.58.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-sdk-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ce71f3f8fede95c7c695f6a3111bc845
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4
new file mode 100644
index 000000000000..56815c236a39
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Useful applications for Plasma development
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=ce71f3f8fede95c7c695f6a3111bc845
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
similarity index 52%
rename from metadata/md5-cache/kde-plasma/plasma-vault-5.16.3
rename to metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
index 6f1f951ab37c..de5c52d61643 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kcodecs-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-plasma/libksysguard-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.58.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Plasma applet and services for creating encrypted vaults
 EAPI=7
 HOMEPAGE=https://kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 IUSE=networkmanager debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kcodecs-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-plasma/libksysguard-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.58.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-plasma/libksysguard-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-vault-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=fc2f2a2a2cbfb39e827fa9fc7870b897
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.3
deleted file mode 100644
index 97aa5e4747a4..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kbookmarks-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/kjs-5.58.0:5 >=kde-frameworks/kjsembed-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktexteditor-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-plasma/kscreenlocker-5.16.3:5 >=kde-plasma/kwin-5.16.3:5 >=kde-plasma/libksysguard-5.16.3:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.58.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.58.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.58.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.58.0:5 ) >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.16.3:5
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kbookmarks-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/kded-5.58.0:5 >=kde-frameworks/kdelibs4support-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/kguiaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemmodels-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kjobwidgets-5.58.0:5 >=kde-frameworks/kjs-5.58.0:5 >=kde-frameworks/kjsembed-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/krunner-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/ktexteditor-5.58.0:5 >=kde-frameworks/ktextwidgets-5.58.0:5 >=kde-frameworks/kwallet-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/plasma-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-plasma/kscreenlocker-5.16.3:5 >=kde-plasma/kwin-5.16.3:5 >=kde-plasma/libksysguard-5.16.3:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.58.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.58.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.58.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.58.0:5 ) >=kde-frameworks/kdesu-5.58.0:5 >=kde-frameworks/kirigami-5.58.0:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-plasma/ksysguard-5.16.3:5 >=kde-plasma/milou-5.16.3:5 >=kde-plasma/plasma-integration-5.16.3:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 app-text/iso-codes x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.14.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fcd7eb2105a07742616282316995458f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4
new file mode 100644
index 000000000000..2f2a8a097d98
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=dev-qt/qtconcurrent-5.12.3:5 x11-base/xorg-proto dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.12.3:5 ) >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=KDE Plasma workspace
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd test debug +handbook test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=kde-plasma/kde-cli-tools-5.16.4:5
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kded-5.60.0:5 >=kde-frameworks/kdelibs4support-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwallet-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/kscreenlocker-5.16.4:5 >=kde-plasma/kwin-5.16.4:5 >=kde-plasma/libksysguard-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5[jpeg] >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qtsql-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.60.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.60.0:5 ) gps? ( sci-geosciences/gpsd ) qalculate? ( sci-libs/libqalculate:= ) qrcode? ( >=kde-frameworks/prison-5.60.0:5 ) semantic-desktop? ( >=kde-frameworks/baloo-5.60.0:5 ) >=kde-frameworks/kdesu-5.60.0:5 >=kde-frameworks/kirigami-5.60.0:5 >=kde-apps/kio-extras-19.04.3:5 >=kde-plasma/ksysguard-5.16.4:5 >=kde-plasma/milou-5.16.4:5 >=kde-plasma/plasma-integration-5.16.4:5 >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtgraphicaleffects-5.12.3:5 >=dev-qt/qtpaths-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5[widgets] >=dev-qt/qtquickcontrols2-5.12.3:5 app-text/iso-codes x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !<kde-plasma/plasma-desktop-5.14.80:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+REQUIRED_USE=gps? ( geolocation )
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=92b2c4a25df7acccd50342a460cbdd1d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.3 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
similarity index 86%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.3
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
index 2ba3a87ee5e3..dee6c82189e8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
@@ -1,4 +1,4 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.58.0:5 >=dev-qt/qtcore-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6
+BDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Additional wallpapers for the Plasma workspace
@@ -7,6 +7,6 @@ HOMEPAGE=https://kde.org/
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-workspace-wallpapers-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=b6a51c29a96c3dcecae18fc61f4434e8
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.3 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
similarity index 60%
rename from metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.3
rename to metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
index cc857f19112a..cdfdeb8c24db 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.3
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma control module for Plymouth
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.16.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.16.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plymouth-kcm-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5281487aac735d2f34417ef1c09d0bbe
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.3 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.3
deleted file mode 100644
index 7aee223db7b7..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/polkit-kde-agent-1-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=9ec7ed651e518d9269322329088830fb
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4
new file mode 100644
index 000000000000..b95e3a5cc08f
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=PolKit agent module for KDE Plasma
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6a949da13f511cc51a31b112af5b7dbc
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.16.3-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.16.3-r1
deleted file mode 100644
index 5788defdb0a5..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.16.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5[policykit] >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-plasma/libkscreen-5.16.3:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( >=app-misc/ddcutil-0.9.1 ) wireless? ( >=kde-frameworks/bluez-qt-5.58.0:5 >=kde-frameworks/networkmanager-qt-5.58.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=7
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5[policykit] >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kglobalaccel-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kidletime-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/knotifyconfig-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwayland-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-frameworks/solid-5.58.0:5 >=kde-plasma/libkscreen-5.16.3:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( >=app-misc/ddcutil-0.9.1 ) wireless? ( >=kde-frameworks/bluez-qt-5.58.0:5 >=kde-frameworks/networkmanager-qt-5.58.0:5 ) >=kde-plasma/kde-cli-tools-5.16.3:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/powerdevil-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=297475e71adf24c2e55064a2779671ad
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.16.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.16.4
new file mode 100644
index 000000000000..bdd445a332ae
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=7
+HOMEPAGE=https://cgit.kde.org/powerdevil.git
+IUSE=brightness-control +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5[policykit] >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kglobalaccel-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kidletime-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwayland-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/solid-5.60.0:5 >=kde-plasma/libkscreen-5.16.4:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.60.0:5 >=kde-frameworks/networkmanager-qt-5.60.0:5 ) >=kde-plasma/kde-cli-tools-5.16.4:5 >=sys-power/upower-0.9.23 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=8110eac7b903084d2cbd539e0a7466b0
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.3 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
similarity index 55%
rename from metadata/md5-cache/kde-plasma/sddm-kcm-5.16.3
rename to metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
index f37510f5acfb..07ac3c186a92 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.3
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=KDE Plasma control module for SDDM
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knewstuff-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.3:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.16.4:5 x11-misc/sddm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/sddm-kcm-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=6f142594fe8cebd9d913c5e19f79ce3d
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.3 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.3
deleted file mode 100644
index 386019a527f5..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.16.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5 handbook? ( >=kde-frameworks/kdoctools-5.58.0:5 )
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kactivities-stats-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.58.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
-DESCRIPTION=System settings utility
-EAPI=7
-HOMEPAGE=https://kde.org/
-IUSE=classic gtk debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.58.0:5 >=kde-frameworks/kactivities-stats-5.58.0:5 >=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kcompletion-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/kcrash-5.58.0:5 >=kde-frameworks/kdbusaddons-5.58.0:5 >=kde-frameworks/kdeclarative-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kitemviews-5.58.0:5 >=kde-frameworks/kpackage-5.58.0:5 >=kde-frameworks/kservice-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=kde-frameworks/kxmlgui-5.58.0:5 >=kde-plasma/libkworkspace-5.16.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.58.0:5 ) >=kde-frameworks/kirigami-5.58.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.16.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/systemsettings-5.16.3.tar.xz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=416319dbc832d681c1cb88e9eea10efd
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.16.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.16.4
new file mode 100644
index 000000000000..b60eea07a423
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.16.4
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5 handbook? ( >=kde-frameworks/kdoctools-5.60.0:5 )
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DESCRIPTION=System settings utility
+EAPI=7
+HOMEPAGE=https://kde.org/
+IUSE=classic gtk debug +handbook
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.60.0:5 >=kde-frameworks/kactivities-stats-5.60.0:5 >=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdbusaddons-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kpackage-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-plasma/libkworkspace-5.16.4:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 classic? ( >=kde-frameworks/khtml-5.60.0:5 ) >=kde-frameworks/kirigami-5.60.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.16.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=416319dbc832d681c1cb88e9eea10efd
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.16.3 b/metadata/md5-cache/kde-plasma/user-manager-5.16.4
similarity index 56%
rename from metadata/md5-cache/kde-plasma/user-manager-5.16.3
rename to metadata/md5-cache/kde-plasma/user-manager-5.16.4
index 1aed7b669bf8..11ac16f0c3a2 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.16.3
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Simple system settings module to manage the users of your system
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.58.0:5 >=kde-frameworks/kcmutils-5.58.0:5 >=kde-frameworks/kconfig-5.58.0:5 >=kde-frameworks/kconfigwidgets-5.58.0:5 >=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kiconthemes-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kauth-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-libs/libpwquality-1.3.0 sys-apps/accountsservice >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/user-manager-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=594791d090ea427ca8efc3e60605c398
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.3 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
similarity index 72%
rename from metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.3
rename to metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
index 01d25ded6778..0bc600740fb8 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.3
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
@@ -1,14 +1,14 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.58.0:5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.60.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire ) >=kde-frameworks/kwayland-5.58.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
+DEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire ) >=kde-frameworks/kwayland-5.60.0:5 >=dev-qt/qtconcurrent-5.12.3:5 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-qt/qtcore-5.12.3:5
 DESCRIPTION=Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks
 EAPI=7
 HOMEPAGE=https://kde.org/
 IUSE=screencast test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.58.0:5 >=kde-frameworks/ki18n-5.58.0:5 >=kde-frameworks/kio-5.58.0:5 >=kde-frameworks/knotifications-5.58.0:5 >=kde-frameworks/kwidgetsaddons-5.58.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire ) screencast? ( sys-apps/xdg-desktop-portal[screencast] ) !screencast? ( sys-apps/xdg-desktop-portal ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.58.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtprintsupport-5.12.3:5[cups] >=dev-qt/qtwidgets-5.12.3:5 screencast? ( dev-libs/glib:2 media-libs/libepoxy media-libs/mesa[gbm] media-video/pipewire ) screencast? ( sys-apps/xdg-desktop-portal[screencast] ) !screencast? ( sys-apps/xdg-desktop-portal ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.60.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.12.3:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/xdg-desktop-portal-kde-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=9430460472aaeb2d62013fce348c6fa1
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.3 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
similarity index 80%
rename from metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.3
rename to metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
index d916edc08492..b35a4aeab727 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.3
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=7
 HOMEPAGE=https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/extra-cmake-modules-5.58.0:5 >=kde-frameworks/kwindowsystem-5.58.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
+RDEPEND=>=kde-frameworks/extra-cmake-modules-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !<kde-plasma/plasma-workspace-5.14.2:5 !kde-plasma/xembed-sni-proxy:0
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.16.3/plasma-workspace-5.16.3.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz
 _eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	kde5	b83032d00dfb7dbc66eec7c703260187	kde5-functions	eff709ecafc59979bd74b425c5e41a33	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	virtualx	53625127887b62eabb9ec61d3d943462	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=ca4c810fa209a70288a89beeba01a6a0
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 62dbe254b40c..5c5f6ce30232 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/milter-regex-1.9 b/metadata/md5-cache/mail-filter/milter-regex-1.9
deleted file mode 100644
index eb08b2fc0039..000000000000
--- a/metadata/md5-cache/mail-filter/milter-regex-1.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst prepare
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) virtual/yacc
-DESCRIPTION=A milter-based regular expression filter
-EAPI=4
-HOMEPAGE=http://www.benzedrine.cx/milter-regex.html
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail )
-SLOT=0
-SRC_URI=http://www.benzedrine.cx/milter-regex-1.9.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	f8dcb46ee7b0bcdec51dac1ef4bfdfc9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=061f95a0b2203d0b3deed45ccca30d47
diff --git a/metadata/md5-cache/mail-filter/milter-regex-2.2 b/metadata/md5-cache/mail-filter/milter-regex-2.2
deleted file mode 100644
index 6c163785c721..000000000000
--- a/metadata/md5-cache/mail-filter/milter-regex-2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst preinst
-DEPEND=|| ( mail-filter/libmilter mail-mta/sendmail ) virtual/yacc
-DESCRIPTION=A milter-based regular expression filter
-EAPI=7
-HOMEPAGE=https://www.benzedrine.ch/milter-regex.html
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( mail-filter/libmilter mail-mta/sendmail )
-SLOT=0
-SRC_URI=https://www.benzedrine.ch/milter-regex-2.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	user	f8dcb46ee7b0bcdec51dac1ef4bfdfc9
-_md5_=978963b93f0797c198bf206fd372701f
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index dfd752299a21..e6c50a621234 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/fontawesome-5.9.0 b/metadata/md5-cache/media-fonts/fontawesome-5.9.0
new file mode 100644
index 000000000000..b1d2509aef95
--- /dev/null
+++ b/metadata/md5-cache/media-fonts/fontawesome-5.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm setup
+DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=The iconic font
+EAPI=6
+HOMEPAGE=https://fontawesome.com
+IUSE=+otf +ttf X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=CC-BY-3.0 OFL-1.1
+REQUIRED_USE=|| ( otf ttf )
+SLOT=0/5
+SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/5.9.0.tar.gz -> fontawesome-5.9.0.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9d76fb6beea24a625315fd14743dee22
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index eeea0fd938c0..e3a0e1d28945 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/geeqie-1.5 b/metadata/md5-cache/media-gfx/geeqie-1.5
new file mode 100644
index 000000000000..98c66639e82c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/geeqie-1.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) ) dev-util/glib-utils
+DESCRIPTION=A lightweight GTK image viewer forked from GQview
+EAPI=7
+HOMEPAGE=http://www.geeqie.org
+IUSE=debug doc exif ffmpegthumbnailer gpu-accel gtk3 jpeg lcms lirc lua map nls pdf tiff xmp
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/libintl doc? ( app-text/gnome-doc-utils ) ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) gpu-accel? ( media-libs/clutter-gtk ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) lirc? ( app-misc/lirc ) lua? ( >=dev-lang/lua-5.1:= ) map? ( media-libs/libchamplain:0.12 ) pdf? ( >=app-text/poppler-0.62[cairo] ) tiff? ( media-libs/tiff:0 ) xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )
+REQUIRED_USE=gpu-accel? ( gtk3 ) map? ( gpu-accel )
+SLOT=0
+SRC_URI=http://www.geeqie.org/geeqie-1.5.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=c0a3bddf88d0f463a003a56bf3949ef0
diff --git a/metadata/md5-cache/media-gfx/springgraph-88 b/metadata/md5-cache/media-gfx/springgraph-88
index d6fd23dfce06..b0c9aa621808 100644
--- a/metadata/md5-cache/media-gfx/springgraph-88
+++ b/metadata/md5-cache/media-gfx/springgraph-88
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install unpack
 DESCRIPTION=Generate spring graphs from graphviz input files
 EAPI=0
 HOMEPAGE=http://www.chaosreigns.com/code/springgraph
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/GD
 SLOT=0
 SRC_URI=http://www.chaosreigns.com/code/springgraph/dl/springgraph.pl.88 mirror://debian/pool/main/s/springgraph/springgraph_0.82-5.diff.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd0e9c5d76d72d45096a753bbbcb0fc2
+_md5_=b7cd65d5e90c6044ed56dc79c3578c12
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 792b49a8a0c9..4ed93f43f106 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/libpagemaker-0.0.4 b/metadata/md5-cache/media-libs/libpagemaker-0.0.4
index 5d216a47e4bb..162ce48a4f5f 100644
--- a/metadata/md5-cache/media-libs/libpagemaker-0.0.4
+++ b/metadata/md5-cache/media-libs/libpagemaker-0.0.4
@@ -4,9 +4,9 @@ DESCRIPTION=C++ Library that parses the file format of Aldus/Adobe PageMaker doc
 EAPI=6
 HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker
 IUSE=debug doc tools
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MPL-2.0
 RDEPEND=dev-libs/librevenge
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libpagemaker/libpagemaker-0.0.4.tar.xz
-_md5_=0ddbff9544173fad4d84cc13503e1cd6
+_md5_=31ac8414a1a79700fd867636ac5c146c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 7fbb67c125b4..60199601f67a 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/devedeng-4.15.0 b/metadata/md5-cache/media-video/devedeng-4.15.0
new file mode 100644
index 000000000000..d5e7f48015cf
--- /dev/null
+++ b/metadata/md5-cache/media-video/devedeng-4.15.0
@@ -0,0 +1,15 @@
+BDEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)
+EAPI=7
+HOMEPAGE=http://www.rastersoft.com/programas/devede.html
+IUSE=libav python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pycairo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] x11-libs/gtk+:3 || ( media-video/vlc media-video/mpv media-video/mplayer ) !libav? ( media-video/ffmpeg ) libav? ( media-video/libav ) media-video/dvdauthor media-video/vcdimager virtual/cdrtools || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn ) 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_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://gitlab.com/rastersoft/devedeng/-/archive/4.15.0/devedeng-4.15.0.tar.bz2
+_eclasses_=distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=fec2215caeeec849d1fa2d165b8fec24
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 8de411bf2f51..0b517175201a 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1 b/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
index c66ce89c104d..a69b46b602ce 100644
--- a/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
+++ b/metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install
 DESCRIPTION=Squid logfile analyzer and traffic grapher
 EAPI=5
 HOMEPAGE=http://squid-graph.sourceforge.net/
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-perl/GD[png]
 SLOT=0
 SRC_URI=mirror://sourceforge/squid-graph/squid-graph-3.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2952c6adf31403205d1146c3f836719e
+_md5_=73e647b4eb6556656ebd8aff2e2369f4
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 463264b0d828..ce4909667ce7 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/skypeforlinux-8.48.0.51 b/metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
similarity index 96%
rename from metadata/md5-cache/net-im/skypeforlinux-8.48.0.51
rename to metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
index 55bd14324d2e..e39569cbcc9c 100644
--- a/metadata/md5-cache/net-im/skypeforlinux-8.48.0.51
+++ b/metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
@@ -10,6 +10,6 @@ RDEPEND=|| ( sys-auth/elogind sys-apps/systemd ) app-crypt/libsecret[abi_x86_64(
 REQUIRED_USE=|| ( abi_x86_64 )
 RESTRICT=mirror bindist strip
 SLOT=0
-SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.48.0.51-1.x86_64.rpm
+SRC_URI=https://repo.skype.com/rpm/stable/skypeforlinux_8.50.0.38-1.x86_64.rpm
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	pax-utils	db85a3c508cf82c45f24b2723791cc93	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=31f5584f1df42349852517aef600cb1c
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 49a3bfbdc324..217c59c4ef59 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r3 b/metadata/md5-cache/net-mail/mailutils-3.4-r3
index b808c435bf6d..a9c027827463 100644
--- a/metadata/md5-cache/net-mail/mailutils-3.4-r3
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) emacs? ( virtual/emacs ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) 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(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
 REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
 SLOT=0
 SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d782426a143ce4e03facbecce999b70a
+_md5_=717516cab0e8f546d49e470b2347b3ed
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 38a71f59d8cb..ceac6904e480 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/dhcpcd-8.0.1-r1 b/metadata/md5-cache/net-misc/dhcpcd-8.0.1-r1
deleted file mode 100644
index 6ab01d983292..000000000000
--- a/metadata/md5-cache/net-misc/dhcpcd-8.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst
-DEPEND=udev? ( virtual/udev )
-DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
-EAPI=7
-HOMEPAGE=https://roy.marples.name/projects/dhcpcd
-IUSE=elibc_glibc +embedded ipv6 kernel_linux +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-RDEPEND=udev? ( virtual/udev )
-SLOT=0
-SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-8.0.1.tar.xz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=6d6867695d63cc835dbcb98fbcbc1b73
diff --git a/metadata/md5-cache/net-misc/electrum-3.3.6-r1 b/metadata/md5-cache/net-misc/electrum-3.3.6-r2
similarity index 66%
rename from metadata/md5-cache/net-misc/electrum-3.3.6-r1
rename to metadata/md5-cache/net-misc/electrum-3.3.6-r2
index e81ad797654a..4bef3205fe5a 100644
--- a/metadata/md5-cache/net-misc/electrum-3.3.6-r1
+++ b/metadata/md5-cache/net-misc/electrum-3.3.6-r2
@@ -1,14 +1,14 @@
 BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DESCRIPTION=User friendly Bitcoin client
 EAPI=7
 HOMEPAGE=https://electrum.org/
 IUSE=audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb l10n_ar l10n_be l10n_bg l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_fa l10n_fr l10n_hu l10n_hy l10n_id l10n_it l10n_ja l10n_ko l10n_ky l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sl l10n_sv l10n_ta l10n_th l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] =dev-python/aiorpcX-0.17.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/tlslite[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/aiohttp-socks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ~dev-python/aiorpcX-0.17.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/dnspython[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/jsonrpclib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pbkdf2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/PySocks[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/qrcode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/six[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ncurses? ( dev-lang/python ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses?] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) greenaddress_it? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) trustedcoin_com? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://download.electrum.org/3.3.6/Electrum-3.3.6.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=ce294b2c9ec5bfa17ec245faae387849
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	9838160d624a44b2d56d1266a69fd473	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=0464375084bd87b449636829a6524404
diff --git a/metadata/md5-cache/net-misc/x2goclient-4.1.2.1-r1 b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1-r1
new file mode 100644
index 000000000000..8c4f2a19baeb
--- /dev/null
+++ b/metadata/md5-cache/net-misc/x2goclient-4.1.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) dev-qt/linguist-tools:5
+DESCRIPTION=The X2Go Qt client
+EAPI=6
+HOMEPAGE=http://www.x2go.org
+IUSE=ldap
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 >=net-libs/libssh-0.7.5-r2 net-print/cups x11-libs/libXpm ldap? ( net-nds/openldap ) net-misc/nx
+SLOT=0
+SRC_URI=http://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=af473c05a5f65fc08c8d9639de03468a
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index df594071ce6a..42fb4d3dd245 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.8.1-r1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.8.1-r1
deleted file mode 100644
index 5187841763d5..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.8.8.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=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 virtual/pkgconfig
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=6
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.8.8.1.tar.gz -> cpuminer-opt-3.8.8.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aebfd8990f125e44501d4252424b6d51
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0
deleted file mode 100644
index 588e6fc37392..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.0.tar.gz -> cpuminer-opt-3.9.0.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=b65c0ff0a984c6b1b79c3e97a8c8688f
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1
deleted file mode 100644
index 6fd4eb2b5009..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.1.tar.gz -> cpuminer-opt-3.9.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1
deleted file mode 100644
index b1f8f9bb0ea9..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.1.1.tar.gz -> cpuminer-opt-3.9.1.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2
deleted file mode 100644
index ca0f7aa0294e..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.2.tar.gz -> cpuminer-opt-3.9.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.2 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.2
deleted file mode 100644
index 7420cb2ea9be..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.2.2.tar.gz -> cpuminer-opt-3.9.2.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.3 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.3
deleted file mode 100644
index 07d2ba199565..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.2.3.tar.gz -> cpuminer-opt-3.9.2.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.4 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.4
deleted file mode 100644
index 1dea74128346..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.2.4.tar.gz -> cpuminer-opt-3.9.2.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.5 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.5
deleted file mode 100644
index 84e88c2bdfaa..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.2.5.tar.gz -> cpuminer-opt-3.9.2.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.3.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.3.1
deleted file mode 100644
index 2c5711f2598c..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.3.1.tar.gz -> cpuminer-opt-3.9.3.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.4 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.4
deleted file mode 100644
index 5f1158e8c869..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.4.tar.gz -> cpuminer-opt-3.9.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5
deleted file mode 100644
index faea8d031792..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.5.tar.gz -> cpuminer-opt-3.9.5.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.1
deleted file mode 100644
index ba2cd7fb3ca5..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.5.1.tar.gz -> cpuminer-opt-3.9.5.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.2 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.2
deleted file mode 100644
index 9a1b0c92bf45..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.5.2.tar.gz -> cpuminer-opt-3.9.5.2.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.3 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.3
deleted file mode 100644
index de0abe4b2777..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.5.3.tar.gz -> cpuminer-opt-3.9.5.3.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.4 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.4
deleted file mode 100644
index 3fa577603f96..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.5.4.tar.gz -> cpuminer-opt-3.9.5.4.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6
deleted file mode 100644
index 1400e4ddd05e..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.6.tar.gz -> cpuminer-opt-3.9.6.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.1
deleted file mode 100644
index 0fef7f507d91..000000000000
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=Optimized multi algo CPU miner
-EAPI=7
-HOMEPAGE=https://github.com/JayDDee/cpuminer-opt
-IUSE=cpu_flags_x86_sse2 curl libressl
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
-REQUIRED_USE=cpu_flags_x86_sse2
-SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.6.1.tar.gz -> cpuminer-opt-3.9.6.1.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1 b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.2
similarity index 91%
rename from metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
rename to metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.2
index 5730f14bf9be..eae55a49a8a6 100644
--- a/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
+++ b/metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.2
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0 dev-libs/jansson >=net-misc/curl-7.15[ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
 REQUIRED_USE=cpu_flags_x86_sse2
 SLOT=0
-SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.0.1.tar.gz -> cpuminer-opt-3.9.0.1.tar.gz
+SRC_URI=https://github.com/JayDDee/cpuminer-opt/archive/v3.9.6.2.tar.gz -> cpuminer-opt-3.9.6.2.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
 _md5_=8bbcca16261a83dc880cc295a6ef0f0a
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 631f4a586d2f..cfa493eb776f 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/kicad-5.1.2 b/metadata/md5-cache/sci-electronics/kicad-5.1.2
index e71e2d0da62f..1f8d740ac911 100644
--- a/metadata/md5-cache/sci-electronics/kicad-5.1.2
+++ b/metadata/md5-cache/sci-electronics/kicad-5.1.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-libs/boost-1.61[context,nls,threads,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] ) >=dev-libs/boost-1.61[context,nls,threads,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 ) sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Electronic Schematic and PCB design tools
 EAPI=6
 HOMEPAGE=http://www.kicad-pcb.org
-IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc examples github +ngspice occ +oce openmp +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ GPL-3+ Boost-1.0
-RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-libs/boost-1.61[context,nls,threads,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) ?? ( occ oce )
+RDEPEND=x11-libs/wxGTK:3.0-gtk3[X,opengl] python? ( dev-python/wxpython:4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] ) >=dev-libs/boost-1.61[context,nls,threads,python?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_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(+)?] github? ( net-misc/curl:=[ssl] ) media-libs/glew:0= media-libs/glm media-libs/freeglut media-libs/mesa ngspice? ( sci-electronics/ngspice[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 sci-electronics/electronics-menu
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) ?? ( occ oce )
 SLOT=0
 SRC_URI=https://launchpad.net/kicad/5.0/5.1.2/+download/kicad-5.1.2.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	e1e6e1eb5b3d911b3abd712f611e2312	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=fb23fe9252b31d3603db2023d77d956d
+_md5_=4a6e8cb519affddcb96a12fcba32ce1e
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3885b2ddc31e..5e836ca7341e 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/cantera-2.4.0 b/metadata/md5-cache/sci-libs/cantera-2.4.0
deleted file mode 100644
index 9810e48079df..000000000000
--- a/metadata/md5-cache/sci-libs/cantera-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sci-libs/sundials:0= dev-cpp/eigen dev-libs/boost dev-libs/libfmt python? ( dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) test? ( >=dev-cpp/gtest-1.8.0 ) fortran? ( virtual/fortran ) dev-util/scons[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
-EAPI=6
-HOMEPAGE=http://www.cantera.org
-IUSE=+cti fortran pch +python test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=python? ( dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sci-libs/sundials:0= fortran? ( virtual/fortran )
-REQUIRED_USE=cti? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) python? ( cti ) ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Cantera/cantera/archive/v2.4.0.tar.gz -> cantera-2.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	scons-utils	741000d14c0b59263aac3f3cf6e39909	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7995b8ca14ca27b4b505ab72e833e4a2
diff --git a/metadata/md5-cache/sci-libs/sundials-2.7.0 b/metadata/md5-cache/sci-libs/sundials-2.7.0
deleted file mode 100644
index 6efa2c10de1f..000000000000
--- a/metadata/md5-cache/sci-libs/sundials-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=Suite of nonlinear solvers
-EAPI=6
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-REQUIRED_USE=hypre? ( mpi )
-SLOT=0/2
-SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-2.7.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=46319dc9edd2207997912282a1e19f36
diff --git a/metadata/md5-cache/sci-libs/sundials-3.0.0 b/metadata/md5-cache/sci-libs/sundials-3.0.0
deleted file mode 100644
index e4dfc5a6af0c..000000000000
--- a/metadata/md5-cache/sci-libs/sundials-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=Suite of nonlinear solvers
-EAPI=6
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-REQUIRED_USE=hypre? ( mpi )
-SLOT=0/3
-SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.0.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=4a5dfb6fc0d043ea0c7fd6d0751df7ba
diff --git a/metadata/md5-cache/sci-libs/sundials-3.1.0 b/metadata/md5-cache/sci-libs/sundials-3.1.0
deleted file mode 100644
index 8c11528a8d91..000000000000
--- a/metadata/md5-cache/sci-libs/sundials-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=Suite of nonlinear solvers
-EAPI=6
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-REQUIRED_USE=hypre? ( mpi )
-SLOT=0/3
-SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.1.0.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=17be79222655632e090df10773844142
diff --git a/metadata/md5-cache/sci-libs/sundials-3.1.2 b/metadata/md5-cache/sci-libs/sundials-3.1.2
deleted file mode 100644
index 82d4339b4dfc..000000000000
--- a/metadata/md5-cache/sci-libs/sundials-3.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 fortran? ( virtual/fortran )
-DESCRIPTION=Suite of nonlinear solvers
-EAPI=6
-HOMEPAGE=https://computation.llnl.gov/projects/sundials
-IUSE=cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=lapack? ( virtual/lapack ) mpi? ( virtual/mpi sci-libs/hypre:= ) sparse? ( sci-libs/klu:= ) superlumt? ( sci-libs/superlu_mt:= ) fortran? ( virtual/fortran )
-REQUIRED_USE=hypre? ( mpi )
-SLOT=0/3
-SRC_URI=https://computation.llnl.gov/projects/sundials/download/sundials-3.1.2.tar.gz
-_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	fortran-2	f75a2d9321053acf424991e805f32ede	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	14d00d009167652b1fa363e55effe213
-_md5_=551e47a1bb7f1774329da6697971a064
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 1d11858cd7fb..0464369038ff 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0 b/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
index 54f62939511a..cc16d4d1cc0e 100644
--- a/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
+++ b/metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=Mixed Integer Linear Programming (MILP) solver
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/lpsolve/
 IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-libs/colamd
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/lpsolve-5.5.2.0.tar.xz
-_md5_=3f0f22e86bb551ddf705770d755392b4
+_md5_=5f4e7797c3823959bf6cf27b3aefd9a9
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index e547875a70d4..23e05f38c4af 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/mbuffer-20190725 b/metadata/md5-cache/sys-block/mbuffer-20190725
new file mode 100644
index 000000000000..499cc15858be
--- /dev/null
+++ b/metadata/md5-cache/sys-block/mbuffer-20190725
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst prepare test
+DEPEND=ssl? ( dev-libs/openssl:0= ) test? ( dev-libs/openssl:0 )
+DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functionality
+EAPI=7
+HOMEPAGE=https://www.maier-komor.de/mbuffer.html
+IUSE=debug ssl test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+REQUIRED_USE=test? ( ssl )
+SLOT=0
+SRC_URI=https://www.maier-komor.de/software/mbuffer/mbuffer-20190725.tgz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=b0e544616332d58c623adc4c724a6839
diff --git a/metadata/md5-cache/sys-block/storcli-7.0709-r1 b/metadata/md5-cache/sys-block/storcli-7.0709-r1
index 2accfab538ca..011939438cb1 100644
--- a/metadata/md5-cache/sys-block/storcli-7.0709-r1
+++ b/metadata/md5-cache/sys-block/storcli-7.0709-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
 EAPI=6
 HOMEPAGE=https://www.broadcom.com/support/download-search?dk=storcli
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=Avago LSI BSD
 SLOT=0/7.7
 SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/007.0709.0000.0000_Unified_StorCLI.zip -> storcli-7.0709.zip
 _eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93
-_md5_=5c0a577c26449895d9b20728eb68f987
+_md5_=145ca78ca8813456b594f13f12ca09a7
diff --git a/metadata/md5-cache/sys-block/storcli-7.1017 b/metadata/md5-cache/sys-block/storcli-7.1017
new file mode 100644
index 000000000000..305fc3d262f7
--- /dev/null
+++ b/metadata/md5-cache/sys-block/storcli-7.1017
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=MegaRAID StorCLI (successor of the MegaCLI)
+EAPI=7
+HOMEPAGE=https://www.broadcom.com/support/download-search?dk=storcli
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Avago LSI BSD
+SLOT=0/7.10
+SRC_URI=https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MR_SAS_Unified_StorCLI_007.1017.0000.0000.zip -> storcli-7.1017.zip
+_eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93
+_md5_=8700e6c4242459f2da0125a39d309f6b
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index c5d3393b4dbf..d323f2db29da 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
index 1be6de6aa382..1aae3d7cff1a 100644
--- a/metadata/md5-cache/sys-fs/udev-242
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v242/systemd-242.tar.gz
 _eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	linux-info	953c3b1c472dcadbf62098a9301327f2	meson	22b6eb3dc04a3ba65083811a5e17c913	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	udev	7752f306eec7b286d00bdb47b763e7ac
-_md5_=e5127e9aed7b1ff1256c81c1058e143a
+_md5_=d46fbef37e6afa66d59f2c6a5c9df86d
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 5c67cabd3b88..ea492044f83e 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
new file mode 100644
index 000000000000..4905f42d397e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://gitlab.com/post-factum/pf-kernel/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_p2
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf2.diff -> pf-sources-5.2_p2.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3 b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
new file mode 100644
index 000000000000..ecce905d6a88
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://gitlab.com/post-factum/pf-kernel/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2_p3
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.2...v5.2-pf3.diff -> pf-sources-5.2_p3.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.2-1.extras.tar.xz
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=78c508dd953652f70f7f70e59ede0ad3
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index b3958dbe7fbb..cba6000b0019 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/dspam-web-3.10.1 b/metadata/md5-cache/www-apps/dspam-web-3.10.1
index e2ef4cf56cb5..f7cd09d1079c 100644
--- a/metadata/md5-cache/www-apps/dspam-web-3.10.1
+++ b/metadata/md5-cache/www-apps/dspam-web-3.10.1
@@ -4,10 +4,10 @@ DESCRIPTION=Web based administration and user controls for dspam
 EAPI=4
 HOMEPAGE=http://dspam.nuclearelephant.com/
 IUSE=vhosts
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=AGPL-3
 RDEPEND=>=mail-filter/dspam-3.10.1[-user-homedirs] dev-perl/GD[png] dev-perl/GD-Graph3d dev-perl/GDGraph dev-perl/GDTextUtil >=app-admin/webapp-config-1.50.15
 SLOT=3.10.1
 SRC_URI=http://dspam.nuclearelephant.com/sources/dspam-3.10.1.tar.gz
 _eclasses_=webapp	16783e418aca3ffa461d68310bf7ab12
-_md5_=4a34a7d760f1e56342be5d3750e0bc03
+_md5_=8a880e08474cb41bf7191b7a344f5e76
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index c6a69b2f87fd..68f4c21acc15 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-76.0.3809.80 b/metadata/md5-cache/www-client/chromium-76.0.3809.87
similarity index 99%
rename from metadata/md5-cache/www-client/chromium-76.0.3809.80
rename to metadata/md5-cache/www-client/chromium-76.0.3809.87
index b9d5233e980f..b40cc967158c 100644
--- a/metadata/md5-cache/www-client/chromium-76.0.3809.80
+++ b/metadata/md5-cache/www-client/chromium-76.0.3809.87
@@ -11,6 +11,6 @@ RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-pr
 REQUIRED_USE=component-build? ( !suid )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-76.0.3809.80.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-76.0.3809.87.tar.xz
 _eclasses_=check-reqs	2c6f909675083dce8430b648bf737cb0	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	b1d22ac8bdd4679ab79c71aca235009d	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	db85a3c508cf82c45f24b2723791cc93	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	b5f01473006ccc2cd78bc3dab20fced4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=5d8c832a3b735d3ea28c0acfdde0b346
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 8d866bcb35c7..8b1ba121b480 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/wmamixer-0.2 b/metadata/md5-cache/x11-plugins/wmamixer-0.2
deleted file mode 100644
index 42a1f0cf783d..000000000000
--- a/metadata/md5-cache/x11-plugins/wmamixer-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=ALSA mixer dockapp, fork of wmsmixer
-EAPI=6
-HOMEPAGE=https://github.com/gryf/wmamixer
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXpm x11-libs/libXext x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/gryf/wmamixer/archive/0.2.tar.gz -> wmamixer-0.2.tar.gz
-_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=2083288ca615660c038d09098d1cc17a
diff --git a/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1 b/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
new file mode 100644
index 000000000000..b08b0c229b9a
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/alsa-lib x11-libs/libXpm x11-libs/libXext x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=ALSA mixer dockapp, fork of wmsmixer
+EAPI=7
+HOMEPAGE=https://github.com/gryf/wmamixer
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib x11-libs/libXpm x11-libs/libXext x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/gryf/wmamixer/archive/1.0.tar.gz -> wmamixer-1.0.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=93851192eec9d73ee7ba0c2b49bbd076
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.30 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.30
deleted file mode 100644
index 9df117b5f76e..000000000000
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
-EAPI=6
-HOMEPAGE=https://www.dockapps.net/wmbiff
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.30.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1abd9fc61efe353363c8deda5ca1f03d
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.31 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.31
deleted file mode 100644
index 78ca9d064c78..000000000000
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 ) virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
-EAPI=6
-HOMEPAGE=https://www.dockapps.net/wmbiff
-IUSE=crypt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
-SLOT=0
-SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.31.tar.gz
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1abd9fc61efe353363c8deda5ca1f03d
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.34 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.34
new file mode 100644
index 000000000000..507b7722781d
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.34
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 ) x11-base/xorg-proto
+DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
+EAPI=7
+HOMEPAGE=https://www.dockapps.net/wmbiff
+IUSE=crypt
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
+SLOT=0
+SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.34.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=51bcef4c215849f8ee13a309bbb5e247
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.35 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.35
new file mode 100644
index 000000000000..77a740cea675
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmbiff-0.4.35
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 ) x11-base/xorg-proto
+DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
+EAPI=7
+HOMEPAGE=https://www.dockapps.net/wmbiff
+IUSE=crypt
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-2.2.0 )
+SLOT=0
+SRC_URI=https://www.dockapps.net/download/wmbiff-0.4.35.tar.gz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=51bcef4c215849f8ee13a309bbb5e247
diff --git a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3 b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
index 1c061514a74c..0eb0ec8b0eea 100644
--- a/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
+++ b/metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
@@ -11,4 +11,4 @@ RDEPEND=x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext se
 SLOT=0
 SRC_URI=http://www.improbability.net/wmfire/wmfire-1.2.4.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
-_md5_=8ea2fffe81f78b3899ab795c04d1b5b8
+_md5_=e12c5f6af816613979e6fda4477129e0
diff --git a/metadata/md5-cache/x11-plugins/wmix-3.4 b/metadata/md5-cache/x11-plugins/wmix-3.4
new file mode 100644
index 000000000000..8d74dddda740
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/wmix-3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr x11-base/xorg-proto
+DESCRIPTION=Dockapp mixer for OSS or ALSA
+EAPI=7
+HOMEPAGE=https://www.dockapps.net/wmix
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://www.dockapps.net/download/wmix-3.4.tar.gz
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56
+_md5_=ad3c6984b0a343f841068c7d387f14dc
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 897fb81d9bba..bc5e3d39ae5e 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/terminology-1.5.0 b/metadata/md5-cache/x11-terms/terminology-1.5.0
new file mode 100644
index 000000000000..f90f7e1715cf
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/terminology-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm test
+DEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
+DESCRIPTION=Feature rich terminal emulator using the Enlightenment Foundation Libraries
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/about-terminology
+IUSE=extras nls
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] ) || ( dev-libs/efl[X] dev-libs/efl[wayland] ) app-arch/lz4 dev-libs/efl[eet,fontconfig]
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/terminology/terminology-1.5.0.tar.xz
+_eclasses_=meson	22b6eb3dc04a3ba65083811a5e17c913	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	a3a237ef6c0c58546bf23b2c382f9e56	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=dca7a25b48feb4168e8bd96df8b3c6e4
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2bbb76f1da63..a77035403247 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12061 BLAKE2B f448db7d0d96e290585ff31a0a53eef16c1eaf1067a762ae38dee6e3aabd907e39615d4506ca817a600c16bc5c05aa26bacbbb4df18dc41ca59fd44b42d445cc SHA512 cbd0f4d5c608e680e0b38d51b1fc83032fe61ae7f08009a95dca0f360997eaa870127096b3cdfa97c14f98aa98b7916911420bb10425f038f9c2f291b8052a2a
-TIMESTAMP 2019-07-30T14:09:03Z
+TIMESTAMP 2019-07-31T05:39:01Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1AT39fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl1BKXVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBtVw//eYKYNouLwpqdVOrSMzWc8WkY9ra+gF0+GjCfw1DwOJt5mtchQjAEvUCR
-iAXE2CG9TAY6cPsPnO73IdOldx4r4NNmEyMLiclfNsu773W87iI7wyNzi1B/ctDL
-MfIf9q2sqSi6rMPt/JJZxQZRflL6bAnAxjZAQqunyxBZ2REScecXoRSdYqGphgsB
-oH+mAEW5M5xHgf19CIlr8Y00j87BN7/ew+Lg9ieL/P4mH3X/azrWyeRWhzOyGZvv
-/Wczf4mCUFR+ZDIW8ognAu8WvynEhEC3RzYOgSCWZ9jvaAQb61vtmUJ+PnkHs5WK
-UG3BNvc3cxtaglMW2xTWlMxdIsxkRVoOqcAdafS0goEC3kgOFaxwqpE5Ji381vUK
-7Dgwgn6MXGivTM/T0v7DX9WzXNbR4Skpiiear1hk2OGHXpQGy3q3Dlbps/YHyEge
-2E/SbZHGPDSu1gmx0lMBvTMjj9eiD9l4m4RKpJyUhz0Yl2P0t8EHM8e18SO20x4u
-aMU0b45Mrh3TnySr3ySMTD1zIWFVc2NYGKETcrle+ZpZ/yTPu/i6TTGrOLlWEdCR
-Mto0VdH8qzHpq0Iuo7Qqypg8Z1YtX7GJStC+GrsiGGeSJc71YKwpXkpbnYET+xh5
-zcjliqRa5eluFAacHD0QSVnmyT1fnGzclIi5WAvx8d3HX/Z5VLs=
-=BfWt
+klBzww//QrNEapmvZFr2wVFmJUcTTTPpqjWl9BU2sHjZ32LsMAzMlD8HigkEBFto
+0vTL2sew+kYBFNk7ajooh40+v1mi/TEAJTB8kDnR2gJj5L6dvrMKwWTB+wlzrHjr
+dClo40nC1uNHuTMQfDgPZIJ66q9FehY9e46n4/8LPp/dOVVbUuRILnFf2is+W4o3
+4d2hGbjfD58KGxDT+b/uV9QHW84R+Pew8gtOSEbFVvbfc2XLYrtlV2daIXfsEJOW
+F30gOsy9ONG9Jx2PYTcvlCp69VW0j7fGIhcAH8YXeEXeL9fekHmrySkurMwCJJld
+GjNHFIJ8JGXw89HXlRebwLiRZHgWDUan3VPj21cTUkRdhUoDjRFu0o0mmpb/Qs2b
+y72QyvBQWv/aMZ+oJpmUC2gK8dmZSQYEi9Mkfbdalu/yvTCacn2swJndhO3L3jSb
+2Fp7saQkXVecj7SLbnDrdiywXaxzhQfLhsizlXXH1q7NuWGjJqbfiMWRg/1hEusm
+tX7aIn/IlIfLZap8COx65hXI2iLplP32Rpu3ollbDzvhzCkbTSlDg+4SICco5dnj
+cD5C58mfbap4JCkUHQg9eySPkXFZCvyZYpzi6RP1d8S2meCliLHPyz4xNxyv/EaN
+UbqGT7jDNgGglN1l0hvYhCVr3kjRzclr3QeJkQhsVx+3EogSHcM=
+=ZzDy
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d86338d7f7bd..407ac8a95bbe 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Jul 2019 14:09:00 +0000
+Wed, 31 Jul 2019 05:38:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index b85d171f3f57..6b6a5ea2eec4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jul 30 14:09:00 UTC 2019
+Wed Jul 31 05:38:57 UTC 2019
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 4df4837f9d39..1360769743f7 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -152,7 +152,7 @@
 1804130008 ./dev-java/jgoodies-binding/jgoodies-binding-1.1.2-r2.ebuild
 1903151139 ./dev-java/ant-swing/ant-swing-1.10.5.ebuild
 1903151139 ./dev-java/ant-swing/ant-swing-1.9.13.ebuild
-1907290040 ./dev-java/openjdk/openjdk-11.0.4_p11.ebuild
+1907302009 ./dev-java/openjdk/openjdk-11.0.4_p11.ebuild
 1905312209 ./dev-java/openjdk/openjdk-8.212_p03-r3.ebuild
 1907290040 ./dev-java/openjdk/openjdk-8.222_p10.ebuild
 1906230639 ./dev-java/openjdk/openjdk-11.0.3_p7-r4.ebuild
@@ -868,26 +868,8 @@
 1702282250 ./net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
 1810020109 ./net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.2.0.ebuild
 1806172339 ./net-p2p/litecoind/litecoind-0.10.4.0.ebuild
-1906182209 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.4.ebuild
-1907151909 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.3.ebuild
-1907030009 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.1.ebuild
-1906051739 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.2.ebuild
+1907301909 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.2.ebuild
 1905201809 ./net-p2p/cpuminer-opt/cpuminer-opt-9999.ebuild
-1906052109 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.3.ebuild
-1906010009 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
-1907180639 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.ebuild
-1905311739 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
-1905221639 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
-1906262309 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.ebuild
-1905201809 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.ebuild
-1906141739 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.3.1.ebuild
-1907191539 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.1.ebuild
-1907160439 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.4.ebuild
-1907050409 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.2.ebuild
-1906040739 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.ebuild
-1906090539 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.4.ebuild
-1812012309 ./net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.1-r1.ebuild
-1906131909 ./net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.5.ebuild
 1901251739 ./net-p2p/qbittorrent/qbittorrent-9999.ebuild
 1902161339 ./net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
 1901251739 ./net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
@@ -1535,7 +1517,6 @@
 1703191202 ./sci-libs/minuit/minuit-5.34.14.ebuild
 1702282250 ./sci-libs/coinor-osi/coinor-osi-0.106.6.ebuild
 1907192009 ./sci-libs/cantera/cantera-2.4.0-r1.ebuild
-1904171112 ./sci-libs/cantera/cantera-2.4.0.ebuild
 1902221439 ./sci-libs/libspatialindex/libspatialindex-1.8.5-r1.ebuild
 1702282250 ./sci-libs/cgnslib/cgnslib-3.3.0.ebuild
 1907191339 ./sci-libs/cgnslib/cgnslib-3.4.0.ebuild
@@ -1573,12 +1554,8 @@
 1809212309 ./sci-libs/ViSP/ViSP-3.1.0-r1.ebuild
 1809212309 ./sci-libs/ViSP/ViSP-3.0.1-r1.ebuild
 1907161639 ./sci-libs/sundials/sundials-3.2.1.ebuild
-1805170209 ./sci-libs/sundials/sundials-3.1.0.ebuild
 1907161639 ./sci-libs/sundials/sundials-4.1.0.ebuild
-1904200909 ./sci-libs/sundials/sundials-3.1.2.ebuild
 1907161639 ./sci-libs/sundials/sundials-4.0.2.ebuild
-1805170209 ./sci-libs/sundials/sundials-3.0.0.ebuild
-1805170209 ./sci-libs/sundials/sundials-2.7.0.ebuild
 1710160605 ./sci-libs/orocos-bfl/orocos-bfl-0.8.0.ebuild
 1804172339 ./sci-libs/libghemical/libghemical-3.0.0.ebuild
 1904171112 ./sci-libs/libsvm/libsvm-3.22.ebuild
@@ -2909,7 +2886,6 @@
 1902101039 ./dev-ruby/minitar/minitar-0.8.ebuild
 1904282339 ./dev-ruby/simple-rss/simple-rss-1.3.3.ebuild
 1905282139 ./dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
-1901222139 ./dev-ruby/ruby-prof/ruby-prof-0.17.0.ebuild
 1902021109 ./dev-ruby/hocon/hocon-1.2.5.ebuild
 1906151309 ./dev-ruby/tty-which/tty-which-0.4.1.ebuild
 1812261140 ./dev-ruby/json/json-2.1.0-r1.ebuild
@@ -3268,6 +3244,7 @@
 1808181139 ./media-video/flvstreamer/flvstreamer-2.1c.ebuild
 1904171112 ./media-video/devedeng/devedeng-4.10.0.ebuild
 1904171112 ./media-video/devedeng/devedeng-4.14.0.ebuild
+1907310239 ./media-video/devedeng/devedeng-4.15.0.ebuild
 1904171112 ./media-video/devedeng/devedeng-4.11.0.ebuild
 1904171112 ./media-video/devedeng/devedeng-9999.ebuild
 1808261509 ./media-video/syncplay/syncplay-1.5.1.ebuild
@@ -3473,8 +3450,8 @@
 1906171739 ./www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild
 1907250409 ./www-client/google-chrome-unstable/google-chrome-unstable-77.0.3860.5.ebuild
 1805012209 ./www-client/ck4up/ck4up-1.2.ebuild
-1907292139 ./www-client/chromium/chromium-76.0.3809.80.ebuild
 1907251739 ./www-client/chromium/chromium-75.0.3770.142.ebuild
+1907302109 ./www-client/chromium/chromium-76.0.3809.87.ebuild
 1804150509 ./www-client/dillo/dillo-3.0.5.ebuild
 1809270209 ./www-client/dillo/dillo-9999.ebuild
 1804150509 ./www-client/dillo/dillo-3.0.5-r1.ebuild
@@ -7354,7 +7331,7 @@
 1702282250 ./dev-libs/libvformat/libvformat-1.13-r2.ebuild
 1706191252 ./dev-libs/libee/libee-0.4.1.ebuild
 1805270804 ./dev-libs/librevenge/librevenge-9999.ebuild
-1808282209 ./dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
+1907302139 ./dev-libs/librevenge/librevenge-0.0.4-r1.ebuild
 1905192109 ./dev-libs/socketstream/socketstream-0.7.0-r1.ebuild
 1812302209 ./dev-libs/libgudev/libgudev-232.ebuild
 1906271239 ./dev-libs/bglibs/bglibs-2.04.ebuild
@@ -7616,6 +7593,7 @@
 1904100009 ./dev-libs/libmirage/libmirage-3.2.2.ebuild
 1905132109 ./dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
 1905132109 ./dev-libs/userspace-rcu/userspace-rcu-0.10.2.ebuild
+1907310209 ./dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
 1905132109 ./dev-libs/userspace-rcu/userspace-rcu-0.9.2.ebuild
 1907060139 ./dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
 1805012209 ./dev-libs/asyncresolv/asyncresolv-0.0.3.ebuild
@@ -7894,7 +7872,6 @@
 1805012209 ./dev-libs/luise-bin/luise-bin-0.1.1.ebuild
 1708050004 ./dev-libs/libhtmlparse/libhtmlparse-0.1.13-r1.ebuild
 1907291809 ./dev-libs/mxml/mxml-3.0.ebuild
-1902221439 ./dev-libs/mxml/mxml-2.12.ebuild
 1905042209 ./dev-libs/libtasn1/libtasn1-4.13.ebuild
 1808240509 ./dev-libs/injeqt/injeqt-1.2.0.ebuild
 1807171709 ./dev-libs/onigmo/onigmo-6.1.3.ebuild
@@ -8334,6 +8311,7 @@
 1903150739 ./x11-terms/root-tail/root-tail-1.2-r4.ebuild
 1806021039 ./x11-terms/eterm/eterm-0.9.6-r2.ebuild
 1804280409 ./x11-terms/eterm/eterm-9999.ebuild
+1907301909 ./x11-terms/terminology/terminology-1.5.0.ebuild
 1905130009 ./x11-terms/terminology/terminology-1.4.0.ebuild
 1905261439 ./x11-terms/terminology/terminology-1.4.1.ebuild
 1805220439 ./x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -9098,7 +9076,8 @@
 1801020340 ./dev-db/pg_top/pg_top-3.7.0.ebuild
 1903152239 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
 1907081939 ./dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
-1811092139 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+1907310139 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild
+1907310109 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
 1806072239 ./dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
 1907241139 ./dev-db/psqlodbc/psqlodbc-11.01.0000.ebuild
 1703232351 ./dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
@@ -9254,6 +9233,7 @@
 1702282250 ./dev-db/innotop/innotop-1.11.1.ebuild
 1812030339 ./dev-db/innotop/innotop-1.12.0.ebuild
 1807242309 ./dev-db/mysql++/mysql++-2.3.2-r1.ebuild
+1907310139 ./dev-db/mysql++/mysql++-3.2.5.ebuild
 1810291809 ./dev-db/mysql++/mysql++-3.2.4.ebuild
 1901100009 ./dev-db/mysql++/mysql++-3.2.3.ebuild
 1903182139 ./dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.1_p20181221.ebuild
@@ -9448,6 +9428,8 @@
 1902180639 ./sys-kernel/spl/spl-0.6.5.11.ebuild
 1709231147 ./sys-kernel/pf-sources/pf-sources-4.13_p4.ebuild
 1907060939 ./sys-kernel/pf-sources/pf-sources-5.1_p7.ebuild
+1907301839 ./sys-kernel/pf-sources/pf-sources-5.2_p2.ebuild
+1907310739 ./sys-kernel/pf-sources/pf-sources-5.2_p3.ebuild
 1907171739 ./sys-kernel/pf-sources/pf-sources-5.2_p1.ebuild
 1901072009 ./sys-kernel/rt-sources/rt-sources-3.18.129_p110.ebuild
 1901072009 ./sys-kernel/rt-sources/rt-sources-4.9.146_p125.ebuild
@@ -9720,7 +9702,7 @@
 1906102309 ./media-gfx/album/album-4.15.ebuild
 1906051109 ./media-gfx/album/album-4.13-r1.ebuild
 1802111238 ./media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
-1805012209 ./media-gfx/springgraph/springgraph-88.ebuild
+1907310809 ./media-gfx/springgraph/springgraph-88.ebuild
 1805292338 ./media-gfx/jpegtoavi/jpegtoavi-1.5.ebuild
 1812162239 ./media-gfx/ephoto/ephoto-1.5.ebuild
 1810231339 ./media-gfx/opencsg/opencsg-1.4.2-r1.ebuild
@@ -9738,6 +9720,7 @@
 1906302339 ./media-gfx/symboleditor/symboleditor-2.1.0.ebuild
 1901110109 ./media-gfx/geeqie/geeqie-9999.ebuild
 1904260139 ./media-gfx/geeqie/geeqie-1.4-r1.ebuild
+1907310009 ./media-gfx/geeqie/geeqie-1.5.ebuild
 1702282250 ./media-gfx/gqview/gqview-2.1.5-r1.ebuild
 1806091709 ./media-gfx/tintii/tintii-2.10.0.ebuild
 1904012039 ./media-gfx/jpegoptim/jpegoptim-1.4.6.ebuild
@@ -9946,7 +9929,7 @@
 1906251739 ./net-mail/fdm/fdm-2.0.ebuild
 1904171112 ./net-mail/mailutils/mailutils-3.5.ebuild
 1904261439 ./net-mail/mailutils/mailutils-3.4-r2.ebuild
-1812310039 ./net-mail/mailutils/mailutils-3.4-r3.ebuild
+1907302009 ./net-mail/mailutils/mailutils-3.4-r3.ebuild
 1904171112 ./net-mail/mailutils/mailutils-3.6.ebuild
 1906271039 ./net-mail/mailutils/mailutils-3.7.ebuild
 1805012209 ./net-mail/mailsync/mailsync-5.2.1.ebuild
@@ -10624,8 +10607,6 @@
 1802211608 ./mail-filter/sigh/sigh-1607.1.6.ebuild
 1904171112 ./mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild
 1805012209 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
-1702282250 ./mail-filter/milter-regex/milter-regex-1.9.ebuild
-1811082039 ./mail-filter/milter-regex/milter-regex-2.2.ebuild
 1907251639 ./mail-filter/milter-regex/milter-regex-2.6.ebuild
 1702282250 ./mail-filter/sid-milter/sid-milter-1.0.0-r6.ebuild
 1901072239 ./mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
@@ -11149,99 +11130,99 @@
 1808071039 ./net-firewall/psad/psad-2.4.6.ebuild
 1805061738 ./net-firewall/psad/psad-2.4.5.ebuild
 1905280709 ./kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
-1907092239 ./kde-plasma/kinfocenter/kinfocenter-5.16.3.ebuild
-1907092239 ./kde-plasma/plasma-vault/plasma-vault-5.16.3.ebuild
+1907301809 ./kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
+1907301809 ./kde-plasma/plasma-vault/plasma-vault-5.16.4.ebuild
 1905280709 ./kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild
 1905280709 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.15.5.ebuild
-1907092239 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.16.3.ebuild
+1907301809 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.16.4.ebuild
 1905280709 ./kde-plasma/sddm-kcm/sddm-kcm-5.15.5.ebuild
-1907092239 ./kde-plasma/sddm-kcm/sddm-kcm-5.16.3.ebuild
-1907092239 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.3.ebuild
+1907301809 ./kde-plasma/sddm-kcm/sddm-kcm-5.16.4.ebuild
+1907301809 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.4.ebuild
 1905280709 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.15.5.ebuild
+1907301809 ./kde-plasma/powerdevil/powerdevil-5.16.4.ebuild
 1905280709 ./kde-plasma/powerdevil/powerdevil-5.15.5.ebuild
-1907150910 ./kde-plasma/powerdevil/powerdevil-5.16.3-r1.ebuild
+1907301809 ./kde-plasma/milou/milou-5.16.4.ebuild
 1905280709 ./kde-plasma/milou/milou-5.15.5.ebuild
-1907092239 ./kde-plasma/milou/milou-5.16.3.ebuild
 1905280709 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.3.ebuild
+1907301809 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.4.ebuild
+1907301809 ./kde-plasma/systemsettings/systemsettings-5.16.4.ebuild
 1905280709 ./kde-plasma/systemsettings/systemsettings-5.15.5.ebuild
-1907092239 ./kde-plasma/systemsettings/systemsettings-5.16.3.ebuild
 1905280709 ./kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild
-1907092239 ./kde-plasma/breeze-grub/breeze-grub-5.16.3.ebuild
-1907092239 ./kde-plasma/oxygen/oxygen-5.16.3.ebuild
+1907301809 ./kde-plasma/breeze-grub/breeze-grub-5.16.4.ebuild
 1905280709 ./kde-plasma/oxygen/oxygen-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-desktop/plasma-desktop-5.16.3.ebuild
+1907301809 ./kde-plasma/oxygen/oxygen-5.16.4.ebuild
+1907301809 ./kde-plasma/plasma-desktop/plasma-desktop-5.16.4.ebuild
 1905280539 ./kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
-1907092239 ./kde-plasma/kwallet-pam/kwallet-pam-5.16.3.ebuild
+1907301809 ./kde-plasma/kwallet-pam/kwallet-pam-5.16.4.ebuild
 1905280709 ./kde-plasma/kwallet-pam/kwallet-pam-5.15.5.ebuild
+1907301809 ./kde-plasma/plasma-pa/plasma-pa-5.16.4.ebuild
 1905280709 ./kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-pa/plasma-pa-5.16.3.ebuild
-1907092239 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.16.3.ebuild
 1905280709 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.15.5.ebuild
-1907092239 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.3.ebuild
+1907301809 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.16.4.ebuild
+1907301809 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.4.ebuild
 1905280009 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.15.5.ebuild
-1907092239 ./kde-plasma/kdecoration/kdecoration-5.16.3.ebuild
+1907301809 ./kde-plasma/kdecoration/kdecoration-5.16.4.ebuild
 1905280709 ./kde-plasma/kdecoration/kdecoration-5.15.5.ebuild
-1907092239 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.3.ebuild
+1907301809 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.4.ebuild
 1905280009 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.15.5.ebuild
-1907092239 ./kde-plasma/breeze-gtk/breeze-gtk-5.16.3.ebuild
 1905280709 ./kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild
-1907092239 ./kde-plasma/kgamma/kgamma-5.16.3.ebuild
+1907301809 ./kde-plasma/breeze-gtk/breeze-gtk-5.16.4.ebuild
+1907301809 ./kde-plasma/kgamma/kgamma-5.16.4.ebuild
 1905280709 ./kde-plasma/kgamma/kgamma-5.15.5.ebuild
+1907301809 ./kde-plasma/plasma-integration/plasma-integration-5.16.4.ebuild
 1905280709 ./kde-plasma/plasma-integration/plasma-integration-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-integration/plasma-integration-5.16.3.ebuild
 1905280709 ./kde-plasma/user-manager/user-manager-5.15.5.ebuild
-1907092239 ./kde-plasma/user-manager/user-manager-5.16.3.ebuild
+1907301809 ./kde-plasma/user-manager/user-manager-5.16.4.ebuild
 1905280709 ./kde-plasma/khotkeys/khotkeys-5.15.5.ebuild
-1907092239 ./kde-plasma/khotkeys/khotkeys-5.16.3.ebuild
-1907092239 ./kde-plasma/plasma-sdk/plasma-sdk-5.16.3.ebuild
+1907301809 ./kde-plasma/khotkeys/khotkeys-5.16.4.ebuild
+1907301809 ./kde-plasma/plasma-sdk/plasma-sdk-5.16.4.ebuild
 1905280709 ./kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild
 1905280709 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild
-1907092239 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.3.ebuild
-1907092239 ./kde-plasma/kwrited/kwrited-5.16.3.ebuild
+1907301809 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.4.ebuild
 1905280709 ./kde-plasma/kwrited/kwrited-5.15.5.ebuild
-1907092239 ./kde-plasma/bluedevil/bluedevil-5.16.3.ebuild
+1907301809 ./kde-plasma/kwrited/kwrited-5.16.4.ebuild
+1907301809 ./kde-plasma/bluedevil/bluedevil-5.16.4.ebuild
 1905280709 ./kde-plasma/bluedevil/bluedevil-5.15.5.ebuild
 1905280709 ./kde-plasma/libkscreen/libkscreen-5.15.5.ebuild
-1907092239 ./kde-plasma/libkscreen/libkscreen-5.16.3.ebuild
+1907301809 ./kde-plasma/libkscreen/libkscreen-5.16.4.ebuild
 1905280539 ./kde-plasma/plasma-meta/plasma-meta-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-meta/plasma-meta-5.16.3.ebuild
-1907092239 ./kde-plasma/ksshaskpass/ksshaskpass-5.16.3.ebuild
+1907301809 ./kde-plasma/plasma-meta/plasma-meta-5.16.4.ebuild
+1907301809 ./kde-plasma/ksshaskpass/ksshaskpass-5.16.4.ebuild
 1905280709 ./kde-plasma/ksshaskpass/ksshaskpass-5.15.5.ebuild
-1907092239 ./kde-plasma/discover/discover-5.16.3.ebuild
 1905280709 ./kde-plasma/discover/discover-5.15.5.ebuild
+1907301809 ./kde-plasma/discover/discover-5.16.4.ebuild
 1905280709 ./kde-plasma/breeze/breeze-5.15.5.ebuild
-1907092239 ./kde-plasma/breeze/breeze-5.16.3.ebuild
-1907092239 ./kde-plasma/libkworkspace/libkworkspace-5.16.3.ebuild
+1907301809 ./kde-plasma/breeze/breeze-5.16.4.ebuild
+1907301809 ./kde-plasma/libkworkspace/libkworkspace-5.16.4.ebuild
 1905280709 ./kde-plasma/libkworkspace/libkworkspace-5.15.5.ebuild
 1905280709 ./kde-plasma/kscreen/kscreen-5.15.5.ebuild
-1907092239 ./kde-plasma/kscreen/kscreen-5.16.3.ebuild
-1907092239 ./kde-plasma/ksysguard/ksysguard-5.16.3.ebuild
+1907301809 ./kde-plasma/kscreen/kscreen-5.16.4.ebuild
 1905280709 ./kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
-1907092239 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.16.3.ebuild
+1907301809 ./kde-plasma/ksysguard/ksysguard-5.16.4.ebuild
+1907301809 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.16.4.ebuild
 1905280709 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.15.5.ebuild
 1905280709 ./kde-plasma/kwin/kwin-5.15.5.ebuild
-1907092239 ./kde-plasma/kwin/kwin-5.16.3.ebuild
+1907301809 ./kde-plasma/kwin/kwin-5.16.4.ebuild
 1905280709 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
-1907092239 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.3.ebuild
+1907301809 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.4.ebuild
+1907301809 ./kde-plasma/kwayland-integration/kwayland-integration-5.16.4.ebuild
 1905280709 ./kde-plasma/kwayland-integration/kwayland-integration-5.15.5.ebuild
-1907092239 ./kde-plasma/kwayland-integration/kwayland-integration-5.16.3.ebuild
-1907092239 ./kde-plasma/kmenuedit/kmenuedit-5.16.3.ebuild
 1905280709 ./kde-plasma/kmenuedit/kmenuedit-5.15.5.ebuild
-1907210139 ./kde-plasma/plasma-workspace/plasma-workspace-5.16.3.ebuild
+1907301809 ./kde-plasma/kmenuedit/kmenuedit-5.16.4.ebuild
+1907301809 ./kde-plasma/plasma-workspace/plasma-workspace-5.16.4.ebuild
 1905280539 ./kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
+1907301809 ./kde-plasma/drkonqi/drkonqi-5.16.4.ebuild
 1905280709 ./kde-plasma/drkonqi/drkonqi-5.15.5.ebuild
-1907092239 ./kde-plasma/drkonqi/drkonqi-5.16.3.ebuild
 1905280709 ./kde-plasma/kscreenlocker/kscreenlocker-5.15.5.ebuild
-1907092239 ./kde-plasma/kscreenlocker/kscreenlocker-5.16.3.ebuild
-1907092239 ./kde-plasma/libksysguard/libksysguard-5.16.3.ebuild
+1907301809 ./kde-plasma/kscreenlocker/kscreenlocker-5.16.4.ebuild
+1907301809 ./kde-plasma/libksysguard/libksysguard-5.16.4.ebuild
 1905280709 ./kde-plasma/libksysguard/libksysguard-5.15.5.ebuild
 1907102339 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild
-1907102339 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.16.3.ebuild
+1907301809 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.16.4.ebuild
 1905280539 ./kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-nm/plasma-nm-5.16.3.ebuild
+1907301809 ./kde-plasma/plasma-nm/plasma-nm-5.16.4.ebuild
 1905280709 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild
-1907092239 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.3.ebuild
+1907301809 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.4.ebuild
 1703110231 ./dev-lang/closure-compiler-bin/closure-compiler-bin-20170218.ebuild
 1907151840 ./dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild
 1907151840 ./dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild
@@ -12525,6 +12506,7 @@
 1702282250 ./dev-python/libnatpmp/libnatpmp-20150609.ebuild
 1702282250 ./dev-python/libnatpmp/libnatpmp-20130911.ebuild
 1907282009 ./dev-python/pysol_cards/pysol_cards-0.6.2.ebuild
+1907310009 ./dev-python/pysol_cards/pysol_cards-0.6.2-r1.ebuild
 1702282250 ./dev-python/pystdf/pystdf-1.3.1-r1.ebuild
 1904171112 ./dev-python/alembic/alembic-0.9.7.ebuild
 1904171112 ./dev-python/alembic/alembic-0.9.5.ebuild
@@ -12582,6 +12564,7 @@
 1907181509 ./dev-python/flask-babel/flask-babel-0.11.2-r2.ebuild
 1904171112 ./dev-python/flask-babel/flask-babel-0.11.2-r1.ebuild
 1904171112 ./dev-python/apipkg/apipkg-1.4.ebuild
+1907301809 ./dev-python/pytest-asyncio/pytest-asyncio-0.10.0.ebuild
 1904171112 ./dev-python/cytoolz/cytoolz-0.8.2.ebuild
 1904171112 ./dev-python/cytoolz/cytoolz-0.8.0.ebuild
 1904171112 ./dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -13127,7 +13110,7 @@
 1904171112 ./dev-python/pycapnp/pycapnp-0.6.2.ebuild
 1904171112 ./dev-python/pycapnp/pycapnp-0.6.4.ebuild
 1904171112 ./dev-python/rst-linker/rst-linker-1.9-r1.ebuild
-1907281709 ./dev-python/rst-linker/rst-linker-1.11.ebuild
+1907302239 ./dev-python/rst-linker/rst-linker-1.11.ebuild
 1904171112 ./dev-python/rst-linker/rst-linker-1.10.ebuild
 1904171112 ./dev-python/flask-babelex/flask-babelex-0.9.3.ebuild
 1904171112 ./dev-python/ipyparallel/ipyparallel-6.0.2-r1.ebuild
@@ -14103,7 +14086,7 @@
 1906171639 ./dev-python/aiorpcX/aiorpcX-0.18.3.ebuild
 1901202009 ./dev-python/aiorpcX/aiorpcX-0.10.2.ebuild
 1804262239 ./dev-python/louie/louie-1.1-r1.ebuild
-1907301709 ./dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
+1907301809 ./dev-python/aiohttp-socks/aiohttp-socks-0.2.2.ebuild
 1905112139 ./dev-python/oslo-policy/oslo-policy-2.1.1.ebuild
 1904171112 ./dev-python/oslo-policy/oslo-policy-1.38.1.ebuild
 1904171112 ./dev-python/flufl-bounce/flufl-bounce-3.0.ebuild
@@ -15191,7 +15174,8 @@
 1805282138 ./sys-block/megacli/megacli-8.07.14-r1.ebuild
 1902050209 ./sys-block/megacli/megacli-8.07.14.ebuild
 1902050209 ./sys-block/megacli/megacli-8.07.10.ebuild
-1901250439 ./sys-block/storcli/storcli-7.0709-r1.ebuild
+1907310109 ./sys-block/storcli/storcli-7.1017.ebuild
+1907310109 ./sys-block/storcli/storcli-7.0709-r1.ebuild
 1702282250 ./sys-block/storcli/storcli-1.19.04.ebuild
 1805270804 ./sys-block/storcli/storcli-1.23.02.ebuild
 1809270239 ./sys-block/storcli/storcli-7.0504.ebuild
@@ -15242,6 +15226,7 @@
 1703190259 ./sys-block/smp_utils/smp_utils-0.99_beta4_p151.ebuild
 1702282250 ./sys-block/smp_utils/smp_utils-0.98.ebuild
 1702282250 ./sys-block/spindown/spindown-0.4.0-r5.ebuild
+1907310209 ./sys-block/mbuffer/mbuffer-20190725.ebuild
 1702282250 ./sys-block/mbuffer/mbuffer-20150412.ebuild
 1812231539 ./sys-block/mbuffer/mbuffer-20181119.ebuild
 1902221739 ./sys-block/mbuffer/mbuffer-20190127.ebuild
@@ -16047,7 +16032,7 @@
 1807111209 ./net-im/ricochet/ricochet-1.1.4.ebuild
 1807111209 ./net-im/ricochet/ricochet-9999.ebuild
 1907120039 ./net-im/skypeforlinux/skypeforlinux-8.49.0.49.ebuild
-1907011139 ./net-im/skypeforlinux/skypeforlinux-8.48.0.51.ebuild
+1907301839 ./net-im/skypeforlinux/skypeforlinux-8.50.0.38.ebuild
 1810122239 ./net-im/qtox/qtox-1.16.3.ebuild
 1810122239 ./net-im/qtox/qtox-9999.ebuild
 1702282250 ./net-im/gg-transport/gg-transport-2.2.4-r1.ebuild
@@ -16127,7 +16112,7 @@
 1702282250 ./dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
 1702282250 ./dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
 1804140239 ./dev-cpp/libcutl/libcutl-1.10.0.ebuild
-1808112209 ./dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
+1907302339 ./dev-cpp/clucene/clucene-2.3.3.4-r6.ebuild
 1804270138 ./dev-cpp/mm-common/mm-common-0.9.12.ebuild
 1904300939 ./dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
 1703011308 ./dev-cpp/libbinio/libbinio-1.4-r1.ebuild
@@ -16692,7 +16677,7 @@
 1702282250 ./net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
 1902171609 ./net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
 1702282250 ./net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
-1702282250 ./net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
+1907310809 ./net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
 1901010309 ./net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
 1903182239 ./net-analyzer/openvas-libraries/openvas-libraries-9.0.3-r1.ebuild
 1702282250 ./net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
@@ -17251,6 +17236,7 @@
 1904251509 ./app-misc/elasticsearch/elasticsearch-5.6.16.ebuild
 1907161909 ./app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
 1904251509 ./app-misc/elasticsearch/elasticsearch-6.7.1.ebuild
+1907310409 ./app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
 1903041909 ./app-misc/elasticsearch/elasticsearch-6.6.1.ebuild
 1907021309 ./app-misc/elasticsearch/elasticsearch-6.8.1.ebuild
 1902241409 ./app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
@@ -18123,6 +18109,7 @@
 1809201609 ./dev-php/jsonlint/jsonlint-1.7.1.ebuild
 1704251814 ./dev-php/jsonlint/jsonlint-1.6.0.ebuild
 1906071839 ./dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild
+1907310139 ./dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
 1802191708 ./dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
 1711141742 ./dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
 1705280428 ./dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
@@ -18221,9 +18208,7 @@
 1904242309 ./dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
 1702282250 ./dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild
 1804271308 ./dev-php/awl/awl-0.59.ebuild
-1804242138 ./dev-php/adodb/adodb-5.20.12.ebuild
-1705280201 ./dev-php/adodb/adodb-5.20.9.ebuild
-1809040339 ./dev-php/adodb/adodb-5.20.13.ebuild
+1907310139 ./dev-php/adodb/adodb-5.20.14.ebuild
 1705192225 ./dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild
 1705192356 ./dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild
 1702282250 ./dev-php/pecl-cairo/pecl-cairo-0.3.2-r1.ebuild
@@ -18436,6 +18421,7 @@
 1812231739 ./dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild
 1903291739 ./dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild
 1804010108 ./dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
+1907310139 ./dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild
 1903202339 ./dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
 1707312250 ./dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild
 1802130509 ./dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
@@ -18469,6 +18455,7 @@
 1704301237 ./app-text/code2html/code2html-0.9.1-r2.ebuild
 1905032039 ./app-text/blogc/blogc-0.17.0.ebuild
 1707301147 ./app-text/blogc/blogc-9999.ebuild
+1907302309 ./app-text/tessdata_legacy/tessdata_legacy-4.0.0.ebuild
 1702282250 ./app-text/htag/htag-0.0.24-r1.ebuild
 1702282250 ./app-text/hnb/hnb-1.9.18-r1.ebuild
 1803111438 ./app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -18499,7 +18486,7 @@
 1805012209 ./app-text/t1utils/t1utils-1.39.ebuild
 1708241205 ./app-text/t1utils/t1utils-1.41-r1.ebuild
 1905130409 ./app-text/t1utils/t1utils-1.41-r2.ebuild
-1902172109 ./app-text/libwpg/libwpg-0.3.3.ebuild
+1907302339 ./app-text/libwpg/libwpg-0.3.3.ebuild
 1805170208 ./app-text/txt2tags/txt2tags-2.6-r1.ebuild
 1808200039 ./app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
 1906051109 ./app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -18509,7 +18496,7 @@
 1702282250 ./app-text/xml2/xml2-0.5.ebuild
 1702282250 ./app-text/tofrodos/tofrodos-1.7.12a.ebuild
 1812102009 ./app-text/tofrodos/tofrodos-1.7.13.ebuild
-1809192139 ./app-text/libepubgen/libepubgen-0.1.1.ebuild
+1907302139 ./app-text/libepubgen/libepubgen-0.1.1.ebuild
 1902121509 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
 1902121509 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
 1805012209 ./app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -18538,7 +18525,7 @@
 1805012209 ./app-text/mht-rip/mht-rip-0.8.ebuild
 1803260038 ./app-text/ding/ding-1.8.1.ebuild
 1804280108 ./app-text/libstaroffice/libstaroffice-9999.ebuild
-1809192139 ./app-text/libstaroffice/libstaroffice-0.0.6.ebuild
+1907310209 ./app-text/libstaroffice/libstaroffice-0.0.6.ebuild
 1804210008 ./app-text/winefish/winefish-1.3.3-r2.ebuild
 1805012209 ./app-text/ddir/ddir-0_p20100323.ebuild
 1812180009 ./app-text/diction/diction-1.14.ebuild
@@ -18561,11 +18548,12 @@
 1702282250 ./app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
 1902172109 ./app-text/libetonyek/libetonyek-0.1.9.ebuild
 1812302339 ./app-text/libetonyek/libetonyek-9999.ebuild
-1902172109 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+1907302139 ./app-text/libexttextcat/libexttextcat-3.4.5.ebuild
 1712160909 ./app-text/getxbook/getxbook-1.2.ebuild
 1702282250 ./app-text/getxbook/getxbook-1.0-r1.ebuild
 1901281039 ./app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
 1804140239 ./app-text/xindy/xindy-2.4-r1.ebuild
+1907302309 ./app-text/tesseract/tesseract-4.1.0.ebuild
 1906041809 ./app-text/tesseract/tesseract-9999.ebuild
 1906041809 ./app-text/tesseract/tesseract-4.0.0.ebuild
 1906141209 ./app-text/tesseract/tesseract-3.05.02.ebuild
@@ -18615,7 +18603,6 @@
 1711240027 ./app-text/podofo/podofo-0.9.6_pre20171027.ebuild
 1906290009 ./app-text/podofo/podofo-0.9.6_p20180715.ebuild
 1710160305 ./app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
-1907261709 ./app-text/kup/kup-0.7.3.ebuild
 1902150239 ./app-text/apvlv/apvlv-0.1.5-r2.ebuild
 1903211409 ./app-text/xpdf/xpdf-4.01.01.ebuild
 1907202239 ./app-text/aspell/aspell-0.60.7_rc2.ebuild
@@ -18704,7 +18691,7 @@
 1806200439 ./app-text/bibletime/bibletime-2.11.2.ebuild
 1801151409 ./app-text/cedilla/cedilla-0.7.ebuild
 1702282250 ./app-text/cedilla/cedilla-0.6.ebuild
-1902172109 ./app-text/libwpd/libwpd-0.10.3.ebuild
+1907302339 ./app-text/libwpd/libwpd-0.10.3.ebuild
 1805212238 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
 1805212238 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
 1805212238 ./app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -18734,8 +18721,9 @@
 1708162040 ./app-text/par/par-1.52-r1.ebuild
 1902150239 ./app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
 1906032039 ./app-text/jadetex/jadetex-3.13-r7.ebuild
+1907302309 ./app-text/tessdata_fast/tessdata_fast-4.0.0.ebuild
 1905051339 ./app-text/xmlto/xmlto-0.0.28-r1.ebuild
-1809192139 ./app-text/libwps/libwps-0.4.10.ebuild
+1907302339 ./app-text/libwps/libwps-0.4.10.ebuild
 1812211109 ./app-text/cpdf/cpdf-2.2.1.ebuild
 1702282250 ./app-text/cpdf/cpdf-2.1.1-r1.ebuild
 1902280539 ./app-text/xiphos/xiphos-4.0.6a-r1.ebuild
@@ -18756,7 +18744,7 @@
 1907181639 ./app-text/po4a/po4a-0.47-r1.ebuild
 1907181639 ./app-text/po4a/po4a-0.55.ebuild
 1907181639 ./app-text/po4a/po4a-0.54.ebuild
-1708271833 ./app-text/mythes/mythes-1.2.4.ebuild
+1907302139 ./app-text/mythes/mythes-1.2.4.ebuild
 1810171609 ./app-text/zathura-meta/zathura-meta-0.ebuild
 1801222238 ./app-text/xhtml1/xhtml1-20020801-r5.ebuild
 1801051609 ./app-text/antixls/antixls-0.3b.ebuild
@@ -18802,7 +18790,7 @@
 1907151839 ./app-text/binfind/binfind-0.0.3.ebuild
 1702282250 ./app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
 1811160239 ./app-text/libodfgen/libodfgen-9999.ebuild
-1901082309 ./app-text/libodfgen/libodfgen-0.1.7.ebuild
+1907310109 ./app-text/libodfgen/libodfgen-0.1.7.ebuild
 1905280009 ./app-text/convertlit/convertlit-1.8-r3.ebuild
 1712252239 ./app-text/unpaper/unpaper-9999.ebuild
 1712252239 ./app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -18839,7 +18827,7 @@
 1906241309 ./app-text/xchm/xchm-9999.ebuild
 1906241309 ./app-text/xchm/xchm-1.30.ebuild
 1904221939 ./app-text/libmwaw/libmwaw-9999.ebuild
-1906182139 ./app-text/libmwaw/libmwaw-0.3.15.ebuild
+1907310109 ./app-text/libmwaw/libmwaw-0.3.15.ebuild
 1703271655 ./app-text/fbless/fbless-0.2.3.ebuild
 1812111309 ./app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
 1811110239 ./app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -18863,7 +18851,7 @@
 1702282250 ./app-text/txt2man/txt2man-1.5.6.ebuild
 1708221824 ./app-text/txt2man/txt2man-1.6.0.ebuild
 1906041809 ./app-text/msort/msort-8.53.ebuild
-1805050439 ./app-text/libebook/libebook-0.1.2-r1.ebuild
+1907310209 ./app-text/libebook/libebook-0.1.2-r1.ebuild
 1809192139 ./app-text/libebook/libebook-0.1.3.ebuild
 1702282250 ./app-text/pdf2html/pdf2html-1.4.ebuild
 1902201639 ./app-text/llpp/llpp-30.ebuild
@@ -18909,6 +18897,7 @@
 1807210139 ./app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
 1901221709 ./app-text/ttf2pk2/ttf2pk2-2.0_p20170524-r1.ebuild
 1702282250 ./app-text/rpl/rpl-1.5.5-r1.ebuild
+1907302309 ./app-text/tessdata_best/tessdata_best-4.0.0.ebuild
 1806262339 ./app-text/jabref-bin/jabref-bin-4.0.ebuild
 1806262339 ./app-text/jabref-bin/jabref-bin-3.8.1.ebuild
 1806262339 ./app-text/jabref-bin/jabref-bin-3.8.2.ebuild
@@ -18969,7 +18958,7 @@
 1801131539 ./app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
 1803221008 ./app-text/xmlformat/xmlformat-1.04.ebuild
 1812111239 ./app-text/cmigemo/cmigemo-1.3c-r3.ebuild
-1809192139 ./app-text/libabw/libabw-0.1.2.ebuild
+1907310109 ./app-text/libabw/libabw-0.1.2.ebuild
 1804090338 ./app-text/cherrytree/cherrytree-0.37.0.ebuild
 1712050909 ./app-text/dos2unix/dos2unix-7.3.5.ebuild
 1710111047 ./app-text/dos2unix/dos2unix-7.4.0.ebuild
@@ -18987,7 +18976,7 @@
 1706171410 ./app-text/epspdf/epspdf-0.6.3.ebuild
 1702282250 ./app-text/epspdf/epspdf-0.6.0.ebuild
 1905170609 ./app-text/fblog/fblog-1.3.1.ebuild
-1902172109 ./app-text/libqxp/libqxp-0.0.2.ebuild
+1907302139 ./app-text/libqxp/libqxp-0.0.2.ebuild
 1904212039 ./app-text/pinfo/pinfo-99999.ebuild
 1902011309 ./app-text/pinfo/pinfo-0.6.10-r7.ebuild
 1702282250 ./app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -19335,7 +19324,7 @@
 1702282250 ./www-apps/trac-tags/trac-tags-0.6-r1.ebuild
 1904250039 ./www-apps/mediawiki/mediawiki-1.32.0.ebuild
 1906121209 ./www-apps/mediawiki/mediawiki-1.32.2.ebuild
-1702282250 ./www-apps/dspam-web/dspam-web-3.10.1.ebuild
+1907310809 ./www-apps/dspam-web/dspam-web-3.10.1.ebuild
 1806270339 ./www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
 1806270339 ./www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
 1809060039 ./www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild
@@ -20343,9 +20332,7 @@
 1907291240 ./dev-util/drone-cli/drone-cli-1.1.4.ebuild
 1907231839 ./dev-util/drone-cli/drone-cli-1.1.3.ebuild
 1702282250 ./dev-util/findbugs/findbugs-3.0.1.ebuild
-1905201239 ./dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
-1902221739 ./dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
-1901211339 ./dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
+1907310209 ./dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
 1904171112 ./dev-util/Orange/Orange-3.4.5-r3.ebuild
 1904171112 ./dev-util/Orange/Orange-3.14.0.ebuild
 1906302139 ./dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -20583,10 +20570,10 @@
 1904171112 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
 1904171112 ./dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
 1805170338 ./dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
-1804181009 ./dev-util/lcov/lcov-1.9-r1.ebuild
+1907310809 ./dev-util/lcov/lcov-1.9-r1.ebuild
 1903260239 ./dev-util/lcov/lcov-1.14.ebuild
 1810222339 ./dev-util/lcov/lcov-1.13-r2.ebuild
-1905220909 ./dev-util/lcov/lcov-1.11.ebuild
+1907310809 ./dev-util/lcov/lcov-1.11.ebuild
 1907181109 ./dev-util/lcov/lcov-9999.ebuild
 1801060109 ./dev-util/cppi/cppi-1.18.ebuild
 1907031939 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -20631,6 +20618,7 @@
 1704202346 ./dev-util/bakefile/bakefile-0.2.9-r1.ebuild
 1904032039 ./dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
 1812232309 ./dev-util/makepp/makepp-2.0.99.1.ebuild
+1907310209 ./dev-util/makepp/makepp-2.0.99.2.ebuild
 1907151840 ./dev-util/makepp/makepp-1.18.ebuild
 1907191739 ./dev-util/jenkins-bin/jenkins-bin-2.176.2.ebuild
 1907191739 ./dev-util/jenkins-bin/jenkins-bin-2.186.ebuild
@@ -20645,7 +20633,7 @@
 1702282250 ./dev-util/obs-service-tar_scm/obs-service-tar_scm-0.3.1.ebuild
 1708261636 ./dev-util/shadowman/shadowman-9999.ebuild
 1905051939 ./dev-util/shadowman/shadowman-2.ebuild
-1902050339 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
+1907301939 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
 1904171112 ./dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
 1906241839 ./dev-util/colm/colm-0.13.0.6.ebuild
 1805241339 ./dev-util/colm/colm-0.13.0.4.ebuild
@@ -22311,6 +22299,7 @@
 1802091708 ./media-fonts/lohit-marathi/lohit-marathi-2.94.0.ebuild
 1805012209 ./media-fonts/sil-ezra/sil-ezra-2.51.ebuild
 1803022138 ./media-fonts/paratype/paratype-2.5.ebuild
+1907310009 ./media-fonts/fontawesome/fontawesome-5.9.0.ebuild
 1802192208 ./media-fonts/fontawesome/fontawesome-5.0.6.ebuild
 1801262238 ./media-fonts/fontawesome/fontawesome-4.7.0.ebuild
 1907291739 ./media-fonts/fontawesome/fontawesome-5.1.0.ebuild
@@ -22648,7 +22637,7 @@
 1904141409 ./app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
 1903070639 ./app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
 1903282109 ./app-admin/mongo-tools/mongo-tools-3.6.8.ebuild
-1907151839 ./app-admin/reportmagic/reportmagic-2.21.ebuild
+1907310809 ./app-admin/reportmagic/reportmagic-2.21.ebuild
 1902241509 ./app-admin/restart-services/restart-services-0.14.1.ebuild
 1811191339 ./app-admin/restart-services/restart-services-0.14.2.ebuild
 1903111409 ./app-admin/restart-services/restart-services-0.14.4.ebuild
@@ -23395,7 +23384,7 @@
 1907151840 ./sci-mathematics/sha1-polyml/sha1-polyml-5.5.0.ebuild
 1702282250 ./sci-mathematics/xmds/xmds-2.2.2.ebuild
 1702282250 ./sci-mathematics/drgeo/drgeo-1.1.0-r1.ebuild
-1805271108 ./sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
+1907310209 ./sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
 1711211320 ./sci-mathematics/geogebra/geogebra-5.0.339.0_p20170308-r1.ebuild
 1702282250 ./sci-mathematics/topcom/topcom-0.17.7.ebuild
 1907010039 ./sci-mathematics/msieve/msieve-1.53-r1.ebuild
@@ -24532,7 +24521,7 @@
 1907291939 ./sys-fs/udev/udev-9999.ebuild
 1901262009 ./sys-fs/udev/udev-236-r1.ebuild
 1901262009 ./sys-fs/udev/udev-240-r2.ebuild
-1907291939 ./sys-fs/udev/udev-242.ebuild
+1907301809 ./sys-fs/udev/udev-242.ebuild
 1712020139 ./sys-fs/safecopy/safecopy-1.7.ebuild
 1904020709 ./sys-fs/lxcfs/lxcfs-3.0.3.ebuild
 1808262339 ./sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
@@ -25104,10 +25093,10 @@
 1702282250 ./dev-perl/Tie-LLHash/Tie-LLHash-1.4.0.ebuild
 1702282250 ./dev-perl/POE-Component-Resolver/POE-Component-Resolver-0.921.0.ebuild
 1702282250 ./dev-perl/AnyEvent-CacheDNS/AnyEvent-CacheDNS-0.80.0.ebuild
-1907282039 ./dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild
+1907310809 ./dev-perl/GDTextUtil/GDTextUtil-0.860.0-r1.ebuild
 1904132039 ./dev-perl/GDTextUtil/GDTextUtil-0.860.0-r2.ebuild
 1702282250 ./dev-perl/Stat-lsMode/Stat-lsMode-0.500.0-r1.ebuild
-1805291138 ./dev-perl/Ace/Ace-1.920.0-r3.ebuild
+1907310809 ./dev-perl/Ace/Ace-1.920.0-r3.ebuild
 1907282009 ./dev-perl/Text-Reform/Text-Reform-1.200.0-r1.ebuild
 1702282250 ./dev-perl/Class-WhiteHole/Class-WhiteHole-0.40.0-r1.ebuild
 1702282250 ./dev-perl/Net-SNPP/Net-SNPP-1.170.0-r1.ebuild
@@ -25579,7 +25568,7 @@
 1810162209 ./dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
 1702282250 ./dev-perl/TermReadKey/TermReadKey-2.330.0.ebuild
 1906122039 ./dev-perl/TermReadKey/TermReadKey-2.370.0.ebuild
-1907282039 ./dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
+1907310809 ./dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
 1904132039 ./dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r2.ebuild
 1706261057 ./dev-perl/Format-Human-Bytes/Format-Human-Bytes-0.60.0-r1.ebuild
 1905180439 ./dev-perl/XML-Twig/XML-Twig-3.520.0.ebuild
@@ -26265,7 +26254,7 @@
 1706171740 ./dev-perl/PPI-HTML/PPI-HTML-1.80.0.ebuild
 1710191135 ./dev-perl/Debug-Client/Debug-Client-0.310.0.ebuild
 1702282250 ./dev-perl/GD/GD-2.560.0-r2.ebuild
-1905220709 ./dev-perl/GD/GD-2.560.0-r1.ebuild
+1907310809 ./dev-perl/GD/GD-2.560.0-r1.ebuild
 1705280319 ./dev-perl/GD/GD-2.660.0.ebuild
 1808200609 ./dev-perl/User-Identity/User-Identity-0.990.0.ebuild
 1702282250 ./dev-perl/HTML-Element-Extended/HTML-Element-Extended-1.180.0-r1.ebuild
@@ -26487,7 +26476,7 @@
 1804052138 ./dev-perl/Archive-Any/Archive-Any-0.94.500.ebuild
 1801031409 ./dev-perl/Redis/Redis-1.991.0.ebuild
 1806242339 ./dev-perl/HTML-Scrubber/HTML-Scrubber-0.170.0.ebuild
-1804022138 ./dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
+1907310809 ./dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
 1904210609 ./dev-perl/Sys-MemInfo/Sys-MemInfo-0.980.0.ebuild
 1904261439 ./dev-perl/Sys-MemInfo/Sys-MemInfo-0.990.0.ebuild
 1711221213 ./dev-perl/Linux-PipeMagic/Linux-PipeMagic-0.30.0.ebuild
@@ -26532,10 +26521,10 @@
 1802280808 ./dev-perl/TeX-Encode/TeX-Encode-2.4.0.ebuild
 1907231739 ./dev-perl/glib-perl/glib-perl-1.325.0.ebuild
 1907231739 ./dev-perl/glib-perl/glib-perl-1.326.0.ebuild
-1706211517 ./dev-perl/Chart/Chart-2.4.10.ebuild
+1907310809 ./dev-perl/Chart/Chart-2.4.10.ebuild
 1810271509 ./dev-perl/MooseX-Types-Path-Class/MooseX-Types-Path-Class-0.90.0.ebuild
 1702282250 ./dev-perl/Dist-Zilla-Plugin-OSPrereqs/Dist-Zilla-Plugin-OSPrereqs-0.8.0.ebuild
-1702282250 ./dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
+1907310809 ./dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
 1706182342 ./dev-perl/MooseX-Has-Sugar/MooseX-Has-Sugar-1.0.6.ebuild
 1707130455 ./dev-perl/Inline-C/Inline-C-0.780.0.ebuild
 1702282250 ./dev-perl/MLDBM-Sync/MLDBM-Sync-0.300.0-r1.ebuild
@@ -26562,7 +26551,7 @@
 1804251038 ./dev-perl/CSS-Packer/CSS-Packer-2.50.0.ebuild
 1810162209 ./dev-perl/Class-Method-Modifiers/Class-Method-Modifiers-2.120.0.ebuild
 1904132039 ./dev-perl/GDGraph/GDGraph-1.540.0.ebuild
-1907282039 ./dev-perl/GDGraph/GDGraph-1.490.0.ebuild
+1907310809 ./dev-perl/GDGraph/GDGraph-1.490.0.ebuild
 1702282250 ./dev-perl/GDGraph/GDGraph-1.510.0.ebuild
 1702282250 ./dev-perl/GDGraph/GDGraph-1.520.0.ebuild
 1704051436 ./dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.190.0.ebuild
@@ -26640,7 +26629,7 @@
 1711271040 ./dev-perl/MogileFS-Server/MogileFS-Server-2.720.0-r1.ebuild
 1710240448 ./dev-perl/Gtk2-AppIndicator/Gtk2-AppIndicator-0.150.0-r1.ebuild
 1702282250 ./dev-perl/Data-UUID/Data-UUID-1.221.0.ebuild
-1907282009 ./dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
+1907310809 ./dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
 1710211138 ./dev-perl/File-Grep/File-Grep-0.20.0-r2.ebuild
 1710260623 ./dev-perl/Image-Scale/Image-Scale-0.130.0.ebuild
 1812272209 ./dev-perl/Email-Address-XS/Email-Address-XS-1.10.0.ebuild
@@ -27461,6 +27450,7 @@
 1907151839 ./app-backup/vzdump/vzdump-1.2.ebuild
 1904171112 ./app-backup/backintime/backintime-9999.ebuild
 1904171112 ./app-backup/backintime/backintime-1.2.0_pre20180221.ebuild
+1907302209 ./app-backup/kup/kup-0.7.3.ebuild
 1907262139 ./app-backup/bacula/bacula-9.4.2-r1.ebuild
 1907262139 ./app-backup/bacula/bacula-9.2.2-r2.ebuild
 1907262139 ./app-backup/bacula/bacula-9.4.3-r1.ebuild
@@ -27582,7 +27572,7 @@
 1702282250 ./sci-electronics/magic/magic-8.0.207.ebuild
 1702282250 ./sci-electronics/magic/magic-7.5.231.ebuild
 1904081939 ./sci-electronics/kicad/kicad-5.1.0.ebuild
-1906041609 ./sci-electronics/kicad/kicad-5.1.2.ebuild
+1907310009 ./sci-electronics/kicad/kicad-5.1.2.ebuild
 1904081939 ./sci-electronics/kicad/kicad-5.0.1.ebuild
 1807091909 ./sci-electronics/kicad/kicad-4.0.7.ebuild
 1702282250 ./sci-electronics/xoscope/xoscope-2.0.ebuild
@@ -30478,7 +30468,6 @@
 1811021609 ./net-misc/vino/vino-3.22.0.ebuild
 1907282339 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
 1907301439 ./net-misc/dhcpcd/dhcpcd-8.0.2.ebuild
-1907282339 ./net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild
 1907270039 ./net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
 1902091139 ./net-misc/pyhoca-gui/pyhoca-gui-0.5.0.8.ebuild
 1709251714 ./net-misc/pyhoca-gui/pyhoca-gui-0.5.0.7.ebuild
@@ -30506,7 +30495,7 @@
 1808310240 ./net-misc/keychain/keychain-2.8.5.ebuild
 1907300909 ./net-misc/electrum/electrum-3.3.4.ebuild
 1907300909 ./net-misc/electrum/electrum-3.1.3-r1.ebuild
-1907300909 ./net-misc/electrum/electrum-3.3.6-r1.ebuild
+1907310609 ./net-misc/electrum/electrum-3.3.6-r2.ebuild
 1907151840 ./net-misc/monmotha/monmotha-2.3.8-r1.ebuild
 1806052039 ./net-misc/lcr/lcr-9999.ebuild
 1702282250 ./net-misc/pump/pump-0.8.24-r4.ebuild
@@ -30533,6 +30522,7 @@
 1906011639 ./net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
 1810152209 ./net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
 1702282250 ./net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild
+1907310009 ./net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
 1810272209 ./net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
 1905250209 ./net-misc/connman/connman-1.37.ebuild
 1809180239 ./net-misc/connman/connman-1.35-r1.ebuild
@@ -31119,6 +31109,7 @@
 1702282250 ./dev-games/poker-eval/poker-eval-138.0.ebuild
 1905250439 ./dev-games/tiled/tiled-1.2.4.ebuild
 1904130609 ./dev-games/tiled/tiled-1.2.3.ebuild
+1907310009 ./dev-games/freecell-solver/freecell-solver-5.6.0-r1.ebuild
 1907282009 ./dev-games/freecell-solver/freecell-solver-5.6.0.ebuild
 1702282250 ./dev-games/higan-ananke/higan-ananke-094.ebuild
 1804151438 ./dev-games/quake4-sdk/quake4-sdk-1.4.2.ebuild
@@ -32728,7 +32719,7 @@
 1810071709 ./media-libs/libggi/libggi-2.2.2.ebuild
 1805012209 ./media-libs/sdlmm/sdlmm-0.1.8-r1.ebuild
 1801092039 ./media-libs/libpagemaker/libpagemaker-9999.ebuild
-1808290939 ./media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
+1907302339 ./media-libs/libpagemaker/libpagemaker-0.0.4.ebuild
 1907180809 ./media-libs/libmediainfo/libmediainfo-19.07.ebuild
 1906230009 ./media-libs/libmediainfo/libmediainfo-19.04.ebuild
 1906102309 ./media-libs/libheif/libheif-9999.ebuild
@@ -32926,8 +32917,8 @@
 1905142109 ./dev-tex/xcolor/xcolor-2.12.ebuild
 1904221739 ./dev-tex/envlab/envlab-1.2-r1.ebuild
 1906201639 ./dev-tex/latex-beamer/latex-beamer-3.55.ebuild
-1706171410 ./dev-tex/latex-beamer/latex-beamer-3.41.ebuild
 1702282250 ./dev-tex/latex-beamer/latex-beamer-3.36.ebuild
+1907302309 ./dev-tex/latex-beamer/latex-beamer-3.56.ebuild
 1805141838 ./dev-tex/biblatex-gost/biblatex-gost-1.17.ebuild
 1805012209 ./dev-tex/aastex/aastex-5.2.ebuild
 1805012209 ./dev-tex/ppower4/ppower4-0.9.6.ebuild
@@ -35090,7 +35081,7 @@
 1801041239 ./x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
 1801041239 ./x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
 1809192139 ./x11-plugins/wmxkb/wmxkb-1.2.2-r1.ebuild
-1810221939 ./x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
+1907310009 ./x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
 1810051709 ./x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
 1801041239 ./x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
 1810211139 ./x11-plugins/wmapm/wmapm-3.1-r2.ebuild
@@ -35115,7 +35106,7 @@
 1702282250 ./x11-plugins/wmmaiload/wmmaiload-2.2.1-r1.ebuild
 1702282250 ./x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
 1807200939 ./x11-plugins/wmamixer/wmamixer-1.0.ebuild
-1805220439 ./x11-plugins/wmamixer/wmamixer-0.2.ebuild
+1907310009 ./x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
 1801041239 ./x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
 1702282250 ./x11-plugins/pidgin-indicator/pidgin-indicator-1.0.ebuild
 1801032209 ./x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
@@ -35129,12 +35120,13 @@
 1811052139 ./x11-plugins/wmclockmon/wmclockmon-0.8.1-r1.ebuild
 1804280409 ./x11-plugins/asclock/asclock-2.0.12-r3.ebuild
 1809221539 ./x11-plugins/wmifinfo/wmifinfo-0.10-r1.ebuild
+1907310009 ./x11-plugins/wmix/wmix-3.4.ebuild
 1805220439 ./x11-plugins/wmix/wmix-3.2.ebuild
 1808180009 ./x11-plugins/wmix/wmix-3.3-r2.ebuild
 1805220439 ./x11-plugins/wmbiff/wmbiff-0.4.28.ebuild
-1805220439 ./x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
-1805220439 ./x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
+1907310009 ./x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
 1903081439 ./x11-plugins/wmbiff/wmbiff-0.4.33.ebuild
+1907310239 ./x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
 1809192139 ./x11-plugins/wmxres/wmxres-1.2-r1.ebuild
 1805220439 ./x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
 1805220439 ./x11-plugins/wmbutton/wmbutton-0.7.1.ebuild
@@ -35704,6 +35696,7 @@
 1803270108 ./app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
 1904122109 ./app-emulation/open-vm-tools/open-vm-tools-10.3.10.ebuild
 1805140238 ./app-emulation/free42/free42-2.0.20.ebuild
+1907310009 ./app-emulation/free42/free42-2.4.2.ebuild
 1905232039 ./app-emulation/free42/free42-2.2.1.ebuild
 1907031139 ./app-emulation/free42/free42-2.4.ebuild
 1904291039 ./app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
@@ -35791,6 +35784,7 @@
 1907252109 ./app-emulation/slirp4netns/slirp4netns-0.4.0_beta1.ebuild
 1905302209 ./app-emulation/slirp4netns/slirp4netns-0.3.0-r1.ebuild
 1907231839 ./app-emulation/slirp4netns/slirp4netns-0.4.0_beta0.ebuild
+1907310139 ./app-emulation/slirp4netns/slirp4netns-0.4.0_beta2.ebuild
 1709080240 ./app-emulation/docker-bench-security/docker-bench-security-1.3.2.ebuild
 1710122023 ./app-emulation/docker-bench-security/docker-bench-security-1.3.3.ebuild
 1807301609 ./app-emulation/kompose/kompose-1.16.0.ebuild
@@ -36129,7 +36123,7 @@
 1907181903 metadata/md5-cache/dev-java/commons-lang-3.4
 1907181903 metadata/md5-cache/dev-java/netbeans-java-8.2
 1907181903 metadata/md5-cache/dev-java/jade-3.3-r3
-1907290040 metadata/md5-cache/dev-java/openjdk-11.0.4_p11
+1907302009 metadata/md5-cache/dev-java/openjdk-11.0.4_p11
 1907181903 metadata/md5-cache/dev-java/backport-util-concurrent-3.1-r1
 1907181903 metadata/md5-cache/dev-java/gson-2.6.2
 1907181903 metadata/md5-cache/dev-java/tijmp-0.8-r1
@@ -36418,7 +36412,7 @@
 1907181903 metadata/md5-cache/dev-java/sun-jms-1.1-r2
 1907181903 metadata/md5-cache/dev-java/cldc-api-1.1-r1
 1907181903 metadata/md5-cache/dev-java/commons-primitives-1.0-r3
-1907301509 metadata/md5-cache/dev-java/Manifest.gz
+1907302009 metadata/md5-cache/dev-java/Manifest.gz
 1907181903 metadata/md5-cache/dev-java/jdbc-mysql-5.1.26
 1907181903 metadata/md5-cache/dev-java/objenesis-1.3
 1907181903 metadata/md5-cache/dev-java/hawtjni-runtime-1.15
@@ -36806,7 +36800,6 @@
 1907181903 metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
 1907181903 metadata/md5-cache/net-p2p/retroshare-0.6.5
 1805012209 metadata/md5-cache/net-p2p/ctcs-1.4.1
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.3
 1907161309 metadata/md5-cache/net-p2p/qbittorrent-4.1.6-r1
 1907181903 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r2
 1907291240 metadata/md5-cache/net-p2p/bitcoind-0.16.3
@@ -36816,7 +36809,6 @@
 1907181903 metadata/md5-cache/net-p2p/ncdc-1.21
 1907181903 metadata/md5-cache/net-p2p/syncthing-1.1.4-r1
 1907181903 metadata/md5-cache/net-p2p/opendchub-0.8.2
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.2
 1907181903 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.13
 1907181903 metadata/md5-cache/net-p2p/pybitmessage-0.6.3.2_p20180521
 1907181903 metadata/md5-cache/net-p2p/vuze-4.8.1.2-r1
@@ -36836,21 +36828,16 @@
 1907271740 metadata/md5-cache/net-p2p/xmr-stak-9999
 1907151840 metadata/md5-cache/net-p2p/smet2html-0.1
 1907181903 metadata/md5-cache/net-p2p/bitcoin-cli-0.16.3
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0
 1907291240 metadata/md5-cache/net-p2p/amule-2.3.2-r2
 1907291240 metadata/md5-cache/net-p2p/syncthing-0.14.52
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.5
 1907291240 metadata/md5-cache/net-p2p/resilio-sync-2.6.3
 1907291240 metadata/md5-cache/net-p2p/syncthing-1.0.1
 1702282329 metadata/md5-cache/net-p2p/vuze-coreplugins-4.8.1.2
 1907181903 metadata/md5-cache/net-p2p/multibit-0.5.18
 1907181903 metadata/md5-cache/net-p2p/syrep-0.9
 1902072239 metadata/md5-cache/net-p2p/go-ethereum-1.8.15
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.8.8.1-r1
 1907291240 metadata/md5-cache/net-p2p/automatic-0.8.3
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.2
 1907291240 metadata/md5-cache/net-p2p/freenet-0.7.5_p1484
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1
 1810020109 metadata/md5-cache/net-p2p/vuze-coreplugins-5.7.2.0
 1907291240 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.19
 1907291240 metadata/md5-cache/net-p2p/bitflu-1.52
@@ -36860,14 +36847,11 @@
 1907271740 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
 1907291240 metadata/md5-cache/net-p2p/amule-2.3.2-r3
 1907291240 metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.20
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5
 1907181903 metadata/md5-cache/net-p2p/retroshare-0.6.4
 1907291240 metadata/md5-cache/net-p2p/bitflu-1.51
 1907181903 metadata/md5-cache/net-p2p/rtorrent-0.9.7
-1907300510 metadata/md5-cache/net-p2p/Manifest.gz
+1907301909 metadata/md5-cache/net-p2p/Manifest.gz
 1907181903 metadata/md5-cache/net-p2p/myster-8.0-r1
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.4
 1907181903 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
 1907291240 metadata/md5-cache/net-p2p/airdcpp-webclient-2.6.0
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.8.0
@@ -36891,7 +36875,6 @@
 1907291240 metadata/md5-cache/net-p2p/litecoind-0.10.4.0
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.7.0
 1907181903 metadata/md5-cache/net-p2p/gtk-gnutella-1.1.14
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.4
 1907181903 metadata/md5-cache/net-p2p/mktorrent-1.1_p20180502
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.8.3
 1907291240 metadata/md5-cache/net-p2p/syncthing-1.1.0-r1
@@ -36899,16 +36882,13 @@
 1907181903 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.10.0
 1907181903 metadata/md5-cache/net-p2p/vuze-5.7.2.0
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.3.1
 1907181903 metadata/md5-cache/net-p2p/mktorrent-1.0-r1
 1806011708 metadata/md5-cache/net-p2p/tvrss-1.8_beta
 1907181903 metadata/md5-cache/net-p2p/bitcoin-cli-0.17.1
 1907300510 metadata/md5-cache/net-p2p/classified-ads-0.13
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2
 1907291240 metadata/md5-cache/net-p2p/freenet-0.7.5_p1483
-1907191539 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.1
+1907301909 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.6.2
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.8.2
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.5.1
 1907181903 metadata/md5-cache/net-p2p/bitcoin-qt-0.16.3
 1907300510 metadata/md5-cache/net-p2p/classified-ads-0.11
 1907181903 metadata/md5-cache/net-p2p/ncdc-1.20
@@ -36916,13 +36896,10 @@
 1907291240 metadata/md5-cache/net-p2p/deluge-1.3.15-r3
 1907291240 metadata/md5-cache/net-p2p/saku-3.11.0-r2
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.10.1
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.3
 1907271740 metadata/md5-cache/net-p2p/cpuminer-opt-9999
 1907291240 metadata/md5-cache/net-p2p/bitcoind-0.17.1
 1907181903 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.3.1
 1907291240 metadata/md5-cache/net-p2p/mldonkey-3.1.6
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.1.1
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.2.4
 1907181903 metadata/md5-cache/net-p2p/xmr-stak-2.10.4
 1907181903 metadata/md5-cache/net-p2p/retroshare-0.6.3-r1
 1907181903 metadata/md5-cache/net-p2p/bittornado-0.4.1_p20160925-r1
@@ -36936,7 +36913,6 @@
 1907151840 metadata/md5-cache/net-p2p/gnut-0.4.28-r1
 1907291240 metadata/md5-cache/net-p2p/syncthing-1.1.0
 1907181903 metadata/md5-cache/net-p2p/bisq-0.6.3
-1907181903 metadata/md5-cache/net-p2p/cpuminer-opt-3.9.0.1
 1907181903 metadata/md5-cache/sys-libs/mars-1.0.1
 1907271740 metadata/md5-cache/sys-libs/libcxx-9.0.0.9999
 1907181903 metadata/md5-cache/sys-libs/tevent-0.9.37
@@ -37581,9 +37557,7 @@
 1907181903 metadata/md5-cache/sci-libs/buddy-2.4-r1
 1907181903 metadata/md5-cache/sci-libs/minfx-1.0.5
 1907181903 metadata/md5-cache/sci-libs/mmdb-2.0.1
-1907181903 metadata/md5-cache/sci-libs/sundials-2.7.0
 1808151104 metadata/md5-cache/sci-libs/tnt-3.0.12
-1907181903 metadata/md5-cache/sci-libs/sundials-3.1.2
 1907181903 metadata/md5-cache/sci-libs/umfpack-5.6.2
 1907181903 metadata/md5-cache/sci-libs/cctbx-2010.03.29.2334-r7
 1907181903 metadata/md5-cache/sci-libs/libint-2.0.5
@@ -37629,7 +37603,6 @@
 1907181903 metadata/md5-cache/sci-libs/udunits-2.1.24-r1
 1907181903 metadata/md5-cache/sci-libs/blas-reference-20151113-r1
 1907181903 metadata/md5-cache/sci-libs/cifparse-obj-7.105
-1907181903 metadata/md5-cache/sci-libs/sundials-3.0.0
 1907181903 metadata/md5-cache/sci-libs/ipopt-3.12.12
 1907181903 metadata/md5-cache/sci-libs/clblast-0.10.0
 1907181903 metadata/md5-cache/sci-libs/libpdb-991112-r1
@@ -37721,7 +37694,7 @@
 1907181903 metadata/md5-cache/sci-libs/libcerf-1.3
 1907181903 metadata/md5-cache/sci-libs/libticalcs2-1.1.8
 1907181903 metadata/md5-cache/sci-libs/mkl-10.0.5.025
-1907300510 metadata/md5-cache/sci-libs/Manifest.gz
+1907301839 metadata/md5-cache/sci-libs/Manifest.gz
 1907181903 metadata/md5-cache/sci-libs/lrslib-051
 1907181903 metadata/md5-cache/sci-libs/keras-applications-1.0.7
 1907181903 metadata/md5-cache/sci-libs/p4est-1.0
@@ -37845,7 +37818,6 @@
 1907181903 metadata/md5-cache/sci-libs/inchi-1.04
 1907181903 metadata/md5-cache/sci-libs/nfft-3.3.2
 1907181903 metadata/md5-cache/sci-libs/coinor-couenne-0.4.7
-1907181903 metadata/md5-cache/sci-libs/sundials-3.1.0
 1907181903 metadata/md5-cache/sci-libs/minfx-1.0.6
 1907181903 metadata/md5-cache/sci-libs/levmar-2.6
 1907181903 metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r3
@@ -37891,7 +37863,6 @@
 1907181903 metadata/md5-cache/sci-libs/dcmtk-3.6.3
 1805170109 metadata/md5-cache/sci-libs/libh2o-0.2.1-r1
 1907181903 metadata/md5-cache/sci-libs/libspatialindex-1.8.5-r1
-1907181903 metadata/md5-cache/sci-libs/cantera-2.4.0
 1907181903 metadata/md5-cache/sci-libs/netcdf-4.4.0-r1
 1907181903 metadata/md5-cache/sci-libs/blas-reference-20161223
 1907181903 metadata/md5-cache/sci-libs/clipper-2.1.20140911-r1
@@ -38577,14 +38548,13 @@
 1907280940 metadata/md5-cache/dev-ruby/hamster-3.0.0-r1
 1907280940 metadata/md5-cache/dev-ruby/rex-rop_builder-0.1.3
 1907280940 metadata/md5-cache/dev-ruby/openssl-ccm-1.2.2
-1907280940 metadata/md5-cache/dev-ruby/ruby-prof-0.17.0
 1907280940 metadata/md5-cache/dev-ruby/selenium-webdriver-3.142.2
 1907280940 metadata/md5-cache/dev-ruby/jquery-rails-4.3.5
 1907280940 metadata/md5-cache/dev-ruby/msgpack-1.3.0
 1907280940 metadata/md5-cache/dev-ruby/levenshtein-0.2.2-r2
 1907280940 metadata/md5-cache/dev-ruby/hashdiff-0.3.8
 1907280940 metadata/md5-cache/dev-ruby/vcr-1.11.3
-1907300510 metadata/md5-cache/dev-ruby/Manifest.gz
+1907302139 metadata/md5-cache/dev-ruby/Manifest.gz
 1907280940 metadata/md5-cache/dev-ruby/sprockets-3.7.2
 1907280940 metadata/md5-cache/dev-ruby/fast_xs-0.8.0-r2
 1907280940 metadata/md5-cache/dev-ruby/c21e-1.2.1
@@ -39277,7 +39247,7 @@
 1907181903 metadata/md5-cache/media-video/submux-dvd-0.5.2
 1907181903 metadata/md5-cache/media-video/mpv-0.27.2
 1907181903 metadata/md5-cache/media-video/atomicparsley-0.9.0
-1907300510 metadata/md5-cache/media-video/Manifest.gz
+1907310239 metadata/md5-cache/media-video/Manifest.gz
 1907181903 metadata/md5-cache/media-video/dvdauthor-0.7.2-r2
 1907181903 metadata/md5-cache/media-video/mjpg-streamer-0_pre20120421
 1907181903 metadata/md5-cache/media-video/noad-0.8.6-r1
@@ -39325,6 +39295,7 @@
 1907181903 metadata/md5-cache/media-video/harvid-0.8.0
 1907181903 metadata/md5-cache/media-video/ffmpeg-3.4.6
 1706250108 metadata/md5-cache/media-video/tcmplex-panteltje-0.4.7-r1
+1907310239 metadata/md5-cache/media-video/devedeng-4.15.0
 1907181903 metadata/md5-cache/media-video/gxine-0.5.909
 1907300510 metadata/md5-cache/media-video/vlc-3.0.7.1
 1802230338 metadata/md5-cache/media-video/dvd_info-1.1
@@ -39435,8 +39406,9 @@
 1907271740 metadata/md5-cache/www-client/otter-9999
 1907300510 metadata/md5-cache/www-client/firefox-68.0.1
 1907181903 metadata/md5-cache/www-client/midori-7.0
+1907302109 metadata/md5-cache/www-client/chromium-76.0.3809.87
 1907181903 metadata/md5-cache/www-client/jd-2.8.9_p150226
-1907300510 metadata/md5-cache/www-client/Manifest.gz
+1907302109 metadata/md5-cache/www-client/Manifest.gz
 1907181903 metadata/md5-cache/www-client/opera-12.16_p1860-r1
 1903162209 metadata/md5-cache/www-client/lynx-2.8.9_pre16
 1907181903 metadata/md5-cache/www-client/uget-2.2.0
@@ -39453,7 +39425,6 @@
 1907181903 metadata/md5-cache/www-client/qutebrowser-1.6.3
 1907262109 metadata/md5-cache/www-client/opera-beta-63.0.3368.17
 1907300510 metadata/md5-cache/www-client/falkon-3.1.0-r1
-1907292139 metadata/md5-cache/www-client/chromium-76.0.3809.80
 1907181903 metadata/md5-cache/www-client/jd-2.8.5_p120826
 1907181903 metadata/md5-cache/www-client/httrack-3.49.2-r1
 1907181903 metadata/md5-cache/www-client/vivaldi-snapshot-2.7.1594.4_p1
@@ -43337,6 +43308,7 @@
 1907261639 metadata/md5-cache/dev-libs/m17n-lib-1.7.0
 1805192227 metadata/md5-cache/dev-libs/pcl-1.12-r1
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.5.2
+1907310209 metadata/md5-cache/dev-libs/userspace-rcu-0.11.1
 1907181903 metadata/md5-cache/dev-libs/unittest++-2.0.0
 1907181903 metadata/md5-cache/dev-libs/geoip-1.6.10
 1907181903 metadata/md5-cache/dev-libs/libe-0.9.0
@@ -43528,7 +43500,7 @@
 1907181903 metadata/md5-cache/dev-libs/libcharon-3.6.0
 1907181903 metadata/md5-cache/dev-libs/libcli-1.9.8.4
 1907181903 metadata/md5-cache/dev-libs/jansson-2.12
-1907300510 metadata/md5-cache/dev-libs/Manifest.gz
+1907310209 metadata/md5-cache/dev-libs/Manifest.gz
 1907181903 metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
 1907181903 metadata/md5-cache/dev-libs/amdgpu-pro-opencl-18.20.684755
 1907181903 metadata/md5-cache/dev-libs/libcli-1.9.7
@@ -43929,12 +43901,11 @@
 1907181903 metadata/md5-cache/dev-libs/libbson-1.1.10
 1907181903 metadata/md5-cache/dev-libs/libatasmart-0.19-r1
 1907181903 metadata/md5-cache/dev-libs/nspr-4.20
-1907181903 metadata/md5-cache/dev-libs/mxml-2.12
 1907181903 metadata/md5-cache/dev-libs/bareos-fastlzlib-0_pre20140912
 1901160239 metadata/md5-cache/dev-libs/cudnn-7.4.2.24
 1906271509 metadata/md5-cache/dev-libs/cudnn-7.6.1.34
 1907271740 metadata/md5-cache/dev-libs/libevdev-9999
-1907181903 metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
+1907302139 metadata/md5-cache/dev-libs/librevenge-0.0.4-r1
 1907221239 metadata/md5-cache/dev-libs/zziplib-0.13.69
 1907181903 metadata/md5-cache/dev-libs/libbsd-0.9.1
 1907181903 metadata/md5-cache/dev-libs/d0_blind_id-1.0
@@ -44336,9 +44307,10 @@
 1907181903 metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
 1702282336 metadata/md5-cache/x11-terms/pangoterm-0.0_pre20150913
 1907181903 metadata/md5-cache/x11-terms/mate-terminal-1.22.0
+1907301909 metadata/md5-cache/x11-terms/terminology-1.5.0
 1907181903 metadata/md5-cache/x11-terms/gnome-terminal-3.30.3
 1907181903 metadata/md5-cache/x11-terms/qterminal-0.9.0
-1907300510 metadata/md5-cache/x11-terms/Manifest.gz
+1907301909 metadata/md5-cache/x11-terms/Manifest.gz
 1907181903 metadata/md5-cache/x11-terms/guake-3.3.2
 1907242009 metadata/md5-cache/x11-terms/terminology-1.4.1
 1907181903 metadata/md5-cache/x11-terms/root-tail-1.2-r4
@@ -45164,7 +45136,7 @@
 1907291240 metadata/md5-cache/dev-db/mariadb-10.4.6
 1907181903 metadata/md5-cache/dev-db/sqldeveloper-4.2.0.17.089.1709
 1907181903 metadata/md5-cache/dev-db/percona-toolkit-2.2.11
-1907300510 metadata/md5-cache/dev-db/Manifest.gz
+1907310139 metadata/md5-cache/dev-db/Manifest.gz
 1904182339 metadata/md5-cache/dev-db/percona-toolkit-3.0.13
 1907181903 metadata/md5-cache/dev-db/mysql-connector-c++-8.0.15
 1907181903 metadata/md5-cache/dev-db/mysql-connector-c-8.0.16
@@ -45213,6 +45185,7 @@
 1907280940 metadata/md5-cache/dev-db/qdbm-1.8.78-r2
 1907291240 metadata/md5-cache/dev-db/hsqldb-1.8.1.3-r2
 1907291240 metadata/md5-cache/dev-db/clickhouse-19.9.5.36
+1907310139 metadata/md5-cache/dev-db/mysql++-3.2.5
 1907291240 metadata/md5-cache/dev-db/mongodb-3.6.13
 1907291240 metadata/md5-cache/dev-db/mysql-5.6.43
 1907291240 metadata/md5-cache/dev-db/postgresql-9.5.18
@@ -45242,7 +45215,7 @@
 1907181903 metadata/md5-cache/dev-db/sadisplay-0.4.8
 1702282310 metadata/md5-cache/dev-db/textsearch_ja-9.0.0
 1907181903 metadata/md5-cache/dev-db/xbase-3.1.2
-1907181903 metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
+1907310109 metadata/md5-cache/dev-db/mariadb-connector-c-3.0.6-r1
 1907221709 metadata/md5-cache/dev-db/pgbadger-10.3
 1907291240 metadata/md5-cache/dev-db/postgresql-9.6.14
 1907181903 metadata/md5-cache/dev-db/datadraw-3.1.1
@@ -45265,6 +45238,7 @@
 1907291240 metadata/md5-cache/dev-db/mysql-cluster-7.3.22
 1907291240 metadata/md5-cache/dev-db/pgagent-4.0.0
 1907291240 metadata/md5-cache/dev-db/postgresql-10.9
+1907310139 metadata/md5-cache/dev-db/mariadb-connector-c-3.1.2
 1907291240 metadata/md5-cache/dev-db/mariadb-10.2.22-r1
 1907291240 metadata/md5-cache/dev-db/mysql-5.7.24
 1907181903 metadata/md5-cache/dev-db/mysql-connector-c++-1.1.11
@@ -45377,6 +45351,7 @@
 1907221240 metadata/md5-cache/sys-kernel/linux-headers-4.13
 1907181903 metadata/md5-cache/sys-kernel/dracut-049-r1
 1907221240 metadata/md5-cache/sys-kernel/aufs-sources-5.1.16
+1907301839 metadata/md5-cache/sys-kernel/pf-sources-5.2_p2
 1907221240 metadata/md5-cache/sys-kernel/aufs-sources-4.14.129
 1907221240 metadata/md5-cache/sys-kernel/ck-sources-4.18.9
 1907271740 metadata/md5-cache/sys-kernel/zen-sources-4.15.9999
@@ -45389,7 +45364,7 @@
 1906280109 metadata/md5-cache/sys-kernel/linux-firmware-20190603
 1907221240 metadata/md5-cache/sys-kernel/ck-sources-4.14.63
 1907221240 metadata/md5-cache/sys-kernel/linux-headers-3.18
-1907301439 metadata/md5-cache/sys-kernel/Manifest.gz
+1907310739 metadata/md5-cache/sys-kernel/Manifest.gz
 1907221240 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.186
 1907221240 metadata/md5-cache/sys-kernel/aufs-sources-5.1.14
 1907221240 metadata/md5-cache/sys-kernel/linux-headers-4.9
@@ -45476,6 +45451,7 @@
 1907181903 metadata/md5-cache/sys-kernel/dracut-044-r3
 1907221240 metadata/md5-cache/sys-kernel/rt-sources-3.18.129_p110
 1907221240 metadata/md5-cache/sys-kernel/aufs-sources-5.1.18
+1907310739 metadata/md5-cache/sys-kernel/pf-sources-5.2_p3
 1907271740 metadata/md5-cache/sys-kernel/raspberrypi-sources-4.12.9999
 1907181903 metadata/md5-cache/sys-kernel/kergen-0.1.4
 1907221240 metadata/md5-cache/sys-kernel/rt-sources-3.18.125_p108
@@ -45745,7 +45721,7 @@
 1907181903 metadata/md5-cache/media-gfx/sigal-1.3.0
 1907181903 metadata/md5-cache/media-gfx/libimagequant-2.12.2
 1907181903 metadata/md5-cache/media-gfx/gif2png-2.5.14
-1907300510 metadata/md5-cache/media-gfx/Manifest.gz
+1907310809 metadata/md5-cache/media-gfx/Manifest.gz
 1907181903 metadata/md5-cache/media-gfx/hugin-2019.0.0
 1907242009 metadata/md5-cache/media-gfx/gnome-screenshot-3.30.0
 1805290208 metadata/md5-cache/media-gfx/rotoscope-0.2
@@ -45813,7 +45789,7 @@
 1907300510 metadata/md5-cache/media-gfx/krita-4.1.8-r1
 1907300510 metadata/md5-cache/media-gfx/digikam-6.1.0
 1907181903 metadata/md5-cache/media-gfx/graphicsmagick-1.3.30
-1907181903 metadata/md5-cache/media-gfx/springgraph-88
+1907310809 metadata/md5-cache/media-gfx/springgraph-88
 1907181903 metadata/md5-cache/media-gfx/zgv-5.9
 1907281009 metadata/md5-cache/media-gfx/shotwell-0.30.2
 1907181903 metadata/md5-cache/media-gfx/pngquant-2.12.2
@@ -45840,6 +45816,7 @@
 1812292239 metadata/md5-cache/media-gfx/chafa-1.0.1
 1907181903 metadata/md5-cache/media-gfx/nomacs-3.12
 1709261639 metadata/md5-cache/media-gfx/evoluspencil-2.0.5
+1907310009 metadata/md5-cache/media-gfx/geeqie-1.5
 1907300510 metadata/md5-cache/media-gfx/gscan2pdf-2.5.3
 1907181903 metadata/md5-cache/media-gfx/jpeginfo-1.6.1-r1
 1907181903 metadata/md5-cache/media-gfx/plantuml-8046
@@ -46041,7 +46018,7 @@
 1907181903 metadata/md5-cache/net-mail/asmail-2.1
 1907151840 metadata/md5-cache/net-mail/signify-1.14
 1805012209 metadata/md5-cache/net-mail/checkpassword-pam-0.99
-1907300939 metadata/md5-cache/net-mail/Manifest.gz
+1907302009 metadata/md5-cache/net-mail/Manifest.gz
 1907291240 metadata/md5-cache/net-mail/dovecot-2.3.6
 1907181903 metadata/md5-cache/net-mail/gnubiff-2.2.15-r3
 1907291240 metadata/md5-cache/net-mail/popa3d-1.0.2-r1
@@ -46062,7 +46039,7 @@
 1907291240 metadata/md5-cache/net-mail/mailbase-1.1
 1907181903 metadata/md5-cache/net-mail/ripmime-1.4.0.10
 1806301939 metadata/md5-cache/net-mail/imapsync-1.882
-1907181903 metadata/md5-cache/net-mail/mailutils-3.4-r3
+1907302009 metadata/md5-cache/net-mail/mailutils-3.4-r3
 1702282329 metadata/md5-cache/net-mail/imapsync-1.684
 1907181903 metadata/md5-cache/net-mail/qmrtg-2.1-r1
 1907181903 metadata/md5-cache/net-mail/offlineimap-6.5.6
@@ -46632,12 +46609,11 @@
 1907291240 metadata/md5-cache/mail-filter/opendmarc-1.3.2-r1
 1807171639 metadata/md5-cache/mail-filter/scmail-1.3
 1907181903 metadata/md5-cache/mail-filter/policyd-1.82-r3
-1907291240 metadata/md5-cache/mail-filter/milter-regex-1.9
 1805012209 metadata/md5-cache/mail-filter/procmail-lib-20091202
 1907181903 metadata/md5-cache/mail-filter/libsrs_alt-1.0
 1907291240 metadata/md5-cache/mail-filter/dspam-3.10.2-r1
 1907291240 metadata/md5-cache/mail-filter/postfwd-2.02
-1907292210 metadata/md5-cache/mail-filter/Manifest.gz
+1907302109 metadata/md5-cache/mail-filter/Manifest.gz
 1907181903 metadata/md5-cache/mail-filter/libsrs2-1.0.18
 1907181903 metadata/md5-cache/mail-filter/afew-1.1.0
 1907291240 metadata/md5-cache/mail-filter/sqlgrey-1.7.6-r2
@@ -46686,7 +46662,6 @@
 1907181903 metadata/md5-cache/mail-filter/imapfilter-2.6.12
 1907291240 metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
 1907181903 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
-1907291240 metadata/md5-cache/mail-filter/milter-regex-2.2
 1907292210 metadata/md5-cache/mail-filter/spamassassin-3.4.2-r2
 1907291240 metadata/md5-cache/mail-filter/postfwd-2.00-r1
 1907181903 metadata/md5-cache/mail-filter/spamdyke-4.3.0
@@ -47182,100 +47157,100 @@
 1907181903 metadata/md5-cache/net-firewall/nufw-2.2.22-r1
 1907181903 metadata/md5-cache/net-firewall/ufw-frontends-0.3.2-r5
 1907300510 metadata/md5-cache/kde-plasma/bluedevil-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/ksysguard-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.15.5-r1
 1907300510 metadata/md5-cache/kde-plasma/plasma-sdk-5.15.5
 1905280539 metadata/md5-cache/kde-plasma/plasma-meta-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/plasma-integration-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/kscreenlocker-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/plasma-desktop-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kwin-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/kscreenlocker-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kwrited-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/user-manager-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/plasma-sdk-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/powerdevil-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/libksysguard-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kinfocenter-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/bluedevil-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/kscreen-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/khotkeys-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kmenuedit-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/kde-cli-tools-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/plasma-integration-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/kwayland-integration-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/plasma-pa-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/kgamma-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kwallet-pam-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kgamma-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-workspace-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/breeze-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-pa-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/systemsettings-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kscreen-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-nm-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/breeze-grub-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kwallet-pam-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-pa-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-integration-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-meta-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/breeze-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kde-gtk-config-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/breeze-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/kscreen-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/breeze-gtk-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-nm-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/plasma-nm-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/kwayland-integration-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/plymouth-kcm-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/oxygen-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kwin-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kscreenlocker-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kde-cli-tools-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kwayland-integration-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/kwallet-pam-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/plasma-sdk-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/milou-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/systemsettings-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/milou-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/libksysguard-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/sddm-kcm-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kwin-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/libkworkspace-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/kmenuedit-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kdecoration-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/kgamma-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/khotkeys-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/sddm-kcm-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kmenuedit-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/Manifest.gz
-1907300510 metadata/md5-cache/kde-plasma/breeze-gtk-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/kde-gtk-config-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/ksysguard-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kwrited-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/Manifest.gz
+1907301809 metadata/md5-cache/kde-plasma/libkscreen-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/oxygen-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/plasma-workspace-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/breeze-plymouth-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/libkworkspace-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-vault-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kdecoration-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/systemsettings-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/drkonqi-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/discover-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/drkonqi-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/breeze-grub-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/libkscreen-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/kinfocenter-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/milou-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/libkscreen-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/breeze-gtk-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/plasma-workspace-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/breeze-plymouth-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/ksshaskpass-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/powerdevil-5.16.3-r1
-1907300510 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/discover-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/ksshaskpass-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/user-manager-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-desktop-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/kinfocenter-5.15.5
 1907300510 metadata/md5-cache/kde-plasma/kwrited-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/khotkeys-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/powerdevil-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/bluedevil-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/plasma-vault-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/plasma-desktop-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.15.5
+1907301809 metadata/md5-cache/kde-plasma/discover-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/plasma-vault-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/breeze-grub-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/drkonqi-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/plymouth-kcm-5.16.4
+1907301809 metadata/md5-cache/kde-plasma/libkworkspace-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/oxygen-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.16.3
+1907301809 metadata/md5-cache/kde-plasma/libksysguard-5.16.4
 1907300510 metadata/md5-cache/kde-plasma/ksysguard-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/sddm-kcm-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/kdecoration-5.16.3
-1907300510 metadata/md5-cache/kde-plasma/user-manager-5.16.3
 1907300510 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.15.5
-1907300510 metadata/md5-cache/kde-plasma/ksshaskpass-5.16.3
-1907092239 metadata/md5-cache/kde-plasma/plasma-meta-5.16.3
 1907181903 metadata/md5-cache/dev-lang/ghc-8.4.2
 1907181903 metadata/md5-cache/dev-lang/mercury-extras-14.01.1
 1907251910 metadata/md5-cache/dev-lang/ruby-2.5.5
@@ -49128,7 +49103,7 @@
 1907181903 metadata/md5-cache/dev-python/pyasn1-0.4.2
 1907241139 metadata/md5-cache/dev-python/python-axolotl-0.2.3
 1907300510 metadata/md5-cache/dev-python/glueviz-0.10.4
-1907301709 metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
+1907301809 metadata/md5-cache/dev-python/aiohttp-socks-0.2.2
 1907181903 metadata/md5-cache/dev-python/subunit-1.2.0-r1
 1907181903 metadata/md5-cache/dev-python/selenium-3.13.0
 1907181903 metadata/md5-cache/dev-python/zope-event-4.2.0
@@ -49275,6 +49250,7 @@
 1907181903 metadata/md5-cache/dev-python/kivy-garden-0.1.1
 1907181903 metadata/md5-cache/dev-python/eyeD3-0.7.5
 1907181903 metadata/md5-cache/dev-python/APScheduler-3.3.1
+1907310009 metadata/md5-cache/dev-python/pysol_cards-0.6.2-r1
 1808151104 metadata/md5-cache/dev-python/python-docs-3.6.4
 1907181903 metadata/md5-cache/dev-python/astroscrappy-1.0.3
 1907181903 metadata/md5-cache/dev-python/BitVector-3.4.4
@@ -49575,7 +49551,7 @@
 1907181903 metadata/md5-cache/dev-python/theano-0.9.0
 1907181903 metadata/md5-cache/dev-python/oslo-utils-3.40.3
 1907181903 metadata/md5-cache/dev-python/python-magic-0.4.15
-1907301709 metadata/md5-cache/dev-python/Manifest.gz
+1907310009 metadata/md5-cache/dev-python/Manifest.gz
 1907181903 metadata/md5-cache/dev-python/mamba-0.8.6
 1907181903 metadata/md5-cache/dev-python/spyder-3.2.4
 1907181903 metadata/md5-cache/dev-python/logfury-0.1.2
@@ -50485,6 +50461,7 @@
 1907181903 metadata/md5-cache/dev-python/superlance-1.0.0
 1907181903 metadata/md5-cache/dev-python/selenium-3.0.2
 1907181903 metadata/md5-cache/dev-python/mygpoclient-1.8
+1907301809 metadata/md5-cache/dev-python/pytest-asyncio-0.10.0
 1907181903 metadata/md5-cache/dev-python/tempita-0.5.3-r1
 1907181903 metadata/md5-cache/dev-python/nose_warnings_filters-0.1.5-r2
 1907181903 metadata/md5-cache/dev-python/six-1.12.0
@@ -51004,7 +50981,7 @@
 1907181903 metadata/md5-cache/dev-python/nose-show-skipped-0.1
 1907181903 metadata/md5-cache/dev-python/mistune-0.8.3
 1907181903 metadata/md5-cache/dev-python/python-barbicanclient-4.5.2
-1907281709 metadata/md5-cache/dev-python/rst-linker-1.11
+1907302239 metadata/md5-cache/dev-python/rst-linker-1.11
 1907271310 metadata/md5-cache/dev-python/websocket-client-0.37.0
 1907181903 metadata/md5-cache/dev-python/zeep-2.4.0
 1907291240 metadata/md5-cache/dev-python/pygresql-5.1
@@ -51230,6 +51207,7 @@
 1907151840 metadata/md5-cache/sys-block/noflushd-2.7.3
 1907291240 metadata/md5-cache/sys-block/partimage-0.6.9-r1
 1907181903 metadata/md5-cache/sys-block/fwdl-1.2.3
+1907310109 metadata/md5-cache/sys-block/storcli-7.1017
 1907181903 metadata/md5-cache/sys-block/parted-3.2_p23
 1907181903 metadata/md5-cache/sys-block/parted-3.2_p20-r1
 1907151840 metadata/md5-cache/sys-block/sas3flash-15
@@ -51302,7 +51280,7 @@
 1907181903 metadata/md5-cache/sys-block/iscsitarget-1.4.20.2_p20130821
 1907181903 metadata/md5-cache/sys-block/whdd-2.2
 1902012139 metadata/md5-cache/sys-block/nbd-3.19
-1907300510 metadata/md5-cache/sys-block/Manifest.gz
+1907310209 metadata/md5-cache/sys-block/Manifest.gz
 1805012209 metadata/md5-cache/sys-block/scsiping-0.0.1
 1907181903 metadata/md5-cache/sys-block/iscsitarget-0.4.17
 1907151840 metadata/md5-cache/sys-block/tw_cli-10.2.2.1
@@ -51322,7 +51300,7 @@
 1907151840 metadata/md5-cache/sys-block/sas3ircu-5
 1907181903 metadata/md5-cache/sys-block/f3-7.0
 1902060009 metadata/md5-cache/sys-block/tw_cli-10.2.2.1-r1
-1904230309 metadata/md5-cache/sys-block/storcli-7.0709-r1
+1907310109 metadata/md5-cache/sys-block/storcli-7.0709-r1
 1804020212 metadata/md5-cache/sys-block/nbd-3.15.3
 1907271740 metadata/md5-cache/sys-block/zram-init-9999
 1907181903 metadata/md5-cache/sys-block/mbuffer-20150412
@@ -51356,6 +51334,7 @@
 1907181903 metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
 1907181903 metadata/md5-cache/sys-block/scsirastools-1.6.4
 1907181903 metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
+1907310209 metadata/md5-cache/sys-block/mbuffer-20190725
 1907181903 metadata/md5-cache/sys-block/megacli-8.07.14
 1812052139 metadata/md5-cache/sys-block/perccli-7.5.007.0529
 1907181903 metadata/md5-cache/sys-block/blocks-0.1.4_pre131210-r1
@@ -52022,6 +52001,7 @@
 1907181903 metadata/md5-cache/net-im/swift-4.0.2-r1
 1907181903 metadata/md5-cache/net-im/gitter-bin-3.1.0
 1907181903 metadata/md5-cache/net-im/toxic-0.8.3
+1907301839 metadata/md5-cache/net-im/skypeforlinux-8.50.0.38
 1907271740 metadata/md5-cache/net-im/dino-9999
 1907291240 metadata/md5-cache/net-im/bitlbee-3.6
 1907181903 metadata/md5-cache/net-im/bitlbee-steam-1.2.0
@@ -52050,7 +52030,7 @@
 1907291240 metadata/md5-cache/net-im/bitlbee-9999
 1907181903 metadata/md5-cache/net-im/bitlbee-facebook-1.2.0
 1907181903 metadata/md5-cache/net-im/bitlbee-facebook-1.1.2
-1907301209 metadata/md5-cache/net-im/Manifest.gz
+1907301839 metadata/md5-cache/net-im/Manifest.gz
 1907291209 metadata/md5-cache/net-im/prosody-0.11.2-r1
 1907181903 metadata/md5-cache/net-im/ricochet-1.1.4
 1907181903 metadata/md5-cache/net-im/cpop-0.0.4-r1
@@ -52076,7 +52056,6 @@
 1905062239 metadata/md5-cache/net-im/profanity-0.6.0
 1802061938 metadata/md5-cache/net-im/centerim-5.0.1
 1902180939 metadata/md5-cache/net-im/tkabber-1.1.2
-1907181903 metadata/md5-cache/net-im/skypeforlinux-8.48.0.51
 1907282009 metadata/md5-cache/net-im/silc-toolkit-1.1.10
 1907271740 metadata/md5-cache/net-im/ricochet-9999
 1907181903 metadata/md5-cache/net-im/ejabberd-17.04-r2
@@ -52159,7 +52138,7 @@
 1907231139 metadata/md5-cache/dev-cpp/nlohmann_json-3.6.1-r1
 1907221239 metadata/md5-cache/dev-cpp/gtest-1.8.0-r1
 1907181903 metadata/md5-cache/dev-cpp/pangomm-2.42.0
-1907300510 metadata/md5-cache/dev-cpp/Manifest.gz
+1907302339 metadata/md5-cache/dev-cpp/Manifest.gz
 1907181903 metadata/md5-cache/dev-cpp/glibmm-2.58.1
 1907221239 metadata/md5-cache/dev-cpp/gtest-1.8.1-r1
 1907221239 metadata/md5-cache/dev-cpp/catch-2.5.0
@@ -52191,7 +52170,7 @@
 1907300510 metadata/md5-cache/dev-cpp/gstreamermm-1.10.0
 1907181903 metadata/md5-cache/dev-cpp/mm-common-0.9.12
 1904221409 metadata/md5-cache/dev-cpp/asio-1.13.0
-1907181903 metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
+1907302339 metadata/md5-cache/dev-cpp/clucene-2.3.3.4-r6
 1907181903 metadata/md5-cache/dev-cpp/pstreams-0.7.0
 1907181903 metadata/md5-cache/dev-cpp/gtkglextmm-1.2.0-r2
 1907181903 metadata/md5-cache/dev-cpp/glog-0.3.4
@@ -52595,7 +52574,7 @@
 1907181903 metadata/md5-cache/net-analyzer/tcptraceroute-1.5_beta7-r2
 1907291240 metadata/md5-cache/net-analyzer/vnstat-9999
 1907181903 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p4_p1
-1907300909 metadata/md5-cache/net-analyzer/Manifest.gz
+1907310809 metadata/md5-cache/net-analyzer/Manifest.gz
 1907181903 metadata/md5-cache/net-analyzer/iftop-1.0_pre4-r2
 1805012209 metadata/md5-cache/net-analyzer/neti-2.0
 1907181903 metadata/md5-cache/net-analyzer/sinfo-0.0.48
@@ -52710,7 +52689,7 @@
 1907291240 metadata/md5-cache/net-analyzer/flow-tools-0.68.5.1-r9
 1907181903 metadata/md5-cache/net-analyzer/mbrowse-0.4.3-r1
 1907291240 metadata/md5-cache/net-analyzer/nagios-core-4.3.4
-1907181903 metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
+1907310809 metadata/md5-cache/net-analyzer/squid-graph-3.2-r1
 1907181903 metadata/md5-cache/net-analyzer/masscan-1.0.4
 1907181903 metadata/md5-cache/net-analyzer/nload-0.7.4-r1
 1907181903 metadata/md5-cache/net-analyzer/nagios-sap-ccms-plugin-0.8
@@ -53260,6 +53239,7 @@
 1907181903 metadata/md5-cache/app-misc/abook-0.6.1-r1
 1907181903 metadata/md5-cache/app-misc/emelfm2-0.9.1-r1
 1907181903 metadata/md5-cache/app-misc/sphinx-2.2.11-r1
+1907310409 metadata/md5-cache/app-misc/elasticsearch-7.2.1
 1907291240 metadata/md5-cache/app-misc/carbon-c-relay-3.3
 1907300510 metadata/md5-cache/app-misc/qlcplus-4.11.1
 1907181903 metadata/md5-cache/app-misc/gcal-4.1
@@ -53359,7 +53339,7 @@
 1907271740 metadata/md5-cache/app-misc/screenfetch-9999
 1907181903 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
 1907241539 metadata/md5-cache/app-misc/ytree-1.99_p1-r1
-1907300510 metadata/md5-cache/app-misc/Manifest.gz
+1907310409 metadata/md5-cache/app-misc/Manifest.gz
 1907181903 metadata/md5-cache/app-misc/socnetv-2.2
 1907181903 metadata/md5-cache/app-misc/lcd4linux-0.11.0_pre20170527-r1
 1907181903 metadata/md5-cache/app-misc/mmv-1.01b_p18
@@ -54178,7 +54158,6 @@
 1907181903 metadata/md5-cache/dev-php/maxmind-db-reader-1.3.0
 1907181903 metadata/md5-cache/dev-php/pecl-oauth-2.0.3
 1711141808 metadata/md5-cache/dev-php/Text_Template-1.2.1
-1705280209 metadata/md5-cache/dev-php/adodb-5.20.9
 1902222139 metadata/md5-cache/dev-php/tcpdf-6.2.26
 1811020409 metadata/md5-cache/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
 1801230538 metadata/md5-cache/dev-php/semver-1.4.2
@@ -54206,7 +54185,6 @@
 1810311639 metadata/md5-cache/dev-php/tcpdf-6.2.25
 1907181903 metadata/md5-cache/dev-php/geos-php-1.0.0
 1907181903 metadata/md5-cache/dev-php/swoole-4.0.4
-1809040339 metadata/md5-cache/dev-php/adodb-5.20.13
 1707271838 metadata/md5-cache/dev-php/cphplib-0.51-r1
 1905091709 metadata/md5-cache/dev-php/twig-1.40.1-r1
 1903202339 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.5
@@ -54261,7 +54239,6 @@
 1903202339 metadata/md5-cache/dev-php/PEAR-Structures_Graph-1.1.1-r1
 1702282315 metadata/md5-cache/dev-php/PEAR-MIME_Type-1.4.1
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_DNS2-1.4.4
-1804242138 metadata/md5-cache/dev-php/adodb-5.20.12
 1902132309 metadata/md5-cache/dev-php/PEAR-XML_Util-1.4.3
 1907181609 metadata/md5-cache/dev-php/symfony-event-dispatcher-2.8.50
 1903202339 metadata/md5-cache/dev-php/PEAR-Text_Figlet-1.0.2-r1
@@ -54345,7 +54322,7 @@
 1902132309 metadata/md5-cache/dev-php/webmozart-assert-1.4.0
 1811020409 metadata/md5-cache/dev-php/PEAR-Image_Color2-0.1.5-r1
 1702282315 metadata/md5-cache/dev-php/phar-utils-1.0.0
-1907271740 metadata/md5-cache/dev-php/Manifest.gz
+1907310139 metadata/md5-cache/dev-php/Manifest.gz
 1811020409 metadata/md5-cache/dev-php/PEAR-MDB2-2.5.0_beta5-r1
 1907181903 metadata/md5-cache/dev-php/pecl-http-2.6.0-r1
 1907181903 metadata/md5-cache/dev-php/pecl-redis-4.2.0
@@ -54391,6 +54368,7 @@
 1811020409 metadata/md5-cache/dev-php/PEAR-Net_URL2-2.2.1-r2
 1801230108 metadata/md5-cache/dev-php/spdx-licenses-1.2.0
 1811020409 metadata/md5-cache/dev-php/PEAR-Image_Text-0.7.0-r1
+1907310139 metadata/md5-cache/dev-php/PEAR-HTML_Common2-2.1.2
 1907181903 metadata/md5-cache/dev-php/xdebug-2.6.1
 1907181903 metadata/md5-cache/dev-php/swoole-4.0.1
 1810310009 metadata/md5-cache/dev-php/SabreAMF-1.5.0
@@ -54401,9 +54379,11 @@
 1907181903 metadata/md5-cache/dev-php/pecl-zmq-1.1.3-r2
 1907271310 metadata/md5-cache/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
 1806072239 metadata/md5-cache/dev-php/doctrine-2.4.6
+1907310139 metadata/md5-cache/dev-php/pecl-mongodb-1.5.5
 1903202339 metadata/md5-cache/dev-php/PEAR-File_Find-1.3.3
 1907181903 metadata/md5-cache/dev-php/pecl-taint-2.0.2
 1907181903 metadata/md5-cache/dev-php/libvirt-php-0.5.4
+1907310139 metadata/md5-cache/dev-php/adodb-5.20.14
 1905030039 metadata/md5-cache/dev-php/smarty-3.1.33
 1907181903 metadata/md5-cache/dev-php/pecl-uuid-1.0.4-r2
 1811020409 metadata/md5-cache/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
@@ -54600,6 +54580,7 @@
 1802081008 metadata/md5-cache/app-text/qpdf-7.1.1
 1907181903 metadata/md5-cache/app-text/openlp-2.4.6
 1907271740 metadata/md5-cache/app-text/poppler-9999
+1907302309 metadata/md5-cache/app-text/tessdata_fast-4.0.0
 1907300510 metadata/md5-cache/app-text/gspell-1.6.1
 1907181903 metadata/md5-cache/app-text/htmltidy-20090325-r2
 1806260509 metadata/md5-cache/app-text/gocr-0.50
@@ -54624,6 +54605,7 @@
 1907181903 metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
 1907300909 metadata/md5-cache/app-text/calibre-3.46.0-r1
 1907181903 metadata/md5-cache/app-text/namazu-2.0.21
+1907302309 metadata/md5-cache/app-text/tesseract-4.1.0
 1907181903 metadata/md5-cache/app-text/docbook-sgml-dtd-3.1-r3
 1905170139 metadata/md5-cache/app-text/qpdf-8.4.1
 1907181903 metadata/md5-cache/app-text/llpp-30
@@ -54676,11 +54658,11 @@
 1907300039 metadata/md5-cache/app-text/gtkspell-3.0.9
 1907181903 metadata/md5-cache/app-text/xournal-0.4.8.2016
 1907181903 metadata/md5-cache/app-text/docx2txt-1.4
-1708271838 metadata/md5-cache/app-text/mythes-1.2.4
+1907302139 metadata/md5-cache/app-text/mythes-1.2.4
 1905212109 metadata/md5-cache/app-text/wdiff-1.2.2-r1
 1812272039 metadata/md5-cache/app-text/xapian-omega-1.2.25
 1907181903 metadata/md5-cache/app-text/diction-1.13
-1902172109 metadata/md5-cache/app-text/libwpg-0.3.3
+1907302339 metadata/md5-cache/app-text/libwpg-0.3.3
 1702282310 metadata/md5-cache/app-text/u2ps-0.8.4
 1907300510 metadata/md5-cache/app-text/gspell-1.8.1
 1907181903 metadata/md5-cache/app-text/htmlinc-1.0_beta1-r2
@@ -54721,7 +54703,7 @@
 1905301409 metadata/md5-cache/app-text/ps2pkm-1.8_p20190410
 1805012209 metadata/md5-cache/app-text/scrollkeeper-9999-r2
 1803032208 metadata/md5-cache/app-text/scrollkeeper-dtd-1.0-r1
-1809192139 metadata/md5-cache/app-text/libepubgen-0.1.1
+1907302139 metadata/md5-cache/app-text/libepubgen-0.1.1
 1907181903 metadata/md5-cache/app-text/pandoc-1.13.2.1
 1907181903 metadata/md5-cache/app-text/opensp-1.5.2-r6
 1702282310 metadata/md5-cache/app-text/txt2man-1.5.6
@@ -54757,7 +54739,7 @@
 1907181903 metadata/md5-cache/app-text/epstool-3.08-r1
 1907181903 metadata/md5-cache/app-text/asciidoc-8.6.9-r6
 1907181903 metadata/md5-cache/app-text/tkman-2.2-r1
-1901082309 metadata/md5-cache/app-text/libodfgen-0.1.7
+1907310109 metadata/md5-cache/app-text/libodfgen-0.1.7
 1907181903 metadata/md5-cache/app-text/djvusmooth-0.2.18
 1801051609 metadata/md5-cache/app-text/antixls-0.3b
 1907181903 metadata/md5-cache/app-text/pandoc-1.18
@@ -54781,6 +54763,7 @@
 1907181903 metadata/md5-cache/app-text/dblatex-0.3.10-r1
 1907181903 metadata/md5-cache/app-text/jabref-bin-3.8
 1907242009 metadata/md5-cache/app-text/zathura-djvu-0.2.8
+1907302309 metadata/md5-cache/app-text/tessdata_legacy-4.0.0
 1907181903 metadata/md5-cache/app-text/jadetex-3.13-r7
 1907221239 metadata/md5-cache/app-text/iso-codes-3.76
 1907181903 metadata/md5-cache/app-text/reed-5.4
@@ -54805,13 +54788,13 @@
 1907181903 metadata/md5-cache/app-text/paperwork-backend-1.2.4
 1907181903 metadata/md5-cache/app-text/qpdfview-0.4.18_pre3-r1
 1907181903 metadata/md5-cache/app-text/ding-1.8.1
-1907301239 metadata/md5-cache/app-text/Manifest.gz
+1907310209 metadata/md5-cache/app-text/Manifest.gz
 1906160709 metadata/md5-cache/app-text/qpdf-8.4.2
 1805012209 metadata/md5-cache/app-text/vlna-1.5
 1907181903 metadata/md5-cache/app-text/htp-1.19
 1907181903 metadata/md5-cache/app-text/html-xml-utils-7.7
 1907181903 metadata/md5-cache/app-text/multitail-6.4.1
-1809192139 metadata/md5-cache/app-text/libwps-0.4.10
+1907302339 metadata/md5-cache/app-text/libwps-0.4.10
 1907181903 metadata/md5-cache/app-text/xapers-0.8.2
 1702282309 metadata/md5-cache/app-text/bdf2psf-1.104
 1907181903 metadata/md5-cache/app-text/opensp-1.5.2-r3
@@ -54821,7 +54804,7 @@
 1907181903 metadata/md5-cache/app-text/talkfilters-2.3.8-r1
 1907181903 metadata/md5-cache/app-text/dvisvgm-2.7
 1907181903 metadata/md5-cache/app-text/bact-0.13-r1
-1902172109 metadata/md5-cache/app-text/libwpd-0.10.3
+1907302339 metadata/md5-cache/app-text/libwpd-0.10.3
 1907271740 metadata/md5-cache/app-text/libodfgen-9999
 1907181903 metadata/md5-cache/app-text/spellutils-0.7
 1907181903 metadata/md5-cache/app-text/yodl-4.02.01
@@ -54829,7 +54812,7 @@
 1905151709 metadata/md5-cache/app-text/texi2html-5.0-r1
 1907181903 metadata/md5-cache/app-text/doconce-1.4.4
 1907181903 metadata/md5-cache/app-text/odt2txt-0.4-r1
-1907181903 metadata/md5-cache/app-text/libabw-0.1.2
+1907310109 metadata/md5-cache/app-text/libabw-0.1.2
 1907271740 metadata/md5-cache/app-text/pspdftool-9999
 1807240139 metadata/md5-cache/app-text/xapian-omega-1.4.5
 1902121639 metadata/md5-cache/app-text/poppler-data-0.4.9
@@ -54868,7 +54851,7 @@
 1803132108 metadata/md5-cache/app-text/qpdf-7.0.0
 1907181903 metadata/md5-cache/app-text/epspdf-0.6.0
 1907181903 metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
-1902172109 metadata/md5-cache/app-text/libqxp-0.0.2
+1907302139 metadata/md5-cache/app-text/libqxp-0.0.2
 1907271310 metadata/md5-cache/app-text/csvfix-1.6
 1905041809 metadata/md5-cache/app-text/build-docbook-catalog-1.21
 1907181903 metadata/md5-cache/app-text/pdfshuffler-0.6.0-r1
@@ -54901,10 +54884,10 @@
 1907181903 metadata/md5-cache/app-text/docbook-xml-dtd-4.1.2-r6
 1905091139 metadata/md5-cache/app-text/languagetool-4.5
 1907181903 metadata/md5-cache/app-text/html-xml-utils-7.1
+1907302309 metadata/md5-cache/app-text/tessdata_best-4.0.0
 1907181903 metadata/md5-cache/app-text/restview-2.7.0
 1907181903 metadata/md5-cache/app-text/hunspell-1.6.2-r1
 1907181903 metadata/md5-cache/app-text/asa-1.1-r1
-1907300510 metadata/md5-cache/app-text/kup-0.7.3
 1907181639 metadata/md5-cache/app-text/po4a-0.47-r1
 1907251910 metadata/md5-cache/app-text/xmlformat-1.04
 1801231609 metadata/md5-cache/app-text/docbook-xsl-ns-stylesheets-1.78.0
@@ -54985,7 +54968,7 @@
 1902182309 metadata/md5-cache/app-text/master-pdf-editor-5.3.12
 1907271310 metadata/md5-cache/app-text/linuxdoc-tools-0.9.72
 1907181903 metadata/md5-cache/app-text/simple-fb2-reader-1.1.2
-1902172109 metadata/md5-cache/app-text/libexttextcat-3.4.5
+1907302139 metadata/md5-cache/app-text/libexttextcat-3.4.5
 1907151840 metadata/md5-cache/app-text/binfind-0.0.3
 1907181903 metadata/md5-cache/app-text/agrep-2.04-r2
 1907282209 metadata/md5-cache/app-text/gtkspell-3.0.10
@@ -54996,7 +54979,7 @@
 1907181903 metadata/md5-cache/app-text/q-text-as-data-1.5.0
 1812180009 metadata/md5-cache/app-text/diction-1.14
 1907181903 metadata/md5-cache/app-text/aspell-0.60.7_rc1
-1809192139 metadata/md5-cache/app-text/libstaroffice-0.0.6
+1907310209 metadata/md5-cache/app-text/libstaroffice-0.0.6
 1907181903 metadata/md5-cache/app-text/uudeview-0.5.20-r2
 1901282239 metadata/md5-cache/app-text/enchant-2.2.3
 1907181903 metadata/md5-cache/app-text/dvipng-1.15-r1
@@ -55009,7 +54992,7 @@
 1907291240 metadata/md5-cache/app-text/dictd-1.12.1-r2
 1907181903 metadata/md5-cache/app-text/stardict-3.0.6-r3
 1907181903 metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r1
-1906182139 metadata/md5-cache/app-text/libmwaw-0.3.15
+1907310109 metadata/md5-cache/app-text/libmwaw-0.3.15
 1805010039 metadata/md5-cache/app-text/enchant-2.1.2
 1907242009 metadata/md5-cache/app-text/libgxps-0.3.0
 1805012209 metadata/md5-cache/app-text/mht-rip-0.8
@@ -55032,7 +55015,7 @@
 1805012209 metadata/md5-cache/app-text/gnopaster-0.0.9
 1907181903 metadata/md5-cache/app-text/sablotron-1.0.3-r1
 1907181903 metadata/md5-cache/app-text/tree-1.7.0-r1
-1907181903 metadata/md5-cache/app-text/libebook-0.1.2-r1
+1907310209 metadata/md5-cache/app-text/libebook-0.1.2-r1
 1903151709 metadata/md5-cache/app-text/xapian-omega-1.4.11
 1907181903 metadata/md5-cache/app-text/nfoview-1.24
 1907181903 metadata/md5-cache/app-text/itex2mml-1.5.6
@@ -55485,7 +55468,7 @@
 1907291240 metadata/md5-cache/www-apps/icingaweb2-2.6.2
 1907291240 metadata/md5-cache/www-apps/icingaweb2-9999
 1907181903 metadata/md5-cache/www-apps/liquid_feedback_core-2.2.3
-1902211339 metadata/md5-cache/www-apps/dspam-web-3.10.1
+1907310809 metadata/md5-cache/www-apps/dspam-web-3.10.1
 1806270309 metadata/md5-cache/www-apps/chromedriver-bin-2.40
 1907291240 metadata/md5-cache/www-apps/netbox-2.5.12
 1907280940 metadata/md5-cache/www-apps/nanoc-4.10.4
@@ -55498,7 +55481,7 @@
 1907291240 metadata/md5-cache/www-apps/postfixadmin-3.1
 1902211339 metadata/md5-cache/www-apps/ampache-3.8.3
 1907181903 metadata/md5-cache/www-apps/hugo-0.48
-1907300939 metadata/md5-cache/www-apps/Manifest.gz
+1907310809 metadata/md5-cache/www-apps/Manifest.gz
 1907181903 metadata/md5-cache/www-apps/scgi-1.14-r1
 1907291240 metadata/md5-cache/www-apps/zeppelin-bin-0.8.1
 1907291240 metadata/md5-cache/www-apps/netbox-2.6.1
@@ -55854,7 +55837,7 @@
 1907181903 metadata/md5-cache/sys-freebsd/freebsd-mk-defs-11.1
 1907181903 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1
 1907181903 metadata/md5-cache/sys-freebsd/freebsd-usbin-11.1_p1
-1907301709 metadata/md5-cache/Manifest.gz
+1907310809 metadata/md5-cache/Manifest.gz
 1907271740 metadata/md5-cache/gui-wm/sway-9999
 1907271740 metadata/md5-cache/gui-wm/Manifest.gz
 1907242009 metadata/md5-cache/gui-wm/sway-1.1.1
@@ -56196,6 +56179,7 @@
 1907291240 metadata/md5-cache/dev-util/android-sdk-update-manager-22.0.1
 1907210039 metadata/md5-cache/dev-util/include-what-you-use-7.0
 1907181903 metadata/md5-cache/dev-util/bitcoin-tx-0.16.3
+1907310209 metadata/md5-cache/dev-util/makepp-2.0.99.2
 1907181903 metadata/md5-cache/dev-util/mdds-1.4.3
 1907291240 metadata/md5-cache/dev-util/artifactory-bin-4.16.0-r1
 1907271740 metadata/md5-cache/dev-util/catkin-9999
@@ -56327,7 +56311,6 @@
 1907181903 metadata/md5-cache/dev-util/cgdb-0.6.8
 1810250139 metadata/md5-cache/dev-util/rebar-bin-3.6.2
 1907181903 metadata/md5-cache/dev-util/buildbot-www-1.1.2
-1902221739 metadata/md5-cache/dev-util/checkbashisms-2.19.3
 1907291409 metadata/md5-cache/dev-util/ccache-3.7.1
 1907210039 metadata/md5-cache/dev-util/creduce-2.8.0
 1907181903 metadata/md5-cache/dev-util/amtterm-1.6
@@ -56337,7 +56320,6 @@
 1907181903 metadata/md5-cache/dev-util/cdiff-1.0
 1907260009 metadata/md5-cache/dev-util/gdbus-codegen-2.60.6
 1808151104 metadata/md5-cache/dev-util/pretrace-0.4-r1
-1905201239 metadata/md5-cache/dev-util/checkbashisms-2.19.5
 1907291240 metadata/md5-cache/dev-util/drone-0.8.9
 1907181903 metadata/md5-cache/dev-util/shellcheck-0.4.6
 1906190339 metadata/md5-cache/dev-util/rustfmt-0.8.6
@@ -56377,7 +56359,7 @@
 1907181903 metadata/md5-cache/dev-util/crash-7.0.0
 1907181903 metadata/md5-cache/dev-util/android-tools-9.0.0_p3
 1905132109 metadata/md5-cache/dev-util/android-ndk-14b
-1907271740 metadata/md5-cache/dev-util/pkgcheck-9999
+1907301939 metadata/md5-cache/dev-util/pkgcheck-9999
 1907271539 metadata/md5-cache/dev-util/catfish-1.4.8
 1907292210 metadata/md5-cache/dev-util/xxdi-1.0.0
 1907181903 metadata/md5-cache/dev-util/debootstrap-1.0.89
@@ -56398,11 +56380,11 @@
 1907181903 metadata/md5-cache/dev-util/qbs-1.13.1
 1903021239 metadata/md5-cache/dev-util/cflow-1.6
 1907181903 metadata/md5-cache/dev-util/nvidia-cuda-sdk-8.0.44-r1
-1907301039 metadata/md5-cache/dev-util/Manifest.gz
+1907310809 metadata/md5-cache/dev-util/Manifest.gz
 1907221240 metadata/md5-cache/dev-util/xdelta-3.1.0
 1907181903 metadata/md5-cache/dev-util/dmake-4.12.2
 1907181903 metadata/md5-cache/dev-util/dissembler-0.9-r1
-1907181903 metadata/md5-cache/dev-util/lcov-1.9-r1
+1907310809 metadata/md5-cache/dev-util/lcov-1.9-r1
 1907181903 metadata/md5-cache/dev-util/wiggle-1.0
 1907271740 metadata/md5-cache/dev-util/squashmerge-9999
 1907181903 metadata/md5-cache/dev-util/mutrace-0.2-r1
@@ -56575,7 +56557,6 @@
 1907181903 metadata/md5-cache/dev-util/molecule-core-1.0.2-r1
 1907271740 metadata/md5-cache/dev-util/quilt-9999
 1805212239 metadata/md5-cache/dev-util/obs-service-meta-2
-1901211339 metadata/md5-cache/dev-util/checkbashisms-2.18.11
 1907210039 metadata/md5-cache/dev-util/creduce-2.9.0_pre20190414-r1
 1907181903 metadata/md5-cache/dev-util/xmlindent-0.2.17-r2
 1907291240 metadata/md5-cache/dev-util/drone-0.8.5
@@ -56706,6 +56687,7 @@
 1907291009 metadata/md5-cache/dev-util/bazel-0.26.1-r1
 1907291139 metadata/md5-cache/dev-util/shellcheck-bin-0.7.0
 1907210039 metadata/md5-cache/dev-util/lldb-8.0.0
+1907310209 metadata/md5-cache/dev-util/checkbashisms-2.19.6
 1707301308 metadata/md5-cache/dev-util/cwdiff-0.4.0
 1907181903 metadata/md5-cache/dev-util/indent-2.2.12
 1907210039 metadata/md5-cache/dev-util/include-what-you-use-6.0
@@ -56794,7 +56776,7 @@
 1907271740 metadata/md5-cache/dev-util/emilpro-9999
 1907181903 metadata/md5-cache/dev-util/scala-ide-4.7.0
 1907181903 metadata/md5-cache/dev-util/boost-build-1.65.0
-1907181903 metadata/md5-cache/dev-util/lcov-1.11
+1907310809 metadata/md5-cache/dev-util/lcov-1.11
 1907181903 metadata/md5-cache/dev-util/bakefile-0.2.9-r1
 1907181903 metadata/md5-cache/dev-util/bless-0.6.0-r3
 1907271740 metadata/md5-cache/dev-util/lldb-10.0.0.9999
@@ -58252,6 +58234,7 @@
 1907181903 metadata/md5-cache/media-fonts/glass-tty-vt220-001.3
 1907181903 metadata/md5-cache/media-fonts/source-pro-20170111
 1907181903 metadata/md5-cache/media-fonts/ibm-plex-1.4.1
+1907310009 metadata/md5-cache/media-fonts/fontawesome-5.9.0
 1907181903 metadata/md5-cache/media-fonts/ubuntu-font-family-0.83-r1
 1907181903 metadata/md5-cache/media-fonts/cm-unicode-0.7.0-r1
 1907181903 metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
@@ -58359,7 +58342,7 @@
 1907181903 metadata/md5-cache/media-fonts/font-bh-type1-1.0.3-r1
 1907181903 metadata/md5-cache/media-fonts/monoid-0.61
 1907181903 metadata/md5-cache/media-fonts/source-pro-20141211
-1907300510 metadata/md5-cache/media-fonts/Manifest.gz
+1907310009 metadata/md5-cache/media-fonts/Manifest.gz
 1907181903 metadata/md5-cache/media-fonts/oldstandard-2.2
 1907181903 metadata/md5-cache/media-fonts/ja-ipafonts-003.02-r1
 1907181903 metadata/md5-cache/media-fonts/open-sans-1
@@ -58593,7 +58576,7 @@
 1907271740 metadata/md5-cache/app-admin/needrestart-9999
 1907151840 metadata/md5-cache/app-admin/quickswitch-1.05
 1811090109 metadata/md5-cache/app-admin/lastpass-binary-component-4.19.0
-1907151840 metadata/md5-cache/app-admin/reportmagic-2.21
+1907310809 metadata/md5-cache/app-admin/reportmagic-2.21
 1706061008 metadata/md5-cache/app-admin/rcm-1.3.1
 1907181903 metadata/md5-cache/app-admin/cygwin-rebase-4.4.4
 1808310639 metadata/md5-cache/app-admin/superadduser-1.15
@@ -58809,7 +58792,7 @@
 1907181903 metadata/md5-cache/app-admin/consolehm-1.31
 1904142339 metadata/md5-cache/app-admin/terraform-0.11.12
 1907291240 metadata/md5-cache/app-admin/puppet-4.10.12
-1907300709 metadata/md5-cache/app-admin/Manifest.gz
+1907310809 metadata/md5-cache/app-admin/Manifest.gz
 1907271740 metadata/md5-cache/app-admin/diamond-9999
 1907291240 metadata/md5-cache/app-admin/fluentd-1.2.6-r1
 1907271740 metadata/md5-cache/app-admin/pass-9999
@@ -59511,7 +59494,7 @@
 1907181903 metadata/md5-cache/sci-mathematics/ginac-1.7.2
 1907221240 metadata/md5-cache/sci-mathematics/kodkod-1.5.2-r1
 1907181903 metadata/md5-cache/sci-mathematics/jags-4.1.0
-1805271108 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
+1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1907181903 metadata/md5-cache/sci-mathematics/gmm-5.1
 1907181903 metadata/md5-cache/sci-mathematics/form-4.2.0
 1907181903 metadata/md5-cache/sci-mathematics/wxmaxima-19.03.1
@@ -59549,7 +59532,7 @@
 1907181903 metadata/md5-cache/sci-mathematics/z3-4.8.5
 1907181903 metadata/md5-cache/sci-mathematics/factmsieve-76-r1
 1907181903 metadata/md5-cache/sci-mathematics/pari-2.9.4-r1
-1907300510 metadata/md5-cache/sci-mathematics/Manifest.gz
+1907310209 metadata/md5-cache/sci-mathematics/Manifest.gz
 1907181903 metadata/md5-cache/sci-mathematics/jags-4.0.0
 1808151104 metadata/md5-cache/sci-mathematics/nauty-2.5.9
 1907272209 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
@@ -60572,7 +60555,7 @@
 1907181903 metadata/md5-cache/sys-fs/fuse-zip-0.4.5
 1907181903 metadata/md5-cache/sys-fs/f2fs-tools-1.12.0-r1
 1907181903 metadata/md5-cache/sys-fs/snapraid-11.0-r1
-1907292239 metadata/md5-cache/sys-fs/Manifest.gz
+1907301809 metadata/md5-cache/sys-fs/Manifest.gz
 1907181903 metadata/md5-cache/sys-fs/mac-fdisk-0.1_p18
 1907292239 metadata/md5-cache/sys-fs/squashfs-tools-ng-0.5
 1907181903 metadata/md5-cache/sys-fs/libeatmydata-82
@@ -60637,7 +60620,7 @@
 1907271740 metadata/md5-cache/sys-fs/unionfs-fuse-9999
 1907181903 metadata/md5-cache/sys-fs/compsize-1.1
 1907072109 metadata/md5-cache/sys-fs/bindfs-1.14.1
-1907291939 metadata/md5-cache/sys-fs/udev-242
+1907301809 metadata/md5-cache/sys-fs/udev-242
 1907181903 metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
 1907181903 metadata/md5-cache/sys-fs/wpflash-0
 1805181539 metadata/md5-cache/sys-fs/ctmg-1.2
@@ -60919,7 +60902,7 @@
 1906101909 metadata/md5-cache/dev-perl/Bio-DB-HTS-3.01
 1812230010 metadata/md5-cache/dev-perl/Data-Perl-0.2.9-r1
 1812230010 metadata/md5-cache/dev-perl/XML-RSS-1.590.0
-1907181903 metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
+1907310809 metadata/md5-cache/dev-perl/GD-Barcode-1.150.0-r1
 1812230010 metadata/md5-cache/dev-perl/Math-Factor-XS-0.400.0
 1907181903 metadata/md5-cache/dev-perl/Mail-Sendmail-0.790.0-r1
 1907181903 metadata/md5-cache/dev-perl/Event-1.240.0
@@ -61408,7 +61391,7 @@
 1812230010 metadata/md5-cache/dev-perl/Devel-SmallProf-2.20.0-r3
 1907181903 metadata/md5-cache/dev-perl/Net-IP-1.260.0-r1
 1907282139 metadata/md5-cache/dev-perl/MLDBM-2.50.0
-1905220709 metadata/md5-cache/dev-perl/GD-2.560.0-r1
+1907310809 metadata/md5-cache/dev-perl/GD-2.560.0-r1
 1812230010 metadata/md5-cache/dev-perl/Syntax-Highlight-Engine-Simple-0.101.0
 1907181903 metadata/md5-cache/dev-perl/ExtUtils-XSBuilder-0.280.0-r1
 1906122039 metadata/md5-cache/dev-perl/TermReadKey-2.370.0
@@ -61561,7 +61544,7 @@
 1907181903 metadata/md5-cache/dev-perl/SOAP-Lite-1.190.0
 1907181903 metadata/md5-cache/dev-perl/YAML-1.150.0
 1907181903 metadata/md5-cache/dev-perl/Date-Leapyear-1.720.0-r1
-1907282039 metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
+1907310809 metadata/md5-cache/dev-perl/GD-Graph3d-0.630.0-r1
 1812230010 metadata/md5-cache/dev-perl/HTTP-MultiPartParser-0.20.0
 1907181903 metadata/md5-cache/dev-perl/Net-Google-SafeBrowsing-Blocklist-1.40.0-r1
 1812230010 metadata/md5-cache/dev-perl/Finance-Quote-1.470.0
@@ -61719,7 +61702,7 @@
 1812230010 metadata/md5-cache/dev-perl/Test-TCP-2.190.0-r1
 1812230010 metadata/md5-cache/dev-perl/Text-CSV-1.940.0
 1907181903 metadata/md5-cache/dev-perl/Exception-Warning-0.40.100-r1
-1812230010 metadata/md5-cache/dev-perl/Chart-2.4.10
+1907310809 metadata/md5-cache/dev-perl/Chart-2.4.10
 1812230010 metadata/md5-cache/dev-perl/CPAN-Uploader-0.103.13
 1812230010 metadata/md5-cache/dev-perl/String-Truncate-1.100.602
 1812230010 metadata/md5-cache/dev-perl/Test-Number-Delta-1.60.0
@@ -62000,7 +61983,7 @@
 1812230010 metadata/md5-cache/dev-perl/String-Flogger-1.101.245
 1907181903 metadata/md5-cache/dev-perl/Data-Dump-1.230.0
 1907181903 metadata/md5-cache/dev-perl/RTF-Writer-1.110.0-r2
-1907300510 metadata/md5-cache/dev-perl/Manifest.gz
+1907310809 metadata/md5-cache/dev-perl/Manifest.gz
 1812230010 metadata/md5-cache/dev-perl/Deliantra-1.300.0
 1812230010 metadata/md5-cache/dev-perl/XML-Compile-Cache-1.60.0
 1907282039 metadata/md5-cache/dev-perl/MooseX-FollowPBP-0.50.0-r1
@@ -62249,7 +62232,7 @@
 1812230010 metadata/md5-cache/dev-perl/Test-Command-0.110.0
 1812230010 metadata/md5-cache/dev-perl/Lab-Zhinst-1.20.0
 1812230010 metadata/md5-cache/dev-perl/ORLite-1.980.0-r1
-1907282009 metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
+1907310809 metadata/md5-cache/dev-perl/Template-GD-2.660.0-r1
 1907300510 metadata/md5-cache/dev-perl/Gtk2-ImageView-0.50.0-r2
 1907181903 metadata/md5-cache/dev-perl/Readonly-2.0.0
 1812230010 metadata/md5-cache/dev-perl/constant-defer-6.0.0
@@ -62319,7 +62302,7 @@
 1907181903 metadata/md5-cache/dev-perl/Test-Manifest-2.20.0
 1907181903 metadata/md5-cache/dev-perl/PatchReader-0.9.6-r1
 1907181903 metadata/md5-cache/dev-perl/Boulder-1.300.0-r1
-1907181903 metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
+1907310809 metadata/md5-cache/dev-perl/GD-SVG-0.330.0-r1
 1812230010 metadata/md5-cache/dev-perl/Authen-PAM-0.160.0-r2
 1812230010 metadata/md5-cache/dev-perl/Crypt-SmbHash-0.120.0-r2
 1812230010 metadata/md5-cache/dev-perl/Dist-Zilla-Plugin-RPM-0.15.0
@@ -62552,7 +62535,7 @@
 1907181903 metadata/md5-cache/dev-perl/Apache-SizeLimit-0.970.0-r1
 1812230010 metadata/md5-cache/dev-perl/Lab-Zhinst-0.30.0
 1812230010 metadata/md5-cache/dev-perl/MouseX-Types-0.60.0-r1
-1907282039 metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
+1907310809 metadata/md5-cache/dev-perl/GDTextUtil-0.860.0-r1
 1907181903 metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
 1812230010 metadata/md5-cache/dev-perl/Mojolicious-6.610.0
 1907181903 metadata/md5-cache/dev-perl/CGI-Simple-1.115.0
@@ -62678,7 +62661,7 @@
 1812230010 metadata/md5-cache/dev-perl/CSS-Tiny-1.200.0
 1812230010 metadata/md5-cache/dev-perl/Color-Calc-1.74.0
 1812230010 metadata/md5-cache/dev-perl/CGI-Session-4.480.0-r2
-1907181903 metadata/md5-cache/dev-perl/Ace-1.920.0-r3
+1907310809 metadata/md5-cache/dev-perl/Ace-1.920.0-r3
 1907282039 metadata/md5-cache/dev-perl/LaTeX-Driver-0.300.2
 1812230010 metadata/md5-cache/dev-perl/Pod-Elemental-PerlMunger-0.200.6
 1907292210 metadata/md5-cache/dev-perl/Crypt-OpenSSL-Bignum-0.90.0
@@ -62850,7 +62833,7 @@
 1812230010 metadata/md5-cache/dev-perl/String-Tokenizer-0.60.0
 1907181903 metadata/md5-cache/dev-perl/Math-Random-ISAAC-1.4.0-r1
 1907181903 metadata/md5-cache/dev-perl/Module-Refresh-0.170.0-r1
-1907282039 metadata/md5-cache/dev-perl/GDGraph-1.490.0
+1907310809 metadata/md5-cache/dev-perl/GDGraph-1.490.0
 1812230010 metadata/md5-cache/dev-perl/MooseX-LazyRequire-0.110.0
 1907282009 metadata/md5-cache/dev-perl/DateTime-Format-W3CDTF-0.70.0
 1907282039 metadata/md5-cache/dev-perl/LaTeX-Encode-0.92.0
@@ -63586,7 +63569,7 @@
 1907291240 metadata/md5-cache/app-backup/amanda-3.5-r1
 1906190339 metadata/md5-cache/app-backup/rdedup-1.0.2
 1907181903 metadata/md5-cache/app-backup/snapper-0.5.6-r1
-1907301339 metadata/md5-cache/app-backup/Manifest.gz
+1907302209 metadata/md5-cache/app-backup/Manifest.gz
 1907181903 metadata/md5-cache/app-backup/luckybackup-0.4.9
 1907291240 metadata/md5-cache/app-backup/bacula-9.4.4-r1
 1907291240 metadata/md5-cache/app-backup/bacula-9.4.2-r1
@@ -63611,6 +63594,7 @@
 1907181903 metadata/md5-cache/app-backup/dar-2.5.11
 1907271740 metadata/md5-cache/app-backup/mkstage4-9999
 1712281839 metadata/md5-cache/app-backup/mylvmbackup-0.14
+1907302209 metadata/md5-cache/app-backup/kup-0.7.3
 1907291240 metadata/md5-cache/app-backup/amanda-3.4.4
 1907181903 metadata/md5-cache/app-backup/borgweb-0.3.0
 1907181903 metadata/md5-cache/app-backup/rsnapshot-1.4.1
@@ -63695,7 +63679,7 @@
 1907181903 metadata/md5-cache/sci-electronics/quartus-prime-lite-15.1.0.185
 1907181903 metadata/md5-cache/sci-electronics/pulseview-0.4.1
 1907181903 metadata/md5-cache/sci-electronics/kicad-footprints-5.1.0
-1907181903 metadata/md5-cache/sci-electronics/kicad-5.1.2
+1907310009 metadata/md5-cache/sci-electronics/kicad-5.1.2
 1907181903 metadata/md5-cache/sci-electronics/librepcb-0.1.0-r1
 1702282330 metadata/md5-cache/sci-electronics/espresso-ab-1.0-r1
 1907181903 metadata/md5-cache/sci-electronics/oregano-0.69.1-r1
@@ -63712,7 +63696,7 @@
 1907181903 metadata/md5-cache/sci-electronics/xcircuit-3.7.48
 1907181903 metadata/md5-cache/sci-electronics/alliance-5.0.20110203
 1907181903 metadata/md5-cache/sci-electronics/gnetman-0.0.1_pre20110124
-1907280940 metadata/md5-cache/sci-electronics/Manifest.gz
+1907310009 metadata/md5-cache/sci-electronics/Manifest.gz
 1907181903 metadata/md5-cache/sci-electronics/linsmith-0.99.30-r1
 1907181903 metadata/md5-cache/sci-electronics/gwave-20090213-r1
 1907181903 metadata/md5-cache/sci-electronics/kicad-i18n-5.0.1
@@ -66553,7 +66537,6 @@
 1906011639 metadata/md5-cache/net-misc/ipv6calc-2.1.0
 1907181903 metadata/md5-cache/net-misc/wicd-1.7.4-r3
 1907181903 metadata/md5-cache/net-misc/netifrc-0.4.0
-1907300909 metadata/md5-cache/net-misc/electrum-3.3.6-r1
 1907291240 metadata/md5-cache/net-misc/ices-2.0.1-r1
 1705171708 metadata/md5-cache/net-misc/unix2tcp-0.8.2-r1
 1907181903 metadata/md5-cache/net-misc/netsed-0.01b
@@ -66733,6 +66716,7 @@
 1907181903 metadata/md5-cache/net-misc/remmina-1.3.3
 1907181903 metadata/md5-cache/net-misc/npapi-sdk-0.27.2
 1907181903 metadata/md5-cache/net-misc/omnisync-1.0-r1
+1907310609 metadata/md5-cache/net-misc/electrum-3.3.6-r2
 1907181903 metadata/md5-cache/net-misc/remmina-1.3.4
 1907181903 metadata/md5-cache/net-misc/streamlink-0.14.2-r1
 1907181903 metadata/md5-cache/net-misc/nx-3.5.0.33
@@ -66798,7 +66782,6 @@
 1907181903 metadata/md5-cache/net-misc/java-wakeonlan-1.0.0-r2
 1907271740 metadata/md5-cache/net-misc/lcr-9999
 1907181903 metadata/md5-cache/net-misc/lanmap-81-r2
-1907282339 metadata/md5-cache/net-misc/dhcpcd-8.0.1-r1
 1805012209 metadata/md5-cache/net-misc/throttle-1.2
 1902201609 metadata/md5-cache/net-misc/jlj-2.12-r1
 1907181903 metadata/md5-cache/net-misc/chrony-3.3
@@ -66911,7 +66894,7 @@
 1907181903 metadata/md5-cache/net-misc/connman-1.37
 1702282329 metadata/md5-cache/net-misc/dhcpd-pools-2.21
 1907271740 metadata/md5-cache/net-misc/whois-9999
-1907301709 metadata/md5-cache/net-misc/Manifest.gz
+1907310609 metadata/md5-cache/net-misc/Manifest.gz
 1702282329 metadata/md5-cache/net-misc/sshrc-0.6.1
 1907181903 metadata/md5-cache/net-misc/nxplayer-5.1.24.1
 1907271310 metadata/md5-cache/net-misc/mosh-1.3.2
@@ -66987,6 +66970,7 @@
 1906212209 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190618
 1907181903 metadata/md5-cache/net-misc/taylor-uucp-1.07-r2
 1907181903 metadata/md5-cache/net-misc/cgminer-4.10.0
+1907310009 metadata/md5-cache/net-misc/x2goclient-4.1.2.1-r1
 1907181903 metadata/md5-cache/net-misc/netifrc-0.5.1
 1907132309 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20190116
 1805012209 metadata/md5-cache/net-misc/netdate-1.2
@@ -67267,8 +67251,9 @@
 1907181903 metadata/md5-cache/dev-games/vamos-0.7.1
 1907181903 metadata/md5-cache/dev-games/mercator-0.3.3
 1907291240 metadata/md5-cache/dev-games/quake4-sdk-1.4.2
+1907310009 metadata/md5-cache/dev-games/freecell-solver-5.6.0-r1
 1907181903 metadata/md5-cache/dev-games/mygui-3.2.2
-1907291240 metadata/md5-cache/dev-games/Manifest.gz
+1907310009 metadata/md5-cache/dev-games/Manifest.gz
 1907181903 metadata/md5-cache/dev-games/ode-0.12
 1907181903 metadata/md5-cache/dev-games/ogre-1.11.2
 1907181903 metadata/md5-cache/dev-games/tiled-1.2.4
@@ -68266,7 +68251,7 @@
 1907181903 metadata/md5-cache/media-libs/libwebp-1.0.3
 1907181903 metadata/md5-cache/media-libs/libopenshot-0.2.4_pre20190609
 1907181903 metadata/md5-cache/media-libs/gavl-1.4.0-r1
-1808290939 metadata/md5-cache/media-libs/libpagemaker-0.0.4
+1907302339 metadata/md5-cache/media-libs/libpagemaker-0.0.4
 1907221240 metadata/md5-cache/media-libs/gegl-0.3.26
 1907181903 metadata/md5-cache/media-libs/libheif-1.4.0
 1907181903 metadata/md5-cache/media-libs/bcg729-1.0.4
@@ -68552,7 +68537,7 @@
 1907281709 metadata/md5-cache/media-libs/libaom-1.0.0-r2
 1907181903 metadata/md5-cache/media-libs/sdl-gfx-2.0.26
 1907181903 metadata/md5-cache/media-libs/vo-aacenc-0.1.3
-1907300510 metadata/md5-cache/media-libs/Manifest.gz
+1907302339 metadata/md5-cache/media-libs/Manifest.gz
 1907181903 metadata/md5-cache/media-libs/libsixel-1.8.1
 1808151104 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932
 1907221240 metadata/md5-cache/media-libs/libsndfile-1.0.28-r4
@@ -69060,6 +69045,7 @@
 1907181903 metadata/md5-cache/dev-tex/rubber-1.4
 1906051509 metadata/md5-cache/dev-tex/circuit_macros-8.4.1
 1902110239 metadata/md5-cache/dev-tex/biber-2.12
+1907302309 metadata/md5-cache/dev-tex/latex-beamer-3.56
 1907181903 metadata/md5-cache/dev-tex/hevea-2.31
 1907181903 metadata/md5-cache/dev-tex/texpower-0.2
 1907181903 metadata/md5-cache/dev-tex/flabels-1.0
@@ -69074,7 +69060,7 @@
 1903150809 metadata/md5-cache/dev-tex/curve-1.16-r1
 1907181903 metadata/md5-cache/dev-tex/pdfannotextractor-0.1l-r1
 1907181903 metadata/md5-cache/dev-tex/luatex-0.70.1-r2
-1907282339 metadata/md5-cache/dev-tex/Manifest.gz
+1907302309 metadata/md5-cache/dev-tex/Manifest.gz
 1907181903 metadata/md5-cache/dev-tex/glossaries-4.12-r1
 1907181903 metadata/md5-cache/dev-tex/pscyr-0.4d_beta9
 1907181903 metadata/md5-cache/dev-tex/frakturx-20070103
@@ -69105,7 +69091,6 @@
 1907181903 metadata/md5-cache/dev-tex/harvard-2.0.5
 1808151104 metadata/md5-cache/dev-tex/floatflt-1.31a-r1
 1907181903 metadata/md5-cache/dev-tex/minted-2.0
-1907181903 metadata/md5-cache/dev-tex/latex-beamer-3.41
 1808151104 metadata/md5-cache/dev-tex/biblatex-apa-7.4
 1901021339 metadata/md5-cache/dev-tex/biber-2.7
 1907181903 metadata/md5-cache/dev-tex/csindex-2.11c-r2
@@ -71111,6 +71096,7 @@
 1907181903 metadata/md5-cache/x11-plugins/wmcdplay-1.0_beta1
 1907181903 metadata/md5-cache/x11-plugins/wmtimer-2.92-r2
 1907181903 metadata/md5-cache/x11-plugins/asapm-3.1-r1
+1907310009 metadata/md5-cache/x11-plugins/wmbiff-0.4.34
 1907181903 metadata/md5-cache/x11-plugins/wmnetload-1.3-r6
 1812311309 metadata/md5-cache/x11-plugins/wmpasman-2.2
 1907181903 metadata/md5-cache/x11-plugins/wmhdplop-0.9.10
@@ -71132,6 +71118,7 @@
 1808251109 metadata/md5-cache/x11-plugins/wmforkplop-0.9.3-r3
 1907181903 metadata/md5-cache/x11-plugins/purple-mattermost-1.2
 1702282336 metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.2.2
+1907310009 metadata/md5-cache/x11-plugins/wmamixer-1.0-r1
 1907181903 metadata/md5-cache/x11-plugins/wmpop3-0.5.6a-r1
 1907181903 metadata/md5-cache/x11-plugins/wmitime-0.5-r1
 1809152339 metadata/md5-cache/x11-plugins/wmpager-1.2-r2
@@ -71149,7 +71136,6 @@
 1807262339 metadata/md5-cache/x11-plugins/wmdiskmon-0.0.2-r1
 1809221439 metadata/md5-cache/x11-plugins/wmmp3-0.12-r1
 1907181903 metadata/md5-cache/x11-plugins/asmon-0.71-r1
-1907181903 metadata/md5-cache/x11-plugins/wmbiff-0.4.30
 1907181903 metadata/md5-cache/x11-plugins/wmmon+smp-1.0-r3
 1903080839 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1907181903 metadata/md5-cache/x11-plugins/purple-libnotify-plus-2.99.1
@@ -71172,7 +71158,6 @@
 1907181903 metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
 1808022339 metadata/md5-cache/x11-plugins/wmping-0.2.1-r1
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
-1907181903 metadata/md5-cache/x11-plugins/wmbiff-0.4.31
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
 1907181903 metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
@@ -71181,9 +71166,11 @@
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
 1907181903 metadata/md5-cache/x11-plugins/wmXName-0.1-r1
 1907221240 metadata/md5-cache/x11-plugins/purple-plugin_pack-2.7.0-r1
+1907310239 metadata/md5-cache/x11-plugins/wmbiff-0.4.35
 1907181903 metadata/md5-cache/x11-plugins/pidgin-gpg-0.9.3
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
 1907181903 metadata/md5-cache/x11-plugins/wmsmixer-0.5.1-r1
+1907310009 metadata/md5-cache/x11-plugins/wmix-3.4
 1907181903 metadata/md5-cache/x11-plugins/wmSMPmon-3.1-r2
 1907181903 metadata/md5-cache/x11-plugins/asmon-0.71
 1907181903 metadata/md5-cache/x11-plugins/wmdots-0.2_beta-r1
@@ -71238,7 +71225,7 @@
 1907181903 metadata/md5-cache/x11-plugins/wmamixer-1.0
 1907181903 metadata/md5-cache/x11-plugins/wmget-0.6.1
 1805052238 metadata/md5-cache/x11-plugins/wmifs-1.8
-1907271740 metadata/md5-cache/x11-plugins/Manifest.gz
+1907310239 metadata/md5-cache/x11-plugins/Manifest.gz
 1907181903 metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
 1907181903 metadata/md5-cache/x11-plugins/wmmisc-1.2
 1907181903 metadata/md5-cache/x11-plugins/wmfsm-0.36
@@ -71254,7 +71241,7 @@
 1907181903 metadata/md5-cache/x11-plugins/wmbiff-0.4.33
 1907181903 metadata/md5-cache/x11-plugins/wmmemload-0.1.8-r1
 1907181903 metadata/md5-cache/x11-plugins/hexchat-javascript-0.3.1
-1907181903 metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
+1907310009 metadata/md5-cache/x11-plugins/wmfire-1.2.4-r3
 1907181903 metadata/md5-cache/x11-plugins/wmifinfo-0.10-r1
 1907181903 metadata/md5-cache/x11-plugins/bubblemon-1.46-r3
 1907181903 metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
@@ -71287,7 +71274,6 @@
 1907241139 metadata/md5-cache/x11-plugins/pidgin-telegram-1.4.1
 1907181903 metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
 1907181903 metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
-1907181903 metadata/md5-cache/x11-plugins/wmamixer-0.2
 1801192040 metadata/md5-cache/x11-plugins/vicious-2.3.1
 1907181903 metadata/md5-cache/x11-plugins/wmmenu-1.3-r2
 1805291638 metadata/md5-cache/x11-plugins/pidgin-mpris-0.2.6
@@ -71706,6 +71692,7 @@
 1906041809 metadata/md5-cache/app-emulation/wine-mono-4.7.5
 1907181903 metadata/md5-cache/app-emulation/xe-guest-utilities-6.2.0_p1120
 1907181903 metadata/md5-cache/app-emulation/vov-2.0.0
+1907310139 metadata/md5-cache/app-emulation/slirp4netns-0.4.0_beta2
 1907282309 metadata/md5-cache/app-emulation/spice-vdagent-0.19.0
 1907210839 metadata/md5-cache/app-emulation/cri-o-1.14.9
 1805121908 metadata/md5-cache/app-emulation/libspectrum-1.4.2
@@ -71717,6 +71704,7 @@
 1907221239 metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
 1805091208 metadata/md5-cache/app-emulation/libdsk-1.5.8
 1907220009 metadata/md5-cache/app-emulation/fs-uae-launcher-3.0.0
+1907310009 metadata/md5-cache/app-emulation/free42-2.4.2
 1907291240 metadata/md5-cache/app-emulation/virtualbox-modules-5.2.26
 1907181903 metadata/md5-cache/app-emulation/dynamips-0.2.18
 1902072239 metadata/md5-cache/app-emulation/go-secbench-0.1.0-r1
@@ -71848,7 +71836,7 @@
 1906230109 metadata/md5-cache/app-emulation/wine-mono-4.9.0
 1902211339 metadata/md5-cache/app-emulation/phpvirtualbox-5.2.1
 1902072239 metadata/md5-cache/app-emulation/img-0.5.6
-1907301709 metadata/md5-cache/app-emulation/Manifest.gz
+1907310139 metadata/md5-cache/app-emulation/Manifest.gz
 1907181903 metadata/md5-cache/app-emulation/playonlinux-4.3.4
 1907271740 metadata/md5-cache/app-emulation/docker-gc-9999
 1902112109 metadata/md5-cache/app-emulation/virtio-win-0.1.160
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b52632b8885e..922bcb97dc2b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Jul 2019 14:30:01 +0000
+Wed, 31 Jul 2019 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fe72383c3765..7f5e3014a357 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5dabd54c6ff02f97c4d3ade51aa2bb7cf4b1a80a 1564494247 2019-07-30T13:44:07+00:00
+e5fb1deca49ffb33d5c98544f2647b997be6ba9f 1564547743 2019-07-31T04:35:43+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0826f0263a41..48146538785c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1564495501 Tue 30 Jul 2019 02:05:01 PM UTC
+1564551301 Wed 31 Jul 2019 05:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d86338d7f7bd..407ac8a95bbe 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 30 Jul 2019 14:09:00 +0000
+Wed, 31 Jul 2019 05:38:57 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6cf726d7003d..a15f5dfa3d5d 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest
index a2ce7cc8d9a6..ab1abb260b3e 100644
--- a/net-analyzer/squid-graph/Manifest
+++ b/net-analyzer/squid-graph/Manifest
@@ -1,3 +1,3 @@
 DIST squid-graph-3.2.tar.gz 20066 BLAKE2B 16c4b9621ad45eefe7be8c83d7339fb832516241e8eb17c7f0906b6dc7cddf06b2ed32d00e84ab390f95f7a57798f7af75a36af940605ce186513c09611c2152 SHA512 ab2529b0b67fb6549dd0837f2208ae712460ad19876baee8000a51c91ab31c464b83b360dfc93690ad6f4b3feb969cc95ca38a179ddefb6e0aa54b0cff866bfd
-EBUILD squid-graph-3.2-r1.ebuild 476 BLAKE2B 20f7043064320e636d1019b7d128f670f393a8d644147f47942922e724b5ecb075e0e9b939de9a32bd3596729d75468a3b8ee23ca4dd44793317492c8461d44c SHA512 6a7c6deb475718b5b10a9d6f3fbabd85e7a412211bd7e8743f60a3ac4506566ffc165504cf90030d63eaf7f57c01085469231359ce13845344fa91364f0e608d
+EBUILD squid-graph-3.2-r1.ebuild 478 BLAKE2B 19d7d79525a3bb2fbe4619bc7ce5e8bbb8991a65db242f93b242e2e0a45ce6bfa5e61cb4e42cd06fc486f322a7f1b5d71aeae13e377b976e60e58c7edbbb9289 SHA512 2073dd5f11f68ec6f3164fe6962b8cd1c0ea975628ac1c23b2e3d0f5a7522fa34fbe46e3e190f3a51de0583e9527cf460f2d15a5a1217e0605b899aa9e416577
 MISC metadata.xml 440 BLAKE2B 3a2323e854cf053276baf26c951e546fbe3ad63edbd4d753525795faee01e724ba385c7d60b2aec7fa5422670d7cf5958d30d5a6b01cc87c8751152b5360f3fd SHA512 32c8207098291a0c1d4248d3d2a6c726a9627c038be9df16aa9368ae20c6dfd63380152c79b3348d990fa61ea8acc220a87bafe3e3f5ba9913686b142aea23d2
diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
index a532f9ba04d6..2d14d8885f1b 100644
--- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="dev-perl/GD[png]"
 
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 607dfd77a641..c42534d9913e 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 6d1513962138..2aa6feb0db1e 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,5 +1,5 @@
-DIST skypeforlinux_8.48.0.51-1.x86_64.rpm 98611419 BLAKE2B e9d987c8f2d8cceee104951c6ec8307dfd19487cc2635eadd3fc6cbfde9857785c823aca41c1157f2c01fc4ee1ecc2cb43d862f06da873f9bc94c2cfde0f9634 SHA512 ced4df76ba20f6c4c7b27930755494c4336295462fc9cc54a8fc15fdf5ed6f2484e7a9d02e68f894c47bafcab42af9924207ffbf5d9fb8c0f0c6ca0aac4e8a37
 DIST skypeforlinux_8.49.0.49-1.x86_64.rpm 97788725 BLAKE2B 4a13134053dc02683de1adebab395713c7f3bb734f429197993a3c38fdcfc423cffe0ffaacdac0b377d156ad65ae9c1780a31fabce8d5949f8cc1a933eb271dd SHA512 825b2a39a411dbe99b40b7666f06762ca9d1f2e1e03689a1cc2853eb27a0233bf2746be9e6174ffac8fbb0cc0a47230b83589dca7d4685b8dedf70167b1e0faa
-EBUILD skypeforlinux-8.48.0.51.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
+DIST skypeforlinux_8.50.0.38-1.x86_64.rpm 97771604 BLAKE2B bf3ed5cb99618162076d1fed448abfe063db4dc51e4c5ec6a8d0abc1e1cd304466550b410c7dfa5de6c3a41a1ff6520a0d6a91a3689719c9772ce74117147ba1 SHA512 1b8a3dbd506acbadb9083b9c39e9933fe1e847a9f55724a2bef3d6611b8242ef8da5a0c05396231baf86f8ac09e0a9237d1a241a22e2da79e64c5564eb93cc84
 EBUILD skypeforlinux-8.49.0.49.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
+EBUILD skypeforlinux-8.50.0.38.ebuild 3290 BLAKE2B 6ba778ac15813855972a0f8a7841186e23b42766a465db44c825b699cf79e5a399c540c71ec0705b243bbe08c73c02efc9077495c4cf1f77edd8ef6e07463171 SHA512 50e044c7e7e5ae986d8465e9842dc8aebf8a888076c192ad4fcb0597010da224358f2ea7bf2e9de0f29108c6ae4563b6bc2af0337d29e2c45303d77a5f707b48
 MISC metadata.xml 678 BLAKE2B 08cae428a7267eb18dd5bbb460dcb617a8eaaf33ccce7229f90e3031f526125922b84d445577e91620e01ccaf789109c331bb11a03362cec9c15ad85162f4b43 SHA512 5372348bd01b1e828c29866180e85e9230ade0aa36f23bfcc89fb10dbf7f1b92530ac00c9dd0fe9977061a660abf9780ab2e59069db2115fb2dacbc5e3ffd26a
diff --git a/net-im/skypeforlinux/skypeforlinux-8.48.0.51.ebuild b/net-im/skypeforlinux/skypeforlinux-8.50.0.38.ebuild
similarity index 100%
rename from net-im/skypeforlinux/skypeforlinux-8.48.0.51.ebuild
rename to net-im/skypeforlinux/skypeforlinux-8.50.0.38.ebuild
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 61e6385172fd..aa8d6a2eab8f 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 99d00db1d5a0..cf124da9cbfd 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -17,7 +17,7 @@ DIST mailutils-3.5.tar.xz 2742824 BLAKE2B ca14597114203234912cf4cfaa4c63e682561d
 DIST mailutils-3.6.tar.xz 2813412 BLAKE2B fa2cde98287f84745c1ccc213d2ee824857b9c64d493677ed817ae53d49576382d22784ad25faa644ca43528637ed629aa4e9a78a3b1040fd51658e54b369399 SHA512 f07b8dc570abf345d45439f4994173d2415f94d72291aac46528842e339aaa7925baf776ccfc8f8901cf0e08a13cbfdf09596dd6c448bf012af002ef5ce2fe0e
 DIST mailutils-3.7.tar.xz 2846864 BLAKE2B d407d370a4823972c060ea6c6a6e16eefe46598fee8302159f9d44fe150ace32b6915e7e3d4ddaca63ed5d5a5cffce48514f7f6297413a97692eb609a295622d SHA512 aa93ee1cde76392808f492dae6c69625ab124a2c31a296449ba217fc26f292871b4d04f8720bf20377177eab33c01cbfe195d6ac3674c35e1db53157a6916a4d
 EBUILD mailutils-3.4-r2.ebuild 3534 BLAKE2B 1b0c89e319679cce912a36f7a1ffe92aaa91cded84a266f488b0a8b562f49e24b8c854e4a8ae2fe685c8eda5be7b1b8fe8c9f06ee353bed8352934550a1ab330 SHA512 e7039f88004a9a7924e845c5818c97d6feb58ae8d892112c6df33ad2bd638a02ade58815e7a5565cc1d5d7d7516931e5d18075a2aaffed25cb05cae6850f9b25
-EBUILD mailutils-3.4-r3.ebuild 3665 BLAKE2B 1a2a62f7403ad10f534fdfdf9898fb9e24467450fbcad54d0f3c0b7d4a289ed36d400cbf24a11ea92acc2e8f6a8a621dfbb7cebbb55b5d6c246ced31d6af0228 SHA512 1cb84032c3c433bad161c8412f5138719ac8a311f4e904b74a653ce0fbaa7f176f8dfd7cfdc676060a35c7a7808059a8f744949d7b7a1913d1f48d2766db2219
+EBUILD mailutils-3.4-r3.ebuild 3664 BLAKE2B 16ac7c0f85b17250c2d5f0e7989cbb96baf19cfd14ad11609d6652060a2ae8d9dfc0d9546ecf9fef9d5a2ec5d9b59196533e25117bf23a593bb88ce23a82bbbd SHA512 f07931b6a0ed00f451507241045569a540ea2b9ff0f34d407f7cf9f6203f91ca3ae2e2fe8d7afbc456e0915e06e5db92b03ae0fb1645d8cb208cc62a2690bdde
 EBUILD mailutils-3.5.ebuild 3432 BLAKE2B dd1a295f0776e886a98d0ba8a0a9e02a7cbdd72bc666c7b36d741a0d379069a3dda4e5e3f6c251b419f32c9bacd21bbc043cb4ac4084880a994e7e6a479ece94 SHA512 5c1690a79b99ef37fb8a30b7bcf0da5b62a418eb774962f303c4ee2d4619ddb75ed4dc3d1d514d110087517d4f35c4fa5f49e00a9a3dc686526fd734dca92702
 EBUILD mailutils-3.6.ebuild 3658 BLAKE2B 0d057e62a4d6b9fd57fcfda4fe23d90e24359cb2e8f74b7ba5433cddb1afe358439bd1d59d38c861f114318dd7896033f55d9c8a822428289568b78f68cab170 SHA512 2f67561308afea43378dfceaf157701775d2ae9703afeafb84bbfae2b720277e7bd79025aaab0c9a97b4aa298ded1d6f203899dc7d3947990a460580667a467e
 EBUILD mailutils-3.7.ebuild 3619 BLAKE2B acb7c1ca9fa7fabcb6713440bcfe7987b67179ccb687bf3b8247071a2cbf43a6852865362b9ea148c033b8587766bd575198a41001e25c9f823f7b12f9e75072 SHA512 434d96f09388488e44facf0bf973846ff3d324da5adbcc64335fd5f0da5b9a7367f7a35856e806e6c6e5e9c36ea624b84b96b80789648e8bf8652742a32c5891
diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild
index 20411ad71538..b929a50b63ad 100644
--- a/net-mail/mailutils/mailutils-3.4-r3.ebuild
+++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
 	ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \
 	tokyocabinet"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4492c1d474f8..7d8a60404353 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 8245e1e1f59e..a3708d2efc93 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,12 +1,8 @@
-AUX dhcpcd-8.0.1-delete_tmpfiles.patch 869 BLAKE2B 3ce9cb22d2db41cdfda25731a654d7e97a1b43181250f5568b168d29055bdf73ae5e0a96238e90e83aa0fc9587287af2823ed7ed623a80b52038f62f59e9adb5 SHA512 88056dc0657a72b2f7e1fd749f5f746a79142a6ed0b60f7d82696861c29329d548c3cc310bc11bb0723b8a4f39cd8eba68928ba32299af55f8a5f20fc4d679f0
-AUX dhcpcd-8.0.1-fix_check_for_open_memstream.patch 713 BLAKE2B b022c690f8c35b20f7bf2581c955c2480280c171794d40ac5782b6de92adfef8694cca3348022d0f8997aff36f55b23aef96b0f1c137f567f5228a6e98f91c3b SHA512 23e258221c76bada8eda626f264af454bb08e6ecee1cad99492a1705e5cf0740cd0ea0230fcbea70557f0ab2333bac382935cf2684e0f4e0606e3a6ef581b31b
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
-DIST dhcpcd-8.0.1.tar.xz 221716 BLAKE2B 597831ed9a965170d0dc9ffdaa8ab34e209b14fa6183ed7a0b915f545d654db32d0994eb9e6f12953f5b81220abfc186ac72da1cd3e60f8b0cdee21da4be56dd SHA512 2931345fb50b63a49ee97b290dbb236895dd13a19ce17bf40b50797cf93ea959272de698718593f882ba0c35e2f733b5476135759f46bd04a8e8f11e81ba9f3f
 DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
 EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.1-r1.ebuild 4530 BLAKE2B 8672d39a8455c0f5f1657718c4312b35b5023624d792d8a1032bfd9ab54b6445165fab860db901a2aa16185b30d423062cbe66890f0ca6b60e1401f8c027bc8a SHA512 cc281d2405e91dd515168c8aa426d9c821591c3335ccac7d9a2e2f6afc0689754a178104d1b7ffd3dffce95269ed9dc16edb27e8db0c339fa20f4ded98c05700
 EBUILD dhcpcd-8.0.2.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild
deleted file mode 100644
index 2c0d5a53ff00..000000000000
--- a/net-misc/dhcpcd/dhcpcd-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-delete_tmpfiles.patch"
-	"${FILESDIR}/${P}-fix_check_for_open_memstream.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch
deleted file mode 100644
index 0bc625ac11d0..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-delete_tmpfiles.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 79846b358f6ea8d0a6027ee0ba38342a730065b0 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 28 Jul 2019 11:49:17 +0100
-Subject: script: ensure that tmp files are removed
-
-fopen creates a new stream which will use a new fd.
-Why using fdopen, the new stream will use the same fd, so when
-it's closed the tmp file will really unlink.
----
- src/script.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/script.c b/src/script.c
-index 1863a661..74aef1b1 100644
---- a/src/script.c
-+++ b/src/script.c
-@@ -213,10 +213,11 @@ make_env(const struct interface *ifp, const char *reason)
- 	if (tmpfd == -1)
- 		goto eexit;
- 	unlink(tmpfile);
--	fp = fopen(tmpfile, "w+");
--	close(tmpfd);
--	if (fp == NULL)
-+	fp = fdopen(tmpfd, "w+");
-+	if (fp == NULL) {
-+		close(tmpfd);
- 		goto eexit;
-+	}
- #endif
- 
- #ifdef INET
--- 
-cgit v1.2.1
-
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch
deleted file mode 100644
index 89ed2afa9871..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-8.0.1-fix_check_for_open_memstream.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fa7f0d1e0a57bfaca49e1cfdc3d292ef1d68001a Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 28 Jul 2019 12:53:03 +0100
-Subject: configure: Fix test for open_memstream
-
-glibc-2.19 needs the return value testing....
----
- configure | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index d25eec56..50058520 100755
---- a/configure
-+++ b/configure
-@@ -747,8 +747,7 @@ if [ -z "$OPEN_MEMSTREAM" ]; then
- 	cat <<EOF >_open_memstream.c
- #include <stdio.h>
- int main(void) {
--	open_memstream(NULL, NULL);
--	return 0;
-+	return open_memstream(NULL, NULL) != NULL ? 0 : 1;
- }
- EOF
- 	if $XCC _open_memstream.c -o _open_memstream 2>&3; then
--- 
-cgit v1.2.1
-
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index 11ac5372df16..9059c97bfab0 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
 EBUILD econnman-1.1.ebuild 669 BLAKE2B 67f4294d07535d80c2cab9355fe933e0ddef5261b120ff2ae624f7b9f2541649abc6196d73c7cd892087f7c53047bb6b6259b595a18adc38dc1d88156938582f SHA512 279f4dc4688fc1888b45ba87e6b9981aa56f279b886c9915bd4fc3bcc7a6879d7af187466872b8a83f7d75a0a51784b86ac473a0e76ea13bcccbfe8a3bb943ee
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-misc/econnman/metadata.xml b/net-misc/econnman/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/net-misc/econnman/metadata.xml
+++ b/net-misc/econnman/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 02d4d5c0365c..d4d56bc6b49d 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -8,5 +8,5 @@ DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd5
 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 EBUILD electrum-3.1.3-r1.ebuild 4320 BLAKE2B 84d8e4688ac9d9cd5a79aa46f8ba7e52e710dc4e7aa5c6148d01de506e460ca84f6fb9ba6344afc8c276fe60c2c6f5cb143fb61a0908067a15c976ea875bae25 SHA512 778f32e95f0de35aa98b1c82a77264c3fc623c6f03d3c0494ae0da880dd533ad9e9660a5b448326de95c89920996b4b209e920416e11e6958d117fcb66dd0614
 EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
-EBUILD electrum-3.3.6-r1.ebuild 4646 BLAKE2B e2aaf3faedffb22656783f300f9ec5d882d118322265e0435dac60ead23e1b8bbaee689375d0130c0258e9f029789220c92397d0ccca60beac094b96cfd73b17 SHA512 6ecb376b5ffd2cd74eeab28e184e508b7fc4258683f04b8f474fec9317f10ec94c87182fab8a593ab29045e6c9d6e1cb1fd6e790a3cda151fd26afbdc323759e
-MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
+EBUILD electrum-3.3.6-r2.ebuild 4548 BLAKE2B 05a2b7975c225fb0a4846e0ab978c38c5b0b9f185bb4c880e8b3b346d873c54671ffcab55493cdd141a592b3ea8293994022745f71384fe8b863736ee65d37cc SHA512 2b49663f37946e474810513b7a5df40eff72fb266313ef40f17b242829829ffebcd777618846607a770fee088bdd99488f55b2dbcd7fadd7883a6fb5cb2e726d
+MISC metadata.xml 1572 BLAKE2B 4681012dbca54a822c32dcbb5eab12718294c138343ac2469426678a85647dedc892a14e2287d0aaf2291e9d9b029796a29f32f6ae82ac6b56d7a9acb49295f3 SHA512 83bedb1cbb9c5260c7260b7e83c2105742c0403ceafae9857b4491abfd070ec3248f918d3a11bb7c93973714fb46af3864bdd85075d075bfb94f2ec6b9aca82b
diff --git a/net-misc/electrum/electrum-3.3.6-r1.ebuild b/net-misc/electrum/electrum-3.3.6-r2.ebuild
similarity index 95%
rename from net-misc/electrum/electrum-3.3.6-r1.ebuild
rename to net-misc/electrum/electrum-3.3.6-r2.ebuild
index 330ad0367b47..d9b89c1d8736 100644
--- a/net-misc/electrum/electrum-3.3.6-r1.ebuild
+++ b/net-misc/electrum/electrum-3.3.6-r2.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
@@ -48,7 +48,7 @@ REQUIRED_USE="
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
@@ -59,7 +59,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
@@ -163,16 +162,12 @@ src_install() {
 	distutils-r1_src_install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index b3234f5ca5c7..4f3345beaed9 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 1e4922873459..a9803d2f12a7 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,4 +1,6 @@
+AUX x2goclient-4.1.2.1-gentoo-17.1.patch 996 BLAKE2B afc5538457142b93deb80832bbfe37352844289304ff07d2bbdb1251b082e471ddba787db5267109a594dd101e936a1552a20d75d8a7e27fc125f4c835ecc54f SHA512 a76e819aae1b8150bf219f58a29c24979bc11c6d49346c3a486d16573819d3663e93e5ef3070c9389a9d0c8c76bcdc4d904cfdf669bdd25176d0c365b2b5b502
 AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55
 DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369
+EBUILD x2goclient-4.1.2.1-r1.ebuild 1459 BLAKE2B 09c635edf46779b6448f885d27900186938fd9695865029a896b476d82f78568888f64c03cb99fb30381c5780923cf9684bb013d6ed1535abde7e9dbcf9089f1 SHA512 c129a3a931fd6f228ac4d7ee2e58025692801ae198c995e683e18026033df680bde4d4e586bb21cbbab2ea33162056f848d611bdb88601a713108088a03dea0a
 EBUILD x2goclient-4.1.2.1.ebuild 1419 BLAKE2B 3d5c8683105bb9f6b37e7111343891eb773b3ba1a8fd6755d0cae28ea9509852d1675be7bd67eb74cec52cca218d0cef222002763fb0ebf3486b2d919578b614 SHA512 5877bf18d4b5cb4db3c6541f754ed8a92d3f8d5b058e44eaab052b7b0ed8cf5b4ca9b9a201931a9d0cd176a40b2c37071050144d8901a090f8b397fbf1d79d94
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
new file mode 100644
index 000000000000..b9a63264be99
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
@@ -0,0 +1,14 @@
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301
+
+diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
+index cb6bb72..cd97e6c 100644
+--- a/src/onmainwindow.cpp
++++ b/src/onmainwindow.cpp
+@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles()
+                      << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
+                      << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
+                      << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
++                     << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */
+                      << "/usr/lib/misc" /* Gentoo */
+                      << "/run/current-system/sw/bin" /* NixOS */
+                      << "/usr/libexec"; /* Slackware, OS X */
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
new file mode 100644
index 000000000000..953c984a775f
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=net-libs/libssh-0.7.5-r2
+	net-print/cups
+	x11-libs/libXpm
+	ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt511.patch"
+	"${FILESDIR}/${P}-gentoo-17.1.patch"
+)
+
+src_prepare() {
+	default
+
+	if ! use ldap; then
+		sed -e "s/-lldap//" -i x2goclient.pro || die
+		sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+	fi
+}
+
+src_configure() {
+	eqmake5 "${S}"/x2goclient.pro
+}
+
+src_install() {
+	dobin ${PN}
+
+	local size
+	for size in 16 32 48 64 128 ; do
+		doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+	done
+	newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+	insinto /usr/share/pixmaps
+	doins res/img/icons/${PN}.xpm
+
+	domenu desktop/${PN}.desktop
+	doman man/man?/*
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 7bba9bb6817a..f3f8dc2de6f3 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index deda453b78d5..9009c3dca5f2 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,41 +1,5 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
-DIST cpuminer-opt-3.8.8.1.tar.gz 1709515 BLAKE2B cecf9f57093fd89cef459cdc0d591a5de4bb12126a931dd9bfee0fc9b08a7ec4b5bb087ad383f14492b3da3066bac695f0022e1dfc595c7e331c9517b4b44db6 SHA512 5dd254237231abb84312c31be97952d1e1f1cd6c4fa0efc409581afb1a28d9783816b9efdb07501d67b99b831bce0a290e5cc2b3ce6c915a3e76b00edd582560
-DIST cpuminer-opt-3.9.0.1.tar.gz 1744675 BLAKE2B e1dff3bafd1c60bd67dbeca6acad4ee48a00bf0d77512686ac5b2bd9f375eee4a6e9b32c891f195bb98c4a48ac0f52a6da91bc51e28017dd811bf975d8c0550f SHA512 f807f9f7416983363116a07b12a191227907e26a658f6cd00f5556292785c27f6b56df9998a06bc1e44769bd549a5be75acd6986d446dd885b8b49763fde1731
-DIST cpuminer-opt-3.9.0.tar.gz 1744113 BLAKE2B 0fef9ead2218284032d70df4d823f43896a72a06c91612b3a9981a89bb51c890d3fe54707af80d2ebe3ceb513ef98c3e7b036b9ec0a9767ff5b969bed2a26318 SHA512 beb3faf8f2b765f7f995274e247b59590c3cebf2f6d46ce39abac8ecec322cabfc4b2acc087686f9c701c2c32d96b5d1f95d34413ec70c727b58f67054fc2603
-DIST cpuminer-opt-3.9.1.1.tar.gz 1771289 BLAKE2B c3a0cdb6793d1590bca11fac736d2d9e0bc200a391f2f440f7e005e6d61c90c331bc856055a1cf207a5abed934caa421e6d291372e293467ad2738039f491f96 SHA512 fdbbc60f433ae810522ca22b1709ee2052de90631cd68d5581fa2297ad549093bc64b0f4ec6900986ec56e16b84ead111f8d8a796b7e654c675b0585990e266d
-DIST cpuminer-opt-3.9.1.tar.gz 1770345 BLAKE2B c2ef3111f1c1f034d2e4d4148031cf4fa099484e4bc54e8266323bdff26cbd90a390bb4bc0e77b095227bb3c0026a1b6d791bebb5345e74462650fe4be0e688d SHA512 ca83b2b325947591e77b8edd7f920043d3422259e9e60a7549066d1290c60b7b108dd91c4f8731e8ffb3932d2d430a0b0f02e6b384b03a939e32c6dd4329732b
-DIST cpuminer-opt-3.9.2.2.tar.gz 1774934 BLAKE2B 2a686a9b50978ff6a3947c1086fedda9bd608575f639670680a3e5fc6e8758bdd8478037b1474f456e33783a37a5d51b0557714d715e9840c6f3f33a14709727 SHA512 4c6f9ac422b0fb4f1194cbca025f0a596a73462d07b6c76da3c8b5f8f8e93ac8421e6c5d318e8615806aabffe5c46c1174f51a887abb059854e434376567f770
-DIST cpuminer-opt-3.9.2.3.tar.gz 1777161 BLAKE2B add68199a46ef4989bb062e52fc64ed660148a4aa9030608ae9d89fa08fea7a96d7851036289aac1c4c051c66347b860006a642cb4afcf8bc78e4b91258f62ea SHA512 d4c7dd80b8fd37387250dc8e088b6438badb388d1be9622f83e34d3590892121833b9dd5e1b609b95740f4f0b89da5bb568ab3527970dfca947cc5e1ade7df0c
-DIST cpuminer-opt-3.9.2.4.tar.gz 1777767 BLAKE2B 47269d66576f7920564f18244f857c1de46dd43d656c7b150ebc8a24b0302598c3efa89c01e6ae6a07d34942e71e5a8dc4af49fd35840abd560f63dc93176c58 SHA512 ec74abad31059a31b7c16b30a06b759563730c0f0cbfd5d5be84ff0dbb167c2e5b794b1531fbd8735aa87fa4a7f624cec6a496ed1f4627073f70d59366495995
-DIST cpuminer-opt-3.9.2.5.tar.gz 1781488 BLAKE2B cd79f8cc363918d6db62b1970086a5758a717ca7f7fed6d204f8e83db43b777d3d5915c3195fcc3256d79dd7d849ca5cac96c47d844ea5129a2823e96a5ca806 SHA512 3ad01cfbda9cd6ecf1e2a2f178989da2c18f6fa7add940be7176bab65b0adafdc87f0f1dec77ddfc36a939940867a58188618ba0881fc08baa0125e240501366
-DIST cpuminer-opt-3.9.2.tar.gz 1770769 BLAKE2B 75413f98b522e30647c9e312e1a23ee5dd3d761780dad7617b68b20d08e123ddd256f70f1494f565abe67997bb1c5fd1401ccd21e7f5492182c7ec2619bc8e00 SHA512 ce12c867706a3caed0104859a8f2366af85497b493f8c2a8c87a45f430abb45a29c415889c8f219450ac2f4e10bd4482f6dbe9dd125e1dde98c8a25e3fdad8c8
-DIST cpuminer-opt-3.9.3.1.tar.gz 1781503 BLAKE2B 3f5df07d6d68343bb074367e3296e08c7e958edfcd3c2d63da83b98e8ce635a8b27d0c871061087908840b665a27556833de8d8106557f6794e9ad35d5a9d53e SHA512 d8f0c298c03e4f309f28a2b555f039212d66e6a9804fa2a1f7d0a8bd3d69969c48f1ac51570b10d5bf9bc695f7a9f91e884298d85d1b6a876d5d3a8974d3b890
-DIST cpuminer-opt-3.9.4.tar.gz 1787750 BLAKE2B 74c3304f743c7650968f90606f7f12fa26b316634f29c5157cbe774ecbe155cc950d9ab44c227909aacbabba4af98379e22a971956a1b8560ce4c096822d6a88 SHA512 f2dc2dbdafb7c7028521aeec5212df87274b6a5f130c116e58fc575d4cd30dcaf10b4ff59f79e782bc6466db65758770c2f4717e446641e29a3eb9ccf4770011
-DIST cpuminer-opt-3.9.5.1.tar.gz 1789716 BLAKE2B 8c2eb876837f86d39c9c665392172654fee8a969c0463e76adf47c1ae631f268ebfacfdddd662c5edb79db3469af2299916a54c3b3ec88a8d3bce62878a0ecb0 SHA512 1da67a4a063781502bc7a2062331388205c6bedec1bbbfd447727b4d3aa23591d794ba8c4b59a9671f232d102298b448b539e54f723d86525ee19ae1e4d7fe52
-DIST cpuminer-opt-3.9.5.2.tar.gz 1790289 BLAKE2B 3007e73d7b833f132b1fb50def05f3af5401a4c9d9bd603b8170da07f673eadd9d0033822861636ab3cef7140cf2311e7400864f5030e0b834ef4fa03673a90b SHA512 027e36bdd59e59a7a8e98e7ded40d8f4f5045813db6ff86553b67e5d719dbc4b1281ac185f340ad70e0af463ac03179f42fd979299f42b801018890e55bbe825
-DIST cpuminer-opt-3.9.5.3.tar.gz 1791944 BLAKE2B 7712ac9f1e66acc304a4d2bc6bd026fbf608bc33266b982cf1b302e804f2d7f9954cae75acc643a8755570ecd7ace3216c2ce0be9ed2f56e571c5d77cac71d94 SHA512 2463238275856706bc37b56d235e0ab3c5f17122bc4d01cd8bdcb638a1e87e762e500cf7c1b65f0dd450400ab9b003dfd43b55d23476e46f15f95c2a8d3c18f0
-DIST cpuminer-opt-3.9.5.4.tar.gz 1784097 BLAKE2B 2be0d57549e8ce326d1ba543a35c87d723b1d5f36225d6201f193156220b29afa601269db1b5de52c1da8c9eaf5e9d3089ef5a8c6232cd462f3b2b11b521d5c2 SHA512 9924bd01c4cfa134c551457d8405700b04dc9b1d7f241b0d5172aad9d0090f95135465e628353a0e02763da16d420ee4c396b36d1544cc613b5b1025eccc7b52
-DIST cpuminer-opt-3.9.5.tar.gz 1787557 BLAKE2B e6d5623c2752a4dc6eae669e6daba2f3a0a8542863a3268e632b6d0e4ee2cf203614cebd8e41e33d71c58262bfc90d1df0c7eab0d72db28d8df6f40795bfd887 SHA512 7fc2d7afa9a85a6ec9a9a87eee18f68e61f4875b579bcca3e8d4fc4541a3085ae59b566d2851b978abdf27efeeaa310db430c3efce07bb422548d0bddfda1fa4
-DIST cpuminer-opt-3.9.6.1.tar.gz 1792601 BLAKE2B ea9fcbf534e9556adc800299600fc0225a086a29475f0ca93432faa7b24b769f0c991e762945669c9de6f831113389c843a84ae827b57b1f24cdc1407764826c SHA512 08fa96930765cb5a7c8306795beeedb3474af8245454f61f5bf174064afe98d958cbc081e9c77225a16b2391267f35e95e6a52c8221657f5e03ae4804d591088
-DIST cpuminer-opt-3.9.6.tar.gz 1789491 BLAKE2B d850ab596e373bc6a69c7b89123ed049221e91850b04910147f4830c02872494a97ce84783c8164a5e57eefbd4a8fe1367ae8781e24ad36cdbe21d526b9643f2 SHA512 aa20b21d47a3eaf9d512febd588c1d57c1ae9ea41c4b6c3818dd398cd5f50ef791014de2ec8ec68efe0be80f2d2748122bc373bcd2fb6dde5d274d78d615afb1
-EBUILD cpuminer-opt-3.8.8.1-r1.ebuild 1029 BLAKE2B 3b78792a9c3e6eeceef1b01e8ffb3541c169c44b9d21c294856a2e9624f6b6106a5f7ba2e9f743f3e3bb97e14986d352fdda69dea944906aa87e4e843a5bf1fd SHA512 2927d9dfd2ea681153c77cb592bba5d447ea8954d9a99a0743cd86bc695349529105ef5f06e0219814bbfead0ede171c4bbb7352edfbfa2bb32d8b144b2e727d
-EBUILD cpuminer-opt-3.9.0.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.0.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
-EBUILD cpuminer-opt-3.9.1.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.2.2.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.2.3.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.2.4.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.2.5.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.2.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.3.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.4.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.5.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.5.2.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.5.3.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.5.4.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.5.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.6.1.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
-EBUILD cpuminer-opt-3.9.6.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
+DIST cpuminer-opt-3.9.6.2.tar.gz 1796238 BLAKE2B 5c9ef9e04897ac8e62196bb54606b407ae5df7f48074f91c202a7323f9ebfa5c44361df99ed83f9c67e69080580c9bf1e29607b491c872a2f1385c8c42444940 SHA512 92e96724fc40d974cd80d61c19c7d46b6581ec0e63328bf940cade12231240fa17f26639a6c344cf19c20ea6e6f7dc4178dea7db51a4c7ec85a66ab5e4a5e59d
+EBUILD cpuminer-opt-3.9.6.2.ebuild 1029 BLAKE2B 1e238f5aada517af0133dbf179c4d51acf846f5a662493cba79eae1ece319cf40cdda84b047c148c8a5955ca48e3263efb181f61e5e7ed2a38cd94ed6ce7d7b5 SHA512 9a032a2b707a639cc14e300ee6e3060da1240a405a593e8cae1fa4b4bb9ceba76a8d43f143bc5b38ce2983cc3038abbf1a14b811099b60b32f18f6bc84ff0730
 EBUILD cpuminer-opt-9999.ebuild 1029 BLAKE2B 03505cb48293bd884d6ff25944aad5d5aed6d2fe8888d07f16529900d5589f3550ac02f3f2e6e24ec70e65a7059d1f0e05e8377fbaff98385c8d23b2005f5670 SHA512 1ca7351712bb25fa0245e281bf23a18bc7d2b778cd8e16969c25cde8702f65519855b30a7c3d171e0ee7b58dc61b8e4c66d91643d8aaf5c68a6829d209735663
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.1-r1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.1-r1.ebuild
deleted file mode 100644
index 38cf197f4977..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.8.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.ebuild
deleted file mode 100644
index 837ad5101bc1..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.2.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.3.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.3.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.4.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.5.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.5.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.3.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.3.1.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.4.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.1.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.2.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.2.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.3.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.3.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.4.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.4.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.1.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.2.ebuild
similarity index 100%
rename from net-p2p/cpuminer-opt/cpuminer-opt-3.9.0.1.ebuild
rename to net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.2.ebuild
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.ebuild
deleted file mode 100644
index 666d27ee1c02..000000000000
--- a/net-p2p/cpuminer-opt/cpuminer-opt-3.9.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Optimized multi algo CPU miner"
-HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
-IUSE="cpu_flags_x86_sse2 curl libressl"
-LICENSE="GPL-2"
-SLOT="0"
-REQUIRED_USE="cpu_flags_x86_sse2"
-DEPEND="
-	dev-libs/gmp:0
-	dev-libs/jansson
-	>=net-misc/curl-7.15[ssl]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-RDEPEND="${DEPEND}"
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	econf --with-crypto --with-curl
-}
-
-src_install() {
-	default
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	insinto "/etc/${PN}"
-	doins cpuminer-conf.json
-}
-
-src_test() {
-	./cpuminer --cputest || die
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 65671c109bc1..7691998bf03b 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 9becc7f2cde9..9d7a5a3bb637 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -9,10 +9,6 @@ dev-util/bcc test
 # not yet keyworded
 dev-java/openjdk javafx
 
-# Aaron Bauman <bman@gentoo.org> (2019-05-27)
-# plasma is not stable yet
-kde-frameworks/purpose kaccounts
-
 # Aaron Bauman <bman@gentoo.org> (2019-05-20)
 # doc USE ultimately pulls in dev-lang/ocaml[ocamlopt]
 media-gfx/enblend doc
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index d6e9c8b4abe1..94e14b70c2a9 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -22,14 +22,6 @@ virtual/notification-daemon gnome
 # packages for these USE flags fail tests
 media-libs/opencv contrib_cvv contrib_hdf contrib_sfm glog gstreamer
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
-# kde-frameworks/kconfig is not stable for arm64
-net-libs/libproxy kde
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
-# kde-plasma/polkit-kde-agent is not stable for arm64
-sys-auth/polkit kde
-
 # Mart Raudsepp <leio@gentoo.org> (2019-01-18)
 # Respective x11-drivers/ not tested and stable yet
 x11-base/xorg-drivers input_devices_elographics input_devices_joystick input_devices_void video_cards_dummy video_cards_fbdev video_cards_nouveau
diff --git a/profiles/base/package.use.stable.force b/profiles/base/package.use.stable.force
index 70f03ad755e2..bac5f6a6f2f2 100644
--- a/profiles/base/package.use.stable.force
+++ b/profiles/base/package.use.stable.force
@@ -3,3 +3,9 @@
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.force
+
+## Kent Fredric <kentnl@gentoo.org> (2019-07-11)
+# The absense of these features require dev-perl/GD, which currently
+# can't be considered stable due to serious defects upstream.
+# Bug #661634
+sci-biology/bioperl minimal
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 55b688cb9ffd..8d29faa7e9ee 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,22 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Kent Fredric <kentnl@gentoo.org> (2019-07-30)
+# These features require dev-perl/GD, which currently can't be
+# considered stable due to serious defects upstream. Bug #661634
+app-admin/yaala gd
+app-misc/gcstar stats
+app-misc/g15daemon perl
+dev-lang/php coverage
+dev-util/lcov png
+dev-perl/Business-ISBN barcode
+dev-perl/Template-Toolkit gd
+media-fonts/unifont utils fontforge
+media-video/vdrsync dvdr
+net-analyzer/openvas-manager extras
+www-apps/bugzilla extras
+www-apps/otrs gd
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
 # sci-libs/dcmtk is not stable
 media-libs/openimageio dicom
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 15193c2678b3..6a40c48b8b0d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1325,6 +1325,10 @@ app-text/stardict:wordnet - Enable wordnet plugin to find similar English words
 app-text/stardict:xdxfparse - Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)
 app-text/stardict:youdaodict - Enable youdao.com network plugin (for Chinese language)
 app-text/sword:clucene - Use dev-cpp/clucene for lucene search support
+app-text/tessdata_best:osd - Enable support orientation and script detection.
+app-text/tessdata_fast:osd - Enable support orientation and script detection.
+app-text/tessdata_legacy:math - Enable support for recognition of equations.
+app-text/tessdata_legacy:osd - Enable support orientation and script detection.
 app-text/tesseract:math - Enable support for recognition of equations.
 app-text/tesseract:opencl - Enable opencl support for speedup using GPU computation.
 app-text/tesseract:osd - Enable support orientation and script detection.
@@ -3935,6 +3939,7 @@ kde-plasma/plasma-workspace:appstream - Enable AppStream software metadata suppo
 kde-plasma/plasma-workspace:geolocation - Enables dataengine providing location information
 kde-plasma/plasma-workspace:prison - Enable support for barcodes/QRcodes
 kde-plasma/plasma-workspace:qalculate - Enable Qalculate runner using sci-libs/libqalculate
+kde-plasma/plasma-workspace:qrcode - Enable support for creating QR codes from clipboard data using kde-frameworks/prison
 kde-plasma/powerdevil:brightness-control - Enable screen brightness control using app-misc/ddcutil
 kde-plasma/powerdevil:wireless - Enable wireless energy saving actions via kde-frameworks/bluez-qt and kde-frameworks/networkmanager-qt
 kde-plasma/systemsettings:classic - Enable classic mode plugin, requires kde-frameworks/khtml
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 55e6b7ff82ee..e36c1aa1945f 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d238af501161..a183145c0000 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -14,5 +14,5 @@ DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff
 EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625
 EBUILD kicad-5.0.1.ebuild 3462 BLAKE2B c15ef73ec7bd3522522fc61e274ecbfd6ea3110829dae3afe8e64516147a1d513354b09c67e6728b4216ab4ac5f9753495770ed50577a9ef3628aaac73da7b28 SHA512 3914612ebf357708a24524c24b7e9442019baa32c98f339d6b5b1cf9a7d5c611f0c257b126a01dbf135efdfd604a2793ad5ca97ec3fab59034a81126f6ea3f75
 EBUILD kicad-5.1.0.ebuild 3493 BLAKE2B 1298dbbcd0682a881ba56afd82ab8e4887d6f0a5b10942feace1af116095bbcafcfe1b11de375ec6d24fa89d32c7c2066d84eb4aba303347c36f251d015b7a03 SHA512 a95da3de07e43c4337ccc7bc717901633337d56be34c77fc01993275dc6e96fe991bcbf882ea546c34f6bcbfe5bcaa323563540d695f6bb81f21e6886e4c2c5e
-EBUILD kicad-5.1.2.ebuild 3569 BLAKE2B 49b1ffbf9ff3286eab1385d009ab205a53b5d484ac22f1ee5d34210eeb20809526bffb9c4faa54e9ff800c76a6ca489197dbb65efe7c960dcc652e2980394c96 SHA512 280e89bad0f39b33311a5ae81f44c0f0da82eae4df6cb66e798e8cc734faecbc768f01104352de031e9df3995d3b08a49b3d9e400ac9b80005362b81c33bfe0b
+EBUILD kicad-5.1.2.ebuild 3571 BLAKE2B e4dd2286a9baee4ea2d65e75acc20f5b9a406c3000f69f882ac24389eec0aafbdd75045057041b6d7afcc69e597ed5dd93a4c88a2e4c594ceadf0d3f740fc42f SHA512 771eb7a214f54f98a6a1b83b3b8db327c7081f42274bb9d374c3727436ac25f0935c800002ec31208b9b4be25b33796b986f55bc0c314468364551f5a969368e
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild b/sci-electronics/kicad/kicad-5.1.2.ebuild
index b7c67c325a93..c739de95232c 100644
--- a/sci-electronics/kicad/kicad-5.1.2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2.ebuild
@@ -3,7 +3,7 @@
 
 # Can switch to EAPI=7 when wxwidgets eclass also supports it
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 WX_GTK_VER="3.0-gtk3"
 
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a36459fa4948..f4092b647a7f 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cantera/Manifest b/sci-libs/cantera/Manifest
index 976ab9e4faeb..0de1aac66598 100644
--- a/sci-libs/cantera/Manifest
+++ b/sci-libs/cantera/Manifest
@@ -1,6 +1,4 @@
 AUX cantera_2.4.0_env.patch 3559 BLAKE2B 07af1b751b653b1c92288286b9c82ef230ea0df7d9ea4036d23ac24338a221cc45c8e74f137fcf741bb9bb7148e7f3339f54234e9a92ac939956ba7c0ca8e157 SHA512 f2574c3de42d1666a2b64914c66d97045a2a3598f63678b3b60a701d111d7bfc9bd71031dd665a64e6791c9f311fb9514b1a0462a5713763a1b5f87fcd72e528
-AUX cantera_2.4.0_libdirname_variable.patch 1252 BLAKE2B 324ff20163a45f7a23fce17b291f36278c3f4a1afbefc09a62b9570230f030c023e77a70dbc034a8006579c6bd4664bda25ff7c9b963a9289bc8d01a03f6edb4 SHA512 19f4909cd5a9edeafbf5bc6f1af7192b30196d59c1e154d6c7dd80c69ee71d15dc8f799e97940c1c0f29905177bb60405be2e8640fc29a215957a4de8f097fdc
 DIST cantera-2.4.0.tar.gz 2321316 BLAKE2B 40750e3864afa3d35817e6f5777a6ac235261e9d134ef749966dbd738a2af5efec2882e6dcc719851f88656b41469e2159d3bff3df32f6abdf57db3b0a2afcae SHA512 8bb0fee34fa5bc9ec78e6f21a100eaa77bdd966bd0b7f0fa27d452e4f122c69e61648beef847178490f5c5d56267a96f6081cac9ccd03cea153c32814e0e84e9
 EBUILD cantera-2.4.0-r1.ebuild 2845 BLAKE2B b3761011ca55477721c6611d0f808bc4b9c95e62518c4c1cbe69f1bc27ec37ea03955a7995699634d0c6aae1fe35cc9781e7e694d255fde018e590c9519628e6 SHA512 92f3cc1d2e71d02474fec596f1787536c4246f8f4d2902e57c38f25f737efe3b3bc085c61869939148f7be2fa3321b92a30f742471c44b89b5b7fca9f9e824d3
-EBUILD cantera-2.4.0.ebuild 3304 BLAKE2B d8d1ffaa3a7d70bb34e6c2982ad2640e9a1db9b94bb6e9a9eff3c2c3361398362858a4b700b33413c7b7ee8bd6d03410d0e9eaad0f73b5328f74ba7a1f140eaf SHA512 a81c574f2858a7999647d9bf340b13eb24436575016632526d8a132359f257654da084b9aaa5026adc627d2240dd5ced5294e6788a01e55229769becf55bf698
 MISC metadata.xml 792 BLAKE2B 8f5617f3f6d8047a15e0fcd14a2e11647fc2a7442759434fb98ce2492b962edf38ba662570bfa627c7db10ef00cf945d73029ade83a5c34d8e21adadaae26454 SHA512 0bc11e72add5ab1e31e0ac5ec7b2c85be2757c0cc4d56d0df16e9a7afdea89f5ec6fd2f46a730d4caf25eeba66de0405631acf64fe271272f2348f3fdeaf7515
diff --git a/sci-libs/cantera/cantera-2.4.0.ebuild b/sci-libs/cantera/cantera-2.4.0.ebuild
deleted file mode 100644
index 6e83a5c6988c..000000000000
--- a/sci-libs/cantera/cantera-2.4.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit desktop fortran-2 python-single-r1 scons-utils toolchain-funcs
-
-DESCRIPTION="Object-oriented tool suite for chemical kinetics, thermodynamics, and transport"
-HOMEPAGE="http://www.cantera.org"
-SRC_URI="https://github.com/Cantera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cti fortran pch +python test"
-
-REQUIRED_USE="
-	cti? ( ${PYTHON_REQUIRED_USE} )
-	python? ( cti )
-	${PYTHON_REQUIRED_USE}
-	"
-
-RDEPEND="
-	python? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sci-libs/sundials:0=
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-cpp/eigen
-	dev-libs/boost
-	dev-libs/libfmt
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-cpp/gtest-1.8.0
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}_${PV}_libdirname_variable.patch" )
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# patch to work 'scons test' properly in case of set up 'renamed_shared_libraries="no"' option
-	sed -i "s/, libs=\['cantera_shared'\]//" "${S}"/test_problems/SConscript || die "failed to modify 'test_problems/SConscript'"
-	# patch env to pass CCACHE_DIR variable
-	sed -i "s/ENV={'PATH': os.environ\['PATH'\]}/ENV={'PATH': os.environ\['PATH'\], 'CCACHE_DIR': os.environ.get('CCACHE_DIR','')}/" "${S}"/SConstruct || die "failed to modify 'SConstruct'"
-}
-
-## Full list of configuration options of Cantera is presented here:
-## http://cantera.org/docs/sphinx/html/compiling/config-options.html
-
-src_configure() {
-	scons_vars=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		cc_flags="${CXXFLAGS}"
-		cxx_flags="-std=c++11"
-		debug="no"
-		FORTRAN="$(tc-getFC)"
-		FORTRANFLAGS="${CXXFLAGS}"
-		renamed_shared_libraries="no"
-		use_pch=$(usex pch)
-## In some cases other order can break the detection of right location of Boost: ##
-		system_fmt="y"
-		system_sundials="y"
-		system_eigen="y"
-		env_vars="all"
-		extra_inc_dirs="/usr/include/eigen3"
-	)
-	use test || scons_vars+=( googletest="none" )
-
-	scons_targets=(
-		f90_interface=$(usex fortran y n)
-		python2_package="none"
-	)
-
-	if use cti ; then
-		local scons_python=$(usex python full minimal)
-		scons_targets+=( python3_package="${scons_python}" python3_cmd="${EPYTHON}" )
-	else
-		scons_targets+=( python3_package="none" )
-	fi
-}
-
-src_compile() {
-	escons build "${scons_vars[@]}" "${scons_targets[@]}" prefix="/usr"
-}
-
-src_test() {
-	escons test
-}
-
-src_install() {
-	escons install stage_dir="${D%/}" libdirname="$(get_libdir)"
-	if ! use cti ; then
-		rm -r "${D%/}/usr/share/man" || die "Can't remove man files."
-	else
-		# Run the byte-compile of modules
-		python_optimize "${D%/}/$(python_get_sitedir)/${PN}"
-	fi
-}
-
-pkg_postinst() {
-	if use cti && ! use python ; then
-		elog "Cantera was build without 'python' use-flag therefore the CTI tool 'ck2cti'"
-		elog "will convert Chemkin files to Cantera format without verification of kinetic mechanism."
-	fi
-
-	local post_msg=$(usex fortran "and Fortran " "")
-	elog "C++ ${post_msg}samples are installed to '/usr/share/${PN}/samples/' directory."
-
-	if use python ; then
-		elog "Python examples are installed to '$(python_get_sitedir)/${PN}/examples/' directories."
-	fi
-}
diff --git a/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch b/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
deleted file mode 100644
index a16f5670b550..000000000000
--- a/sci-libs/cantera/files/cantera_2.4.0_libdirname_variable.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur old/SConstruct new/SConstruct
---- old/SConstruct	2018-08-24 16:24:45.000000000 +0300
-+++ new/SConstruct	2018-11-05 03:07:07.000000000 +0300
-@@ -327,6 +327,10 @@
-         'prefix',
-         'Set this to the directory where Cantera should be installed.',
-         defaults.prefix, PathVariable.PathAccept),
-+    PathVariable(
-+        'libdirname',
-+        'Set this to the directory where Cantera libraries should be installed.',
-+        '', PathVariable.PathAccept),
-     EnumVariable(
-         'python_package',
-         """If you plan to work in Python, then you need the ``full`` Cantera Python
-@@ -1465,10 +1469,9 @@
- # *** Set additional configuration variables ***
- # **********************************************
- 
--# Some distributions (e.g. Fedora/RHEL) use 'lib64' instead of 'lib' on 64-bit systems
--if any(name.startswith('/usr/lib64/python') for name in sys.path):
--    env['libdirname'] = 'lib64'
--else:
-+# Some distributions use 'lib64' (e.g. Fedora/RHEL) or something else instead of 'lib' on 64-bit systems.
-+# If user didn't set 'libdirname' configuration variable set it to default value 'lib'
-+if not env['libdirname']:
-     env['libdirname'] = 'lib'
- 
- # On Debian-based systems, need to special-case installation to
diff --git a/sci-libs/sundials/Manifest b/sci-libs/sundials/Manifest
index 22e4ccc853f0..e1de506801e1 100644
--- a/sci-libs/sundials/Manifest
+++ b/sci-libs/sundials/Manifest
@@ -1,20 +1,10 @@
-AUX sundials-2.7.0-underlinking-libdir.patch 19659 BLAKE2B 9dab5796e7f64528df06a435433719bbd34f6f9868ab6d88ec59e32777c4513c995bebe3f4e32b91cfb000328c6ae307a1c29cd34acd21cd9485668c3783b991 SHA512 95bc36d359b672b725391d75540304fac6b2610960f67a636cf5656e30904a2ed309a75175f4d20b9199d70d45fa817e53e86433ff18dfcf28ef76840b9d0dba
-AUX sundials-3.1.2-fix-license-install-path.patch 388 BLAKE2B f4d1e6eacc87c0978b3311bb24876db5ff77d0e0c2e6a369746a7320c0279ec4c46cf359fa81677c0eda63d28e37f5d283dea9809ff0c5126e4386addabab63e SHA512 9a675e33d93a8c1c6500d6297e362abdf4d81d56575175eb05c8b51a9d1f993406cd8fcb80a5d7be68d9578db11233f0857ae74bba2df96a7a95691fde51222d
 AUX sundials-3.2.1-fix-license-install-path.patch 335 BLAKE2B ac9a2c33fabf13cb55876f39836006b1b145395311800bd052f5e0784b7926fab4ffd4abf2bb0047d69fbd5feccdec026bf7f7c115fb4f130c8419c6e8986dcb SHA512 7ac45a8932a273330fcf6fecb355cbbcf83038240fd06db6e20eb54a51a137266d033c7fe513f73b72e252509b0105d4de48fffedb4adff2ce8e5187e26b7ac3
-AUX sundials-4.0.2-fix-license-install-path.patch 320 BLAKE2B 59274a4354f1a9bf6424e0eba19fdd8e01ec97f505c0439d4aff409c842d8052520938abe35652012ddd040625c77c0fd62a00f706a42c06ba7ec7dcafa58050 SHA512 714ff9c373991ebec9917ff68244af11ddd152f46c6286d45b8bcbfa08f7ca85e3de6f2f77733a44f845024dcd8c21f7acad705950ecead914ddab16167fe2dc
-AUX sundials-4.1.0-fix-license-install-path.patch 320 BLAKE2B 954793b037653c8cadd5a35a0cdec7c90a1c2cb5a0b584f974d2aa0888a605b502e684949b17431a2278dc28f3bb77b654b8a38574dca385234692b8577dc15b SHA512 5945e9a21748368b8004a4f768409c1b6de2da0d61198ecdc7cfcc0cff8a5b6c1536fcb5558fc8dbe79dd01107cf2d629d0823e57583f652f2d82c3182437476
-DIST sundials-2.7.0.tar.gz 12258093 BLAKE2B 331fcf255f2bb8bcc798818b05db114feda7aacb6585177a836f17a9b58477f504099b4a33c7d71cab6e70eeb6fe47a76d101c08aa6219ee6fbac630524d5928 SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
-DIST sundials-3.0.0.tar.gz 12996039 BLAKE2B 0557190f6f7550bd4d7d3df10f727c6f235ff4917f2cfd35ca77785037edc43236a82383664f6fe1579bb5b07a148875b82b22f5a9e4f5f2a0607838e8a3b286 SHA512 3c86c7f27e64c2e6732546b0b1e87ea092502e361cae09b3b7eb29795c978edf494e17be13b78541dc91cc0709d928006bd0fc62ea968f2b621efa51856cdd60
-DIST sundials-3.1.0.tar.gz 13033516 BLAKE2B 41294c1022ab09db6fbfa0d41c169d2ead3483693653a9c0cc26fdffec61918fed5e93241f64f9bfdc6ff22812fb846f3ea8deecd82c28d179dded85ec2c69ba SHA512 288427e00f58c512583cc14d81385e82b0fdeaa4e9adca588a108ad0752341b7be62c9fa2740924ec733e3e0d5794f305dc582fc72e244e675e5ea00ac0d08ca
-DIST sundials-3.1.2.tar.gz 18212893 BLAKE2B cee897f59920d6530553e4005b043fe615bf86ed6cc4ecb829afc25ea46c1a37cefd5a05584bd763af29689980d7bb03442ad22c4b83dd3af2406e786540652a SHA512 b65989998b440b2b5c5d000f4b86d8bcbf03215fcee4e348cd4b8ff935ea3471a3593ab8bd0e7d5f8ba519b5a1285cc93d41ec622d0b51592d7593c7579af082
+AUX sundials-4.0.2-fix-license-install-path.patch 479 BLAKE2B d77b43b2d30978dce198f51917286b208cc1baccb4230a2eaf9f1e656a23e1b1980bf7c86a4a4bd16a5210b16083aec4e05b316af5a42f6a64631a843d79f7f9 SHA512 99baa802dd367159a82c57997421aad938b52babf3c2444957f46fe9affcd57e9524a6ef0fecdf3ef973e95a032f3dec37487794e397e45db515db01af2893dd
+AUX sundials-4.1.0-fix-license-install-path.patch 479 BLAKE2B c87cf483663f970aba2352e6831fcce7ead9ec7ce3c9a8e451e47481b0c663d698df98ffc62bbc9b6e6117188fcf1272a491b9df1a77d4acadf0625dbcdf2d26 SHA512 a8fa64f8d16e09b86b08910b395f17f2bfdcd82667b789a85bef87591ecdb9b0f01630f9dd65e7892f36261d3ef42ce12c95e980be29669dd74cc6469bd4ea87
 DIST sundials-3.2.1.tar.gz 14958699 BLAKE2B ecc4b454ec589e9177acc9375e1db370ad6281f8d29580d9558ad3146dbbaab52794013e9cb56ad83f7309dbd3084a1ccaf6972c6b1468cefcc86bf30d3a460c SHA512 1f3e4b12f368e4f50c38b970c012f1702e339319ee0a858661bdf83e5739bb5b8a36f98b82e2ef76d1ce8a473123046347ee1b44f3cb685509823864f0af1384
 DIST sundials-4.0.2.tar.gz 17183377 BLAKE2B e322a978186f41d84a936faa55962ef6794bf99d6c6a108bfa2bd5615f27f32f7ab6ca4989802fa052d3132b53dca3069b7e4ec9941f95efb92de7bf0792dd88 SHA512 6d0a6fc49c695e70593da71892f0906585dee9c94899bb6b8c9a56c85f345809565166a62544647fdac411d22e37276b9b1bb78ba9be46eaeb28dcd3f6162ef5
 DIST sundials-4.1.0.tar.gz 17221960 BLAKE2B 598c7adc9e37fcfb1f44a3235f58af489ad907d053cb67ee0d3b076076621958374eb847e48318ddf7ced85a7601c5330ac640c7abe8723aaee7d650e3298b8d SHA512 1922dca3f0b8869098670aede802e48abec39607c96304e4efd9b03d195b16920175846fce10641aeebc48c216bda73c8691139dce57ffa7731a6bc8194b81b0
-EBUILD sundials-2.7.0.ebuild 2065 BLAKE2B 54faae8f12f0594f7fb97a5bcaadfad2851872d9371e151bd64b5b350ee46d3bcbee8b203770f1ca538d7a7bcdb55dd23db5d457ac5ec52da078e3bdb2e011f3 SHA512 38671b242ca205636353097386b2f185cdcc9448aef1c7fe3d8f1977f4877274202708a6c89ddfc7bf8cc17e4609a5d107456364150f7a8fb67c3a3a62c67742
-EBUILD sundials-3.0.0.ebuild 2253 BLAKE2B e546ea8f864ac81002528ab329f820d9ad10ecc57625a5110f4b97152901b5b3da8191d44299f85ac95b7e9a1c036c5de8c7a3ef5c46647611a48f8fd9f995e3 SHA512 1e4e9db8640c3d29a8001c088de40f8feba6ce3bda6d76d20d462ea1d7f84213bc644c8499ec99a8125618d180202de010003f819c98b21833c3b4538f976100
-EBUILD sundials-3.1.0.ebuild 2227 BLAKE2B 88fbb7206514de8b715e641585507f5cd662676ddadd0bfbad91539e770823456e5412a7e9620f425c8651a226cfa53bbb6bc3f8c56b523454863916de521a25 SHA512 22db26dd50955f3fe6debbe7fcaba20e54bfed4427f64d5b8ebc337f3f6ba240434c18381dc9abdf336ea30dfc011a346fc8d7cd7f0d88da638ba7a6f45ed50c
-EBUILD sundials-3.1.2.ebuild 2277 BLAKE2B 70f0f03abd27d68479491239dec51534472e77e8da5e83ccf9684612eb0993bbb7eb8a227dd34088c1a988b0287ba421ac767517040d7d4fe9a6e298e2791cc8 SHA512 d39a91985d42808f6514d755e5d94e0650e90e11193afa8b39b677015f914fcc8d5ca2d4460027feb4333da18ff928b6a0308f37bc36ac6fefc63f011de4456f
 EBUILD sundials-3.2.1.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.0.2.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
 EBUILD sundials-4.1.0.ebuild 2054 BLAKE2B 478d94f66348574f7f6f39acd026532a4b7cdb496473ad526db55b185bba569ebd17e5899b44b3841920152d65e690b863ac03a2030912850cbee8b956f17eeb SHA512 9931d3f771b41b7630513136a716326992e86182237053c6fc09f92f4598f2ce5906d35d095a952b785446bbe97038c50c926370ee99ad70449be11fca47cbac
-MISC metadata.xml 1063 BLAKE2B 9fcc89ceb3553bf23a0f1074eaca3a76707ddcd7cdbce253c6710e2db8422fff558a0e761fe93eb00bf385bd6f30fcb53decc5323c425c609f419be92855799a SHA512 d81c64ac7241460ebc7bcd61f1b398ef55a1e9b5a5a9bb0ede400bfe06889d2db781c43853bf33069510f2461140ab8b7a47a4553cdafca64c1ed7bd0f16d742
+MISC metadata.xml 1059 BLAKE2B 48ccadfac9b7ea4203334ffdadaa76ab3164273835c727e76085db3a5afc179404eb21c74aad77ceb368397377afb0efa27d798c849eab2ffc35153cd4fe7588 SHA512 47da8b9edc993c480a045642ad2746ff6180e54e1ad368823fd81b0d217e72c31394d7575cb4c2d5e5cfea065dffb01751bc8b1088f0f1a6feaaea15c2c7fb8f
diff --git a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch b/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
deleted file mode 100644
index db47ac3b350d..000000000000
--- a/sci-libs/sundials/files/sundials-2.7.0-underlinking-libdir.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -Nur sundials-2.7.0.orig/src/arkode/CMakeLists.txt sundials-2.7.0/src/arkode/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -127,7 +127,7 @@
-     PROPERTIES OUTPUT_NAME sundials_arkode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -146,8 +146,10 @@
-   SET_TARGET_PROPERTIES(sundials_arkode_shared
-     PROPERTIES VERSION ${arkodelib_VERSION} SOVERSION ${arkodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_arkode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the ARKODE library
--  INSTALL(TARGETS sundials_arkode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_arkode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/arkode/fcmix/CMakeLists.txt	2016-09-26 22:16:52.000000000 +0000
-+++ sundials-2.7.0/src/arkode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -70,7 +70,7 @@
-   PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FARKODE library
--INSTALL(TARGETS sundials_farkode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_farkode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added ARKODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvode/CMakeLists.txt sundials-2.7.0/src/cvode/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvode CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_cvode_shared
-     PROPERTIES VERSION ${cvodelib_VERSION} SOVERSION ${cvodelib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvode_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+
-   # Install the CVODE library
--  INSTALL(TARGETS sundials_cvode_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvode_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvode/fcmix/CMakeLists.txt	2016-09-26 22:17:07.000000000 +0000
-+++ sundials-2.7.0/src/cvode/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -57,7 +57,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FCVODE library
--INSTALL(TARGETS sundials_fcvode_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fcvode_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added CVODE FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/cvodes/CMakeLists.txt sundials-2.7.0/src/cvodes/CMakeLists.txt
---- sundials-2.7.0.orig/src/cvodes/CMakeLists.txt	2016-09-26 22:17:15.000000000 +0000
-+++ sundials-2.7.0/src/cvodes/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -121,7 +121,7 @@
-     PROPERTIES OUTPUT_NAME sundials_cvodes CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -140,8 +140,9 @@
-   SET_TARGET_PROPERTIES(sundials_cvodes_shared
-     PROPERTIES VERSION ${cvodeslib_VERSION} SOVERSION ${cvodeslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_cvodes_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-   # Install the CVODES library
--  INSTALL(TARGETS sundials_cvodes_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_cvodes_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/CMakeLists.txt sundials-2.7.0/src/ida/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -124,7 +124,7 @@
-     PROPERTIES OUTPUT_NAME sundials_ida CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -143,8 +143,10 @@
-   SET_TARGET_PROPERTIES(sundials_ida_shared
-     PROPERTIES VERSION ${idalib_VERSION} SOVERSION ${idalib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_ida_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDA library
--  INSTALL(TARGETS sundials_ida_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_ida_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt sundials-2.7.0/src/ida/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/ida/fcmix/CMakeLists.txt	2016-09-26 22:17:26.000000000 +0000
-+++ sundials-2.7.0/src/ida/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -56,6 +56,6 @@
-   PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FIDA library
--INSTALL(TARGETS sundials_fida_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- #
- MESSAGE(STATUS "Added IDA FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/idas/CMakeLists.txt sundials-2.7.0/src/idas/CMakeLists.txt
---- sundials-2.7.0.orig/src/idas/CMakeLists.txt	2016-09-26 22:17:32.000000000 +0000
-+++ sundials-2.7.0/src/idas/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -126,7 +126,7 @@
-     PROPERTIES OUTPUT_NAME sundials_idas CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the IDA library
--  INSTALL(TARGETS sundials_idas_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -145,8 +145,10 @@
-   SET_TARGET_PROPERTIES(sundials_idas_shared
-     PROPERTIES VERSION ${idaslib_VERSION} SOVERSION ${idaslib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_idas_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the IDAS library
--  INSTALL(TARGETS sundials_idas_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_idas_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/CMakeLists.txt sundials-2.7.0/src/kinsol/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -134,7 +134,7 @@
-     PROPERTIES OUTPUT_NAME sundials_kinsol CLEAN_DIRECT_OUTPUT 1)
- 
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_STATIC_LIBS)
- 
-@@ -153,8 +153,10 @@
-   SET_TARGET_PROPERTIES(sundials_kinsol_shared
-     PROPERTIES VERSION ${kinsollib_VERSION} SOVERSION ${kinsollib_SOVERSION})
- 
-+  TARGET_LINK_LIBRARIES(sundials_kinsol_shared -lm ${KLU_LIBRARIES} ${SUPERLUMT_LIBRARIES} ${LAPACK_LIBRARIES})
-+  
-   # Install the KINSOL library
--  INSTALL(TARGETS sundials_kinsol_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_kinsol_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- ENDIF(BUILD_SHARED_LIBS)
- 
-diff -Nur sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt
---- sundials-2.7.0.orig/src/kinsol/fcmix/CMakeLists.txt	2016-09-26 22:17:39.000000000 +0000
-+++ sundials-2.7.0/src/kinsol/fcmix/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -54,7 +54,7 @@
-   PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
- 
- # Install the FKINSOL library
--INSTALL(TARGETS sundials_fkinsol_static DESTINATION lib)
-+INSTALL(TARGETS sundials_fkinsol_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- #
- MESSAGE(STATUS "Added KINSOL FCMIX module")
-diff -Nur sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt sundials-2.7.0/src/nvec_openmp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_openmp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_openmp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -51,7 +51,7 @@
-   ADD_LIBRARY(sundials_nvecopenmp_static STATIC ${nvecopenmp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -65,7 +65,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecopenmp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecopenmp_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecopenmp_shared -lm)
-+  INSTALL(TARGETS sundials_nvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECOPENMP header files
-@@ -78,7 +79,7 @@
-     ADD_LIBRARY(sundials_fnvecopenmp_static STATIC ${fnvecopenmp_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecopenmp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecopenmp_shared ${fnvecopenmp_SOURCES})
-@@ -86,7 +87,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecopenmp CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecopenmp_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecopenmp_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecopenmp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt sundials-2.7.0/src/nvec_par/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_par/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_par/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -52,7 +52,7 @@
-   ADD_LIBRARY(sundials_nvecparallel_static STATIC ${nvecparallel_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -66,7 +66,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparallel CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparallel_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecparallel_shared -lm)
-+  INSTALL(TARGETS sundials_nvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARALLEL header files
-@@ -79,7 +80,7 @@
-     ADD_LIBRARY(sundials_fnvecparallel_static STATIC ${fnvecparallel_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecparallel_shared SHARED ${fnvecparallel_SOURCES})
-@@ -87,7 +88,7 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecparallel CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecparallel_shared
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecparallel_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
- #
-diff -Nur sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_parhyp/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_parhyp/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecparhyp_static STATIC ${nvecparhyp_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_static
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecparhyp CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecparhyp_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecparhyp_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt sundials-2.7.0/src/nvec_petsc/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_petsc/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_petsc/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -53,7 +53,7 @@
-   ADD_LIBRARY(sundials_nvecpetsc_static STATIC ${nvecpetsc_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -67,7 +67,7 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpetsc CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpetsc_shared 
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpetsc_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPARHYP header files
-diff -Nur sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_pthreads/CMakeLists.txt	2016-09-26 22:16:50.000000000 +0000
-+++ sundials-2.7.0/src/nvec_pthreads/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecpthreads_static STATIC ${nvecpthreads_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_static
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecpthreads CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecpthreads_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecpthreads_shared -lm -lpthread)
-+  INSTALL(TARGETS sundials_nvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECPTHREADS header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecpthreads_static STATIC ${fnvecpthreads_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecpthreads_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecpthreads_shared ${fnvecpthreads_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecpthreads CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecpthreads_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecpthreads_shared -lm -lpthread)
-+    INSTALL(TARGETS sundials_fnvecpthreads_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
-diff -Nur sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt sundials-2.7.0/src/nvec_ser/CMakeLists.txt
---- sundials-2.7.0.orig/src/nvec_ser/CMakeLists.txt	2016-09-26 22:16:49.000000000 +0000
-+++ sundials-2.7.0/src/nvec_ser/CMakeLists.txt	2016-12-30 23:41:54.355840949 +0000
-@@ -44,7 +44,7 @@
-   ADD_LIBRARY(sundials_nvecserial_static STATIC ${nvecserial_SOURCES} ${shared_SOURCES})
-   SET_TARGET_PROPERTIES(sundials_nvecserial_static
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
--  INSTALL(TARGETS sundials_nvecserial_static DESTINATION lib)
-+  INSTALL(TARGETS sundials_nvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_STATIC_LIBS)
- 
- # Rules for building and installing the shared library:
-@@ -58,7 +58,8 @@
-     PROPERTIES OUTPUT_NAME sundials_nvecserial CLEAN_DIRECT_OUTPUT 1)
-   SET_TARGET_PROPERTIES(sundials_nvecserial_shared
-     PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION lib)
-+  TARGET_LINK_LIBRARIES(sundials_nvecserial_shared -lm)
-+  INSTALL(TARGETS sundials_nvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
- ENDIF(BUILD_SHARED_LIBS)
- 
- # Install the NVECSERIAL header files
-@@ -71,7 +72,7 @@
-     ADD_LIBRARY(sundials_fnvecserial_static STATIC ${fnvecserial_SOURCES})
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_static
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
--    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION lib)
-+    INSTALL(TARGETS sundials_fnvecserial_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_STATIC_LIBS)
-   IF(BUILD_SHARED_LIBS)
-     ADD_LIBRARY(sundials_fnvecserial_shared ${fnvecserial_SOURCES})
-@@ -79,7 +80,8 @@
-       PROPERTIES OUTPUT_NAME sundials_fnvecserial CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(sundials_fnvecserial_shared 
-       PROPERTIES VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION})
--    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION lib)
-+    TARGET_LINK_LIBRARIES(sundials_fnvecserial_shared -lm)
-+    INSTALL(TARGETS sundials_fnvecserial_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
-   ENDIF(BUILD_SHARED_LIBS)
- ENDIF(FCMIX_ENABLE AND F77_FOUND)
- 
diff --git a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
deleted file mode 100644
index 188e29999fca..000000000000
--- a/sci-libs/sundials/files/sundials-3.1.2-fix-license-install-path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru sundials-3.1.2.orig/CMakeLists.txt sundials-3.1.2/CMakeLists.txt
---- sundials-3.1.2.orig/CMakeLists.txt	2018-07-31 17:25:19.000000000 -0000
-+++ sundials-3.1.2/CMakeLists.txt	2019-04-17 12:18:58.894563957 -0000
-@@ -1629,4 +1629,4 @@
- # install license file
- INSTALL(
-   FILES ${PROJECT_SOURCE_DIR}/LICENSE
--  DESTINATION include/sundials)
-+  DESTINATION share/doc/sundials-3.1.2)
diff --git a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
index 97cc6f715c4e..fbcf53c410cf 100644
--- a/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.0.2-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-01-23 01:05:44.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:35:57.000000000 +0300
-@@ -1214,6 +1214,6 @@
+@@ -1210,10 +1210,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.0.2
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
index 72b5f5915c87..6eb75ce59cff 100644
--- a/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
+++ b/sci-libs/sundials/files/sundials-4.1.0-fix-license-install-path.patch
@@ -1,7 +1,12 @@
 diff -Nur old/CMakeLists.txt new/CMakeLists.txt
 --- old/CMakeLists.txt	2019-02-12 21:50:51.000000000 +0300
 +++ new/CMakeLists.txt	2019-06-23 00:39:23.000000000 +0300
-@@ -1172,6 +1172,6 @@
+@@ -1168,10 +1168,10 @@
+ # install license and notice files
+ INSTALL(
+   FILES ${PROJECT_SOURCE_DIR}/LICENSE
+-  DESTINATION include/sundials
++  DESTINATION share/doc/sundials-4.1.0
    )
  INSTALL(
    FILES ${PROJECT_SOURCE_DIR}/NOTICE
diff --git a/sci-libs/sundials/metadata.xml b/sci-libs/sundials/metadata.xml
index b4735cc5086b..a817ac12febc 100644
--- a/sci-libs/sundials/metadata.xml
+++ b/sci-libs/sundials/metadata.xml
@@ -17,6 +17,6 @@
   <use>
     <flag name="hypre">Build with <pkg>sci-libs/hypre</pkg> conditioners</flag>
     <flag name="sparse">Enable support for <pkg>sci-libs/klu</pkg> sparse solver</flag>
-    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>    
+    <flag name="superlumt">Build with <pkg>sci-libs/superlu_mt</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/sundials/sundials-2.7.0.ebuild b/sci-libs/sundials/sundials-2.7.0.ebuild
deleted file mode 100644
index 3b5df344e82c..000000000000
--- a/sci-libs/sundials/sundials-2.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-underlinking-libdir.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-}
diff --git a/sci-libs/sundials/sundials-3.0.0.ebuild b/sci-libs/sundials/sundials-3.0.0.ebuild
deleted file mode 100644
index 5be731414779..000000000000
--- a/sci-libs/sundials/sundials-3.0.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DHYPRE_LIBRARY="HYPRE"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.0.ebuild b/sci-libs/sundials/sundials-3.1.0.ebuild
deleted file mode 100644
index 6285504725e0..000000000000
--- a/sci-libs/sundials/sundials-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-libs/sundials/sundials-3.1.2.ebuild b/sci-libs/sundials/sundials-3.1.2.ebuild
deleted file mode 100644
index e5ad2325ff83..000000000000
--- a/sci-libs/sundials/sundials-3.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-FORTRAN_STANDARD=90
-
-inherit cmake-utils toolchain-funcs fortran-2 versionator
-
-DESCRIPTION="Suite of nonlinear solvers"
-HOMEPAGE="https://computation.llnl.gov/projects/sundials"
-SRC_URI="https://computation.llnl.gov/projects/sundials/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/$(get_major_version)"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cxx doc examples fortran hypre lapack mpi openmp sparse static-libs superlumt threads"
-REQUIRED_USE="hypre? ( mpi )"
-
-RDEPEND="
-	lapack? ( virtual/lapack )
-	mpi? ( virtual/mpi sci-libs/hypre:= )
-	sparse? ( sci-libs/klu:= )
-	superlumt? ( sci-libs/superlu_mt:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-		ewarn "OpenMP is not available in your current selected gcc"
-		die "need openmp capable gcc"
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS="$(usex static-libs)"
-		-DCXX_ENABLE="$(usex cxx)"
-		-DFCMIX_ENABLE="$(usex fortran)"
-		-DF90_ENABLE="$(usex fortran)"
-		-DHYPRE_ENABLE="$(usex hypre)"
-		-DHYPRE_INCLUDE_DIR="${EPREFIX}/usr/include/hypre"
-		-DKLU_ENABLE="$(usex sparse)"
-		-DKLU_LIBRARY="${EPREFIX}/usr/$(get_libdir)/libklu.so"
-		-DLAPACK_ENABLE="$(usex lapack)"
-		-DMPI_ENABLE="$(usex mpi)"
-		-DOPENMP_ENABLE="$(usex openmp)"
-		-DPTHREAD_ENABLE="$(usex threads)"
-		-DSUPERLUMT_ENABLE="$(usex superlumt)"
-		-DSUPERLUMT_INCLUDE_DIR="${EPREFIX}/usr/include/superlu_mt"
-		-DSUPERLUMT_LIBRARY="superlu_mt"
-		-DEXAMPLES_ENABLE="$(usex examples)"
-		-DEXAMPLES_INSTALL=ON
-		-DEXAMPLES_INSTALL_PATH="/usr/share/doc/${PF}/examples"
-		-DUSE_GENERIC_MATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc doc/*/*.pdf
-	cd src
-	for r in */README; do
-		newdoc ${r} README-${r%/*}
-	done
-
-	# Use a sledgehammer, patching the buildsystem is too annoyoing (the
-	# CMake build systems consists of 2000 "lib" DESTINATIONS...)
-	if [[ lib != $(get_libdir) ]]; then
-		mv "${ED%/}"/usr/lib "${ED%/}"/usr/$(get_libdir) || die
-	fi
-}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 46731ef59074..0fc3dc411e49 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/lpsolve/Manifest b/sci-mathematics/lpsolve/Manifest
index 51390a091e47..644b9f356760 100644
--- a/sci-mathematics/lpsolve/Manifest
+++ b/sci-mathematics/lpsolve/Manifest
@@ -1,3 +1,3 @@
 DIST lpsolve-5.5.2.0.tar.xz 737000 BLAKE2B 912690a7e4ed5fd5d475f322f5c168554fb3d47281545f42d2383ccbe72b3cb0036f72878c94899889972e266e9cf6ad73e59ac1e822deae753ae5b31a00c9b8 SHA512 341bff74dccf805cfd3aa4ee844a51f3c46ce875e88b1bf079a6ff0074f7cbd27420ec9c6a66a2530098a85c967457214543895651f4c570b956324a51bb9fe6
-EBUILD lpsolve-5.5.2.0.ebuild 676 BLAKE2B edcbc7ea1202d57d5338d75f0ebc432e3a08ebddc2eecf3fd8a43ada0d76e04199126e5180b38ae8aefafbfa7f0b718ee8f88b84788064cb2ba361fe4b042649 SHA512 f12844e5198a8ce3a86b87e6c62bd67da4162119d1b876bbb046c360cadeeee59a033a20878e82d96e5216905806fad1ca649d4b1678797852cf8a05d0729b64
+EBUILD lpsolve-5.5.2.0.ebuild 672 BLAKE2B d1bf38682b9f1d1cd5c5fb735162316cdb27079698f4bb50428cca13c5240007e5284bc0a214913d3031a06ee445f16ca962a93fb1947cf3fe7af77aa0399a06 SHA512 c0b795e95c1db20a2d904c69052b2239de975964a03fa0b6ad85cb6bf2f95f9e9e7f97e0a7344b6f796135a49ab419a9f34350e3dbb0163e16e0e7e6bf981c39
 MISC metadata.xml 462 BLAKE2B cc1d11f0cf8ec77ba2700ac44f3b0a791734b7edf4afc7f1b991a1ad612e1684ec9389b7517ae2678ecf247537c5c3e7e0bec2de8561964ebfc50b9f53ed57a9 SHA512 817ef33327783389aa73830c2ff2b9b54a140dbcaa9ed61a6d0ad7c2058014fc311c5abeef20cac157fac94d71fe2e8de8f241b3d7a2a2df26817d96cc19dd86
diff --git a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
index 5de810343b29..6ea531bf763f 100644
--- a/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
+++ b/sci-mathematics/lpsolve/lpsolve-5.5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND="sci-libs/colamd"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index ef35888c851a..16404faa124b 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index c5425cca850d..41f0a28607b8 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -6,8 +6,10 @@ DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866
 DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
 DIST mbuffer-20181119.tgz 141445 BLAKE2B 8900b71af77b42ac6901285391bb571744bdcfd9fea307758b17be48f8ba3fa921c0e4752817d4feb8b139753440af25a8a8162f867e793d00e1baf8f1977e9e SHA512 0a30fa1c16f519a2ce82ae1f0f467dc9672e16affaff17f16cbec7bd3a28aea565e80ab4274ec24e60dd78560c692b8f852c7cba794a3715242f0d2385259347
 DIST mbuffer-20190127.tgz 142141 BLAKE2B 43ab5d92e0f930037da512f8310bb97edc534b8dbc9b76e36407ec87939e87667e723af026c6e48703a47c83c47ee72e82c36d4c99ab720a6c190fbb0bdfc30c SHA512 e42ba41ebe206cb34d16a4b8a2cf8470e8173ba3147ade8fb1fbb3e9fcf534e0a129f2327055a034a9e65c7b59b56441717641841d632709b02f3dd5e9962922
+DIST mbuffer-20190725.tgz 145246 BLAKE2B f0ec2826fcf59543c255c484bf3c901f8c515633a8f81042dcdfa5a712f2eff619fc031fffd6510f98c7348f49916c08ec1c465764546a606b9d451240e2768a SHA512 3f3670a0b618dadf47aa47310c88be96915af372c4dcdbdf3ba6b4d9c67fd994a027bdf6ed397c34c062499dbbc2b563ff9e79d8351c0faedfdeebe660ca4a25
 EBUILD mbuffer-20150412.ebuild 795 BLAKE2B 92d4c504fb558dafd340c80c814240c3dc266a8f1a28bddc8621004269da216a16b2630a637963c0478208c0e5761a6ee99570dbf1a96fd84058a377190c04ce SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b
 EBUILD mbuffer-20171011.ebuild 1419 BLAKE2B b623eea89a7b8d913c885b818d94b83ca4883df2d44d2c36463d2e62d9240affed87290989359c51a380e56a763d31f98440de4a011a05692aa2ec686b890d07 SHA512 94da802069d9c9336d85fc837ab8debbd5441aa69530714b3f90690ff13b7e9ef42a86448ba1e443b60b3cacf7ac9646397b5c3f5f71256b5dd631490439539c
 EBUILD mbuffer-20181119.ebuild 1456 BLAKE2B cf6f4a9db384e77059cb01cf4e2e0c94331e59a17a66e1a4734d85edc591b616f59884fe68ec055238b66e464a655314a1121fe2ee11124ea7417a964b9f1fd9 SHA512 12c54c5a023a249722715250565fc04a398cf113e1719c47e5c0efd29f7f9638a9527fa25cf98d887d50f1a11acff00f652caf001887a3125994c2b14fdd421a
 EBUILD mbuffer-20190127.ebuild 1459 BLAKE2B a87dde3b2660aef09ce4f5a856e4b0ef749670d8bf12b2360fee723f2e25cc1fc0323da076d873958702330376219fb0d2022432ad7fb4fe74cbe3ca73f4d66e SHA512 c83578e3dc9f649ee256c0b5e2b1353f09d04812fa065dc036755d1d2a71b64c3075158a9d13b12aea7380ba6b79a10983637c603bb1c11ed94cc9786afd8231
+EBUILD mbuffer-20190725.ebuild 1461 BLAKE2B 532bf0487562555bb3d4b4eb6b34a108fddb36bee4a02aa9e97b1f817a8f4ec8f3402261a333992c1b13cb52f819c39a3cb826ccb98e6ef73ed7ccb96d21dd87 SHA512 2c05fd3280392b9b09f3165495e838ced872e8964c5d73cf6eb9d43d89bd3920494154763d15a7745cea0537e860875d5d171b127a4bf8104e2085ec9a467636
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-block/mbuffer/mbuffer-20190725.ebuild b/sys-block/mbuffer/mbuffer-20190725.ebuild
new file mode 100644
index 000000000000..77c4badc66e9
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20190725.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+
+REQUIRED_USE="test? ( ssl )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	export MAKEOPTS=-j1
+
+	default
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-block/storcli/Manifest b/sys-block/storcli/Manifest
index b4f661981e6b..0ade820d8617 100644
--- a/sys-block/storcli/Manifest
+++ b/sys-block/storcli/Manifest
@@ -7,11 +7,13 @@ DIST storcli-1.23.02_readme.txt 201906 BLAKE2B 6dde1f7609d51f3d0b2feec9301a57472
 DIST storcli-7.0504.zip 40558670 BLAKE2B 3cd54b47b42e5bb8329ccd4b09a6c0863347a04b276fa5dc11acf10ac1124c25b5f60e4171de96c1b8975bfae4cc7408554de933ba8fd5547fbd6e9395710ce8 SHA512 1c5c248a1c19eda5974415a7e1cc10c83bfad0d6e37adbd01ae624316fc1d60628503655c4dd0005a14c79c570177664ea9cdb7330b97daf19808a9513b1311a
 DIST storcli-7.0606.zip 36634159 BLAKE2B 56cae14537872ef23d8ddc6a0790b727abdf4abecd06b9d1615dc4ad0a554a48bdd077772181d2f0ad9bbe90f015130b4a62caa16b1f02d042403cb6ca389e04 SHA512 ef8bc6b275bb915707624d73d802e84e7a04da087d275055916f047f16d15f1303047c9eb53eae8de88da97ce82fc79616822888fc320af7ba54ad6aa2999996
 DIST storcli-7.0709.zip 25844769 BLAKE2B f44791d0813f348068a89a14a0ea457667ab8e224da09a458bfd1126f5e1d9f19655f5392a8d2a8a04ae07f76fc3c91abcdbd48a058c8e9d517c504de8688e66 SHA512 c3995110b592bbf6e58a0e54f62ddbdbb025c6d27ce56111a40d9eb04b7d5ee7a9bfc76e449b0b4900e1082f20df8e06a852a3fe0efc1114158d104036f6033e
+DIST storcli-7.1017.zip 36266095 BLAKE2B e1bb4c6bbd19712530fc8d3d7917bf943221f121d0a7d5d3e44205f73bab408d7e4ff94d8cac479a1b834b82e8bdb6661805ca13f1695f8bad52d69d2c988fe9 SHA512 fb4b45fa577417627e67d20bbfa2e07512fe600ffeb9d21e11a80e25208f17b56fb25fa74a9777622c72012a605813b0206a990a6d4191f6b57371bd1d72fd6b
 EBUILD storcli-1.19.04.ebuild 2050 BLAKE2B 50e963ae4290d138661fc3b3f95a692c2e230267fc2b0c12440ec5ce68e08c9167248d2addcbac9b6d5e20456124e9398e1e60cd6524820d7121dfa06528bc89 SHA512 4b0697daca02917b91c5efb2cbbf9145af30a19ed9adb7b0279cb3b8b1a94819b2b23ff46bee7895bf016249402e2c8da467d92c25201995d8227aabbbbc298c
 EBUILD storcli-1.20.15.ebuild 2063 BLAKE2B a660891695ad51e079658f04be6a1333883326c6f36dea59bc798fa93e698efc66e2470892464f5b6ec2fcc5f67d27aaccf05aa34b21e899b0d18e1f721e6607 SHA512 8e6a5ebe11f74fc0351a1983dbc19d1cfe527513dc3f927567e500667755fbf921a531a4b41ebc59d430a6cddb36d0266e40a68c648b87f6de4be9ecffddbe33
 EBUILD storcli-1.21.06.ebuild 2656 BLAKE2B 272ee62c3fa026de02d750ca3c5bd2f6267ee2c2262fe61ae68c39ad0692271f55bdc1188cb5a004603f93ab9f97a8d2ef16cc163336a8b92995a4420cc7817d SHA512 ff8dfdfe0bbd8e7e520f76150aec96d7873cb7b17b88ed68a2d9d8ed6fa1e74f7a4ef2606cdc6a1eb7a1769899f03de2118abe6d8997246240d646956ac855e9
 EBUILD storcli-1.23.02.ebuild 2358 BLAKE2B 6a124e14392bedf31f5408ce4b2bded73b8237f08391f40b1f8438ef8df31e38d5ea9e8cca99d8888e3f5e25dac309052c9a3896cb78dc270fa7bc74fcf482d6 SHA512 279aedf5aff9387e4dcad20172f253fa24b08b862f84dc9781b30da937ee5dd3f0c406bc769da91dd72f0914e017fb7df003f3951e9f42e3ca4a4fb523a47fb7
 EBUILD storcli-7.0504.ebuild 2209 BLAKE2B fac3eb79205c9826a12fbd058bcff11233cfe76043c9872a8906f833bce749426c61e1cddfefafa40b98460d88ae1cc364145570462619a91e5756a15975418a SHA512 2a7a4b4491c145e2c2243414a075f401e5d22d057e6b5e9bc02bc1912cee390768a111aaf9678df77b84b653f2737a441f8bc4213403e20a2d7f8208ab42f54c
 EBUILD storcli-7.0606.ebuild 2486 BLAKE2B 0873b7c99026c2d3eee5c07bfa960c1b087ccbd2157809ab7682b41d198bd0752132752a4f528116587a0dab594bd55a574ddd20d8f341a7f7f30fe84229036e SHA512 8cefa565d87a6abe22d8290eadb1a675a2e4791a507f68ff56cd28857b31a15a409d91c550174b66e8ccc7e4de99d790894f32f1e2b73b525e8110a5d02298d1
-EBUILD storcli-7.0709-r1.ebuild 2347 BLAKE2B ed6bcf2602ec1a5db7228039469710c233d5b2955a353dd622b6f2613f9866580ad88285012bfa49f4a24ed8a9143f6ea5c7de51a083cca903c1e8c491e02059 SHA512 ffe5dd86ffec62f9d0dc287c831196fb04c3c151b8e233dee4bb86be29d88b8a76f79a4027117e709ff3990a43ca18c4f5dccdcb18ae0a106402ae8882076d49
+EBUILD storcli-7.0709-r1.ebuild 2345 BLAKE2B 3a03247560eceebed6c1413850607eb7c2b7f551668f2163745ba2c717450c72ccdaacea7bc328bf536a959b22b4e6478d718ba30b4b56ac6daaa34501fd0672 SHA512 e76b173a67d812f10dd21d5319ee1b9dfd20ba285005caeac9dac5b34a5f5306e0f64c5887dd7e852bdf838fd529c07bd2f3b5d593b8286502ae3bfe23596635
+EBUILD storcli-7.1017.ebuild 1810 BLAKE2B ac0928c466af3f0a87b333002c242ac82c6592b359e026c49690d734660a4a44b4fe5e34cb1b67696369c7d101f7f250da729cea9cd51750dcf39a423b29b740 SHA512 6006b68ae8fbf475909263b96a807942dfd686795bef2ff6e7e017a09766f7fc693715896c31d000cd0001a0ea7f6b4f797d4d2e13fccfe70cb583ab3755cd64
 MISC metadata.xml 251 BLAKE2B fb85d245662fa1577cfe1d77526bd34fb2a674dd447192f2defe78b751423e3d14ae73efd3ac0e1e5e6fdb6259622a782e724ec77021faf526509f199dd20d61 SHA512 46942a98ef7e36470d1169a5bc8839d25603e33c143cd36327a8a85fc14cb6bfb32247eb7608d92cc58a06cc8eef5bd64d6ec2d21e69a88632e4b936598aa772
diff --git a/sys-block/storcli/storcli-7.0709-r1.ebuild b/sys-block/storcli/storcli-7.0709-r1.ebuild
index 65a0583219bc..eaebee5c38ea 100644
--- a/sys-block/storcli/storcli-7.0709-r1.ebuild
+++ b/sys-block/storcli/storcli-7.0709-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-cont
 
 LICENSE="Avago LSI BSD"
 SLOT="0/7.7"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-block/storcli/storcli-7.1017.ebuild b/sys-block/storcli/storcli-7.1017.ebuild
new file mode 100644
index 000000000000..7122690d293d
--- /dev/null
+++ b/sys-block/storcli/storcli-7.1017.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pax-utils
+
+# Upstream is still using strange version numbers
+MY_PV="007.1017.0000.0000"
+
+DESCRIPTION="MegaRAID StorCLI (successor of the MegaCLI)"
+HOMEPAGE="https://www.broadcom.com/support/download-search?dk=storcli"
+SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/MR_SAS_Unified_StorCLI_${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="Avago LSI BSD"
+SLOT="0/7.10"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+MY_STORCLI_BASEDIR="/opt/lsi/storcli"
+
+QA_PRESTRIPPED="${MY_STORCLI_BASEDIR:1}/storcli
+	${MY_STORCLI_BASEDIR:1}/storcli32"
+QA_PREBUILT=${QA_PRESTRIPPED}
+
+src_unpack() {
+	mkdir srcfiles || die
+	pushd srcfiles &>/dev/null || die
+	default
+	mv Ubuntu/storcli_*.deb "${WORKDIR}" || die "Failed to move storcli_*.deb"
+	popd &>/dev/null || die
+
+	rm -rf srcfiles || die
+
+	# Unpack Ubuntu package which will be our $S content
+	unpack "${WORKDIR}"/storcli_*.deb
+	rm -f storcli_*.deb || die "Failed to cleanup storcli_*.deb package"
+	unpack "${WORKDIR}"/data.tar.gz
+
+	mkdir "${S}" || die "Failed to create '${S}'"
+}
+
+src_prepare() {
+	default
+
+	# Create clean $S
+	mv "${WORKDIR}"/opt/Mega*/storcli/* "${S}" || die "Failed to move storcli_.deb content to '${S}'"
+	rm -rf "${WORKDIR}"/{opt,control.tar.gz,data.tar.gz,debian-binary} || die "Failed to cleanup no longer needed files"
+}
+
+src_install() {
+	exeinto "${MY_STORCLI_BASEDIR}"
+
+	if use x86; then
+		doexe storcli
+	elif use amd64; then
+		# 32-bit version is less crashy than the 64bit (bug #656494)
+		newexe storcli storcli32
+		newexe storcli64 storcli
+	fi
+
+	dosym "${MY_STORCLI_BASEDIR}"/storcli /usr/sbin/storcli
+
+	pax-mark m "${D%/}${MY_STORCLI_BASEDIR}"/storcli
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2dbed8a35c1d..5208fbc889e2 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 2aa907e615e8..37ec4fdd4d65 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -3,6 +3,7 @@ AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
 AUX 239-stat-0.patch 3553 BLAKE2B 225dd5e8e001a10a33c7ecb5c1378589b3eeecbea4fc746f27cc72d8eb8787c6966b8787c5922f0d0cefa28ac966c7c4f65ed341335d4105bc109df14110604c SHA512 a982c6384fcad2a1ad709564e932231e837ef799b764bbfa73eff5c42635a4bdc0dcf36e72300482ed188b492da723d3cd7ae04dda9b2c16c70fd1871c556a46
 AUX 239-stat-1.patch 2553 BLAKE2B 123a9488f7e2c9c2b70cb87ecc45be54b19b18660a2b238d028227e19cb7ba4933a115e2e82652b3179462ed0d2115058bff5d8d0212f439a919857f083c318d SHA512 6aee279728d0e609956c825ced6d2c00d8f4905327492c0348ad6ee8e862287b101ec4e2f1daa19533cf51f2ba1a15f0ea2dd6ccde44a4ff1b0fb151ffc7381e
+AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
@@ -21,6 +22,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383
 EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
-EBUILD udev-242.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
+EBUILD udev-242.ebuild 9623 BLAKE2B 8eff33719a73d53608d149a7a7df66292526e3ae3db0d820a06aeae4080ff0802025ba9bb873c28a0424c369c2eeb3dc67389ebffd3be6e55bebb63be6670c2a SHA512 ac6f461b77f67fbd5037b9e7cf86f1314c8a5b6b4866e0d7e1d41991bb83c5231c21001329801745ee04f28101536d02aa6b9f40f96552e64252a5bc187b71b3
 EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/242-gcc-9.patch b/sys-fs/udev/files/242-gcc-9.patch
new file mode 100644
index 000000000000..e9f690a65be5
--- /dev/null
+++ b/sys-fs/udev/files/242-gcc-9.patch
@@ -0,0 +1,163 @@
+From c98b3545008d8e984ab456dcf79787418fcbfe13 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 7 May 2019 13:46:55 +0200
+Subject: [PATCH] network: remove redunant link name in message
+
+Fixes #12454.
+
+gcc was complaining that the link->ifname argument is NULL. Adding
+assert(link->ifname) right before the call has no effect. It seems that
+gcc is confused by the fact that log_link_warning_errno() internally
+calls log_object(), with link->ifname passed as the object. log_object()
+is also a macro and is does a check whether the passed object is NULL.
+So we have a check if something is NULL right next an unconditional use
+of it where it cannot be NULL. I think it's a bug in gcc.
+
+Anyway, we don't need to use link->ifname here. log_object() already prepends
+the object name to the message.
+---
+ src/network/networkd-link.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
+index 533193ac932..6fc82940033 100644
+--- a/src/network/networkd-link.c
++++ b/src/network/networkd-link.c
+@@ -338,8 +338,7 @@ static int link_enable_ipv6(Link *link) {
+ 
+         r = sysctl_write_ip_property_boolean(AF_INET6, link->ifname, "disable_ipv6", disabled);
+         if (r < 0)
+-                log_link_warning_errno(link, r, "Cannot %s IPv6 for interface %s: %m",
+-                                       enable_disable(!disabled), link->ifname);
++                log_link_warning_errno(link, r, "Cannot %s IPv6: %m", enable_disable(!disabled));
+         else
+                 log_link_info(link, "IPv6 successfully %sd", enable_disable(!disabled));
+ 
+From bcb846f30f9ca8f42e79d109706aee9f2032261b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 22 May 2019 10:31:01 -0400
+Subject: [PATCH] shared/machine-image: avoid passing NULL to log_debug_errno
+
+Fixes: https://github.com/systemd/systemd/issues/12534
+---
+ src/shared/machine-image.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6b9d8fb97a6..6a6d952b424 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -201,11 +201,13 @@ static int image_make(
+                 Image **ret) {
+ 
+         _cleanup_free_ char *pretty_buffer = NULL;
++        _cleanup_free_ char *cwd = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+ 
+         assert(dfd >= 0 || dfd == AT_FDCWD);
++        assert(path || dfd == AT_FDCWD);
+         assert(filename);
+ 
+         /* We explicitly *do* follow symlinks here, since we want to allow symlinking trees, raw files and block
+@@ -221,6 +223,9 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
++        if (!path)
++                safe_getcwd(&cwd);
++
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+                 (faccessat(dfd, filename, W_OK, AT_EACCESS) < 0 && errno == EROFS);
+@@ -359,7 +364,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path, filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -373,13 +378,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path, filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path, filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }
+From 2570578d908a8e010828fa1f88826b1c45d534ff Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Fri, 24 May 2019 10:54:09 +0200
+Subject: [PATCH] machine-image: openat() doesn't operate on the cwd if the
+ first argument is specified
+
+A fix-up for bcb846f30f9ca8f42e79d109706aee9f2032261b.
+---
+ src/shared/machine-image.c | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
+index 6a6d952b424..55e5f08f91e 100644
+--- a/src/shared/machine-image.c
++++ b/src/shared/machine-image.c
+@@ -200,8 +200,7 @@ static int image_make(
+                 const struct stat *st,
+                 Image **ret) {
+ 
+-        _cleanup_free_ char *pretty_buffer = NULL;
+-        _cleanup_free_ char *cwd = NULL;
++        _cleanup_free_ char *pretty_buffer = NULL, *parent = NULL;
+         struct stat stbuf;
+         bool read_only;
+         int r;
+@@ -223,8 +222,12 @@ static int image_make(
+                 st = &stbuf;
+         }
+ 
+-        if (!path)
+-                safe_getcwd(&cwd);
++        if (!path) {
++                if (dfd == AT_FDCWD)
++                        (void) safe_getcwd(&parent);
++                else
++                        (void) fd_get_path(dfd, &parent);
++        }
+ 
+         read_only =
+                 (path && path_startswith(path, "/usr")) ||
+@@ -364,7 +367,7 @@ static int image_make(
+ 
+                 block_fd = openat(dfd, filename, O_RDONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY);
+                 if (block_fd < 0)
+-                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                        log_debug_errno(errno, "Failed to open block device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                 else {
+                         /* Refresh stat data after opening the node */
+                         if (fstat(block_fd, &stbuf) < 0)
+@@ -378,13 +381,13 @@ static int image_make(
+                                 int state = 0;
+ 
+                                 if (ioctl(block_fd, BLKROGET, &state) < 0)
+-                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                        log_debug_errno(errno, "Failed to issue BLKROGET on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+                                 else if (state)
+                                         read_only = true;
+                         }
+ 
+                         if (ioctl(block_fd, BLKGETSIZE64, &size) < 0)
+-                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(cwd), filename);
++                                log_debug_errno(errno, "Failed to issue BLKGETSIZE64 on device %s/%s, ignoring: %m", path ?: strnull(parent), filename);
+ 
+                         block_fd = safe_close(block_fd);
+                 }
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
index 0490d5f1dea2..126aa9ccf37e 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -97,6 +97,7 @@ src_prepare() {
 	fi
 
 	local PATCHES=(
+		"${FILESDIR}"/242-gcc-9.patch
 	)
 
 	default
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1c2e01dfc1a6..88af890a2913 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index ecb8934c3d43..1dabf3e73930 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -8,7 +8,11 @@ DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f
 DIST patch-4.13-pf4.xz 173732 BLAKE2B 990defc1eb15ca509f922381dc5f7726265caeccd9a9b639989a3e6dc56c4cb3b6076a2588ef93cc39aa4f36e403f654a2c580aac50be61d74dde429ef69f1fc SHA512 6b6fdbb26ec1053c0b3fb0223b2e1cbfb28d88b172ffa8d110a5e7a37f3b0bf377d5957d47007c3468dc42b8c33aad1acbc89c44027c8f7326dcbf940d7de88f
 DIST pf-sources-5.1_p7.patch 2206844 BLAKE2B 542a9c09aa1e9def85afafe4f6275aa62c178a7e60af157bdef0fe6ed659bc7ce96f30e3b05cb750bfa2f5e92e354064848b3a1d0f0c2894a07970cd2edc6bb4 SHA512 22ca39aa667fee4a75a470bffa86905191b3550ca82e3e1554bdd8ae3d5255053d8f650e781ae713b99e9b3cf1070e60f3f5df751fb7a70fe6d52e538a798a37
 DIST pf-sources-5.2_p1.patch 365922 BLAKE2B dee7af932e0e220b4493a09adc21b210439705a615333e0fef91ffb577aa489f133864742f50b926266c9e939d9780ac5f587c4c518e15669cad866c38d90a34 SHA512 b518678bbabedc25e72716ebbe1afa4599ebc46d4eb3ee3ed8ae815ecbf64ea0cafe1dde9e5b5b72898b17758972ed5fca37f71a45f774a2922ce7deead15f2d
+DIST pf-sources-5.2_p2.patch 556688 BLAKE2B cbcfc2b0949386e72a5bfe2a7e4eb5fe56a38c2a451e631509f31b61e3492150f5177e97390d1945959026188ef62c5e90a7474f9d26b5a63d920a1136b350f3 SHA512 2a74dac88e2e5828e44576041223e3168ac980fa6ff01819bdbd5f626cd233d4571641bffe176c0738fbfb2d8aefbe1f8e91990e4aa95e6587eea91983582db7
+DIST pf-sources-5.2_p3.patch 1101135 BLAKE2B f56ff7a269e48513ac2d8360531eef0b60b0d86ec3af223729870c3461746aef1f7370a6448558e921bfacf345043ca4f97d56c1f8069d5a6f607f9cb615e096 SHA512 0b81cf9927bcec69910f18046ccfead4ad3072e8926315f7eed122edd09ca87c43d345402051249f55de2f98c12b04bd87096653051eb1dc77e27fe24c2e85f3
 EBUILD pf-sources-4.13_p4.ebuild 1970 BLAKE2B f3e2a4b1d772d397204e98065c7f70163b84e9d3f305df1fdff828552ddc6918988888f6669fc6216a639cfe5d623afa3011eb67aceff3a10e96c2b30bdbb717 SHA512 e9c31c053bc53aff13032b743f40fb754cc451b28abfd6297643bbd43a3ec6f5b5ceaf89808a42089174cc8ec25bd59d86cf0dceede8867cddea6bf8d6c1277d
 EBUILD pf-sources-5.1_p7.ebuild 1943 BLAKE2B b21d2989f5532ddc528ec7996b1f447fe78e8106fd540816e5e77fac684f044e20dd119ee4e57aec04948662485e4565c23202ea06ee632a1f43ccb336e76f20 SHA512 9e31de214070b8a7e9d4b0358859efe7361bf881c045520cfe1b841efafba5e64c7ddc5d6a3641dfde92b2f37d31ae85f53fa4a3832b77139bda458632c756f8
 EBUILD pf-sources-5.2_p1.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
-MISC metadata.xml 435 BLAKE2B 45bab7ef2444e2f33d9005e5c70b2c3de803f76da1554ff7f2cf603ca46a8f5446f6f3dca82b627e2f411e55f97af2db106abba2c3c51ddbfceeafb9bb5d0c24 SHA512 91bb4e39eddf00e9c55cd19436ec7ad54d4b0e292973bc1b72bdeb73278721dea618549f5047e78e66ae3216cb6a48a003daa0199a12276b103f7257f4f803e2
+EBUILD pf-sources-5.2_p2.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
+EBUILD pf-sources-5.2_p3.ebuild 1902 BLAKE2B 0481e16f025f088eb9c5a0417f229709e4a36e63283e8addbf3547f4bfd27b2ebba8b3fcba1192224ae9165767300250b00380286e6a612e17c7161570e4584a SHA512 c9e76fb9a4c2d0a4ca53dc0c8d27060e213e0347187c0fd439d82c4e8ad4fdb84700800a48426cf0fd032b2cbd86522f1cc06fe5a73da4c3e59b8b6b9e05f71c
+MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/metadata.xml b/sys-kernel/pf-sources/metadata.xml
index f890875488ab..c10c60b8af4d 100644
--- a/sys-kernel/pf-sources/metadata.xml
+++ b/sys-kernel/pf-sources/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <upstream>
     <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p2.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p2.ebuild
new file mode 100644
index 000000000000..9035be35ba7d
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="
+	https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/
+"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/pf-sources/pf-sources-5.2_p3.ebuild b/sys-kernel/pf-sources/pf-sources-5.2_p3.ebuild
new file mode 100644
index 000000000000..9035be35ba7d
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.2_p3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+ETYPE="sources"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+
+HOMEPAGE="
+	https://gitlab.com/post-factum/pf-kernel/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/
+"
+
+IUSE=""
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# No reason to bump this number unless something new gets included in genpatches,
+# in that case we can manually remove the linux kernel patches from genpatches.
+K_GENPATCHES_VER="1"
+
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security crew
+K_SECURITY_UNSUPPORTED="1"
+
+K_USEPV="yes"
+
+# We want the very basic patches from gentoo-sources, experimental patch
+# is already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+UNIPATCH_STRICTORDER="yes"
+
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+
+PF_URI="https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch"
+SRC_URI="
+	${KERNEL_URI}
+	${PF_URI}
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz
+"
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}/linux-${KV_FULL}"
+
+PATCHES=(
+	"${DISTDIR}/${P}.patch"
+)
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	default
+	kernel-2_src_prepare
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 965cac5d23f3..cc79e6e236c9 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
index 005a82761bac..6a27d9bb177a 100644
--- a/sys-process/evisum/Manifest
+++ b/sys-process/evisum/Manifest
@@ -1,4 +1,4 @@
 AUX evisum-0.2.2-respect-cflags-ldflags.patch 458 BLAKE2B 9c40cb1b47b6fa52f870e281e18f7858aac131ea542d4afdeb7e9a52cb6cbc7658b5ff425d359e9471c101bfdd81cd0f94b90bfefacb4d1dc1da5aafea5bdd97 SHA512 e2399269e346f50c3c265cefdf3996e89fb9fd5d9da060e8cd27c70284279cae3ae6fcb183573cd286a7e4a028dfab7efe41fabeaa5eb74e2a5c227383f2e025
 DIST evisum-0.2.3.tar.xz 85000 BLAKE2B 3f3a43ff569d05550d092930f1cf61eb4deef2a449bd1b407b0f460c15887b76fc430ecbbe8357e6a06d6c34cdce68321d38922635ec4b9caccad084d9c619d6 SHA512 0043432f2b434c2bbdbe03b96d29a3f9515d063bdf5ae61ef5273aad1ec6dbc532860af4a22bebf275f171585e793e3851eec9c98a7eaa4645e32d3a79eafdc1
 EBUILD evisum-0.2.3.ebuild 647 BLAKE2B 5be77ea47801cf4dc982300559d2bc3d21cdfdbc807c3ae87b17a15a517e9cb11934a9ccdf4e232d449e694d5b880458156a05c3a27b98a4bab10fdd0a7ce653 SHA512 828700dc6177e8c8904635848b8a19d3ccfaac2dd251789e28174d67229a595e50b1b66ef0083c83b5e8807422276f2d75a097821f6be5b618ada15f8d10e666
-MISC metadata.xml 905 BLAKE2B c288b46a8df2a24a0e509001487c8d987443c139407cb9ec2b964c2cabd02d39566fd2cbda5e77356df2648db9cde543a881350522382734795f3dbc82d460c5 SHA512 75dd35bac971d67c6fd9a78b2cfb599f50d1f8d6107a83729efc9df0cea4fd414ddc50719bfbeddb48edfee82a4a1888a66a2932e35d6b61df8299f87331e381
+MISC metadata.xml 815 BLAKE2B d969cde79150c0cd2977017520a7ac95713b1c43aad52645f4d354f5a3ef3320638f5da097f0b7999689135036f1f8594b5331d2ca3420af93a2c3bfc726569e SHA512 c1b2c28863e8572ddfb79f8159e9ffc0defb4dc9c7b02c3ad7b1a4804ddcad06034471d9774f4e09bda1c84a8ce72393172f194c30cb5e5fda0a1177db842c3e
diff --git a/sys-process/evisum/metadata.xml b/sys-process/evisum/metadata.xml
index 4213c69bb418..3107bd664005 100644
--- a/sys-process/evisum/metadata.xml
+++ b/sys-process/evisum/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <longdescription lang="en">
     This is a process monitor and system monitor.
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 52a9b845b7c8..c5f34a8893c3 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index df778026ff0f..e1e3492e6c76 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,5 +1,5 @@
 AUX postinst-en.txt 935 BLAKE2B 0b073933e97ab4187f6e91fff6c2a0dace375006e61b1e420bb0eef68684452e708d3cdb448487d33c76ee0c014975afad645b3bf158547d4b517763d9a3747f SHA512 b7a2253cf0c91c966f538ebf2bb839fbe2affef1c249c9bf7f3b32f07810195a502ff149f1cfebbf1abfc39c84edbfd0df7952ca7d21049bfe2175bd9456cb12
 AUX setperms 255 BLAKE2B 10c5f33dc7b59887d208ff33daa9d31de10bc8a1b5722f6fa4c14dbb94b6b84029fe968ad7a047edce78c6da1d07b011c1e545f17892bb6fbd5ff373396d9940 SHA512 38bd7c199950a4df65e5583e84da1a776beecf6a2726dc483663b282b29bfd8d80a86ff680850f1ff6b8fc10e8a049c1efd666377c157f2726c665246884a1ed
 DIST dspam-3.10.1.tar.gz 1044198 BLAKE2B 6292b5408e187883475e58d293671c4d313a7b2d5279b65f9fda1390333bea0a24b2b084c24723904c67c734388d39234f06918f279b46f7d6229f3f5791be7c SHA512 44c8ee6df058ed6b9c97722201bcd99645f93dd697676b2480a221280d8d1bc64c6eb03d4c69eede7c54028bbfc4583e7bbd7c4607587bcd037a559e868040ee
-EBUILD dspam-web-3.10.1.ebuild 1698 BLAKE2B 2e5bce3c61f6da36886744a64c0e6b0263145cb0faf4f2d4a5a5e3a10c5fe1abfd2864ee9f44dc1942bf3257ff95db9b140a708d53a820b627fa2d5a79508c45 SHA512 37e20d57b8f6c2220deca084b02fddfc5c77c50b3d2010f9ba3f11daaf1b24b5865c2dc74ddb1194a9b4ee79bcd515e8aec01975fcaad908081bcfb19c1f8106
+EBUILD dspam-web-3.10.1.ebuild 1700 BLAKE2B 881ee82705090264db7a828ca6389918a59dd3db7d9f9b3ab6cc0d854afda534a7ef69caf0b26cd93ef88b09fdd8939283840fc24dff537699ce7961b9682eac SHA512 c35d9bccca7c99dba45b509da79f310b788f15c776c3d95159b3a69f71b9404836d448243c1933c5b320053bbc86c6160c4f1c72377257e80a2563341cc78ffb
 MISC metadata.xml 364 BLAKE2B 46ea371b864cfa14f4e4193b499b57ab419bafa540106fb3023ae276c807d94820499ecfaa9438de4723f4fa5dca1359a5f27c6ac887f1633bf6c4b1e2a7a9b6 SHA512 a30327548152850c82f53069bf25d9742e5e56d2f476923411526208e1c92a181ebdb3fe7f7f0a3538560b88d8f2686842034999e7d4b22a84f7f30a260aef0e
diff --git a/www-apps/dspam-web/dspam-web-3.10.1.ebuild b/www-apps/dspam-web/dspam-web-3.10.1.ebuild
index 7ab4583673b5..af47d7170f47 100644
--- a/www-apps/dspam-web/dspam-web-3.10.1.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.10.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://dspam.nuclearelephant.com/"
 SRC_URI="http://dspam.nuclearelephant.com/sources/dspam-${PV}.tar.gz"
 
 LICENSE="AGPL-3"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=">=mail-filter/dspam-${PV}[-user-homedirs]
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 159fc94a98c6..38f1389e68dc 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f41507c2c222..298c46af609c 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -26,7 +26,7 @@ AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d9
 AUX chromium-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-75.0.3770.142.tar.xz 709968204 BLAKE2B 0e3456127796e7580c50edc0dc16c6989108837a380c96704c96bbd14b042f6d7059dc082a099a7f7752b3b3c6c072e9e9ecc89f3528b914f13a4a923a4488dd SHA512 89534fafe06281cf8ac328f7a17c192f4a03cbc8e6b410626ea2e7993231b4ba195b4190a3f183fad63a03602df7b763a776f10802b1330c737f0249bf17a792
-DIST chromium-76.0.3809.80.tar.xz 728765904 BLAKE2B 18f4d46508c35c1df6e592bed961c0d0ef88be5f03f6bea86b7464f91519463820738b420b888efef07754a392fef4ac2698c8c3b377642df4b5c3240978f1c5 SHA512 4b88508489e420e67309186b33aee593b649e440eae500f6f308701324ee200952d7295772ea9e2e00e7c866931a939bd98130a732f8e1651bc7f6e27575b585
+DIST chromium-76.0.3809.87.tar.xz 728890984 BLAKE2B d09b6b4dd84d6e2ad6a24602296bfab99294ca09c21553312fa55979eb308d1b3a42cc0e31b4e619cd19c0dfc38dda89bca3b5d2787a96b8836d720f0763f124 SHA512 f237cb794bff68cbc2ea3daadea2852df810543873ceaefa4be901702b3578ce7b23a0f083b76373de20e60ea2dc1245c58de0888fb6c72ca465bca0ee0e7c1a
 EBUILD chromium-75.0.3770.142.ebuild 21531 BLAKE2B 4f1e8ca832be0392df5d32e41cc9fb27365f45bbad03a2d17b39831818b13ce72531545712f0ff712b925413129143b80f07398712251eae91d3cd623b04e90d SHA512 53ac5bc2629ed7e54db851f638a7b16df9b50b9500f148d2feaa0ace5491e3c6289d72c703a20da7fbf737d064036eed8723d8da16bf44bc694a49949a401e56
-EBUILD chromium-76.0.3809.80.ebuild 22111 BLAKE2B 8c56836cc24fa8c3a7e38b1cec45dfcb4ce6068a6df330b6f92fed4847ebc2f5b0ecc8c25248ea47b03ebe91e29a4f0379aa484b54bdb7ea3b005d307ae4c5f8 SHA512 49adf8ea8fcd8f9c5908f4148dacbcdaf3f45ae052ccea0fe30227d515f78e1d90a6913f1f8047c1d72c4ffaf0b04093c9302b637cc1b95680ecfb930af19dcc
+EBUILD chromium-76.0.3809.87.ebuild 22111 BLAKE2B 8c56836cc24fa8c3a7e38b1cec45dfcb4ce6068a6df330b6f92fed4847ebc2f5b0ecc8c25248ea47b03ebe91e29a4f0379aa484b54bdb7ea3b005d307ae4c5f8 SHA512 49adf8ea8fcd8f9c5908f4148dacbcdaf3f45ae052ccea0fe30227d515f78e1d90a6913f1f8047c1d72c4ffaf0b04093c9302b637cc1b95680ecfb930af19dcc
 MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187
diff --git a/www-client/chromium/chromium-76.0.3809.80.ebuild b/www-client/chromium/chromium-76.0.3809.87.ebuild
similarity index 100%
rename from www-client/chromium/chromium-76.0.3809.80.ebuild
rename to www-client/chromium/chromium-76.0.3809.87.ebuild
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 7c5623def8fa..223da7ad3f85 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/enlightenment-extra/Manifest b/x11-misc/enlightenment-extra/Manifest
index 19cfed394468..e42512c7ec91 100644
--- a/x11-misc/enlightenment-extra/Manifest
+++ b/x11-misc/enlightenment-extra/Manifest
@@ -1,3 +1,3 @@
 DIST enlightenment-extra-0.0.1.tar.xz 374872 BLAKE2B f067ae5115033d5b87783584327ecd5e08b3b38998d2f9e20b70b135b7ec25106fd92abf5314c2af580cfbcc66ecd65ca7e434429708e1abe8d02dd4b0e2ba98 SHA512 40cf1a19c48cb6f14fd7fbed3223eabdbc69260834480e4463495af36fbfa1d00b7bfe3777998a17e5081b14e66080dc3013a6d3a6c610a175a08c99b4e5529a
 EBUILD enlightenment-extra-0.0.1.ebuild 848 BLAKE2B aa6c027f5b33009ca0fe4d39296b4947b5d0e4c30e897107e40a3c09f17e913a588afac77207539732ff4b45a3bd18b85876f0f9e748313e0f5e1291995dd787 SHA512 02caa297c9a9d718a8ac932ae6a493729cc0d375c318dfbfd9cf8ce22348f179ed0af6f3c4ea03cdd75cc1e8c8e5e3775fb1b21363369f2d548e0b5044156120
-MISC metadata.xml 345 BLAKE2B c7372adfaf1dbac2ac58fdefeb26b327b0df266b3f9026467bcc44bddc1de8ea17a73ce170f4af092b547bcd984f82ae20bfdfcc1b507505d8a5210d2aa89f57 SHA512 f0e959b76ab3ba78d9c45af63b7b5368ebab5ee916cfa23d86a269d1778f23a03fcffa96bf7164e7c3387637ef2904cf4988658ad70227f4fec49be5b8e7451f
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-misc/enlightenment-extra/metadata.xml b/x11-misc/enlightenment-extra/metadata.xml
index ba2dca1a6dde..6b0a0fb3a729 100644
--- a/x11-misc/enlightenment-extra/metadata.xml
+++ b/x11-misc/enlightenment-extra/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
-
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index f814e6e894ad..2390f18dd071 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
index 80860a3b2f2e..325723f6027e 100644
--- a/x11-plugins/wmamixer/Manifest
+++ b/x11-plugins/wmamixer/Manifest
@@ -1,5 +1,4 @@
-DIST wmamixer-0.2.tar.gz 93067 BLAKE2B 9e888b9b3214eee6c8e59da564e36e8f7c1e55df711ebeaaf73300b27b934840994177d003f2be14f40b5e30321c572e82888e030534ccc7cbe0ff12109231d4 SHA512 94f971ac59134f926b637c6c4ef80be1e082b9b81d2e744b921562140e610e958233645c0ee12310086f1aaa3bbb20622c6c92666dac51df3a963e725374583c
 DIST wmamixer-1.0.tar.gz 93181 BLAKE2B 16370da2c1f408b3b584a649e1317850963f2446997e1027cfa7b2cdfa1351807761d3981e2a2cc91ef42272df1146550b3943862d1cf03af5f96d83e6c2c42f SHA512 a5eac2ea3f63770f64f6d2c921aec0d38c54e953c7f5bf1d7ba14c510cc21927751d6939571eb3aede2c7bd0e44bfc84f8dd06ae1af0ef71f2bce8f1b6614708
-EBUILD wmamixer-0.2.ebuild 689 BLAKE2B bfb4fe4651215b362cb80ff4cf73b1c292460f22e0092098fa02a2c6d390d349e054286980398cfd0b5c70b3c9fcfb315ae4f8c2f2dd7955331edb1ab480839a SHA512 a61081ce73b586568d6cf49141daa079be7e5590e19c3a218be1354c19291c156ff1f9685e8d3323c88edc02c2ff9795ec02c496e5678b8d67772ac9f68f9e9c
+EBUILD wmamixer-1.0-r1.ebuild 708 BLAKE2B f545b2fe1c33448907149f4c2f7477799717bf8fbe8bb00de4dfe500dc1a47150f7d4146318eb35b64914128b359ff580657a23d581e32e9358f2d5b77051d43 SHA512 0f9193d7b3d55dc546c83775418a36ae99a5a40c9a5c92be1d9cbf4887c04bc662ad03e831be77997cf8fe94928fa12eb45f8a8e40b0d3f9ed8e05970884804b
 EBUILD wmamixer-1.0.ebuild 690 BLAKE2B 59f091bdd8019d353f5f1e83b428cedd8c69f790fcf5200b0aa14027b093eadf2400266000582f50d9c8b20612b9c442456b3cf58c7d7f92134d559b72d08a1b SHA512 d88c7bcc14fe83d32019499e4f32f77422ccf22389482682a94803fd704f5f9f50238e00d7cc0b2fef645923f91d0adc86eb16dec0ce33fd29d3574449a99197
 MISC metadata.xml 474 BLAKE2B b04cb3956e9f0b9043bf692a6d61024c8986ff04217f8bc9ce0fa15f7db50522798085eb5f4fe828dd9dd8c5baa11bf3ad658bc9cbd703b7e9cee3ab31320357 SHA512 2ef950ff6ffc4ec050aaa62f0da4589043a2b56df7f4e9c80bac8614e5817872dd08bacdb15b584f90a0b790812cbf3a6ebc343ffc65ffeb0cae081266891283
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild b/x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
similarity index 87%
rename from x11-plugins/wmamixer/wmamixer-0.2.ebuild
rename to x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
index 47ea86948d75..a73c156da7f8 100644
--- a/x11-plugins/wmamixer/wmamixer-0.2.ebuild
+++ b/x11-plugins/wmamixer/wmamixer-1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="ALSA mixer dockapp, fork of wmsmixer"
@@ -13,13 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXpm
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libXpm
 	x11-libs/libXext
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
 DOCS=( README.rst )
+
 src_compile() {
 	$(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c
 	$(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 362846fd0cca..04ed7a82eaec 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,10 +1,10 @@
 AUX wmbiff-0.4.27-invalid-strncpy.patch 816 BLAKE2B 8c9dec1bb64014c4d99dcfe0214f8b07bdada1945d5992e131d7ae8edd4d23041c1b3a73a5f9a7c5fb4ae76bd7769270e96be5fbf24a8aa740ca5430da6e7f8d SHA512 7881bfa7b1febb4aeba8f530aa5670fba3b8a688876c2eb5b316ae34f5eddf44e90ce00973c1df34c571e14c55573653485e94b6d17a253edd041aa13e7a2dba
 DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720
-DIST wmbiff-0.4.30.tar.gz 269315 BLAKE2B 11690bcb54b33320c433a191dbbaa769efd490cf5efdbf3cd30ce46c59542092a91fb42ac19afa7718321d99764f8df1c0021795bc6ec1c94304dd46d253b50f SHA512 10b5a6673763a48694cb9cd87f5972c09b0fc50acedde7658133830a06dea8c98ffb9943591cbef802330862d7ccf7a7322d7e9e25ee82209b5a0e40a22353b4
-DIST wmbiff-0.4.31.tar.gz 269883 BLAKE2B 45ecdd6116fa30d2aa71aace18fbf9c6d2ee755188a56a7cc067697ed4a55d7b7ad24b4430d8f36d5c6dad17a152186a12c78cd49d1c86004a0a21ebb56f8d7e SHA512 768207887e92edc4a36f02d6b048cc393e75f9ccabca86f54368fafbd822bb6de5258890395da3f3e7a4f4f951628d15796d38e315b1176c6a3e084d10c167cc
 DIST wmbiff-0.4.33.tar.gz 266114 BLAKE2B 06e5e454a2f8e78203dec66cc274d983e8ec1c0dc7bb82db4ec3c42a8671f0f7a399b79fc94f45e595dcd6fe56c87426dce3900f8fc0f12fbc704ad196390dc7 SHA512 9b88b5929e9234d17bfa5022eb95cbca1720c724827e078dbd44c0bcff77f386b7692a6576b3a96bb1f5fab602c274b3335c71543e5ad053c1cc476d114f818c
+DIST wmbiff-0.4.34.tar.gz 265020 BLAKE2B af4160b983ff46557c78f2f363f8a6b73841050a99d89d953ba4bd493bf016da00457c38bb8130e329f742ad244d62df4b47519b90ee0e8858c88acb0b1184ab SHA512 28a80b635cf6ef03fe688686dd52ed965c2bb17d009aa904967b381f6717ad99014c2c514e9eb973fb2ea83c99a388beb9568f4ac940cbd4631f61c8a13f8cf4
+DIST wmbiff-0.4.35.tar.gz 265332 BLAKE2B 049f01dafaf71af614c47379fa1e59593e6d7904ecc7e63721edc06d06a4705141c5a339f773b7352984b288c32cb7d324fcca72c4459890328672b0d0a4b4e8 SHA512 7a276c33545351dd1e3c072b4b702fabb293744c3b26326739ebc278f18eda3fe971eeaa8392445eb49514eeb430677638b100076409ec6216915a1388a491c4
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
-EBUILD wmbiff-0.4.30.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
-EBUILD wmbiff-0.4.31.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
 EBUILD wmbiff-0.4.33.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
+EBUILD wmbiff-0.4.34.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
+EBUILD wmbiff-0.4.35.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
similarity index 91%
rename from x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
rename to x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
index 58c48049945b..4c3609d57973 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.30.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.34.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
@@ -21,8 +21,8 @@ RDEPEND="x11-libs/libX11
 		>=net-libs/gnutls-2.2.0
 		)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
similarity index 91%
rename from x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
rename to x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
index 58c48049945b..4c3609d57973 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.31.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.35.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools eutils
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
@@ -21,8 +21,8 @@ RDEPEND="x11-libs/libX11
 		>=net-libs/gnutls-2.2.0
 		)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
 
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index 48e40f7086ed..518ac362b7d4 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -1,6 +1,7 @@
 AUX wmfire-1.2.3-stringh.patch 352 BLAKE2B 59523193d0adc31509fa41020ba945dd095cf648d75ff600b088657a82c9167fe1bd5464c9ffdb7bad650dd5605e7072375da562a8ed7307b576eb468d149b30 SHA512 bd0e66712cb88eb61dc4348d3f08775b6673598cb8e74a8d4c2cc437c6c9a515b1bd1568edda70d6b60f6e88da6eabe38c5bf800571ccc72c493bf367a435a94
+AUX wmfire-1.2.4-inline_c99.patch 653 BLAKE2B 5ae6f48c1062f46d22609a1707945b9a1b692cd306786bff048eb9e1d75f0c466bc8d91df989e2501bdf97d61fcd4441d0f9c2fbbfa4913038bd87db0205f9ec SHA512 0284c1f83b43c8ee4d713a53c0ccd684dd0422bce4fae485b6423c40009abc2db14079e9e7a4c8e02fab0c06d5ba3fd226ca47b8b14806cda25cbdc9853a33b1
 AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 BLAKE2B 5b53fd87f6dfce827e5d2403c32e303a7b8dc5d663e93223c6dee6c5bec70f7ad3c07e2261edac7330886eb907bbda72e2635ca3a308d5e0f63b701f31e90976 SHA512 2d0bdc693e53c9c8669f1277134629c3fb506f6c20d67121aef7a624878d56db7a5afa227aaca7c669d0f8ad999ceeadd48380a3f8e9d061ddb853d09f0eb539
 AUX wmfire-1.2.4-no_display.patch 560 BLAKE2B 505f4ba45ecaa5a7d7cf1f8c17f4eedf80c96afd028302243d47ccbef047dc17a12b008e6b10730f16aa037d3047b06c11ba6074e446dbaf3d3660afe67b1447 SHA512 8329fd7912b765f19fb5f72e8bb42f71e0a99a2c350e71e84f604efcec61d43f78557fec5338ffcb86d6cd1ed57e886e9b8eb474bdf47f4e6639795c194500ce
 DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
-EBUILD wmfire-1.2.4-r3.ebuild 881 BLAKE2B 937bc67e869842edccad12898cc14749f6d83344bce4fbbb68a910351c01320d43a48d115e5b7f288af0f2494257ad6beaf9511b6bafd6c8abccda9cfe27eb0b SHA512 b69b7fe59d42b3588b113f3b2e5d2498baa7b4b9d28a79876b999b5bf2c5f1228abfb546f4e3795861eee9c9e224712b70ad2efb645b257428e3c368c2d700c7
+EBUILD wmfire-1.2.4-r3.ebuild 925 BLAKE2B 4599c9ba8d15ede135e66e1b78d121c1bd2e79993f01db490d39c11fc39242c2aa94314eb0168a6d3ec36c5846b2ca5c9c4692a14f771af5b27777e307b23432 SHA512 50e44025ea52dbf33d6b60257ba5ab470fbaa42fc528ecc6ff2f91227e98f795eb1805774d6b505b7b930964a98fd2b1a7934466906eecb92197a205fb59a7cb
 MISC metadata.xml 573 BLAKE2B c75563b4bec05cc6903b69585a1d456d81ba429a99109e841ec3c0ab51327ad91c323c1ef4321b47e56cf5e9ccbff257f7efc6f042afd8715d5224143fe2ac9d SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch
new file mode 100644
index 000000000000..34846bf86bdc
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-inline_c99.patch
@@ -0,0 +1,21 @@
+diff -Naur wmfire-1.2.4.orig/src/wmfire.c wmfire-1.2.4/src/wmfire.c
+--- wmfire-1.2.4.orig/src/wmfire.c	2005-12-04 11:39:16.000000000 +0100
++++ wmfire-1.2.4/src/wmfire.c	2019-07-30 22:43:03.306268675 +0200
+@@ -108,7 +108,7 @@
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+-inline void draw_fire(unsigned int);
++void draw_fire(unsigned int);
+ static void make_wmfire_dockapp();
+ void read_config(int, char **);
+ void do_help(void);
+@@ -470,7 +470,7 @@
+ /* Draw fire                              */
+ /******************************************/
+ 
+-inline void
++void
+ draw_fire(unsigned int load)
+ {
+ 	int x, y, i, j;
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
index dbf51f0404f5..eb4a64478ef2 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-1.2.3-stringh.patch
 	eapply "${FILESDIR}"/${P}-no_display.patch
 	eapply "${FILESDIR}"/${P}-lastprocessor_SMP.patch
+	eapply "${FILESDIR}"/${P}-inline_c99.patch
 	eautoreconf
 }
 
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 3d4d3950a361..c6c802d3016d 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,6 +1,8 @@
 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
 DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
 DIST wmix-3.3.tar.gz 118037 BLAKE2B b219f607ea31132b7753ba7e92e7ff3ce1ddbb992a3f0295ca68001ee81c55ed347196b2d864058f09763e6cf438865060a768c466f3f647474382a9434f76e8 SHA512 5bca1ca70ba8e76e66d70dd01e2198d85d7ac57a5180740c453f349458ba38291bbb7a87697a25c36b79722a1ada5edd1ff3f1c9021998cdf33d248a1f554d4e
+DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75
 EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
 EBUILD wmix-3.3-r2.ebuild 494 BLAKE2B bca47764688e70866fdbb53d8e15032b26d1d8a37234d4fc2c6c19d16a6a49c1732c964dcee29b39ddc50adbd5a5145d2deb22587a94a76e3551a9f5ff95b497 SHA512 c7858600df6faf39f7f5220c0c651d3d938c235c9fa4308b91210514ac1c36065ec72f8fdedce5c347ca17bb241631bec69acbdeb2ccf9bf278ca1fab59ca337
+EBUILD wmix-3.4.ebuild 491 BLAKE2B a7316e2fdabb6428fc5fd8670bfdcd984deea4262b13a69e78b0aa6481d1c70acd290484d60bc18be35791d1ada792600537f2207cf8b224d31d73f82589efc3 SHA512 c27eff98ad85d1528f0cc7267281b7e205646e15b005cd5c81c77113bfdc330783c26cc46a2e2d104649bb6c9500e448868e753542fa86eb368f32cb09720d72
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild
new file mode 100644
index 000000000000..55507ef664ac
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="https://www.dockapps.net/wmix"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index a70a602689c9..5b736f7eb5fc 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/terminology/Manifest b/x11-terms/terminology/Manifest
index 55916d6000b4..9f0276ae1f6a 100644
--- a/x11-terms/terminology/Manifest
+++ b/x11-terms/terminology/Manifest
@@ -1,5 +1,7 @@
 DIST terminology-1.4.0.tar.xz 4878656 BLAKE2B 7e6b41e1057aa245c9cbcbdf164efd68cef7d3bc92706d10d100bface25a7e29468512ee690795e9f09242b644d80215239f761fe7216ea5d768f48259436778 SHA512 c7fd6605c00983e79a647b1e577868e5d2b713321164cb0ee8ef4b4a4155bf320f3e145ce91ecf1d3b0c40f28ae360b96798e47fd11accfa230932cfbd9e5c9e
 DIST terminology-1.4.1.tar.xz 4878484 BLAKE2B a8ec1a6f3a80057316c6c90ea60c2a273702dfbe7dae70fac649c9bbe3245ea8fbacc625a9b9430dbb969cc02b79792f189ea1c16b2ebc0dee9eeb0242dda8f4 SHA512 5756b09aa0f92f9e1fea17d399eca161272a8514e29343873024b9727eaaeeca0b7efe465c01e42cd548b37cf0da7d99733a789921093700519f80a2952f0706
+DIST terminology-1.5.0.tar.xz 4884284 BLAKE2B fff45958207bd6e06b8685ebe42ca734b183da9042940b773e15308200c27307f417a930a687c187a5f24f1eab9d1b7a518314b3cd919d260bb05369a2f2236c SHA512 ade2363e0a834b25a67157d0cfa946b3b09d8a2941fd7da9dd3792cf8d201f218c7723b691eab325d9bdadeefddfea56c19e562ebc37466cb3a9b3b45c9f708b
 EBUILD terminology-1.4.0.ebuild 864 BLAKE2B 36c00aa1e5bc52e26f9ab041f9d31df08fd6b76514f6085a26dd58c68ceb67f7244eff0af33dac8d430642f87980ccc675aea7c966e6eb935e4db7feb4184712 SHA512 4d3081f5580b44e9619eac1c9826c1fc9b85a6e2aae7d4de7a19945f1ec8cdb851beca96051958089c907acf4384e4872a32a7e61fe396dd0725b0a19b90ca1e
 EBUILD terminology-1.4.1.ebuild 866 BLAKE2B 45d945cf025162170ed8b024c7d894948c1a8ca1c0c3bf5e87867c23086ce4f88857a750f8304b38e3e4dadb5203af31eec9744cd0b87477dffe7a61a6b24264 SHA512 7222d8bb616e6a8438c31fd0f9f0065133a20b7e3a15b27912fc45b551dd183fbd03c2a0380b46f08497a398fb373d0baa5a0d407997feec29f203d5492dceea
-MISC metadata.xml 303 BLAKE2B a67da101bb9f64cb0e8a2edc5e32b4f459ca8957c869a044afc1cd3b565fa2ed6d8b92a91f0cf66c6cdb2d0785a43a8de9f50eab1fa13c38240674286017b484 SHA512 0edef7bd2e9e90cd04467f43a0ed63d5f2b2204196716b37b5d363fac060d2c20090ede1fc94deee4113239baf797a7b9c56a11c5854557a9f35fb19747a45bc
+EBUILD terminology-1.5.0.ebuild 866 BLAKE2B 45d945cf025162170ed8b024c7d894948c1a8ca1c0c3bf5e87867c23086ce4f88857a750f8304b38e3e4dadb5203af31eec9744cd0b87477dffe7a61a6b24264 SHA512 7222d8bb616e6a8438c31fd0f9f0065133a20b7e3a15b27912fc45b551dd183fbd03c2a0380b46f08497a398fb373d0baa5a0d407997feec29f203d5492dceea
+MISC metadata.xml 335 BLAKE2B 284db47c691f29fa5b409845f970dde0aa4f2db13d11c4f383bf3b6d13ec8ce05786817a774755a1711e3c748a007733f6a55941a25f7fefa6a87d16df2de625 SHA512 050b1e1ebe7f891d60a1cdb1e6156535eeaa91e7a8064f9dfa9dd0ae948444b13c568761ff7d1f980d78c9afefdb9df1b33813fa2167b7347bcb3f43cb95fb96
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index 9515a632de5b..1505fd1eeaaf 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <maintainer type="person">
     <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <use>
     <flag name="extras">Install additional testing tools</flag>
diff --git a/x11-terms/terminology/terminology-1.5.0.ebuild b/x11-terms/terminology/terminology-1.5.0.ebuild
new file mode 100644
index 000000000000..65b045e742ae
--- /dev/null
+++ b/x11-terms/terminology/terminology-1.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+DESCRIPTION="Feature rich terminal emulator using the Enlightenment Foundation Libraries"
+HOMEPAGE="https://www.enlightenment.org/about-terminology"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="extras nls"
+
+RDEPEND="
+	|| ( dev-libs/efl[gles2] dev-libs/efl[opengl] )
+	|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	app-arch/lz4
+	dev-libs/efl[eet,fontconfig]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use nls)
+		$(meson_use extras tests)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 11e846c04b07..3b3be85d6118 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/e-gtk-theme/Manifest b/x11-themes/e-gtk-theme/Manifest
index 247de898dc68..af8e3f5dfd4c 100644
--- a/x11-themes/e-gtk-theme/Manifest
+++ b/x11-themes/e-gtk-theme/Manifest
@@ -1,3 +1,3 @@
 DIST e-gtk-theme-0.19.3.tar.gz 488203 BLAKE2B a6f19d1da6aeb78030f71face4239bc63c8a550c7ba3ab6cad2b06827ec5ae0da3f14372c1e552454f74f7b18a3aa0c007ca4f7f8040993fc366d5bd25da36cb SHA512 6a833a3c0c38388d56370ae3fe2a3477423fc56133469ddfe482ce0c82e0f4cf39c773448a554227946c8787d588ee637a8f9d2a341f175c1b9ebc1db4f9d990
 EBUILD e-gtk-theme-0.19.3.ebuild 582 BLAKE2B 1b4cbc294306fc0f32ec47b413d0012b565a5119b8d16e39698321790f04d3e09c086e2ea8134345b571fe15fc8e295a3e069764f67b6ef343ee6c133615cd93 SHA512 c429951ccbaf0282658498ce6e853ca8e8c181b606adcb38ba5d8f95c42448c09a78bb6ca92aef6d60e0b8377ae1ce291a265962f7e9c2c2fdadf2ab4902fcc0
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-themes/e-gtk-theme/metadata.xml b/x11-themes/e-gtk-theme/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/x11-themes/e-gtk-theme/metadata.xml
+++ b/x11-themes/e-gtk-theme/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/x11-themes/numix-gtk-theme/Manifest b/x11-themes/numix-gtk-theme/Manifest
index 0f8287a89667..3e3bd18de886 100644
--- a/x11-themes/numix-gtk-theme/Manifest
+++ b/x11-themes/numix-gtk-theme/Manifest
@@ -1,3 +1,3 @@
 DIST numix-gtk-theme-2.6.7.tar.gz 156607 BLAKE2B 0ba8476ffa6e94b83412a76fd7a7c9b17453e886f4c1168cb663cb780e3b9e8cf238f06c04b979d6847eb932623fc59eb8d8736293735f11d23cad1dbb4017dd SHA512 a034644a08173e70de496b88b40c8749d3c3dc988da0c09a03eca77a5263704b001114678e0492988831b1664593d4054f2d7c0d90d95f5b05dcd05914577a03
 EBUILD numix-gtk-theme-2.6.7.ebuild 546 BLAKE2B 44a3f16d58d715d85b81c69a65918272e27983301bb394546190f2f091996d63d0259d148469118e5d31734bccfd7ff96e0121a0d528a249c3d8b22e277ff9b7 SHA512 0661ba521b5a9d6e933c2d46d0b9937d39feef8a2df2da147108091dd2cf5b1186a8a7a87e245818d2211bdecf37f95838beeb65ceae8629fa250f6b1716f3ab
-MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
+MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-themes/numix-gtk-theme/metadata.xml b/x11-themes/numix-gtk-theme/metadata.xml
index d9a6217dd22d..6b0a0fb3a729 100644
--- a/x11-themes/numix-gtk-theme/metadata.xml
+++ b/x11-themes/numix-gtk-theme/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
 </pkgmetadata>
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 5c651ccd6614..e00bd8ba485f 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 51e037da8f87..7152fed362f1 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -3,4 +3,4 @@ AUX gentoo-sysactions.conf 3056 BLAKE2B 155b0826c544a5a4829214b4b43d49e2dad455d0
 DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba
 EBUILD enlightenment-0.22.4-r1.ebuild 2202 BLAKE2B 452b356c54a8f77a1cc81b8ec7cd9417f62c19a836c7ca2e1c3896ecdce46134c866c50d7ac033fa335a80f9622318fcf8c90185705292124eed3562dd8029f2 SHA512 b2388a95bb84e8e63ba500514360d144549816125465a33b1494f1f6a3ac6a4804d41672017d6df9dae440e37f4c38e030214254447167c5edf30001a6cca1a3
 EBUILD enlightenment-0.22.4.ebuild 2188 BLAKE2B e5edf01ab49f61a0318e0669f9193482bd713e3bdae5167f73d69d1eedfd3f233dec84f02711fbc39f59d3ef592ff1c1406ea605ed2f541e55a913c35f6ff8b6 SHA512 6082de94db744272db7ea7f767b6c3ef5d4320cabdd65c724248f17ba995c4ca9d914374101b6449a201275adc20ad4d580d59f40b3bdab4e853559467869a78
-MISC metadata.xml 892 BLAKE2B 05d547df7e3f87b0e2d32bb7c3a0b30ad1b233778081c3595071fccdd5124b263d3a34de09c880f79199885b8da4a3c6cd499304ccd249cea9b764be4ba84bf3 SHA512 79cf7b40de376a2d3344d3e76cdb632bad71162814a9039f322ce12ce8473da3398fcc6aecad188a592dcd31ec7d32ce1563955e057c0750c4ed0e68b7551022
+MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index aca5ea1b717c..d5f28f5d919c 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <use>
     <flag name="packagekit">Enable module for package manager integration</flag>