20 files changed, 73 insertions, 22 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 94ac757bdfd7..c7fe6bc33ce5 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index e1823ba4e485..fe9cab36a556 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -21,10 +21,10 @@ DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb
 DIST mysql-extras-20180308-1938Z.tar.bz2 318238 BLAKE2B 003389434dc52d5e49be77d0e70edfce664d5011a6dbc280bebc1d958a6626ecf7457a720dc66a6b692e2f7796f36fc55cc7048cee78278aa1fe6f82659ccf07 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c
 EBUILD mariadb-10.0.30-r1.ebuild 6874 BLAKE2B f599097904869476a5a30ce264a2c27683ae1c59129bc6c4e4d73d5268fe5788027a2f9056309a9b97fa00881f63b7f8b88560f38272866d0d89767b10f602dd SHA512 370fa3e79b5aea1b89e2136da06a3d7b3a3bcfb49dfdcf030346764fbcee81b4c365e43be6a994e4bc6ad067aba126bd4be66ec94096dca25eb45b8fc0a136bd
 EBUILD mariadb-10.0.33.ebuild 6718 BLAKE2B 46e9980c6d4143e621aee1341b88b8021bc80e42faf54f0f7dd8a9c830ba88939a292016cf07c9e39a2c3c2addcd7de6d7724d3404cab8daae4002fa81a98f7f SHA512 f46c1b1e827d283d930ad6a4059b4d3e8f8ab5cf9bbf33c0f985646119b000eca0474f2447d0bf6dd22243b859de2496e29c5b9b862ab3f8610cf5fb3a674bcd
-EBUILD mariadb-10.0.34.ebuild 6724 BLAKE2B cb3f7600d93945204e8fb533a64523f621151530f63db6aa9bc37e24987095bddbc977c8f16157c19b48574cc77371423b7eb72dda3d98dbe36aaa647f6ced4f SHA512 1e960915df95089ca1ce1a43ee313fe5f0ee2e44ef23fb4f1de85ebb745d0379d8634095ef22520a34f3069f66ced63055792f8f036f7026b87ced11e66fb57f
+EBUILD mariadb-10.0.34.ebuild 6721 BLAKE2B b73ce5719d70c52ad4d3e84cd35fa87aead2a4bac768cfe1987533dbe758b04a29101d5857ec141b1675c7d5a5b22e1d96e106ae94227f779042649b3a8ee6f3 SHA512 60e65533e2d06ecc666e13c2be1a3ceea673f9708350dd5c6777b2dc3376558f042eaf5f94a3efd73e7edded4ee8e023ec204eb7eb5a06c9963fd2b54ee76e8f
 EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b694204e40d4a89ceeee742395965067f4ca4dd301a832db5db9804237e6f9aa5da2b6840fdddfc80aee768ce32c804 SHA512 3c164ee1598deb014be1dad3ab4f11d20e4a560cb19b34f407db51ddaedb7a24f8c9910a7d4f40adc6f552c9db5594248e273c8cca13e9a3a6cef26bd83b23c7
 EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
-EBUILD mariadb-10.1.31-r1.ebuild 7808 BLAKE2B 102fd7848fa434d9155f4fe9c96a24e989ca4aace1d121edf14f6c56e239bd52f8188320c771e9b6f54fc20946648b1895040c8ba2c1cac855ab4b2f8d4baf30 SHA512 d86f491994dbb960a20b1001fc05bb7e95c340808ce7cf98c725a4706e72258e33950ea51d403d317459b9498a6e9ab49cab58f78a5445ae3b1306cbc7f0acea
+EBUILD mariadb-10.1.31-r1.ebuild 7806 BLAKE2B 437fa0e864bacde0d99f4fa8c5b52657e28592f20e6b3f8cb2ee3b8fe17ce36ced49a8c6817d11ab108818c581187026ed2260f300ddad6ebfa8d951d7c7693b SHA512 7f691e72ea1ab508cdd33a695cd5682e25e27b8e4e6e7bb670a40ceba885c83159161be7ecd652997c589f8e82d1464bfbb66c6611973b1fa438192b9b220862
 EBUILD mariadb-10.2.12.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
 EBUILD mariadb-10.2.13.ebuild 33186 BLAKE2B 1948f1f012ae1766774e47c74077f3197409d0bc7ba1c1f28721137fbd447e397d6a1f88b87b1659cf9523abd1aa77f9bb0659fba5e8a56d70426e8507efbcc0 SHA512 107b441d9108c3261b7b3b262dcf9f8d5e8b51f86201415df2ad1a18e57d0683e75c65ae5ba75b81996922f92066c1c8ad229fec25ecc2588373716d33d54e08
 EBUILD mariadb-10.3.5_rc.ebuild 33146 BLAKE2B b6feb54ae1266ddd9cb59a07e279549f1467b7da7ee80ee61c9aca83c7d0cc0dbb1d3c4e556d180f5bb230833fe5af652edeea5750a42beb2848adf5725d29fe SHA512 75fe9e53e73b3ab930093a98dd584d7b89846a419d4df1d29c3bfe366b139998da0ef9762797585c134e95f26cc5208075634ea11ffa1bfe69eb771efee94d29
