gentoo resync : 15.11.2017

13 files changed, 166 insertions, 14 deletions

diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index bf1a199cb1bd..0cc1a65d3517 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -7,9 +7,11 @@ AUX aerospike_ssd.conf 1341 SHA256 11dbbffdea382e30d606c4564a577e0657f3ff87f3715
 DIST aerospike-server-community-3.13.0.7-debian7.tgz 10658707 SHA256 29715ff1698f69f29daeca80f0f70125aa2e8e1b798a34e8aa1ba23338552c66 SHA512 1dfe2fc52c7870f6c4bfbe26cb718cad7725c1362886c4ed30fed04ac40a692eedab47f03ce70fd2a4bc52a9df92ec08683eec24a1fa62a5674530272c705409 WHIRLPOOL 3780f47eecab4081359c2c41f3ec2fe28045bf55de0fb0889f15e0327522ff7ecdf401a8973a58d65efe575caaad6216e43dc8de695de21fbd71113cb2178a29
 DIST aerospike-server-community-3.14.1.4-debian7.tgz 10451324 SHA256 a7189f7d802b5d805d5d6e432b58de86c4db97bde482be255e58e61ef688362c SHA512 737c8e2e64d4738d97f1abe4199c4fbc5c00f4c967da3cf6ebbe6e77e416d40ec4c431cf3aec1b9dd4d6388efc0268220b5717924c7083631582899a2d3b6402 WHIRLPOOL dd46cabb8c7b6a8b77085d702538c037cb446327be335cef1cacbfa542613341af84ea6acac6038eb2ce7aee822f31bb8dbe0afb8e223212bf77237c28040e1e
 DIST aerospike-server-community-3.15.0.1-debian7.tgz 10299283 SHA256 e4f3a8a08af075f8a5c61b0af735c4a136e6392caa80fb457c19fc459c94b926 SHA512 a68c6ce094176bf944baef551553a526581718757967f5f06a7bb02cb81eef923a86db6310f20a3380923ca65d8f31a6785251b7aaacca318c3dc9d6987eaaec WHIRLPOOL 47d1026a313d9a2f35da136181c985b1fd501814338b7574242d605a9ba1fd73b9844e6852f3de253e3773b5a00e9583eaf2d97bb7d981664c0b72ba261a6aaa
+DIST aerospike-server-community-3.15.0.2-debian7.tgz 10299075 SHA256 2e3b914743ba787b7c9ae950bdb64986f2bb69d1798bc138cb159bdacfdb182d SHA512 6aae04d81ff9a56e2283186b8a38947b9a30cd2ed97ea4613a9eecd89912ec31695a959f25fc0b06b2cac13c1aaf1c46366cf3967f776a515196e2a2e5dbe431 WHIRLPOOL 2e77d3da6840275ff6ff309e11e2676eca0197d332f05e13140e23fa223f54a6f5e90bf902638c3d34bacd1f4e27e3b046d28cef057a799a8da0e8d81525ff41
 EBUILD aerospike-server-community-3.13.0.7.ebuild 1634 SHA256 954a8f13463c378210c9e0f72b283db37de9826d66f7cc9389055bfbe4a4fb29 SHA512 2d2dcc4f31b77e9c47b8a55e3657907f5b45567d2f44724aad4d8ebec4650a1f8d5bd73cddb916c8fb05489ec4f630f984b5c9c9499cab9e855f4d43e7f47cfd WHIRLPOOL 7ec1c880dd21a8f10fb5b1d0291b59ba04330aa9443d0e447d4c0c24ea541b98af7125667fb4ee4ea24d78f310685b3e0efa220a3fd4ce69c0e8f40f8865cbab
 EBUILD aerospike-server-community-3.14.1.4.ebuild 1634 SHA256 954a8f13463c378210c9e0f72b283db37de9826d66f7cc9389055bfbe4a4fb29 SHA512 2d2dcc4f31b77e9c47b8a55e3657907f5b45567d2f44724aad4d8ebec4650a1f8d5bd73cddb916c8fb05489ec4f630f984b5c9c9499cab9e855f4d43e7f47cfd WHIRLPOOL 7ec1c880dd21a8f10fb5b1d0291b59ba04330aa9443d0e447d4c0c24ea541b98af7125667fb4ee4ea24d78f310685b3e0efa220a3fd4ce69c0e8f40f8865cbab
 EBUILD aerospike-server-community-3.15.0.1.ebuild 1634 SHA256 9e441e6889f926f41176e9e1f335471d49bede19ca57fb6094fc863393c88dbf SHA512 5c383a5f7c7a48a6662f527255bcad1b404466f17c7a7986bcb5d5c014537edada76a44add4c8c2121eb549f255a7e1c51258406a8b4e2e48262fd510e9391cb WHIRLPOOL c7aad4c205fb91c917c343bcef077c159f072b4e02d9924052a4ad354dbdf2742824f45b238560f910bbc91df4dbecdeade9b7edd2127ee7ea33eca561cafd23
