From 796cae72cf9ed18ba01256ac1f83a686a2a76036 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 20 Nov 2017 18:45:28 +0000
Subject: gentoo resync : 20.11.2017

---
 dev-db/couchdb/Manifest                            |   5 +-
 dev-db/couchdb/couchdb-1.6.1-r2.ebuild             |  78 ----------------
 dev-db/couchdb/couchdb-1.6.1-r3.ebuild             |  79 ----------------
 dev-db/couchdb/couchdb-1.7.1.ebuild                |   2 +-
 dev-db/etcd/Manifest                               |   2 +
 dev-db/etcd/etcd-3.2.10.ebuild                     |  63 +++++++++++++
 dev-db/mariadb/Manifest                            |   4 +-
 dev-db/mariadb/mariadb-10.0.33.ebuild              |   2 +-
 dev-db/mariadb/mariadb-10.1.29.ebuild              |   2 +-
 dev-db/mysql-workbench/Manifest                    |   2 +
 .../mysql-workbench/mysql-workbench-6.3.10.ebuild  | 103 +++++++++++++++++++++
 dev-db/mysql/Manifest                              |   2 +-
 dev-db/mysql/mysql-5.6.38.ebuild                   |   2 +-
 dev-db/postgresql/Manifest                         |  10 +-
 dev-db/postgresql/postgresql-9.2.24.ebuild         |   2 +-
 dev-db/postgresql/postgresql-9.3.20.ebuild         |   2 +-
 dev-db/postgresql/postgresql-9.4.15.ebuild         |   2 +-
 dev-db/postgresql/postgresql-9.5.10.ebuild         |   2 +-
 dev-db/postgresql/postgresql-9.6.6.ebuild          |   2 +-
 dev-db/sqliteman/Manifest                          |   2 +-
 dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild         |   2 +-
 21 files changed, 190 insertions(+), 180 deletions(-)
 delete mode 100644 dev-db/couchdb/couchdb-1.6.1-r2.ebuild
 delete mode 100644 dev-db/couchdb/couchdb-1.6.1-r3.ebuild
 create mode 100644 dev-db/etcd/etcd-3.2.10.ebuild
 create mode 100644 dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild

(limited to 'dev-db')

diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 11090d663a43..29783a981160 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -2,11 +2,8 @@ AUX 1.6.1-erlang-18.patch 4121 SHA256 2b8cccf4d6b42f4cbc1d6809f4ce183aec751eeece
 AUX 1.6.1-erlang-19.patch 4270 SHA256 659484e060929bd51e6fc305cb83bef1c2e5d1860f3f078a14f4fbb0a7be89c9 SHA512 abc3e0162ca80e2f1784e47d15c23bd134efcf4b8e1ebf01d7c853215971ce03dfab86597671142c05c44a4fd6748ab9daa29a11fff23435831a89cbebb82099 WHIRLPOOL 1d33d182a6c60d94ada6a6f19e5d0fd6e850a32521186253010b1597ba673a3c4ac1e1e6b54b096db71af0c71a83998bb3d9fb6698167347c56f4c8de575379e
 AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
 AUX couchdb.init-4 439 SHA256 ae1b5551ce432ca85a99e3a93355204936b4dff99dc0cdba5e19d44b87946f76 SHA512 a1e0a9403082e1c336454584d78d15e5d76861b3b3d0e56fcfb25ab50c0dbbdcf658e251e25f22e2a58dc72f38ec16ce82759bf9c7b5330a569ffb5fab912999 WHIRLPOOL 8ebe4af5892ea2b8ef4e00d273ce3a0612de281907327a2b3191a30822077fb0470b6a0af39cea6806d59da25d19b517db678aaead514ad9b46a22c8d2110922
-DIST apache-couchdb-1.6.1.tar.gz 12085350 SHA256 5a601b173733ce3ed31b654805c793aa907131cd70b06d03825f169aa48c8627 SHA512 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc WHIRLPOOL 5776fe139db54e5ec285ef9882f5164a42a499bab312d66c0edd5314dd1915827a7cf7df02cd5df85c437bf3f70096cb101748956d639e8e80ffd0bb0b79197a
 DIST apache-couchdb-1.7.1.tar.gz 9963069 SHA256 91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad SHA512 cd7417ef4b1eaeb1fe4251b559d904238fd25881c542f1498e6e9f1c4a55a79e34e06e711f90ce39e5e65fcac8be9c611943b8ed57d4a7465859b5811ac0a21f WHIRLPOOL b4cbed19cbb9f5025215638b11c4990c26d831504f46009bba436bd66b3f4ae93588b65d3f3984486e5c20b451a5bd148f16a71a02b01f454d64f859c53a425b