diff --git a/dev-db/mariadb/mariadb-10.0.34.ebuild b/dev-db/mariadb/mariadb-10.0.34.ebuild
index 3375434f0e1f..c33e7880c587 100644
--- a/dev-db/mariadb/mariadb-10.0.34.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.34.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
index 9cd0087e80b7..79621c39d489 100644
--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
 
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index 78ad97b61fd6..39ed3d5686f0 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -10,6 +10,6 @@ DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 BLAKE2B 54941a760cc44b7
 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 BLAKE2B 0991036cedc3198e789369a40641cc318fdc4230c2b6242b923e836c50248e3e1f5b891c1ce7465d132c30e482ef5458a19ed8b9e4a9865719be8eda61eeb1dc SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901
 EBUILD mysql-workbench-6.3.10.ebuild 2690 BLAKE2B cbea5b68d89b90e9806e55ee8166f6a3a9528a4b883267e70617e2e54bbb9a3ff2479e6b6a97551d5315f4b87cf41bae7576f142a32c108260b5536f9f4a56c8 SHA512 7199940aabe6f2b90a3f9999fdaff72bfd52115cbb3a25f4a2b611e6962490c93fd384fd0d7de4fc54ceb95730ad5d9fa124f8221210822b05c3fdcb0f3dac81
 EBUILD mysql-workbench-6.3.4-r1.ebuild 2823 BLAKE2B e0982f34995ce56ba191c6b19492757438171b628aecf12641192bfc84a94d226ac745916b12d3b27fc8537e040e3a72bd4ae572b0c18c71f032ae4f0f2222c4 SHA512 b3865e92b552dbaedb60989602401608fd792908f6abf9cdc44786242b765120e36029a86e6169aef8c87c3ed0392ca1655596603fb06591931717da942d3ccc
-EBUILD mysql-workbench-6.3.4-r2.ebuild 2644 BLAKE2B 1f00d454567aa281b7535a4eaba509b094f4a00010718a78913eb2bd1f55b83d6d622767d0b66d15450ea1586e3d1919bb2af0ca139ea946be6cfeae7412aa6b SHA512 18873a92067d037bfcf2f69e95acda490968a8ca752bc34a83c925f29c894a2c721d01418046b983827b93aeb7cbf7695fe4ff5563a33e60b1775a8280fe1f3e
+EBUILD mysql-workbench-6.3.4-r2.ebuild 2639 BLAKE2B 3ec26fc7bc62e5b4ca9840a7d2f0116566fd4af7d848f89175e67d07ebff340466221a6226d632fc960e6a8f41cae60cb8a8d50317ceb00d049b395c6ab0c493 SHA512 da097fc7e58b6d3383aa66d37cfa0b734c203db43904c0aa8266e51f160a61f649f6bd08136569076eb0ad5b56bdbb855139a58a9adbb8736ff419574e05702a
 EBUILD mysql-workbench-6.3.9.ebuild 2621 BLAKE2B 1a2583c3a0cf268ab0c0d52203773612fa115a1c6096d4a4571ca40bedbeff4cf3fe95bccf75512705d4c3eed7cf72a0358b1dd6acccbb95fa1e1eb2d6c154ef SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
index 4d9464660152..84f314bf0128 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index eb17d1a1185c..ef1155cca77e 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -9,9 +9,11 @@ DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d5
 DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
 DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe
+DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623
 EBUILD percona-toolkit-2.2.11.ebuild 1262 BLAKE2B 8d33c609579606aac77a67c5d568a7c14d87f9f90ab3abcd1b6e225bd605a39359fb21f2f4cd845ac3bb27f2aa4e4e4e9e19407a84473db10b37f84364216826 SHA512 fb9ab1638b6aff2e43b55a2fb1872f07d36f3f41a7c7c02038681cbaf163e85291b0c79e422e4395b521a0bcb9bc9d0d9d4ae4aaa2654bcafcd39c6e85dca922
 EBUILD percona-toolkit-2.2.17.ebuild 1213 BLAKE2B 8602c2ac1859da4fbefa52c5714e07a9e44c3b148b35555e4977c1c4604fdf35de3a95a658065533e9f894f01a19f7b57b0eb2c537446622ab98ab59a7b13b6e SHA512 78b956efbe27586145cee31f784cb143cec4c40ef9f06efb315367178db085f2767f8b29180be0549ab407ad77ddc20527588102354eee23d3a328fc46f8a892
 EBUILD percona-toolkit-2.2.19.ebuild 1213 BLAKE2B 784c406e8b359b1c75c49725ee670c16d4e3ea91d845d83b9b5f032cbebcf455074fa7423f42102f257df571ad7b4cd9a21bbc318175c446867047c90d1cce95 SHA512 21caa33395129da3a11c2bd3bac9eff2a722bfc473d4e1065c9baa123542239531755b4b16965c5c470e7851027ce81b9a17b35bf6ba16cd922ca34a600f8fa2
 EBUILD percona-toolkit-2.2.20.ebuild 1215 BLAKE2B 8d8de3c3b9d82e46d9e2b73f17e58922eab9e69a1060263d15037804101d2acc39efff1cce8d085b79b8a698a7c3e832ae94687f9d7808dfe3eee891b2758b9f SHA512 d4a46bf28dcf7e71158d797cd699371fd9f6adc45ddc7766c98301308704b9f13bcc1d57439b63fdeceba8d47a4ed07059bf2301c486f500b2a659baae724a56
 EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1
+EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 MISC metadata.xml 833 BLAKE2B 4252a5af815b3d1ce0175c6e4755a7754092039be8836803a18a188dca0b09dc3a278b28a5ad088beffb0aeb438c12c8494d051a953d9331e567939ae8ad7c3d SHA512 000249923e3303c31bdb6a74806ef08f917c84fdfb93d6e844d3d77ab8f10143ba0a61de4c71dc7b54003c0cb152e9e7b6491245b44a54d80f8e98d7e4d00959
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild
new file mode 100644
index 000000000000..8cb91309b313
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index 1cddb89b6f27..d34d7211d45d 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -5,5 +5,5 @@ DIST percona-xtrabackup-2.4.8.tar.gz 57965576 BLAKE2B 5cca947549181413ef68bcc7a5
 DIST percona-xtrabackup-2.4.9.tar.gz 58001052 BLAKE2B d2a25a5ca2190ccf82a600245a0e21848abd9a33ea937a81b2ba9c7e518b24291080a3d3c4b8e6d02f51523e5cf2e78680e4b351c4f2bcd8f122c58f62c14418 SHA512 913431f0fa648731efa2e9bc87c9431a28816b0eca12e1c6df6e7ab04a4148ddd8fa03c9792335ad152b05bede5b9fe64ce94a393b5e4e37d4b18f4989b0ccdb
 EBUILD percona-xtrabackup-2.4.7.ebuild 1757 BLAKE2B 7c6066f3b07036640671fd0d647bc1ec3c1752f20b2c634af72eb243ad9ab0e3fdba12ba9da36beeb1493119627e6d1bce002ce3591361edab3aea2945d10bff SHA512 12837447a0a2f63db110d93b7f736658e6c34aaf478bf1d94589ef48d881fea24085b55c1a71aeea85a315ac3843309292ef35a95d566b19dbf2971f62d8bf48
 EBUILD percona-xtrabackup-2.4.8.ebuild 1804 BLAKE2B ff7c593ef58016456633261f0fe4c0ebf918e077c6f8c98470422373f687c968a98a312571c332e50df1146bfd0fc202879f65891d124a40ccb27553b113534b SHA512 d598f38cc0266ca845b81a83a273f83e59dd44aa797ab22602be86e01572af021f28b07c8b1aca0497cdd5752bacc5572c76aa4e3c00a55aa82124b03eb20480
-EBUILD percona-xtrabackup-2.4.9.ebuild 1805 BLAKE2B b45b26e44ff69188c25cc2f9c78355a2e9e727933820f6af8d7e41c44e69316bc1821e7ad9ccc25cbae879d7fe32bf4fa53804659272f3c4c73194d3986d8c18 SHA512 3ad3e6c0040ea6c29c7cb68068a43bb3e98e5b998e574a7b2adb969033cfca02e04247b6430c092c6a01b5a7c7ac06be9d00b64775caf18b6e5ab6af65b35f78
+EBUILD percona-xtrabackup-2.4.9.ebuild 1804 BLAKE2B db219c17e234b628a1730f23fa96f1766353b0de1615f1f93cc3b5ebb45faf405ea31215547fe0c1778dd65e48b743ea2b68727792695ca014e2d6f13bc20839 SHA512 25a54c649707d02e84ae5504122d725b1045fed258ed12d3643022c5d03fa1a008f13982cb7c5dbb02d212225ba8230057634dc867ab082bc9fc9692155c2dc2
 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