+EBUILD aerospike-server-community-3.15.0.2.ebuild 1634 SHA256 9e441e6889f926f41176e9e1f335471d49bede19ca57fb6094fc863393c88dbf SHA512 5c383a5f7c7a48a6662f527255bcad1b404466f17c7a7986bcb5d5c014537edada76a44add4c8c2121eb549f255a7e1c51258406a8b4e2e48262fd510e9391cb WHIRLPOOL c7aad4c205fb91c917c343bcef077c159f072b4e02d9924052a4ad354dbdf2742824f45b238560f910bbc91df4dbecdeade9b7edd2127ee7ea33eca561cafd23
 EBUILD aerospike-server-community-9999.ebuild 1948 SHA256 849b2a73933091c40e642c3874fb860a9d8d962f20a4e454b5afb131e852a679 SHA512 35a88f0e3a71ee4389604dfcab274de8a7659637fc04b6926e47a410252842b672924ef6775c0eb3329c23131513fbf1cf87a8555c5463d972d45ae965d51fb7 WHIRLPOOL a1c58ed03c7e98d8a2cd3e8e5ef4b7e85ccf74154a3ad505fa720cee0d3173e0b270b398801fd4133cee1906fd35c66be464f50b96c6a71289df61b4d1d64842
 MISC ChangeLog 4364 SHA256 90bbf78c11449834a0fe0c74d0d2c993dae1effe4b6d400cf02a5a18fb8853e3 SHA512 74598ced1aefd88bb382e9baf8dc270fd29d64f6cbbfc822ef01cce878bad64811f46c279fa5f285ff7a3bba2f7c3cf396ece0ff6cf0bba7d929ed65d08c8992 WHIRLPOOL 521f423156fab6e666c27aebb4a38cd227e33d340e18dc9796b3dc4069d32636d0bfd7e33edc27f63bcf9ed09c08eba01828dc3a02282243aa9f35d45950cdf1
 MISC metadata.xml 281 SHA256 c5f4069c93aa8e06d87ed6375692bcbef3e1bb5e4bdc51f781164f58d54ca4b4 SHA512 d3a33c339bb7409528ddca6187790b842150e273bd7630a610c0be08be50e26278ed7b4d42305bfd1a796544c6be251301c938b15d70e609b9d91bd22161aee6 WHIRLPOOL 171454c2084c7dd11595a8535b505410ef93f18f271de22db329b9ef24a567c13443c17359c72a17eb8ccabe7100091ecccf337c9817c3dd45af2f05fd9f73d5
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.15.0.2.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.15.0.2.ebuild
new file mode 100644
index 000000000000..b4e85baa2e30
--- /dev/null
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.15.0.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="Flash-optimized, in-memory, nosql database"
+HOMEPAGE="http://www.aerospike.com"
+SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-libs/readline
+	sys-libs/zlib
+	dev-libs/openssl
+	"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-debian7"
+
+pkg_setup() {
+	enewgroup aerospike
+	enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
+}
+
+src_prepare() {
+	local server_deb="${P}.debian7.x86_64.deb"
+	local tools_deb="aerospike-tools-3.15.0.3.debian7.x86_64.deb"
+
+	ar x "${server_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	ar x "${tools_deb}" || die
+	tar xzf data.tar.gz && rm data.tar.gz || die
+
+	rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
+	rm usr/bin/{asfixownership,asmigrate2to3}
+}
+
+src_install() {
+	insinto /opt/
+	doins -r opt/aerospike
+
+	fperms +x -R /opt/aerospike/bin/
+	fperms +x -R /opt/aerospike/lib/python/
+
+	for dir in '/etc' '/var/log'; do
+		keepdir "${dir}/aerospike"
+	done
+
+	insinto /etc/aerospike
+	for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
+		doins "${FILESDIR}/${conf}"
+	done
+
+	insinto /usr/bin
+	doins usr/bin/*
+	fperms +x -R /usr/bin/asd
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/aerospike.logrotate aerospike
+
+	newinitd "${FILESDIR}"/aerospike.init aerospike
+
+	fowners -R aerospike:aerospike /opt/aerospike/
+	fowners aerospike:aerospike /usr/bin/asd
+	fowners -R aerospike:aerospike /var/log/aerospike
+}
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index a33e4e9771be..721a229b853e 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -3,8 +3,10 @@ AUX 1.6.1-erlang-19.patch 4270 SHA256 659484e060929bd51e6fc305cb83bef1c2e5d1860f
 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 1835 SHA256 9ab8a41457baed9407cf4164bedc30efc43ab76b760edb4b5f494609dede1b72 SHA512 b5a9cbd431cf364ccce0cb6dc4ffcf91b9786fd9f0ab27357ee18760dc71373dae9776eb63df8a1b78c2a714769c9bc7098cb1b2a0d83aa4c609876974b6da45 WHIRLPOOL a595f56bbae24b021cdc88a59a448ef7513d1a8897417664f76fb26e344ce1033807849dc42b76eb037a30bd960c53ca81bd2a700a3db124c5e0cabae5faa666
 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.7.1.ebuild b/dev-db/couchdb/couchdb-1.7.1.ebuild
new file mode 100644
index 000000000000..5010dcaad8ea
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.7.1.ebuild
@@ -0,0 +1,77 @@
+# 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="https://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'
+	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/mysql-cluster/Manifest b/dev-db/mysql-cluster/Manifest
index 70b6d4974bf6..5196edf938fa 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,8 +5,8 @@ DIST mysql-cluster-gpl-7.3.19.tar.gz 41340089 SHA256 53b6692d25ad85772c19593f8b0
 DIST mysql-cluster-gpl-7.4.17.tar.gz 41691695 SHA256 f1966c721c7ed83b59f9ae2cc5e4df56071e358907deef2329d579d5c03601b1 SHA512 eaeab8b4c62e4b503210c269cf3147cb1fd3690e9bdb291a6bb46c874adf958166ccdf5b8766a09ec14d7fd63e3aff3e4b1f1527201e50e86e588507aa01767f WHIRLPOOL 1ad8b4b48ff4e4d0e5ada9f14c5d1fb4a23d8c211121ccc53f20051dfcecb0463d45c2b24178d87174f0950db6bb606e259144c4f1f9052759865644a9277f5a
 DIST mysql-extras-20171108-2050Z.tar.bz2 313241 SHA256 a8ae0806728f5308f96fe07fe2348b9c72629968e6480ae45995ca0a3693b9aa SHA512 830e6bac6fcead4b2d9649f6aaf6ec6573f86ce3c1a8bc1be6c89a408d69bfb81136baa7273d4449688d683b832880c2470970cd737c2b07cc7a1c2ce9c5a0b6 WHIRLPOOL 7ea7aabe9fc93418297522529c2fb0cfe43c7c28019000c25e100838e8ac545cab0611a08f2931157b99acee9704c441832e037c28232079e57a0718ddb4591c
 EBUILD mysql-cluster-7.2.31.ebuild 4305 SHA256 e4b578bf70f23321a3362e6f513c9272611665c7019f5bbe581930eae2860a5d SHA512 930bd60377563298a1b596685c2b5bf43d995415f06fc8f6b9e1e10c97cbbe43a97de255450bb177873033b99bf303bc3c4fa41bef124d2b29a7767923b39a24 WHIRLPOOL e4f180d633dff3e5c43acd71dce449f2fda25105198980a496f0a10d0f5c19a93c8da7501fdea0a4e49ba2a7949c16173bce7415c2fe6def80cf6e94439c90f9
-EBUILD mysql-cluster-7.3.19.ebuild 6237 SHA256 3c149227efcaef774be8fc1afac0de83cc9ef3ef7319c725625335d14379cfdf SHA512 a805b952e034f125511806c6e98d38e2612cf46cf6d55fc6e504f488335b429587ae8fa45e0c5a955c4a5a22db005d2d33657fc8ff6ac9dde4ae3b8873bc95ec WHIRLPOOL 66c1e5d160e8fd715cefb2e629a8d315b9c4797614d2dbbb94ad89dd94618be77cc928999e0e33201bb44530a28ed0505e8c19d8a862812656512b3074bd62f7
-EBUILD mysql-cluster-7.4.17.ebuild 6237 SHA256 3c149227efcaef774be8fc1afac0de83cc9ef3ef7319c725625335d14379cfdf SHA512 a805b952e034f125511806c6e98d38e2612cf46cf6d55fc6e504f488335b429587ae8fa45e0c5a955c4a5a22db005d2d33657fc8ff6ac9dde4ae3b8873bc95ec WHIRLPOOL 66c1e5d160e8fd715cefb2e629a8d315b9c4797614d2dbbb94ad89dd94618be77cc928999e0e33201bb44530a28ed0505e8c19d8a862812656512b3074bd62f7
+EBUILD mysql-cluster-7.3.19.ebuild 6261 SHA256 fc625592e119a46278802e80fe686ae4c09d6861849601efe3c3afcec8ca96d0 SHA512 93a21dac888d0c809ab90ac8b0064cc23bdf4b941e82b5bc00a54d2cad40dde144f6d7c08729fb7a02d8bd003ea0786689b535802cbbc1cf1105ee15b4fb7b4f WHIRLPOOL f21acfa000527b487ba9b63267bd6d9a61340a26bb7ef08499d16f48f447aa4db183faed950fd7befca95aad37a06cb14a672f657f5a514bc5b79dbd0e69a856
+EBUILD mysql-cluster-7.4.17.ebuild 6261 SHA256 fc625592e119a46278802e80fe686ae4c09d6861849601efe3c3afcec8ca96d0 SHA512 93a21dac888d0c809ab90ac8b0064cc23bdf4b941e82b5bc00a54d2cad40dde144f6d7c08729fb7a02d8bd003ea0786689b535802cbbc1cf1105ee15b4fb7b4f WHIRLPOOL f21acfa000527b487ba9b63267bd6d9a61340a26bb7ef08499d16f48f447aa4db183faed950fd7befca95aad37a06cb14a672f657f5a514bc5b79dbd0e69a856
 MISC ChangeLog 4144 SHA256 07b9aaf673d386476ecf94e5efd8f36b29bcd6c03a8ed98477705cf1b8a2a04f SHA512 b6ba5accdb4963a66fd2ec137c5d35850d15a8da7891252eec32c381cbb93ffaa92c36d1c49a0b7545063eb58c3f9b79a75d1e5815d9890a403563601634242e WHIRLPOOL fd6aee40cc89ac8da2e1b33acb992963e6bc60f6f9f722ca5779047abb696c26e7dfcd4c07094887639005eb80f8ec699960399022804cf2320b4efaaccf49aa
 MISC ChangeLog-2015 2348 SHA256 343f777d9569de16f5ff95232ebc908eabee68ce641474776aaa8665357e498c SHA512 cc53b01580c21a312d77b59e8d653dcf3c2a8576cf8cf664784d94c60d266224155ed5a2b409c457f8104e05be56bfa449ffb526e42226ece9abd2549d481468 WHIRLPOOL 13ef8138e6c990e173c1042a8b146bcdb6d86121636c79f48226c75931bd3f36f0db0c9d55a348be4ef3e9ef3e7d3a4b00cd6450c524bcbb3472a474c48dc65c
 MISC metadata.xml 1657 SHA256 d9bfb8c2a39756a9f2fe07acd1d692f1b2464c955f7d747bec91a0b27e558448 SHA512 594c4282f0ca9fd8b207778f5fcb00397a8779564b95f50ac99b22f48a4df80372675243a62a68f6e026733a31a383c43820450eb3f00cb13bce974b7e7368ae WHIRLPOOL d3c3a59a78dec7ae522bfa763db03a5a514a29c3e5ee1ea1ef79125aac8cfc8edf3dfd8082a6d769a7c4a21f0ebc1ca2b7845aa3dcf9d2dc4b387ec82887b5e4
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
index 01e3c5a94122..e83b46f92f48 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.19.ebuild
@@ -15,7 +15,7 @@ IUSE="$IUSE numa"
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= ${JAVA_PKG_E_DEPEND}"
-DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6 test? ( dev-perl/JSON )"
 RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
index 01e3c5a94122..e83b46f92f48 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.4.17.ebuild
@@ -15,7 +15,7 @@ IUSE="$IUSE numa"
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~amd64 ~x86"
 COMMON_DEPEND="numa? ( sys-process/numactl ) dev-libs/libevent:0= ${JAVA_PKG_E_DEPEND}"
-DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6"
+DEPEND="${COMMON_DEPEND} || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=virtual/jdk-1.6 test? ( dev-perl/JSON )"
 RDEPEND="${COMMON_DEPEND} !media-sound/amarok[embedded] >=virtual/jre-1.6"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index f4469d6cc89f..13ea92e64dfa 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 13538 SHA256 c5007eee07ab824b31358f6435be8d2e9c59f6cfa8f76a1c81530e810cf592e1 SHA512 b8d9b57ccfa73f7e9878f910f9f7a6010b90ddb182c707f10983d65988a05ff7823ad5e217036394304b8a5bcd28aea592c307bfffc5905cc8434a5f15b0f9e9 WHIRLPOOL 2a8f2547ccd5b8daebb4682c4003b8798a76f2478586162fb87dfa88128ae8e720d5eca5043f303c30c614e14b65d88f48c67b5992000f4f08ad693bb593f066
+EBUILD postgresql-9.2.24.ebuild 13537 SHA256 8963568f64cecf5b46acf97971564c707ee9963da1152cbc883d90cd44d5419c SHA512 54c78bcdf62f2ad33a25422019073049eb907f5c268eb8e83c616852eacbb2e885aa07a07bdd39a469cd300757a65a8b8baeeb7e22210f711dd3e74e03d810eb WHIRLPOOL 76332d10848edb0396d5d50f9490e0411128ffc4cabfa03ca596779e960c4c9a4ca54f3f2ca39730cc69499e8bca0bf7960318bbc41a258a4468f218f9a92404
 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 13797 SHA256 a76e00b8a4f360804d2ee4145f0b8b0f0848d2d66f133137f76e192c632f9147 SHA512 f6739316c8469a92daaba28f3e346c75e1cc79c8ad973c0c7945891bed2543e81243e5317dc1a1da1da91b189c04d904406d529b672456b1232c9353f3fb3cab WHIRLPOOL 44a2aa20210f766b73767b7694631b63da849f079a2a669d340439bf628e5f858c77dd9b33ae7a136a0707cf1adcc0b7f9e7298f328cd117b22bf7395de7f7cc
+EBUILD postgresql-9.3.20.ebuild 13796 SHA256 382a126b1e26c646010aa2a0d2bdbee6864e52e88fbc3883952dd1677ec0bc89 SHA512 d4d1d50ca70bd496a17bcd5bb87a17d6d2be49a272edf4146d940ed17159a9f079077ebbf931adad5dfb9f7a41123ae6b4dd5137ec2e3789b19db90b691e780a WHIRLPOOL 3a8f7efeda53da92fcdfffea842f44716fe680224a74dc18b8591438286f21d160d31b9ac8840e08739527091034cfab7bf030c96f85824768762a3ffc848cab
 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 14607 SHA256 6dad52f6f3882febed7255cec96f9d8176baff9cfcaa53d3b05ccc1efb199e91 SHA512 4680c3697a35d0afb7a0df6e9ef1c932335a24b4d54eb10adb333303e72b3d6dae0fa36e7ebb2b24532ebec3e9e749f4d2201f120e5289c0a0626f5b926564d4 WHIRLPOOL 2cbb8cf74fd0d6add8946cac453d88a8e2b0422765c29128f807df4f160f1f203cf5db949888ba7f09f50b5eb22146dd49a812916441b4c390ace383dbc0256a
-EBUILD postgresql-9.5.10.ebuild 14835 SHA256 8f4be11779a90eb052ec87f662ff8a09003819d3a1d90683800b19116b25cfb0 SHA512 ac40e26e2bfefac755b363ad694269c463513f1c45438ec32f24c1624c013cd23237075eefad304ddb19f812e5c55f6a10530dfc8882eba54d5de3466adbcb93 WHIRLPOOL d76bb7c81352205b16506be9df5c403b66b5d2d39baeed82ce7265acb06baf073eae9a695eda95666253481cd976c82eaaabe02cf4a7be8d9fe91fbc051fc096
+EBUILD postgresql-9.4.15.ebuild 14606 SHA256 e240f3d77a06d01ae4681886d167dc5ccae86305748cff8c31a89fe3d013dc43 SHA512 0f80dda730cec9863e4911cc3d8665bc85311d237980d3b5e368cb7ecd56e391505ccc759edf77155b2eb30ed341d5c13f02c3b727f8a51870c41ca684071281 WHIRLPOOL 3e39862a200ae150bd2b9b916cb0573ea71beb04fa4eae28639a9211582407cc574b53ad1711b36c23cba789b254b59c749d9b80771efa0617676438048ce8d6
+EBUILD postgresql-9.5.10.ebuild 14834 SHA256 20c6e2faa9b5bda029320f625b879e0da04ed2d3ba9b7f7e423055fd746a23d7 SHA512 18317f8580ad163d4072956736bb8f8b1c7904bbb0aec1bb277328a44594384b67f00391627bee01546d8a0306d12cab2008ca2674ee7c24ce247e4dd85ea072 WHIRLPOOL dde8679018cdf8414076ca17757627dfefddfd3bb3150c5612b4fd771da8c2d1fe24fa9a9f67d59a1dbaa00b34d406dc28de1878a8a9dffa5fd13aae01f31581
 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 14977 SHA256 a295e855243bdf31fdbcf32526410f8ad36fa64bb718933d602510f68e7df758 SHA512 0d60989bda8cf383b32889c468a65f2f76270dc81c102d6950688b247c9c6274e1475663517a7821b8733928f89b8ecf9a2ac7713e52db61ca2422b2922267aa WHIRLPOOL 9c13e2f04b215868429f41a02844c4079e958cb5d3492d1826fc1c8186a7732b3979f9e8a3eedd38618e324eb1967efbd004e5641e45bc0230c4799dcc3117bd
+EBUILD postgresql-9.6.6.ebuild 14976 SHA256 0c7e65b3aade7aa511c87e9e65c12224ed8e5d6f0eb94773ced8d2dc9073ebc7 SHA512 d7b69f5a4397b0bf434cf514c4f1696a77ca8870031cd02ff00199db3a0606bbb7ad2c80024c27a1f4fbb0c2770231cc886535fc4ffea8a33c5a08a52a4cc7b4 WHIRLPOOL 9ae7802e2615011cfff1e5805e75053520bb9b23d9ac16f99afbab3f3ea53ed36e61f83e70f43c3da54f92855e800350f18e556cea1875aa5f45319853e6d059
 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 fe742c1180d5..a7b2dcd816c2 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 bbd1a57e7433..6d9154e7feed 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 9581093e829b..881d04d280bf 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 2a574225bb73..7488bdc69c3f 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 d448498a6675..aa1d327f4899 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)"