-EBUILD couchdb-1.6.1-r2.ebuild 1876 SHA256 c5edae443bb4025460844b845ab3aac1b70be4b2a4c1ad294c69f2f0d64798e2 SHA512 32ca749588b62e0cdb954e6fcf8753558ea754429b6cc330c8d2503d15f829cfa5d78922981447eb665335edb90bef6bffccf2f740ff7bfb438001abea63499d WHIRLPOOL 263970ac0b11cdc953ce249fe7ea75ff6e17777da5f8ed1d42a9d9c45d13b99736fe3373c62feabfccb7f235c91d292e51e5005b90dc50a47650196a6740efa1
-EBUILD couchdb-1.6.1-r3.ebuild 1920 SHA256 2278b40da7545b22c5bc1316844a72f23df40d7542cb36f6a36f34db063a73f1 SHA512 741b364f8d0d4cc5d80be5169fbbb0230fcc39a9d15392459d884f248e955d9df702168997e172a42049adb6a37d834cd13c9536377dcef719ef5356044a1737 WHIRLPOOL b5f36ea8b8432a0411d848dbfb13d3baa6eca2cc48849267850b6f27a4ff69b6bc0289880a862d786d9d9db3494c9a51c231aadbd5bbae428506118c65e0ede7
-EBUILD couchdb-1.7.1.ebuild 1833 SHA256 3baa8ceb321b161b550770cebb7fe2b6f99ee72dd95da8e3f15b857be8e0f798 SHA512 6865840a88f05df7932986aa3849c87ce306c711f84feaf358ebf35214efea83aec66e9ebe2a403a03ce19a7b2a89c5126208741d3b817596a58e8d21f8d85d9 WHIRLPOOL 5643ad35360c6ba217a5a7639f4f70680f559d0dd792e188488896367c3de339ac9f26d090bdf388671efd0a8d3f733c340a2a003875d62d2004b71eac165781
+EBUILD couchdb-1.7.1.ebuild 1833 SHA256 1cfb8b61868e096ae451647825401e6bea6aad7455e1b2fcd505ab9babceaf3c SHA512 48561428b5da0cf6afc118c782e9d627dc82208e7bc9825cdf186e51c746d0bca6040dac52586b56d42f4ecb01d08fb7b12c431641a23de47cd814a2648372f0 WHIRLPOOL 0d8ac073b8d6f731ca7267f11c4ae10a848affeb7cb9c28b623aba6adee3d325976961ae0a0b292e79c7cc1698cdaf780a40cc7b2f463068e871068c484bde79
 MISC ChangeLog 3689 SHA256 9695fbf0257c000cfb6b875048d6b5f7b61cd2a1d15da22017114675b293a5f3 SHA512 25cd2bbf8512952af2ffa3f6fd8fd14ec09497088eaea9b660f54e1c10752118b387e10b113218b1a36fdbedc9b7d03d18fb79814cc297484dfafad7234c6e51 WHIRLPOOL 3efe4e412eef4ca434bdf53ac0b81e8f882a7db4285b291730e4669d9bd68e267a6957ba783dc656774faa9c014e355593d0efc00554a978359ca0ddfa71028f
 MISC ChangeLog-2015 14103 SHA256 3a06cdf5f2fb5900395c9ceb77aa1e355811eb9412e6126f48dab7c07de136e3 SHA512 a90e09a5a6e33ec0f1eddec1a2b651a201b90dc797525616034330006e263f12cf1e338d456269a48a406557d649c6cc1bf3ced63545cda5055961f35adf088a WHIRLPOOL 1585d163b62ca0835f429d6d81b8d8572bc9dff8d477315649cb48aebf7364c81bec11dc4835b694d5c790e4fc50f54b39c8313c31d7f9fc7ab9bd2d69a953ac
 MISC metadata.xml 212 SHA256 061538b4837ab7b95b652299476a75942b769652dbd569225713fdf1166b1d37 SHA512 e4f4b6dbbf6bf039ff5c19bb6a209ad4e0b1286f8cf7cc0cbafcc04fcf93fb92766c8cae06ff19f980a069c7fe9a1686437ab215f84ce10e301275ae107d00bd WHIRLPOOL bb35c86572b2ad56bf93b52f6eca6bea0f5591c1a9ebd608833dea63c89d4bd36cd402a8ffc2d5fdc1d7e1d5466782d1e37dfcac14fae0bbb181029799728fa5
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
deleted file mode 100644
index ae88d2259b31..000000000000
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib pax-utils user
-
-DESCRIPTION="Distributed, fault-tolerant and schema-free document-oriented database"
-HOMEPAGE="http://couchdb.apache.org/"
-SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="libressl selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-19.0[ssl]
-		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
-		libressl? ( dev-libs/libressl )
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}
-		sys-devel/autoconf-archive"
-RESTRICT=test
-
-S="${WORKDIR}/apache-${P}"
-
-pkg_setup() {
-	enewgroup couchdb
-	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
-}
-
-src_prepare() {
-	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
-	epatch "${FILESDIR}/${PV}-erlang-18.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-erlang="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
-		--localstatedir="${EPREFIX}"/var \
-		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
-	# bug 296609, upstream bug #COUCHDB-621
-	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/usr/share/doc/${PF}#" -i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake
-	# bug 442616
-	pax-mark mr src/couchdb/priv/couchjs
-}
-
-src_test() {
-	emake distcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	fowners couchdb:couchdb \
-		/var/lib/couchdb \
-		/var/log/couchdb
-
-	for f in "${ED}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${ED}}"
-		fperms 660 "${f#${ED}}"
-	done
-	fperms 664 /etc/couchdb/default.ini
-
-	newinitd "${FILESDIR}/couchdb.init-4" couchdb
-	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
-
-	sed -i -e "s:LIBDIR:$(get_libdir):" "${ED}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild b/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
deleted file mode 100644
index 176891afcd2d..000000000000
--- a/dev-db/couchdb/couchdb-1.6.1-r3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib pax-utils user
-
-DESCRIPTION="Distributed, fault-tolerant and schema-free document-oriented database"
-HOMEPAGE="http://couchdb.apache.org/"
-SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="libressl selinux test"
-
-RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-20.0[ssl]
-		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
-		libressl? ( dev-libs/libressl )
-		>=net-misc/curl-7.18.2
-		<dev-lang/spidermonkey-1.8.7
-		selinux? ( sec-policy/selinux-couchdb )"
-
-DEPEND="${RDEPEND}
-		sys-devel/autoconf-archive"
-RESTRICT=test
-
-S="${WORKDIR}/apache-${P}"
-
-pkg_setup() {
-	enewgroup couchdb
-	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
-}
-
-src_prepare() {
-	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
-	epatch "${FILESDIR}/${PV}-erlang-18.patch"
-	epatch "${FILESDIR}/${PV}-erlang-19.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-erlang="${EPREFIX}"/usr/$(get_libdir)/erlang/usr/include \
-		--localstatedir="${EPREFIX}"/var \
-		--with-js-lib="${EPREFIX}"/usr/$(get_libdir)
-	# bug 296609, upstream bug #COUCHDB-621
-	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = "${EPREFIX}"/usr/share/doc/${PF}#" -i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake
-	# bug 442616
-	pax-mark mr src/couchdb/priv/couchjs
-}
-
-src_test() {
-	emake distcheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	fowners couchdb:couchdb \
-		/var/lib/couchdb \
-		/var/log/couchdb
-
-	for f in "${ED}"/etc/couchdb/*.ini ; do
-		fowners root:couchdb "${f#${ED}}"
-		fperms 660 "${f#${ED}}"
-	done
-	fperms 664 /etc/couchdb/default.ini
-
-	newinitd "${FILESDIR}/couchdb.init-4" couchdb
-	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
-
-	sed -i -e "s:LIBDIR:$(get_libdir):" "${ED}/etc/conf.d/couchdb"
-}
diff --git a/dev-db/couchdb/couchdb-1.7.1.ebuild b/dev-db/couchdb/couchdb-1.7.1.ebuild
index 3d797e33d490..a86f1de84856 100644
--- a/dev-db/couchdb/couchdb-1.7.1.ebuild
+++ b/dev-db/couchdb/couchdb-1.7.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="libressl selinux test"
 
 RDEPEND=">=dev-libs/icu-4.3.1:=
-		<dev-lang/erlang-20.0[ssl]
+		<dev-lang/erlang-21.0[ssl]
 		!libressl? ( >=dev-libs/openssl-0.9.8j:0 )
 		libressl? ( dev-libs/libressl )
 		>=net-misc/curl-7.18.2
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index eebc0d783c39..2cd8de0dfb27 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,8 +5,10 @@ AUX etcd.logrotated 104 SHA256 adc7dbb76a2a11c2bf38fe47a702ba7302128c32e44774dbf
 AUX etcd.service 304 SHA256 53e42ea98e8a9e2acc92c2c694099340000c2cc4fc03df6610aad509d79ad6f6 SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961 WHIRLPOOL 95c675c5ab30509070f63ae2c101b1414fe099396d812394b626455597403fb7b5e92bcffdce267728e915fd11cb16a3b8314e76a4d778cc98e7ea64dc6c1a98
 AUX etcd.tmpfiles.d.conf 76 SHA256 3594bdadb402b300d560fc23db53354c0ad73a78e38ba365fa2e62726b333ac1 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce WHIRLPOOL d260b0c66bda20a61ff9703e4527c43d08ad8c4a2d8f83610d38c656cd82fe3a67e674e1082c617de0867b2377b65aa0f4ddc54d900821c42076771302652ee3
 DIST etcd-2.3.8.tar.gz 2206562 SHA256 6a138b2005e42b0961a12886cc641b792e991cd631fdb502ec5c614b65231cd1 SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc WHIRLPOOL 4db1b4fe6d0ff917adfc53bd959bb7ac2937da794483e4a4a95e5fb557cf4fbfd43d5bb3c5e21e499432f80f6606407accaa69bc03a3982621276deb529c07da
+DIST etcd-3.2.10.tar.gz 3016954 SHA256 86b7afd78b3a409b23ddf9d889b74c4edecf0fec1148f83bf025911705895f08 SHA512 6d00bd47b8c76332e4d1eaa12d8db6052c19bad5e99402860875ba1d6590e0b4aa1afc7cfeb25128125d0195c408c5f4d782b75a0132fc6a8f5cfff673faab75 WHIRLPOOL de440a42fb85fa33ae9aa4f4ea5b1e7640b73fb35819a3a9f12823c4bfe88ba7f32b931a9aa74e851f0cf47d6d38c4832fe47b826e636e1d7a8d14ab0d3a5539
 DIST etcd-3.2.9.tar.gz 2889569 SHA256 7ad70d9b0d206fe09abc40e82d29ac748d09c0423ddf255ddf4334d21867eb6f SHA512 c194365e388fda8f796af70ff4b575b6ccabac0ca9ae3d84d55718e3914b927d5a6ba10b48eddc897139918880fcfa29d7a329463d20ce72f62115a0a41b6d4d WHIRLPOOL 4e6eb6b7b6d9ac68f0b1c8c2e5cc677ce9815ffd70c27901ef9a416ad73d9578b20592374e4e85a3aea11092b671832e8cdefc9781edd500e5d3bcd14f65cbc3
 EBUILD etcd-2.3.8.ebuild 1379 SHA256 a155c628b920b29ce72bdabf20634e4664210802b6a324b48f416b2c132b4454 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3 WHIRLPOOL 7468aa9d7ba52fd5cb2f581ec8913eceea5e4c662593dc0cbe50b27aeb3e5acdf5db54d1d56655f4552151f5df393a6fae4ec3eb55c6b7a954ecbd63f459f729
+EBUILD etcd-3.2.10.ebuild 1474 SHA256 2c5cdb3fa0460133550681acb34ba45e9ecf929831b5b623ef4efb390bdf4839 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5 WHIRLPOOL a2dad1bd9c91a266cf4992e4d917ac8072e8eecec76084c7e57de402fa1d1f8b10118c787d66370bbb5d9307ac51f94a16270f00787b9eec85ecc1521aacc014
 EBUILD etcd-3.2.9.ebuild 1474 SHA256 2c5cdb3fa0460133550681acb34ba45e9ecf929831b5b623ef4efb390bdf4839 SHA512 21daa3a43edf7cdce091e376302967ca86bf3d3d09babab7bb331b7efed065c6b2d74b7eeb74e010b2d4d84595776befb037dc78391b37e5c7bab8e67b5d7cd5 WHIRLPOOL a2dad1bd9c91a266cf4992e4d917ac8072e8eecec76084c7e57de402fa1d1f8b10118c787d66370bbb5d9307ac51f94a16270f00787b9eec85ecc1521aacc014
 MISC ChangeLog 3997 SHA256 89726f1d48ebcdda7143b5bc4b79bf63b875877638e70c25fd91b074393a8187 SHA512 9d92e847ae61a4a8169ecc33a535c5119a19e4a6541a830f4aee0f935fd541d27f29ac4c016cf068d876d7108b781758d7e2a9ad979446c378538cee89d10b89 WHIRLPOOL ce3a507955d0ca316a5015e8e1d5827831582c41ca9df294cdf818090768b1fc569b67dcf09e11dff1bc91980165cc05060cf9951ce505cb42604b2ec0b0fe3b
 MISC ChangeLog-2015 958 SHA256 148c73d433247e8711a033ffa225469e78f875d5778f60fd9685bef5d678f4ec SHA512 d96c5afde74fd863fd0c69652c3b94cd022eaaa1eab53b1ff326f8dd1677bdc9e21ab34a261d403861a6b4d86a9cf66da0d614c4007772d0d21a470b8ca9a414 WHIRLPOOL 1333d7a44902ef017dc4fe3a8685170f852f68ee8e0db433af29133455b99aae316a893de0760db30f3f093d0539162b8baa741556e894945c5c5bfa92acfc26
diff --git a/dev-db/etcd/etcd-3.2.10.ebuild b/dev-db/etcd/etcd-3.2.10.ebuild
new file mode 100644
index 000000000000..9de03c3233bf
--- /dev/null
+++ b/dev-db/etcd/etcd-3.2.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 755 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6767cda5bc33..80c020f5d7c5 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -19,10 +19,10 @@ DIST mysql-extras-20170830-1210Z.tar.bz2 312079 SHA256 eda0090fb448e22a004e33495
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 SHA256 e2ecfa43d70d9796cfd60dc2448b8e76e4e35ccbbe12b6a4becc8f854e172c12 SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 WHIRLPOOL cae69f01090231bd25a48002e8682b70894d0b4e3ae43083fb062db159a44d4b085edb46f92ed0452d98fccbec7fc0fd1f97eff9fd16b810fc22e845e8923b50
 EBUILD mariadb-10.0.30-r1.ebuild 6886 SHA256 e9ed5cf89f7d44ad61b6c9c35d958fbfe6b56b30cd7cf22c405e1f31d2bcba09 SHA512 4c8ed348db2b71ebc351a78c141b56fe1736e35e7db6819612c43f347251b4fc68db9a2b982a1a70219310e23b0ffdc3bdf1253cebd6955ba0700c76b39a2ca3 WHIRLPOOL 4ceb753a8122b9c2e42cc1ad7e85f5c71d3e06dce0eb22dab57982e8f102101f42cef4a85367c66f2eb2e2b0ee1924226284fa72e9f229fb523321a1a672d062
 EBUILD mariadb-10.0.32-r1.ebuild 6767 SHA256 9ea0af871fe806b30a877415da0b0881cd24f3eb3611d4e2dec18e78e15c443d SHA512 8ecca9144723916e28351cb349ea465227946d08ce905a19c7fe5503018c3e8441549a92ef6bffcd8d2ee9eedff3541354ab920d89c4f4f0bbd5ea1c19f96e5e WHIRLPOOL 8736b28d7092ff0f07b722f057a7f9ee65960b2d2a6b633fc17b0f14925a5ee68de857393ba433f1f0c126307d3e496bc6b306659769e9e576b14c66d0ef67e2
-EBUILD mariadb-10.0.33.ebuild 6733 SHA256 46c7513c868983c4dc939ff1ccfd95d9905a2e2ac21cde05576e7fdb13028cc6 SHA512 8b8d1b8d8df075c72b0a07c3e0b3ec3c1bd1d23ff760348f01a4bf72aa554bea4502f30586ecc45114e5fa57dfa20bbdb36ebc0890cbd27ed76326a56acac358 WHIRLPOOL f42685c9f3176648757edcf9aa5948753b421526f80c417cb76e1c927b3da0ab8cfe9130f341247ca20457dfe6702ef76e398cef99b7341a15f735abdb43a9ae
+EBUILD mariadb-10.0.33.ebuild 6732 SHA256 d4c7f35238cd84c396c8b926d4cf99d25dd0ea3eda008f0f88806bdf6c97e7c4 SHA512 fa51a137de23e34f073efb52c4b821e41fdd6635c02272e3a9a085961f05c7cad87aef14ed56c44f3186bb103859433ce51012f1f53d820bb989455524017500 WHIRLPOOL 8ed6801f2e84175f28fd1fe2b56baf5c669fb1e0a90c3bd854889c8df3d54642f435b40cdc4a449e91a95621b1b1514ca4ce4d43f8eb23d9ab4aa8828a7dd992
 EBUILD mariadb-10.1.24-r1.ebuild 7187 SHA256 fb9a9a37ea87839b5df675be187df0756853d995e56af9f46e4d938f1f3bb778 SHA512 f88e2f171b9785ab6c834511ca71d9939eb36020a32cfdba5fb91f81253df8a35b891db321c0f796dfec03c7fa39226d1696607518efbaa446531590de97a75a WHIRLPOOL 95a507b48de0251948e1511c285d50b7fdbc490395ce3618a2e4517fd3223d62e17787837570f5f4ba5b78d3b7f773889826ef0966ae7b92ed7da9d6639a0f21
 EBUILD mariadb-10.1.26-r1.ebuild 7255 SHA256 3dfe3f3c0effdb9a13b4e89398169a58773c056da51a12ac9c79e28ed0cc2b02 SHA512 171bd1cf59c77e98505f9f2217a5522611977fcd1c13d67dbe551892da3569b45298a032e33d5aed8cc2caa95f326c6f011291f678436a7fb3069133792693c7 WHIRLPOOL 3bc062878d0be9c3211299ab3e2c2d90d970f2cb2cf311dfe3fa799545bc09fd32f6da3532883dc5a6a4adfb42e23459b302d43bb01ebb1d776f5811f5102156
-EBUILD mariadb-10.1.29.ebuild 7320 SHA256 4c1fd50d0e9b8a54e0391a178799fe6e7c36c933ac2658edeffc521d2de716b4 SHA512 1baeda05f916bee423be86822b31836c6b9b4f679c475f4a8db0bab6e4f5de54789878738bbf69f9466aa4adcf91ca8bf9521146bffb8ced956bc0283c374fa7 WHIRLPOOL 4ddcc9a6f92b21320cc10d88f41b8eed4632305f5b7d05b305ec1db8de5c81e149e1112243a6fbc7c83bdd1df038c06bf15c48d31c7ad447e79f31d52465dcd5
+EBUILD mariadb-10.1.29.ebuild 7319 SHA256 d84f2794ff8ac97c57c6edddae7b06793b440d9e6c15591a9ff309c14a90e1e2 SHA512 6aa16991f61d917bbde26e986369f28c71f53335d18bf1079eb0cc8250d7375127588715403f6753db0565cdfdc0e0a39d0ee2b77c0598bc911f4afa17b349f2 WHIRLPOOL 7b3a192f3512ac5c348dceb4d568a8cee3487da801b7cff9b06abf451f154cc7ef993402b324842768b16535c1d6e22ac1d5f4b3c25c0462ff2667c23dc35ea6
 EBUILD mariadb-10.2.10.ebuild 32355 SHA256 b9e37664dc6efb4e70f996b277237efa926f564642942c93b08675a885bc31bb SHA512 56116f8a65f22c89b491cdd4e72c6fb118dbf7efae56c9827d1520055e555abef57e9b88957c3460e1e7ff76b44f2955a0092acda08e183a9ed867c08053ea44 WHIRLPOOL 9d72a6474950fbf3248d0c2e89aa8b9e249b5118f88d6bc291e9fcf8cb4277e1298c72ec7a86e97136d15434031651cc152369bccd0cdaff26e9eb92a5cf41c2
 EBUILD mariadb-5.5.58.ebuild 4241 SHA256 ebb8013626eb0a5a222b3bac6ef12606545e67338903c5872249589ae8d79aa8 SHA512 3de822605e73ca9094f6635ee232b133371823e3f3330d6ecad973c0e9176d2280a5fd5ae6032a4f6e3f914c8a937f912e2aeb91a5802342ced02aee6db11944 WHIRLPOOL 3d68d32e9d157c909659ddb17550c517e5407366c2e867a7d7ecc14594d329e551d42221e2a918155e0a1d6cbe7819a121f8ac3a417110156010ed1716ef230f
 MISC ChangeLog 24701 SHA256 3ff49394f0611c2c667536a084ba1816152d1770039e716db13ff905ed3382da SHA512 c7dce735d23de6f8c71f27d0047e5079bf6587ba386935800613cb36c0e3653f59e5021d73a4efaf56c74ba4a4f6ce4bbe21e10b214ed4618e0b2528bf13f65d WHIRLPOOL de0cbab6250b12fb8f55acc5978e3d135723ff727805e2c898a921ad7adae798702a16df7077159c195ea9854cada6840f1ef03d7f4934a183d5b0f081dd57b9
diff --git a/dev-db/mariadb/mariadb-10.0.33.ebuild b/dev-db/mariadb/mariadb-10.0.33.ebuild
index 75c3241b4352..59f54eb1b320 100644
--- a/dev-db/mariadb/mariadb-10.0.33.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.33.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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~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.29.ebuild b/dev-db/mariadb/mariadb-10.1.29.ebuild
index 6312a9acd364..8a76b7c2dd4d 100644
--- a/dev-db/mariadb/mariadb-10.1.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.29.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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~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 d909151d95a5..9fb37add3f78 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -5,8 +5,10 @@ AUX mysql-workbench-6.3.4-cxx11.patch 1550 SHA256 53f63681ece9f2efaf45782ac816f7
 AUX mysql-workbench-6.3.4-gtk.patch 1190 SHA256 82376441bc452d2afe7ce55dc66edd69e8ccdc218f094c50ad30e5e906257618 SHA512 81af1d9dbe40b0ad04e9d8e317a1b47832b864071e26ab954237f850685bdb53ad84fedf4aa546e83f4dd122e368d1bc90e46e9b6261104b86998607b7830d33 WHIRLPOOL 7af06b97839a5e2a561649be0c5d67db5b7c57201ac57febc54e5d645194eec9c4e02ed93ef52e9af1078e1f23e00e48c0773bef3d61f30df14fcba102631b65
 AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 SHA256 f176881b7f75db8fdcb3bf523116132b57a2cbf07c41b22b4f7a97855cf68f1c SHA512 23e4135ee5c8b7cc7b70cc6b5170209c9a6350cfc7e8450d29a1098c31472b68494147ec4f1286365f7802af72570f4822b0078ae269affbbaf98e3ad9e99eb4 WHIRLPOOL 5b19c530ceeaf0273db116881ecd2ff4abbf9b2e8ddc28ccb05f108004efb20013bb7f351feafc892610d286fc7452f913d0db4604ff22cba23dd51fcee7b794
 DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
+DIST mysql-workbench-community-6.3.10-src.tar.gz 14969443 SHA256 b5593e439c6f8d50262a8950456a9ba3709b02d1dece0360d5f6e47e1b0d7dc3 SHA512 f892853a5f8b000c424b945c38680e17b041699fe2b03743b71c803de6cedeb12e3f69ad94d1c737e23f26d8608026e18fb29d31be6b3a2ffea1d78229212a4d WHIRLPOOL e5d589a15a41a63861ad479a56b8d843487cf739fe9c3422796ddfac1577e7535e6c8c3531ee01595fb7780c524dd186371740ae36ed2d508b36fc7d9e764874
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
 DIST mysql-workbench-community-6.3.9-src.tar.gz 14634678 SHA256 607af29481821b25c13c8b28011162c9d6d5e9ef96df5f664408116b88308951 SHA512 a3df060114adb0c4f95423dc2732a39917be4eb2281cc2d811cc68c2d43cfa28eea52c4ab743018e91c8c58b0ad7d4b34a9936df8c17381accee8159afe19901 WHIRLPOOL 654eaa76d6f132e50ca904aae54c07a7d2aabe746e519f5c6c8cd5d40529ebe022616d5ef28be8dd322aba19e589dc8d9dd2bb4c5f2356fa7b5698a84190208e
+EBUILD mysql-workbench-6.3.10.ebuild 2621 SHA256 c894ad19d032f22379c090f943c149b9b21ac527093cd01c7b5a5bcf169f3ebd SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb WHIRLPOOL 60ef55be7f05c59b34ce988e5e086182fe29feb753eae69f52f1c93635b887e68695211f987c4e045df277abcd7047c3a096835f8ff7c413dbfee2f06b8c87a4
 EBUILD mysql-workbench-6.3.4-r1.ebuild 2823 SHA256 866fff18e03b405280508bf8c84223e74742bdd5d5d5c4f70dfe7b0d2f284ead SHA512 b3865e92b552dbaedb60989602401608fd792908f6abf9cdc44786242b765120e36029a86e6169aef8c87c3ed0392ca1655596603fb06591931717da942d3ccc WHIRLPOOL 1b8ec2a2209b934133de3fe535e936429cccdda8394f730671dcdb8a4cdbd8cc5fa215896fedcb833e888fc4fd5d549d1ddba159b7e02478ecccc0c13e7e66b2
 EBUILD mysql-workbench-6.3.4-r2.ebuild 2644 SHA256 4841553433623e4e17c50636e21dcfb497f8c3dc95102835862fa2907a19ef08 SHA512 18873a92067d037bfcf2f69e95acda490968a8ca752bc34a83c925f29c894a2c721d01418046b983827b93aeb7cbf7695fe4ff5563a33e60b1775a8280fe1f3e WHIRLPOOL 5c0058348e671a5d2ac527f68e39a009511ff32f9b15e64aa095fd5b96cf4e28aa12e62e9ca842db1ebe2a93d0a9b92cc899e13e6627d2370b003e4464cf7b50
 EBUILD mysql-workbench-6.3.9.ebuild 2621 SHA256 c894ad19d032f22379c090f943c149b9b21ac527093cd01c7b5a5bcf169f3ebd SHA512 26f05929ce84c1e64e5d3aadf95d19431ba129528bff947646a9b952a155887f773370caca1d44d68f7d09d7b0b9184d77d44ef3eb6ceb016976a549369bc1cb WHIRLPOOL 60ef55be7f05c59b34ce988e5e086182fe29feb753eae69f52f1c93635b887e68695211f987c4e045df277abcd7047c3a096835f8ff7c413dbfee2f06b8c87a4
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
new file mode 100644
index 000000000000..efa53cd769f5
--- /dev/null
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.10.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="https://www.mysql.com/products/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		dev-libs/glib:2
+		dev-cpp/atkmm
+		dev-cpp/pangomm
+		>=dev-cpp/glibmm-2.14:2
+		dev-cpp/gtkmm:3.0
+		dev-libs/atk
+		x11-libs/pango
+		x11-libs/gtk+:3
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		>=virtual/mysql-5.6
+		dev-libs/libpcre[cxx]
+		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		virtual/opengl
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		>=dev-db/mysql-connector-c++-1.1.8
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch"
+	"${FILESDIR}/${PN}-6.3.9-mariadb-json.patch"
+)
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
+		modules/db.mysql.sqlparser/CMakeLists.txt
+
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local mycmakeargs=(
+		-DUSE_GNOME_KEYRING="$(usex gnome-keyring)"
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DMySQL_CONFIG_PATH="/usr/bin/mysql_config"
+	)
+	ANTLR_JAR_PATH="${DISTDIR}/antlr-3.4-complete.jar" cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 73e2672e28fe..82223eba1086 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,7 +11,7 @@ DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357d
 EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
 EBUILD mysql-5.6.36-r1.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
 EBUILD mysql-5.6.37-r1.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
-EBUILD mysql-5.6.38.ebuild 6361 SHA256 cc2a884db25e9c2fb5472b511f46c401760f7d09e54dbbb44d5f323358aa3d4c SHA512 a75bb5e915c16b42c7ceec7c471e89315c683a5742d600e20a215d7f96f4913ee3c99865cc7aa6b0ff36d253ca18e09f1a1edf6eff806a69ab18e365088d8c5a WHIRLPOOL b63e1e6ee2be18f9bb39a85730dd3503291b13fca72580c4d502915506bc7e28ff7c5602b517eb90d66ab78d8a27e5fed3d8e47b61f6f631c0866d7778ab9cdc
+EBUILD mysql-5.6.38.ebuild 6360 SHA256 2d4c25923ee354ede0331de03c3c0c4bad2cfad9af0fc7e85826250e86984b6d SHA512 05fe5c48d5c48c848b97233cf0c66adc72f9ee6f2740dd155b5f31e9078818ae55dc491c42226ff5acc45dd6c163256c71e8831b9cff38442ff4dbbd8d6ea8b6 WHIRLPOOL 119004da5939091e7b44861e3bef380168b174c543e2c1237977c7587ffcce99fca2af1700cc9172da371fef2d1023e3e4b8c01e5dc53bdf2457b8d598a67e34
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index 602ee7cc67f6..f9b5a7e68974 100644
--- a/dev-db/mysql/mysql-5.6.38.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
 RDEPEND="${RDEPEND}"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index eaba434f5a7e..136f658885ef 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -47,18 +47,18 @@ EBUILD postgresql-9.2.19.ebuild 11735 SHA256 138e40dd809a0af6cd2a227e5b5fbbeaccd
 EBUILD postgresql-9.2.22.ebuild 13345 SHA256 dff3fded6bcced845bd0fcf77b7fe126324ce0a31922144da50e1e9ad5f35f56 SHA512 c0286afe4a066ddbd32b2cc3d09e5f86250b7656f2148dbd2128ec3b650260a0af9f67cbee02fa3f3bbab880824b2a692c93add8cc705d22c1a6664ec7dd3b8f WHIRLPOOL ef4d7d6158ec832f13b0873023e543e44c2ad1457baa31cbfcf74647fb15cf7bb1a4f0c928336a16aeb99bb32fc44f8fb4bff81075f573101d6619b079b43ed1
 EBUILD postgresql-9.2.23-r1.ebuild 13541 SHA256 d93f312199b82b0541928b4b2a2906212a2eef6dab348c0b85198e44a296b65e SHA512 380dfda81ac3e5c6bed023c899f102eb97c7ba9b43fca1bbee101b599a69c1cb51594dc5d5171202a415774c719b94f4fb6573575f166893d0c0ec71d9534dd9 WHIRLPOOL aa2e2b9c3316dabf2837006c843f58ac4dc6571ff076be584699d534f4c16421bf8dae778425c68d122c5a031083887eae28bf112c0e9cd51484fab087332930
 EBUILD postgresql-9.2.23.ebuild 13353 SHA256 cc028ba5d35c865b4971f0d5103f5ad17a899d043e96c2a594815e5513c1f95b SHA512 99cb6a49c13473d45f5c399458df5b1773fc23f61070ca9147cb8e25587fa8ea8e18cb38e608aac3eabaad0f0317b14ef7057f9456b196468f25c57d5003bce6 WHIRLPOOL e80339f1016007d470375ca36b781f423ec53500994388a6bed7e0c548186e117dc86514a2e95648a0a23ec74f4e28d2adda33b6f4cb3d385e43c486a2dca0e5
-EBUILD postgresql-9.2.24.ebuild 13536 SHA256 1eedf4586d917d8630f64e9e9a96785cfe35044ebf007b6fefca607e3983be4d SHA512 f73cdec942c0333c80c6422cbc39ae7e725b08975316b27d89a4582bec4751e7b9d6ee648398c2736cdb1965f5fb559113311d86b15a1576554ffdc0fe9f9f50 WHIRLPOOL d5892f291223e5f0c5759fcea354b2ccc45c3a49477e5b19d2a97588ed8c7bba34f52001bef9d65a0c547086c5b1b862eb46673305ee39026639166364afe4ee
+EBUILD postgresql-9.2.24.ebuild 13535 SHA256 d7dd31e1d76d40d99ec9fb50323e22255e3e16be1ac8274ce6e593d974ebe05a SHA512 45820ccc8e78236cf394e1faff9be1025795115a74e85dc57323f449aa2b8ed82751e1e9b5dc995b613db6d65fc1ce5369baf57b60a066be48ac83e7067b38ab WHIRLPOOL d0de74a72bc04acf84f02ade813adff43f238ba76ac4685737c12399ede19d72313a59e1ade2564aaea02f579069502c49b9465737949a51e6e052406c087d17
 EBUILD postgresql-9.3.15.ebuild 11990 SHA256 9e98677996c9a2aa865318a437b5f19a45dfc989709701b074d4d62b2ae333f2 SHA512 b6a66d1a6726d0c6ec545930c6cb7d0379f7373e75ab26ed2510a15e071a1223bfbdecd66583be5272b40599cd41a750d172e86406d24533d293d2474ae215a7 WHIRLPOOL 9fb156077e4c2fab054dba97b5d73fb33aa46eb8b928c85c64af0aa03a1a0797d0b2a3106671f49490a020fea62174dd9a670899c63a3ef41ca0376f08638581
 EBUILD postgresql-9.3.18.ebuild 13604 SHA256 c3fbd47ca159d367eeb583dd86208715e4bae9480f9e380b3a4b199d3121eccc SHA512 ff6c8e72feb7e742104865cbf9310b21969be5995a3c723cda19288238b30559c97796c3f25d6a0da91adc366e6b8d242240f62b08b8e20b18080cbf6be875ce WHIRLPOOL 57a37c19602846b56279208207d9a6661c65f31b6355fe42fc396da6459eabe212b86b4244fd3186195d6be7de6591a8a0990a0fd91ef0e5945030b013cc0e55
 EBUILD postgresql-9.3.19-r1.ebuild 13800 SHA256 438d34bef1412db604d8ed263cfb7c6de1a56a09181f1161c6f32b6f20f0be42 SHA512 a494d82d83de9404e02d400152bdcdf4bfd86c568df5a607d64b547d0c47c9acc752338fc555eaacdc72d6c01a041bd25da90e17f77d0ef7c270046f597787e9 WHIRLPOOL 6e3896bd1536fae1066bc0a4d1080ea171b372ab6a710a1a087f5a3c687a6869c72e34fba4c8fb12a6f2e82d45e0c20b5fc75d1ef05429654aebe170447e5275
 EBUILD postgresql-9.3.19.ebuild 13612 SHA256 e67affb945cb1f0e8a1ffc1d2f3462b7769fe7e08739bfb929b32849ab91b59b SHA512 7edb5e2a49852cb9e293e116de5f3495250aed637a9ca62d7effd76232499a1c9e56e4ef683c9b65252a41b0323b78fd8ddab0ca664033be1ce199dc2178b167 WHIRLPOOL 87255163b5e4d791f4aa645ab4f061c2935794782eea8998857663398db1978c125fbd9bc99360b8af31628a3134b2b9ae0f93d0ad6c2f32453d05154f7f3e7f
-EBUILD postgresql-9.3.20.ebuild 13795 SHA256 f26286846566446c8394c969ae487f8515a2ec8a664c7ef8f2da46f78d770a5c SHA512 3b9cf39ef98c8a15a365d5e12080e05486b627fbf5f4412dc1f28fda05abfbcc4138e744258600420c6cafd253dc0eb9ae18ea1a98d7fb3a58d3a96f7ca326b5 WHIRLPOOL c210909f71ee99514aac24e5f98f174a3291f483d9effd386a358d5b0663fee8a01b212437f9eb7deb35ef50f582f0fa7a5ed1ae5748d0695831893cd5374c7d
+EBUILD postgresql-9.3.20.ebuild 13794 SHA256 b91b4eae975e6ef312f59bd43a2dea3eadcc417ebfb883d978ac66f86aa45ec5 SHA512 9a7f6f70bb9544553cf77b48bd9b274627e2849f5631993c1ef5a308c19489d96d97d0f3a1d355dd2b8d596a279a409c7d1b5875bdfdf18d96f4aefd6d73a387 WHIRLPOOL f6f402457594b3a110d03647a1c4a701716d37b3f41b0a6dbe2038efdf4930c189b33cccea75b80cd5db184f1fdba5a45affa19903ad51b09720c2da56f8287d
 EBUILD postgresql-9.4.10.ebuild 12800 SHA256 56748a56a6eb3e4cd8d75c4157ca9f1db4ce094e4526e7617fd7a8abd2a945e5 SHA512 e871945bf9027fe9288ca22d44f89c4dd51184be830f06ed4debfc4b2848dcc914c6ac559bc16853fb27331305ac15d8b6cd1247f10b433029f30a16b98de78d WHIRLPOOL 3a86bc549b1ab99ad7bbacae40110b9c5ee3b4ca2fb84e40a3fec2646497b8039ef3edb61b07fe551c77c2f697dafddd6111967854521c284bbcabab763f69da
 EBUILD postgresql-9.4.13.ebuild 14414 SHA256 b1191ed2503818964af23ce6476fc0ee39a81af45088ed21e1a9bbabb7e30111 SHA512 ea30a21f8a5604abe407231306ba7b944c1e84b8ee1b8eb29dcf08b920bb11d46ce93cec82c5e6147608ac8a318daa2255377dbcf403415fa1a68cfe84de82c9 WHIRLPOOL d63ab0c21f3eb0c3a12fabede3d66b8854350bca51ea451ae0a2773ee242363fa285bde5c13b9c45f8c8b996d8cd5035862c28e5d3ae9d3b192a2acbaf2f2ddb
 EBUILD postgresql-9.4.14-r1.ebuild 14610 SHA256 c06f2770f6ff15a5dbd2e04de6c59ec2679ee2ce5f03eb5840fb4920169bd204 SHA512 1eb925c156cb593e55ff349784a77cbd87a0fa18ce2c589bd63767f5f5ce1e1c5f81a5329ecb1b1ebc6ad55f0e56a8760bb55765f4682687c98b4b570277ba39 WHIRLPOOL 5284e65496462b3190c5f2286a275764132402bd17c0837b52d01bb7458d711c6c9b37af84744542a523e42302548e1bc3b97c25d3353b5967d413ee912f7985
 EBUILD postgresql-9.4.14.ebuild 14422 SHA256 ab3788ea2074c5f745e2cf16f20edcd21ab3d200d4e771cb1724c83431d4b6ae SHA512 fa0c366667b1e0600bf3e86091adaaf7d313a144d1d77bab5235d4feec6f7c9b46eab26616c4f8a9490c1d9b139f26ddbbca89cc237453c09289eb75624e831d WHIRLPOOL 9ba46dd9d3daf8412a3644ca73caeb8ddde945818dcff798ca6df0efbf3a6770de1373c1fdf4cf4b65951977a9f0b91f228aa29fcfd07cec57af132298a361e9
-EBUILD postgresql-9.4.15.ebuild 14605 SHA256 5e11e0464bb7153861269087de4b02717be3254d700844e4b462f6e551e2f4fc SHA512 84ca11aeb2d5b65d2ca9f5dcc07b8d8b0da2f926ababe38005a6b39e0e9080fe883afdba1d1710a6feafee4d3fcf07e1bfde00830f069aadcb7d5767506a0caa WHIRLPOOL 6a737e383e9de84a2f81fe657b0b25f64512ec91130f9ecbd4fe652b78830ac543985f438970f5c91cfdc6138e632d09f8e664ea36e47ab69916a1ee6218aac0
-EBUILD postgresql-9.5.10.ebuild 14833 SHA256 c53a39d75ce137899042bab857e3b762d16aba772088be06634fc013eee3a155 SHA512 6b570acaea4e534baa34b384352b7dcb65ef830301d28f4081a8ffaeee0e536eb87696ab7e05c76bf9a602e63c1529042f8a322856b0daae5c0f36dfbbed4e7f WHIRLPOOL 363f74f6680e89327822248673b6050f7867b55eaf38e6a53853efeb9932bcb016ec363345a73e7c380801b3e7111801e4126e15eb4e65af6674583739836e08
+EBUILD postgresql-9.4.15.ebuild 14604 SHA256 cc34abcd58e0ced4bee60aa4d90cead5c9e858bb09eb66742a4a1fee5cc6f4fb SHA512 35bae06be64072e8cdf854f57a0d0153c3b79135d74b4a1afca1840456707a75716485e664a87debadf54189d7e680d7a823eeaf4d8c77abad2381b77be9ad43 WHIRLPOOL 68e844c08e91a0f09381386b7475ec9b5bff7e026966ca19bee79c9a02de1ba8c9a1e955838168787fb1b7dcaedeba88c758b7159670331bd3e162a54d2649a2
+EBUILD postgresql-9.5.10.ebuild 14832 SHA256 f75c46524cf3cf16238d3df4bc00df554c71970f9b815413832686be109c0aaa SHA512 acc9387639ac9c6ff2b3c097a8552b0b76b79b2f065c42e2a32856b854dd6a20938d3bb9d796de7d6c490c47228a84ceedb2b451ffd67d82cf2b151f08bf7ea0 WHIRLPOOL 97f95ba9692a312fd9f48c9473d60e5df08f23ed32b2726526de31adb2c45f0a615bc0c512134090b9781c2bd6c25aed8ea92b2bcb19db3f54c4e199d8d158d6
 EBUILD postgresql-9.5.5.ebuild 13139 SHA256 6c892bbc3d171aca36611ee56bc95d041b149d6ba8b9162d024a30cb5902ff63 SHA512 1de5c0764000d9f1ceba56931d8b0517d3acb55905c0a199d029a7959e2bf7bd0449d7cf335c9de97f5ba028f87c1b5d135d35813407b3726848570229bbd936 WHIRLPOOL f839a4a5543d3a0aae87039fdc0d8486c71e7ce02d907d95aa71ea42fc376bc9289a56c50c3148212f4a413eb4a2090cdd6762ca3723a9cb2d7fcaeb7379a64a
 EBUILD postgresql-9.5.8.ebuild 14642 SHA256 0902de32099cab163eca68a01c85173e21c82ab2f509f9a9520e9ea58b8b558e SHA512 901fdc87137be8b4a1bae48efc9cf355bb1ae79c326e929c36e18ea35f767f8e6fb82abf63570ccdcec0dacc4f4d6daa92ac9a1e60da07cc7e46b67552949bf4 WHIRLPOOL 6d95ce1a79081afbac26485e3ddc7caff166bfcfa38f6c8b3c202e23c74e56d6041c16d5873e5f20fd78d7c54c4c2eefc4d2f6578fb8afaf761b07abea45cdfc
 EBUILD postgresql-9.5.9-r1.ebuild 14838 SHA256 b78e896f248434b46b81e6d6a4c943ec84b8eed8cf8f8fc448f9b4ff47e9bbd1 SHA512 33332df4890fdaea9e426ea3b9a2060bf5e15f882ff1850af75445c20ae90a2f7a8b4920644b640f8f2b54db9db6b08fdaa412299f482d0c4c9b918e2bf1a5dd WHIRLPOOL 91e3969ee3ff9751543f6cd216d31217274a5c8acaae579cfaba73b063afdfae7c2936379919d4543f17af08afd905623910e1eb2e55c710bd0d3885ce67f7f6
@@ -66,7 +66,7 @@ EBUILD postgresql-9.5.9.ebuild 14650 SHA256 66f174eb010fd59e2e0e0d656ccd7fec3740
 EBUILD postgresql-9.6.4.ebuild 14824 SHA256 e97ebf6b5b838853f25c51961cf392bf8fc52150eb0cdef51f6874f4e05c379c SHA512 10d8beb1db4ce1220f64877dcc732ab22a883e260c4eef0801123adf0994a3a2539455bc9fc61fd40388be2160c3da506764373458fd1b209b340a11d018a051 WHIRLPOOL 51e9d56b16656187a3ed3f444e4310b94804fcd13c4def7913479386c49957603a6fc9a02c1bc68986bc5ddc303bbf71f1d55a2f33aabeec117e1da03d4d07da
 EBUILD postgresql-9.6.5-r1.ebuild 14980 SHA256 82d17f4d81573d41cd9f50b88c2678769dbf4270056749ff9fa0ebae9987d6f5 SHA512 31a1194cd7dbd23ddd5c1ada080d64504da399d418b0ddcb71a7ce7cd0600fc7373ccdd85723e8970308cf587aacee6ff8744c73e2801b9bced3d108b09b4145 WHIRLPOOL 2b9058a1effa914f3d507fe779650452d8efc4e9c5044e0eac4af5627f1d04bb8f5e57b6d74d6a6a78a034d963aa829288893af9004d8a263b5a98dc93d9efcb
 EBUILD postgresql-9.6.5.ebuild 14832 SHA256 aa10bb6693070992994620f9507d3960063dbb2f7ddd4e0c6ab61e6c204a6403 SHA512 e063329853426a7052722191ed12a98beed3170f77da7eb395def5bfdae8cc335686a6866fa24bd01a6daa664845887dac4117cef95e1f4ad0faac7b35290604 WHIRLPOOL 4589b1f57db1f0ff512826ce91f7c33a17f7d18081ca7b2ef6136c0f741597a78d5417dd63dfc7ab2f98da46e55c92b62c542920211666da9dbbc92aefd74fba
-EBUILD postgresql-9.6.6.ebuild 14975 SHA256 543f87fb9e2b38251ad2a204c6d1e64e38d7d48e0a2d2b05b60d8c0e8787276c SHA512 a1355cf8a99c41b8bf7b4dfd93a9d555a40ceeac369a48addd879584000f46bc01aa7749375f5baca5d020fe876ae8dc35f7c22271174206ca57509987b0adcd WHIRLPOOL 0bbe989516e2ce172e1f054e8a51e060b2334981efb349b8e9621fe1f794a54d79f339542a58e316058e5eea4998a4c086eefafaba9496b265ed05ea2c560ab0
+EBUILD postgresql-9.6.6.ebuild 14974 SHA256 a90fa780c99d1944228894cfbaefdfe1d4265ed8ed303257a6eff705d0eb6bd5 SHA512 dba20fcd1377745c38d016259ef236bebf34f694b791f273c64848bb8900770a65419a3279df76b0dba00e7a1090b8ac2fd58991fe886752cc09edae892106de WHIRLPOOL 148e6b3226bd8ddca99276bc4eaebad921699786200979cbed700b42b94cc1c3735704f7f2fd31a8942a624407b072a92d970ba0c4d8f5241d34d27f3f051da5
 EBUILD postgresql-9999.ebuild 13581 SHA256 b2d47e07868d66352c879f9d911ed713de9881d05c6806d2d40b3515268cdbce SHA512 619ba19094569be077c69dca78674736bbde7cdd84e8cc4bfb8543ed69f8f793691e5e75fcbb15c4f1195fc353cde8fb1586de403874102537d546218d1194f1 WHIRLPOOL 5ba4d032b598591440c50fcee150b5340337e7e374c8eac8d99925544ccd87af414bf8dae358390bf1d323619dae45026732e4e19634948be560749d9f88b2fc
 MISC ChangeLog 34734 SHA256 39191b7df137cd50c7d8b834b673d517709d6ea867a09ce8eeb2fd42cd0d6b49 SHA512 b405d44ca7ede523760599ac3ceac384a9abd4a73a2fe47544e90c6259e6fe5766edc147064fba7fe9f2926c4cd298805521e2aa5da63286d5d8ba1bff7dd27d WHIRLPOOL 8bf92c120033a40cb4b5001c9b9e5d4eae858754e8e7552f0864a7c12020fff770bb755008928af0685035a5e01fad2f12591ef365397edbd877db314f99c7e7
 MISC ChangeLog-2015 18629 SHA256 4f6c87a86705d9d4597dcbd319d207c8b45f4dba38455f1466bdcdaffb65ba1d SHA512 2604c3af8d03fff5f293c30b5c6bbfc801c0b99fa5d20021b365795e2af50cc65c73972fb643e594720e28ccf5e873503550eeedef262375da63b29442e80c96 WHIRLPOOL 760146d15f3f656816be71d4d4b27823975ecc37c13f03766c38a0b8a3c2cabf15bec3da2c01d843859e277937815e85532a17327650dc221c4d22d01fece293
diff --git a/dev-db/postgresql/postgresql-9.2.24.ebuild b/dev-db/postgresql/postgresql-9.2.24.ebuild
index 60f3457892f8..ce564c995413 100644
--- a/dev-db/postgresql/postgresql-9.2.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.24.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 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.3.20.ebuild b/dev-db/postgresql/postgresql-9.3.20.ebuild
index 169b33718053..4052f76be967 100644
--- a/dev-db/postgresql/postgresql-9.3.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.20.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 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.4.15.ebuild b/dev-db/postgresql/postgresql-9.4.15.ebuild
index fa93f0ca9fb2..dca65869c859 100644
--- a/dev-db/postgresql/postgresql-9.4.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.15.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 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.5.10.ebuild b/dev-db/postgresql/postgresql-9.5.10.ebuild
index b96967417e70..16237513245e 100644
--- a/dev-db/postgresql/postgresql-9.5.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.10.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 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/postgresql/postgresql-9.6.6.ebuild b/dev-db/postgresql/postgresql-9.6.6.ebuild
index 7e3d2387376d..a75bcb77992c 100644
--- a/dev-db/postgresql/postgresql-9.6.6.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.6.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 ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 
diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest
index d010400501cd..42d63ae85c1c 100644
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@@ -4,7 +4,7 @@ AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b
 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c
 EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f
 EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db
-EBUILD sqliteman-1.2.2-r4.ebuild 895 SHA256 ffff2ed1d92fe75698c0fcd98339001b7045d18e591c2ccd51e9369864c4da8b SHA512 fb1dd1ff69dd23db5fd03576869b6a7b5474d0487f3fb9fe6d6778dc6284b1834a44185f876a735fe3c12bad1a50033488a4e29544656b7d93cdd9ed083c5d07 WHIRLPOOL 7427fb72a5b56759ff4e22e10809e39d559c652e5d9ac5ab4d46a8e2d042d27d6e4c4e2cade9637d3487ef73542e9df1bfbcc8db93c3c3f972bd64c564d59d96
+EBUILD sqliteman-1.2.2-r4.ebuild 894 SHA256 a7f744cfdf6d5a01a70f14859ecd0f93319b7512207201955488f7c34f9bf6f8 SHA512 a13fc0d37d1bdc2598b3a2cc8cc9c00f71ad720c71c6406259904120e162f9ace760a4fbf4c15b0bb0eab73a0ce4a73620bf43e07315c4169893b6140a8fe539 WHIRLPOOL e9fb015aa6734724b24d4897170c9618af4cdd2f5624422efadefb98f76637108b34f4cdde45af62ee903684dab4ccbf99e2a1a1794fb206246cb947f717ba21
 MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916
 MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1
 MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
index ebe92bb1c46d..979ce3516bed 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
-- 
cgit v1.2.3