index c18eb722b773..fc4d5f95ea80 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	app-arch/lz4:0=
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 0dba8de337c9..459740c6a348 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -43,7 +43,7 @@ DIST postgresql-9.6.7.tar.bz2 19504886 BLAKE2B 04ed26987f3a38826b7e04bf364d8f59f
 DIST postgresql-9.6.8.tar.bz2 19528927 BLAKE2B 6aab5dbe4b13e1624befc33c2fa5241804dff71879e2d60c166db19c2fe015cd19cfc35054e6aede82bfe6b83a7146b6d2eedaabb94111c163da732526ff1723 SHA512 6b7595c0046308c725d77360b156e979d6bc469b78ac6500f631112f19b2607ca2d816781f8c5fd3bd835c48e079e79ada7af687fbd306a8fec5e160f20dd211
 EBUILD postgresql-10.1.ebuild 13697 BLAKE2B d356373a27d27fdd2447f93691847816fd089019206d7371cbd6c84a513b6d490b20278232769fe1de63d60d6bdd1e0ff9afce5fbf7b0da66296a57167d689df SHA512 65bbb3d9d6e64dbf46d8d24c0aacaa930c417b262fa01442cdb09820bf47d37e81fa272e5afe808cb96bd5a3fdad3d23540c1d08a2d5a8de8bb6e8f4b0a3db11
 EBUILD postgresql-10.2.ebuild 13694 BLAKE2B 9b4bab58754dce659e2c6c0c6b9e93a8af9097dfdff9efdab74eb6ed5f1533d04920a4b2bea58beba224ee38114c0cffd4e995879f0431fe8a6c66cc13a25dd9 SHA512 ecf4fdb9532135052036b6b94742be2d4d92bcfdd46b517f4882b46cff6962cabff0b3ec8ac8cf71303e44c67d433deff7e4d541a25d5909204f15919faab099
-EBUILD postgresql-10.3.ebuild 13694 BLAKE2B 9b4bab58754dce659e2c6c0c6b9e93a8af9097dfdff9efdab74eb6ed5f1533d04920a4b2bea58beba224ee38114c0cffd4e995879f0431fe8a6c66cc13a25dd9 SHA512 ecf4fdb9532135052036b6b94742be2d4d92bcfdd46b517f4882b46cff6962cabff0b3ec8ac8cf71303e44c67d433deff7e4d541a25d5909204f15919faab099
+EBUILD postgresql-10.3.ebuild 13691 BLAKE2B 8414d44a4af307caa14e06d3b34e631ff4a1ae5a1a5c9311dc57f5d97998f3743c9bab734d03d8246f6966b3e57f0df94f1c403e6247213fe160d65da781ffeb SHA512 582ae144d826eaf3bda9a8a170caf5b75d7e7fdf362e2f38e605e150b4978fea72be0f4b0e28b9a531aa3f88c3b4ed317e2fa1fa5f397b463a431f295964fb72
 EBUILD postgresql-9.2.19.ebuild 11686 BLAKE2B f925064291b78586507d974cf47f850cdcd900dc6a8b60432ca02f242582ff876a13033a093200f4936898d48eb2ff47d74f808c84908962cac0f8b767a9c199 SHA512 886faf3fe74308c908e8c49e7a65cac36e55932eafee581ab021ef66ab3cc7fe2e37c5e4011b33239f6c11935465a6875e8f6d5b86fe4f64e5ead807a1e73164
 EBUILD postgresql-9.2.22.ebuild 13296 BLAKE2B da5e5cb771bbd20396f1621b7af93052a5e2fb022073286aa023245c083c146cad4d911d8754a94a33f9960ab91c8219c76bc624d15e2fbb385b54ac10f34558 SHA512 e16dca2871f2ede54993d9a81768ebc5ad3391041916d42108db09617c7d5577bf0f8daabc30b4d7a6851e991886e3155320a0a1c384c55eb248de12b3f7894e
 EBUILD postgresql-9.2.23-r1.ebuild 13492 BLAKE2B 912b67da2be82aa402ff4cb684f273a1630a6b551adb66d92125bfae9c81b66a48fb7eace28086525ee1bfffa1072a2f756b374a2d9ff10018ace257ab8643fb SHA512 cfb518dd4033579b2fe7f459555809c7d141bc0e15d80d308afa0ad1d3ec92e8809f81d92b855b97d76b299b2e6ec7a48971f2a6fc052da2ec82f048aa22c009
@@ -52,17 +52,17 @@ EBUILD postgresql-9.2.24.ebuild 13483 BLAKE2B ef135a71dfb8f2349c106ddfa34c164058
 EBUILD postgresql-9.3.15.ebuild 11941 BLAKE2B 33410678e64b27a4802e11c1a5fcacadacb0b1332abdf61dfd64e0d6173b0be91ae9d457b58255dd56e410e13c9b5f778b7094acc8e1ddc1e265f685cff6a60b SHA512 3372d3801726ea6509713d79393ee59fc30eb2d832f17805f3d990308813064a59f42b7930d3342639475eeb37bdadc4952cf945e574f47c8ab7f0e9013b83d9
 EBUILD postgresql-9.3.20.ebuild 13742 BLAKE2B 8c6a98061068a6ee781f77fa994c683d80c2c7a1fc4ba7b7cf08a8a4932ff6b7d2522563a9da03b537034da7ecc84b3ab4974b5d1cbdbdab9d64f0e24779cc9c SHA512 21a54b6e8d4483bd15b464e6ab23cc04dbfe2b38fda30131b0d5c26a6cb156aca3ddd09b7228b32b64e4edadd9f24fe0a779efa9f04e633078a4153fcb11086f
 EBUILD postgresql-9.3.21.ebuild 13747 BLAKE2B eba1e76731b756897b9cd8b357f3f355cc70c0350cbde5648ae78705bc15255a9568d20b1e3bc6fbfde3886f34222a590073238146c9a7b618dd07c2a711aa39 SHA512 7a30b8dcb6c198b4a8e7a29bec5c6cd4c86b9886b505e72749adf826a656c0a1d83dd6e22883ac444ae54e43d908c2f415b2c87b04319b0115c2dfaabb3eaf6f
-EBUILD postgresql-9.3.22.ebuild 13747 BLAKE2B eba1e76731b756897b9cd8b357f3f355cc70c0350cbde5648ae78705bc15255a9568d20b1e3bc6fbfde3886f34222a590073238146c9a7b618dd07c2a711aa39 SHA512 7a30b8dcb6c198b4a8e7a29bec5c6cd4c86b9886b505e72749adf826a656c0a1d83dd6e22883ac444ae54e43d908c2f415b2c87b04319b0115c2dfaabb3eaf6f
+EBUILD postgresql-9.3.22.ebuild 13744 BLAKE2B 18192645bd6ca52355673ab8f9567293250fdc4c802165d78c61ba1d1a3a1b92e7e6c2a67fa1754e1ad800d792030d358bcdda99b52159d9cfaeb58e20ac4122 SHA512 3b5143ae3600b936124ca2a008c538e0563d08ccc589a3177fe0dc5d25c35b379b9d704dbede0cfedb0ffbb293515f4625701291df6f31cff376fcf39f6393ea
 EBUILD postgresql-9.4.10.ebuild 12751 BLAKE2B b90abd3b620ce5020b6c9af6e26856026c43204d7f15943a04c33c6dbe75c6b8aab8e4a59022a76913baa8596e0e44ffb454d8d98d7b1fad3747955d0e867ec3 SHA512 ccf11b56f79cd334fb67c13b549506c5c1bfe09b9496466d5d4d4dc976a9e5275cf9e9c1d0e579d615716f1abf320953126d531591439d5d1f777cdac8e4f70e
 EBUILD postgresql-9.4.15.ebuild 14552 BLAKE2B 5e343b4b7c24bfe2cab725491f41c4ec7eb12ca81595e268325adedad80e1266737ce3a18b5d4bd2dae8b3ebaf11b0ae55bed298aa9263eade7e2e7da00b3ff7 SHA512 afa0b8c349c8bd9c10b512f02c8dd16e6857d1a52acaa3ec7d695eb4ca3b7273c2cdcdc7b4b20f7c005570e4bdfd78126c890b6eaa60088ff9170cb5ec1b9595
 EBUILD postgresql-9.4.16.ebuild 14557 BLAKE2B c9478cf449e3de5e7de82ee121318e5fd5ba69932aa2a8d7f7f0071d716a77baf13e51611add88c36f645e6d79313dd49618a4bca89594d5e7534ec03892b58f SHA512 b10739ecf8688da66d712d0bcd99897128aec40f42ece1082de2bd3da5c63ca56f3bbb189c7e62fd67d3fead991be69da465ca1151b56f1e9bf5d4a6b65f7ccb
-EBUILD postgresql-9.4.17.ebuild 14557 BLAKE2B c9478cf449e3de5e7de82ee121318e5fd5ba69932aa2a8d7f7f0071d716a77baf13e51611add88c36f645e6d79313dd49618a4bca89594d5e7534ec03892b58f SHA512 b10739ecf8688da66d712d0bcd99897128aec40f42ece1082de2bd3da5c63ca56f3bbb189c7e62fd67d3fead991be69da465ca1151b56f1e9bf5d4a6b65f7ccb
+EBUILD postgresql-9.4.17.ebuild 14554 BLAKE2B e24143470f9844174c241473671f9b422a3080d740048b532e9dda0cc8f347cd087845b01014b8ca3f6a3f96ed8389ed5cffd9f83c0bde6adc95ad02361da842 SHA512 4a5fc54ceb68528483bac90469ce1fa009e49a4f5148426633fff9f9b96799c1cd18aeb514931963905cd81d876d9c952fddd84405562b1dfbf8054e4cacd76c
 EBUILD postgresql-9.5.10.ebuild 14780 BLAKE2B 988e6270060614715936959b06867137f0629884d98cb50643d7d0fc4314c8192fa4205125bb376b3d9ac8d0b17cbceabd89b79671e9bd78017ca13a7c40ecc2 SHA512 26f93ac88c51609e62ea3d2dce5dbbc63cf8ad52ac76f029a437befd907d17d5b343a77a651c362b3292f8cb81784c480febe3909431a2f24ac51b9335d0b149
 EBUILD postgresql-9.5.11.ebuild 14785 BLAKE2B b10e25f8d4586c076f49cd9e7b7874c7a7892215a316f65685b5014bbc855485f932cb7684a8bc9c77ac4b3e5bcaf33915e58b6a98b3f2902fd1b9d791556438 SHA512 d55f33f3a7a9137ab6a923212d90cea54473f35115179f19d3be9f9863a8baa5875ef6647b7cb862288e304d5da91dd20e8a2b0f134f17c80d016eb9fa43be80
-EBUILD postgresql-9.5.12.ebuild 14785 BLAKE2B b10e25f8d4586c076f49cd9e7b7874c7a7892215a316f65685b5014bbc855485f932cb7684a8bc9c77ac4b3e5bcaf33915e58b6a98b3f2902fd1b9d791556438 SHA512 d55f33f3a7a9137ab6a923212d90cea54473f35115179f19d3be9f9863a8baa5875ef6647b7cb862288e304d5da91dd20e8a2b0f134f17c80d016eb9fa43be80
+EBUILD postgresql-9.5.12.ebuild 14782 BLAKE2B 778b7eddd38fbd46b772d4b8c26d131d5ba74c2aed3a3b601151f97548947759b546b58d9d926c3e5309c0dfb29acad4cb5ae4c207c33ec6ef85b59af6fb590a SHA512 fc2d167d0058c1134d0e40b57e7ba22846307aa56e091467ed8ea339235c5728b9ed969aac6c55196201af83ebc38f4739f531a5e069e19ecb82ebfcf723072b
 EBUILD postgresql-9.5.5.ebuild 13090 BLAKE2B cdcc7cfae7249c37a72bdb0a5c91362bc926170bc47d046f2023ac34ea925281d2f136500c1cae288b4ca2d4c9c8f90b490ddb648c26b3fbcbbf9fcdbabfc2b7 SHA512 957a4a494eb13d125867531c004193746cac0c3197ae3f45b191f78c7c02941400bd02f18af8f954ffbb45523688f5dc3cb4d804f5504020e0304083395cf8d0
 EBUILD postgresql-9.6.6.ebuild 14922 BLAKE2B 25182d0ccbf475123d876bc4ad825b9b5049b7bd8edd8e96ef7390ab8d371515df12cc95426ba503366e81fe04be01c3a4c40a688caeb60fdb972f8f5e7c8ec4 SHA512 385e3c883cfe4926be01f760205a4c0827f6f20c0e465a082cd474e7b68c2a9977a2ebe4acc90c04171ff32f265abedcd12d225dcc3215981fe59216b1dbf6a2
 EBUILD postgresql-9.6.7.ebuild 14927 BLAKE2B 1cba06e2425db4f19790ca672da27626850f16ca33b372ea140b561c65b8d5523657c4e88d82281cb551390f6247a79d3bbc2d859a28812d85c752fba1d2dc57 SHA512 6ba1b0fead0c121700f090c73e3d1b05faa8d69c4cb6f3fb73ec90fef20f0c7610c5adf0fea0c2934689ee9310aa2f975594198a5d434ab9ccf6f6a1159024cd
-EBUILD postgresql-9.6.8.ebuild 14928 BLAKE2B 5963a72b10e83b3c05c0afa1b119b38b3debbc6fc7723344fd9ae62e578c4fa6e5a02a62c60a901baa96ec4e7d50c1260f545d6d896144aa8e0f06c3d681209f SHA512 eaf54012af3c62f55227c6968b7fe1d02377f80da4aff9bb90c2d2f83e8127e6aab4bc6be52fa799e19bb4a45b3ba7a2b60db9f693b327d38195b6dcd85fbb2f
+EBUILD postgresql-9.6.8.ebuild 14925 BLAKE2B a2aacec2f8168d697f93df9f285b8b063b6ec122c8184625e283c52628d4d675d93941c3a37c654d08f9e153631f4eaba79ad444adcdb8d8f9fd38f16f5cba94 SHA512 0675f2bd25bdf6dd83997ebd8ed7536a3a93fbe4b44ab28cb9a4b6b844a6f779da446316ef7a9c5015dd8b0501d1014e6f42bb0f3c837676dbc74c80dc6f7c75
 EBUILD postgresql-9999.ebuild 13544 BLAKE2B 2a1f9c50e21e7b9981adb38d18d4814903578a461d81f8a250fccc73b5680232f9d53d3c56486e65007b90a954f31939775ce5e4bcc621672e8b29e0ee332b0d SHA512 7c579c0a60b1e10e2d0c254fc9f60f2908db3634371d359c88ebf0acf581eaadf24ba5e8d3ee0ebd4aa05d840a97d0df74385578c0d792ee7ba87402b6931813
 MISC metadata.xml 751 BLAKE2B 4628a6d379a41b4646be34dfcfca2be58bc93b883ccd6f4d21a426aacb34dd7d5347c5f9d61f9211f4f91bff67d2d5935b203959ab0790c74031944a9ab799f6 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1
diff --git a/dev-db/postgresql/postgresql-10.3.ebuild b/dev-db/postgresql/postgresql-10.3.ebuild
index 3606fab49166..3d5f13113f44 100644
--- a/dev-db/postgresql/postgresql-10.3.ebuild
+++ b/dev-db/postgresql/postgresql-10.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 
diff --git a/dev-db/postgresql/postgresql-9.3.22.ebuild b/dev-db/postgresql/postgresql-9.3.22.ebuild
index 08f19cc0a961..247e9a1b97c9 100644
--- a/dev-db/postgresql/postgresql-9.3.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.22.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.17.ebuild b/dev-db/postgresql/postgresql-9.4.17.ebuild
index a1248b747bfe..25676b51c9ff 100644
--- a/dev-db/postgresql/postgresql-9.4.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.17.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.12.ebuild b/dev-db/postgresql/postgresql-9.5.12.ebuild
index b00eaaaff86f..90f8e694d0a0 100644
--- a/dev-db/postgresql/postgresql-9.5.12.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.12.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.8.ebuild b/dev-db/postgresql/postgresql-9.6.8.ebuild
index 7cdd558e3a61..fce21d7b454f 100644
--- a/dev-db/postgresql/postgresql-9.6.8.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.8.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index ad29a0faf964..800830bbead5 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -27,5 +27,5 @@ EBUILD sqlite-3.19.3.ebuild 7611 BLAKE2B 1263a4f8abaff47d5295084f20992bcba69901f
 EBUILD sqlite-3.20.0.ebuild 7620 BLAKE2B ea080930bb5e163562cd5e1b7e7e66437cd10638c2e8de05ef657028d5811169b0ba769c43fe016e7fb630daf8e9e03a92b49056bc06be8d6145e2e69af789dc SHA512 22a41d407e0c18fe978eb26cf7606bb977779f61fa26e39f9ebb9d289c26a884ec4d8dec311a2147c5eb51532b8fa9ef6eab4f042a3d7a6e6fb7f06053e67193
 EBUILD sqlite-3.20.1-r1.ebuild 8072 BLAKE2B 0b1c72b1efd206d11ddddea689032b7680b1909ffc1f0b46a1819dba8d62a7ee44674a124c4c529d47cc11cd378510436b1333a4d0ecb88a718a896cc047a1e8 SHA512 e819cbf0aff755be74c04b096495b909cd43d50162e7c243a67936169e42db5113880fc47e5d2da26aa0ff84a87d71bb9007eb87a026dd302d58deb5db0409ac
 EBUILD sqlite-3.21.0.ebuild 8454 BLAKE2B 87a6fcf651090d1440710bf253252ecd81164f91da4a6c2dd2a5dbc9b8e8db22f4569ddb48c7ad10efb1f930f91b37f1ac8b49621ec671c4ba64f394a3e53326 SHA512 a9d711fd29747bfa9829d6ad0c78d50fc08044e31011b2be746e2857bf8dc2969ba64c4fe80de8c9f928ca677ae105eda46b48d89ee2e9e13622fc26dabfa72f
-EBUILD sqlite-3.22.0.ebuild 9315 BLAKE2B 563c2b961a27812183b0bead13e340ae4a1f9269d38decdc04aaca321cd068fe46f4a3fcef37d98b8f0b36bef2500d911055b40c7e8a8a5e6c5a44c346dda953 SHA512 6f1a128ae8d2d3aa8fa2453ac9eac96930e431f089d5273dd70b485d5a1632a8e26e278229ade446c943c84bb0874a7b8644270bac7956db74ba36f4d07249d8
+EBUILD sqlite-3.22.0.ebuild 9312 BLAKE2B cdeedf176f05d9e42f4b608f090a5c6c2d4f8dc6e5b36fb67114ee3a0d3f795e1303ffa4968622a5313d126911fc92daaed43084587078534afe0f51c96e734c SHA512 74115a4e493e8ba91b59ba8b866412a23779bc9246c9394e1ce3971304ae51583161211efdeb92a05787bd4985f8f6e1fd6b3d4e0a1d60194b06e7ac45348a00
 MISC metadata.xml 745 BLAKE2B 967f5a809e007354fac9d750f068aaf552aac8503f72d20c57dfd0f85dbdbf620209bbd9646cb2b79cfc5f2a40917422c4925784d54220f61132d70ddd414d53 SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849
diff --git a/dev-db/sqlite/sqlite-3.22.0.ebuild b/dev-db/sqlite/sqlite-3.22.0.ebuild
index 07ced87f7236..32bb8bfe8298 100644
--- a/dev-db/sqlite/sqlite-3.22.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.22.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index dc4064dffc41..ba545a60a3a9 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -2,6 +2,6 @@ AUX unixODBC-2.3.5-CVE-2018-7485.patch 5224 BLAKE2B a21d659f75f9ae11a6d78a4a74b0
 DIST unixODBC-2.3.4.tar.gz 1830660 BLAKE2B 19b3b932e66ab2fea5645d9723592d881d86203fcc93a1a34bdc9d24fbb7fa606a0389b37988606ac60da71f378327380a32d4687dba16e784c9cdf0fd9b5fdb SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
 DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 EBUILD unixODBC-2.3.4-r1.ebuild 1664 BLAKE2B eaccced362a7f62eebe1809ee0327df36978a6f0856c2b631cee32763f92b20909c4bb32bc79bd179f5d9193f34d5307519bb1880d9a94bd5a27d238a3682efe SHA512 5429a6f9ad0279d77a2a26b5a1a0752a23646922fb0f2c2a3df594e551a1e46db614bb991d126d7652f5359e4ccbca0bfe1051c1af6b80ea47dbc59ca35d7329
-EBUILD unixODBC-2.3.5-r1.ebuild 1829 BLAKE2B 581f8fb19ba7dc1d06e2dc2029e031a58cddc501f58a248130f93a765563205846a7c4b2d1d627786aac53021efbd883445f59bb2e58f134ccb8abafd956daa7 SHA512 58c769992cff2c548ab7e26e3101a449585a1119f0dc6b73b021b03973ac1301adb7d2cce0a92dee8b0c6d176ec35bb97c893e9f74991e908c8c4911b26ab9e9
+EBUILD unixODBC-2.3.5-r1.ebuild 1827 BLAKE2B a687d58ae59d39a8d76f907736ead784cb3db2767ac05ce59ee2d1676a809afdca3845141cde18945226c51dd13cce9046351a8316181925e79e258581da696d SHA512 f2b22ec0205166faac7ae979c270d90c15e78c4d7070f3d87412e301c0e568832559f3c231a2af4ea93817cfec800f798b7ffdbdb2af47c3e62a680322896f3b
 EBUILD unixODBC-2.3.5.ebuild 1770 BLAKE2B a2cbcd5f110ac341228fe52330a03a2974dcef1e926e1d117971dbc3de71e8720511ae1474b80d9acc20c8af3ef3cb3ba56b930466da906483b29286e3fe1fb7 SHA512 e3e7b84a4c432a53c467c85828e5652e3475fa881db70c754c6b5b2884e39c89995fac9f1c9f6c151057c87c63f19c4d92a41d0d2097b464190209b19a4622c1
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
index 007a894e64bf..aa2e9ab27bc6 100644
--- a/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="