gentoo resync : 31.12.2017 (final resync this year)

37 files changed, 32 insertions, 507 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 086b07a82d3c..6b29962363fb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/castellan/Manifest b/dev-python/castellan/Manifest
index ea48d8f80ad6..ffab68145dcb 100644
--- a/dev-python/castellan/Manifest
+++ b/dev-python/castellan/Manifest
@@ -1,7 +1,5 @@
-DIST castellan-0.12.0.tar.gz 50497 BLAKE2B d5fbe6f0b29ad5dff2031f17d6883715fbf8ab96d3a7705cbb57d5de1c2e13f5f0490893133abc074b91579f6c589939196249553aeb3e7d60a4aca416efac14 SHA512 9fe47f9678dc2528cbca652029263db89b71939e70c4f5fddffd1769271c04bec3cad0a7c29a800b646098b3df89fc064049c4fe3887695fe0b5dd6b3146835a
 DIST castellan-0.12.1.tar.gz 50245 BLAKE2B 93f56301ffb57f44fd89fccafa5a2aaede3a3b8f54bf223e1e2a3cc1f14304b2d153557d62f884140512ef72747268b9f86e1102b067a0810bf8235df2e72a7e SHA512 f5e3a8a6ed6c00caa242d2a2a1431f2ddd56ff0168a62fa825eb90083cc1830fe2d8bc4d21b8ed6d1b5f6d1042cb2ad778d49e6a39b003768a61b9ff4d389027
 DIST castellan-0.4.0.tar.gz 49026 BLAKE2B f5c4854ce4837a33c6bca369799da2f6b6109a1ebb2bebf47ee93f687214f9388039c237d474ef401bdddd3f983d18af6e4d84f3d6fe3418d3f8989c6811a3f4 SHA512 2ccb2a757810c6ec125dbb8832cd09f918f9fbf84836ff69c79872471c7e4e40bc8030e305336ad9821de7c3b93617d39917387a6ab8f68443fb09d3f74d4dd5
-EBUILD castellan-0.12.0.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
-EBUILD castellan-0.12.1.ebuild 1439 BLAKE2B 693be4147a5d7520ac015b9181fe57dd7bed38d62790edc370b7881b2d70c5033d4e4059e71173dae4ab0f43bb4d388ac6f1b8309ab99db542c000bd46ec905c SHA512 acd45fa667e65fe1322725f562d5cd809cc6569209dbe25f0b3022ee7d06ed2f25b9712c5dd1aa9da45d0c16087eb18302d444d71e32cbfb750174c2e144fe35
+EBUILD castellan-0.12.1.ebuild 1437 BLAKE2B 69aba8d6c23bcbbe7438a5608761ea8ba4a0a0ddb010f5e92ca26c20cc5d9e1fddcdbf9c03e55781ff6b133515652354bf724e22fdc0101d2dafd97e047819e0 SHA512 aa3a0b44173a59d3c44007fe0ad573edc2affd4aeb765eda18bc7d208ef15828a61dca39ff5ad234a4a696cdaf26b45ebce726f15bc494bfca9ced57aac4e76c
 EBUILD castellan-0.4.0.ebuild 927 BLAKE2B 4970a777ef6a94cec2def40cbdc097b18fe8f001455d86c55f8aebf973aa7a076bb0f415657862828e8a6d91f9cbe0955de9f973f665c977e1779b096f07a60c SHA512 a7e4cf2a25a51e3b2ddf54a182b229ef441e6c2f5925b62c1efd4a457376cc36c0b8cef52691abe0e113c53913a13a0e649ecc3551ddf8c0ffe2529238a379c1
 MISC metadata.xml 326 BLAKE2B 5ce95fc1eeafa570c9910dd492a822dfeb251bb98c5b341281ee99e7402be32234fc38bbca1b7ea0fbb67f8bc88e9b1a1c85da73f79d2a9ffc3a69289da507b4 SHA512 f8d928ab94ac70a7a3c2548b67a6296b8e86b5e239a9c74cc4b1a120f64c1e2e2084612b025e26fa3c02099f543ce156e5419a5f6ea165eff79b2dd77e9a2d66
diff --git a/dev-python/castellan/castellan-0.12.0.ebuild b/dev-python/castellan/castellan-0.12.0.ebuild
deleted file mode 100644
index b2400c1455a3..000000000000
--- a/dev-python/castellan/castellan-0.12.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Generic Key Manager interface for OpenStack"
-HOMEPAGE="https://pypi.python.org/pypi/castellan"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/castellan/castellan-0.12.1.ebuild b/dev-python/castellan/castellan-0.12.1.ebuild
index 2d93dd3fb60f..b2400c1455a3 100644
--- a/dev-python/castellan/castellan-0.12.1.ebuild
+++ b/dev-python/castellan/castellan-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-htmlmin/Manifest b/dev-python/flask-htmlmin/Manifest
index 0b0b82465921..4e51fa20d056 100644
--- a/dev-python/flask-htmlmin/Manifest
+++ b/dev-python/flask-htmlmin/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-HTMLmin-1.2.1.tar.gz 2921 BLAKE2B 61601aceb58545972469ca3482e7e44464d3e3f1fd0b4a40d8f1c5e1c340c5b5292d59effc3a7a4881f1a012e90d961dcc0ec3b069f1c83d4b4cc76c99d3a301 SHA512 255dac2da4db1cdacb3cccf8dcd06507c249d97c6e92e7c413d3598fbfa247f657c294eb5f1ff1f50ed73ed656ca2a1015ab712f4ea880a209f13c1d8950d83e
-EBUILD flask-htmlmin-1.2.1.ebuild 515 BLAKE2B b3385cebbd9934d6bef3b4965cf1570b1d40e4ae1f1da63eca4b37a8ef6e8e10adf919ed1d8345f7e5975428931e2399239879ccf4e2a7bf3749382305058d83 SHA512 34058db8fe52027aee5e1fadb7ef8ab98a0317e569070f29bd3498192c46a5e65c87bd1d66944f13acf82283b6731554bfbb90af03d5f79999914846bfe9fbc7
+EBUILD flask-htmlmin-1.2.1.ebuild 577 BLAKE2B d0549ccf44b7dce8923fc25dc96c6afe54d4c14ed5e42eed255a19324cbcfa3a01f140115a5e8cc7e06411a864d65e760071f840c0e83c763bc95d4dc3412cc9 SHA512 8d72ac817e063c09287931b59856b4e2f87c0ee1643e13ee5992fc95ef996dc5556700dd598f8c5e84c9adb449297a3c9f308005938784a4824ff9f2724aa6b2
 MISC metadata.xml 430 BLAKE2B 5e46d9cb5b03bc29264074d3abad076a3699e6753679cacf19134355f35265cc70dbc8fbad591eed798a36cde80a44d78244e88dd7deadc830440ac7724132b6 SHA512 78c978ecd3f4ef205b0ddef1cec9e60b95988ce92bafefb5134e8a1f1f8fec8ef47f50af05ce3f71047b7f72ecae76a9f4d83add103ebedbc374fc4e49a24180
diff --git a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
index e744d00a4a6e..00e93c0cb191 100644
--- a/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
+++ b/dev-python/flask-htmlmin/flask-htmlmin-1.2.1.ebuild
@@ -25,4 +25,7 @@ RDEPEND="
 	dev-python/flask
 "
 
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index d24538bf2d8b..ff348a7d0da2 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -2,7 +2,7 @@ DIST jsonrpclib-0.1.7.tar.gz 16980 BLAKE2B 76052a094d45cd483df8b4e12e657d43aca22
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
 DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71
 EBUILD jsonrpclib-0.1.7.ebuild 633 BLAKE2B 5964bd430a3d3278a602d079afeaa15762372d7ce35b0e84884efd525d8b533e4be79fc71358b2c39564a68b7233a4aee4bfe65a77da63bf0397dbaa15ad76bb SHA512 debe25d5265d5f2d50f7d17af46beeb6da9879bf54734eaa36481c3e0030d60bec3f9525674a4acf6360c8135204096f1743593149b9e32522a299d7238bc221
-EBUILD jsonrpclib-0.3.1.ebuild 710 BLAKE2B 563d5e0e4946e3912d6b87d60016bedecf8413d6947e48b1b0e77a2ae7519cfdbaf6ef4f09f2a4635e890db2016e9866f0c3a9dc56491aa6b0d60c2de912a2a3 SHA512 a1ddbb9900c1aa49fdb6c758b134c5ae00e9f17ca0ae17faf36a5024ce194ab00b80b583d65a4bce281defde4148ea0816b4e01c2a516ba707569fe22c9b073b
+EBUILD jsonrpclib-0.3.1.ebuild 708 BLAKE2B 708cbebddd314140bf094c3bb00780b33a7d68c31fe077f60c812f64f27d6724cabea52e8456bfb24fde044e49d2209bc237d7110baf96b940cc4007372b3be8 SHA512 d9d61aa7a6d9b35a3ea7c1a6a9fef2bc3d5e9f4999ef11f9daceb28e5d3accccda06b81f776b8791422844aab6e35efa6a37a69c160439510c3a529f301e407e
 EBUILD jsonrpclib-0_pre20110820-r1.ebuild 573 BLAKE2B d78437cbefdcc6f269bcc1139deeb82a7ad2c96bd4313851d57aca21635a7fd784545f9487ccfa1eacf74f093e80d76294b697a85004e7e6f0ce094b045d6995 SHA512 10a9c32643d393ff9f857eb2d48d708d1635cc52d3369bac0abe05d0cb29b67295d49126380f5c880dd61d83e0676a1934a9610e95c8a0217e1e920964b1b800
 EBUILD jsonrpclib-9999.ebuild 710 BLAKE2B 563d5e0e4946e3912d6b87d60016bedecf8413d6947e48b1b0e77a2ae7519cfdbaf6ef4f09f2a4635e890db2016e9866f0c3a9dc56491aa6b0d60c2de912a2a3 SHA512 a1ddbb9900c1aa49fdb6c758b134c5ae00e9f17ca0ae17faf36a5024ce194ab00b80b583d65a4bce281defde4148ea0816b4e01c2a516ba707569fe22c9b073b
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
index de6e1a8301bc..98f9b51fdf2f 100644
--- a/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-0.3.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~mips x86"
 fi
 
 DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 570e66698035..05f7b523e173 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,7 +1,5 @@
 DIST oslo-cache-1.17.0.tar.gz 47178 BLAKE2B bad4a005255a03cea4552b18adc242123923c3e5f8dfc73085ed8b0e600fa4c2c8420f0b5a4959d6272e8425b07da95ee77293bde486edcefd40471ff4fca439 SHA512 0ae55959a46624bd0b50cc8161f9428b3f61669f726ebc05d944f7e049c5172a1d9c83778c9632e8b2a21f047884d90d15b95c0e23a0dd19cb78f8d62f06d00e
-DIST oslo-cache-1.25.0.tar.gz 51267 BLAKE2B 7bdf6a38aeaa296bd87b965551eb57523d653aae247d3381af402bfbaeebaa0ff66b21b0ede30e3ab00f957bc36936484552996d30048d42224268ac1b59243c SHA512 3c21736c864cd63f3a55fe06cedad54a877970d3ede70fe9259cd549fb2a81d425547445238f8c8f9e42929b775216c79b34eead8655588ef8e1c2617bbae6a2
 DIST oslo-cache-1.25.1.tar.gz 51049 BLAKE2B 24e229d7c7a03fc244fe257394fcff1dc55509c6ed6a60ef8eef49c1a7660972a8412188ca96902b61463dd452bc63fed890ba27235d93dd620a93a52de706a2 SHA512 bc5b6502c6f310670ffae9b70b232ff90f0d0c04b75ba14aa4d528634f912efb243b89e229b8277e86ef3d7cbe2e81e69996c80f011d8ea4e1050646f074b297
 EBUILD oslo-cache-1.17.0.ebuild 1049 BLAKE2B 03dfb73c16f74235614ef5fb65b22ccf3c7c7bf981ac0c2db7beae7d00bb33aa5376071195848c6a068b99c89fcf7329d5b1e39378671972fb19a38b282fe632 SHA512 b23fe1da5ce175391e582189a6494e0fdbfe7c6cdd351ed33d53ad161aebf7fb905978f479530f69722ae4756fdde1fb6e50578848cb7c8c6f0dd666293d2d2c
-EBUILD oslo-cache-1.25.0.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
-EBUILD oslo-cache-1.25.1.ebuild 1192 BLAKE2B d87477ad9e4476368b85798b0f1ac0ac85a97d11800b44bfa880d80a39e8bb1f810a97338bf9a76a30cabae162f21109e383f2b994fac8a054c0be081281cc98 SHA512 ebd7a506113f6e73be88ebe29d860e66e294474639a75e125feab4e078d74ad284baa86393874ff72d1d88d0b941df1c0f8b0a461232f11d469067605265b04a
+EBUILD oslo-cache-1.25.1.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
deleted file mode 100644
index 9f4447b6a1cf..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.25.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
index b655f5a5bee6..9f4447b6a1cf 100644
--- a/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.25.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
index a02c461693eb..63dae82b6cad 100644
--- a/dev-python/oslo-privsep/Manifest
+++ b/dev-python/oslo-privsep/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.privsep-1.16.0.tar.gz 30448 BLAKE2B b1bdff6d168c4215728e8a3e84df9973bdd066882d8409d12fc736861f9a796c5591b1ea4d4f6397ba742e0a2e0b4cc731058e8e8924f0c8598d315b43fb72ca SHA512 223cb4a32a9a8545833621c7a6e3a9ab5acf84a188f2a6f45df4311e02ec64cef8d7150ddde89ca3c207f5aee599ed655b1f9a5fbdec7f55605d4d3aa251edd5
-DIST oslo.privsep-1.22.0.tar.gz 33179 BLAKE2B f89c44deb7bfc7531063731db9a6eb2f92a85f686c8ae5f117068eaddee1ff26d45b14a2c7c0a65e8071f238e9239c98fbe20a2a524fd10a511f2bd71dc13794 SHA512 ba4bb9b4fae1dae029a72f1216c23eb7c3ec0d9376c6c1b6ac864b56d3a942e4774ef95830f451c6d2c11cac5089bbca3c7c1cc47f7efd9dc5be58a3bcdf76e5
 DIST oslo.privsep-1.22.1.tar.gz 32602 BLAKE2B 1dff51174aaf3b8b8c2c5006e476f8b6f386f071cffd5038c9261af3696a7ab1e05e8ab400a6c15a1dc050363e991587d8234ee6a99dfacd20f10162779766df SHA512 fc71b92b9a73e9de5003bf3e9288eca6a128c8d98abb51e5e372823a8ad549aa484bec3ab2bd0ccffe527282f96f12dd02c0bdcd0680b123649ac452ad4c0a7e
 EBUILD oslo-privsep-1.16.0.ebuild 1569 BLAKE2B 6e3cc5258fe489407beb7c661c89e491e10bf1ac991233baeabc6f84569b8b605be6228ff3bba07df8e7949b9f9232323b4ff897af583ac3e5858dfc81b78435 SHA512 74b826948de43144eb62e8221a2e15ce37f10a436975faaa287d8d16d6d28d570467256c7202ac7965f622011c9b593879e09f9c1d0898cce4b400fc333f11d8
-EBUILD oslo-privsep-1.22.0.ebuild 1794 BLAKE2B 93e0ee8b4cdfd90f7cc4013a3dadb140582576b4a31394c691a12d17ade417e5f5dcdb0eafedaca6d0ab7d43cc7c81ef830d6e8328a84763185bf8f31284ab02 SHA512 e46645b4149348dc6fe59c11e6fea184e4e3f51ad3e4634bef267591184da60f8ad35965f381ed578ca7328509445ac151e573b49dee6d918e4804b9e7f470c4
-EBUILD oslo-privsep-1.22.1.ebuild 1796 BLAKE2B 1176280a1e7d5ca019c2aac7b062efa7271af2617e91950f0a85a00a23d9377298372b6b516eaf41e0c7b6e64c85f0b1460c5b7071f301f27b31458fa6541377 SHA512 9e7b7a35ca35c17189920600188d7e8f52eb0cd212cd36f92d99e5775f877aac632429d0a61025bd1ac6d49c514b64240e094fbb0b44f396078bffed9f867a71
+EBUILD oslo-privsep-1.22.1.ebuild 1794 BLAKE2B 1bc84d099ab37d2ede53ae4347e6e76f5b0420a71a66386d676f1196c0afea30367abdbf5c510d49f9c771ea4d6274a668ec3ad73811bbf2b259ab779dd037e0 SHA512 d69fc20db1a3aa80f5c79b19d9eaff293dcd11ecbe0ddadbe1c8ca9f7935a9522108de8103f83e037e5ae4fe49abe293bd842b14ac1da6402d8c241ee6015278
 MISC metadata.xml 544 BLAKE2B a76322f18a6f2b32d17934a5d8c747963f5bf647cae027babcc4508c4b15ad6c958baa30399247302aa696dcde2ade3a9ae4552de7c1538d4b0af79b3da2ce69 SHA512 f7f8a7194b5439872af70f9ae742bf8cb6e338b8100e3cddbdea34be89c187c5475d6e0523dac5cc886a85133d18bb8669ef9292228e4351d31122c73561dd30
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild
deleted file mode 100644
index 2994eb02cc86..000000000000
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack library for privilege separation."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
-S="${WORKDIR}/oslo.privsep-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-python/cffi[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# python_test() {
-# }
diff --git a/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
index 7e62a26bbdd3..f2203d0c8cce 100644
--- a/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
+++ b/dev-python/oslo-privsep/oslo-privsep-1.22.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.privsep-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 327b3ec8d0ad..1ed14ac3d3e1 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.reports-1.17.0.tar.gz 47891 BLAKE2B 8f39a955585baf10a8bff017c7cd652f511e97061705ca63671522cd40da7d4c3d1b8f3d2aa3da69257b3d7c9a57a6f0f8d4bba12d7439edbb91af5f81733399 SHA512 1fded7c8d6149dbbe11fb6fb28f6db656571519fcc093bfa7bf85a8d998c6cf23f28512e0658c9f8f547185f10bfb3b993fdc52942eac5ba884d2ee15556ad20
 DIST oslo.reports-1.17.1.tar.gz 47828 BLAKE2B 414020c3ec934fc32132837b1af16a5f4ad481b392237a930370111e0930d18681c1fbd9d969ad5207966856caaed4c94c3dd89e63849ca042acad72cf3440e4 SHA512 2ed6d69c8643901a185f38de34cff663160daa246d372503f17e2102634c6634dfafeaa7d6474b7bd702f43aece27a3e4d16c06ccc0a9f6bee1d79a2204ec704
-DIST oslo.reports-1.22.0.tar.gz 48141 BLAKE2B d7b0518cde504152336451fc73dd9acca1fc5fa44717eae358e8065051944ea25e6624fedd4795125405cb423f099f1cd2f63a127e2fada9928b34baa386a4e2 SHA512 fa4d6f08531c383fbba3fc2785db0c22a21226d477faebe65ae6ede5e2c7db7fbcbb6edd793c38e6f862679e13f2e7e5838ee48784ae554f18ba9363edbbee54
 DIST oslo.reports-1.22.1.tar.gz 48151 BLAKE2B f3867bf3c6c7fd207b1e730e8c96098d74b42239107999194bcef295ae0a86048bed7f47498a5d4a0186d15d48f97d897850fd2558eaae7bc386b9401c01155a SHA512 c2c7f35fe80df9393cb1d9add59a7be95586ee078074548795f881c8515073946bcf3dfda02536850b943f346a6b81bfffa1d9f461f0cafdf6163da09b6d07d4
-EBUILD oslo-reports-1.17.0.ebuild 1216 BLAKE2B 9a68f2237752bedaaaf13d7197f33eac27d92a4481458ee9b994fcda589edd39b95590e8e386a0b05a2c843e203d2235942f4cccee49b0572b1b28bd32a36ded SHA512 0ef892ee3ef4fc5c114c623d8a44fcf48276089252182d22e81d6807500efaf121b32523b5907ece493e878443574813380111a7fe16183bd03062bbb85b6008
-EBUILD oslo-reports-1.17.1.ebuild 1218 BLAKE2B 919082da9506e999e1e5b290f10ea6bb242042b93f0326e66e89387090ed781a9953af8b43f2eb81b84c9742921db10161d75f25c5616feff76efc421e5a7c0d SHA512 c9874eac382be979797970151447313943d6fde38afc3919d1a402824ee92b5214d56e94eef848f35df8d266cb84595d6414f42c0f701d69846bb09c790c475f
-EBUILD oslo-reports-1.22.0.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
-EBUILD oslo-reports-1.22.1.ebuild 1351 BLAKE2B 83367cbfd28d874984e164d4f8b15ccbca009d4270d2947ff1141c3160999e6d9ae4aa3ba53b06a7b25d8419f0699026799078d6378ce16550c78a39201ed680 SHA512 084554d3cbf8e69dac1c5ca62f78f98ecb9a2e0dbcc38be10e1774e3a60aea77037211654562e2e1539e93e0b95e06aa3f7b074c0258b0732f52fe8af41f29ae
+EBUILD oslo-reports-1.17.1.ebuild 1216 BLAKE2B 97b3facf59f234514e4329a10efd272899929250accfb4183de2c42ef6f99d680ef3d6c4bbabb816cd6a037e5aeebf09d0e5162208bc2b75b908daf1ed089dee SHA512 ec46af4946bd83efc02ff72b36e6ebd1ee2cad29c7e34e4d308c690215633341de9e6f63637e89582ce6dd789ab5d704677ddb9f9ad371d6921c2bcfca8abac5
+EBUILD oslo-reports-1.22.1.ebuild 1349 BLAKE2B e6e3c2cbcf89616d6ea7a30ca9e0a622cfde35683209f7cf56aec7afb718699ea5d0cf3fa276eb24ba5cd9dc111cd6ae5784b0542f6f4510f9cc81cfc3af7527 SHA512 34a44e0e2b3feda056aaec1b61996cd7bf7838b9a98304bc74565d543f2f013ec90a2b37181884b61020f16f05d20a365326929b2b717ea84e3a3798c527828e
 MISC metadata.xml 329 BLAKE2B 431c4b925c3e743ab9f24b399affb6c0debc3c81f2dff9fc3e30c04af99b1984b8b8ee56d143c5f130a2c77f3bcecc0ff905d07fad2e3301ce5ca1b7920715d9 SHA512 61b44fd1704b8cee9c664efea764a36fc32e5019e5b9c7fca107b8a3a3272a7f97c525827b6ea918d0f91e9098f19fa164df62c83cf617b8125886aee633c1ec
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
deleted file mode 100644
index 074ad9e09bae..000000000000
--- a/dev-python/oslo-reports/oslo-reports-1.17.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
index 62da8e1b81b7..a41d32fdc2f5 100644
--- a/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.17.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
deleted file mode 100644
index aba2422ed1ae..000000000000
--- a/dev-python/oslo-reports/oslo-reports-1.22.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="generified reports for openstack"
-HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
-S="${WORKDIR}/oslo.reports-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
-	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
index ad722b7e1add..aba2422ed1ae 100644
--- a/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
+++ b/dev-python/oslo-reports/oslo-reports-1.22.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.reports-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index d4c52db82168..aa5dc15cb720 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.service-1.19.0.tar.gz 74937 BLAKE2B 0459f16c7eaf75c3df5a58eda40fb5b9cb3831662038c5ee19e6049fad940474a65e9003641f6ba4755b918d1d7f6333fd60670c672b30339b6b7339ab5275ee SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70
 DIST oslo.service-1.19.1.tar.gz 76246 BLAKE2B fb5355d058459da0be54f1d208201f130a20a1a59c90fc15ecb4e748c8cdd5174410a521ad05bd125b3f4ada673d1ba2ad7c7a2565a2d0821e2ec55a50e7e61c SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68
-DIST oslo.service-1.25.0.tar.gz 76400 BLAKE2B 09dda44cbe2633efe149b552b9d2c484f1f63f085d2772e1caac9adc38246b5ccb5fd04c3d94b717b1c70f620898ca686ae72fb306b5236232902578ed2ae456 SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c
 DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
-EBUILD oslo-service-1.19.0.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
-EBUILD oslo-service-1.19.1.ebuild 2064 BLAKE2B 87c27ff38449f2f1f6dca056162db9de081b93423bba9702c7aaed572233df87ed4249a219a2d1a0c251fa2230f85545f6c918b445d2d53774b73017d1751fc0 SHA512 32a3713312f0332458d112ca5504a1982c22534ac973a0ce773f5f7eb9ed3ba21cf3c9617f1f0a9aa66117b4f444bf7862312e87e22dd522876970b4f30c513a
-EBUILD oslo-service-1.25.0.ebuild 2207 BLAKE2B 413d64c460fcb44bd70704262cd237fc852201f417d203dff5b6e283918e939fb270cd7268e00391d79192bccd868ea4ef261cb8f54fb6f2fb6c3b715133d420 SHA512 30109f79017401d8b966283c1a99b3b55b287e4275f057f069fb6c7b66b785c2d5a5b314fc0a8712776e30be11bc3c37ba2782efec80e29131da8fe9b3f3aa43
-EBUILD oslo-service-1.25.1.ebuild 2209 BLAKE2B bb9c522991599ea1a3b333b565b8d4b8c788abffc97193094d9706581328e64d6306eda3f40983d3e79674b1845b638ad8b28f2609ffaa28b3d73dbf9ff29920 SHA512 b884733ccb9a5e9ccd993ae639677c1300d62304bed0f9638d68896734f8dfae4e5859a3d49f60a67f0b1434aa68fd639a3c7e6cdcebc200600dac25fbad4486
+EBUILD oslo-service-1.19.1.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
+EBUILD oslo-service-1.25.1.ebuild 2207 BLAKE2B f0b267507fa5a90770ec57cc24debd421ae9ea7949f0e590b42869717f5c5553d169507f2cbe056bf32af7a7696fc299dab858ad1493d528540e81b03a73f5ac SHA512 84d67ce2b71608204676112d4c8618210edc6d309e0edd9ac49ed583321c782118ba226a22a81fbe3dc8881302d269762fe9f64fadc0992d3fc412dec334fe26
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.19.0.ebuild b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
deleted file mode 100644
index 68dd17fdfc1a..000000000000
--- a/dev-python/oslo-service/oslo-service-1.19.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.19.1.ebuild b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
index 0660928ac7c8..68dd17fdfc1a 100644
--- a/dev-python/oslo-service/oslo-service-1.19.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/oslo-service-1.25.0.ebuild b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
deleted file mode 100644
index 4443ed6a468e..000000000000
--- a/dev-python/oslo-service/oslo-service-1.25.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
index 729b8faae141..af307573d4db 100644
--- a/dev-python/oslo-service/oslo-service-1.25.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 16c0c10124d6..0cee851abc57 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,7 +1,5 @@
 DIST oslo.versionedobjects-1.21.1.tar.gz 145514 BLAKE2B a5cc7b4a814718cd24c460b2b39af381c55fba94d363ca8ebfb096386261ac86f0f18a6aafb78b032e454c7fcdc4ce7c3d9ae5a9348036283fa61eed98b05e27 SHA512 e594d77a923c588a7ca1bc4f1faae4532f28cc2306d548235e0bc3cf0c6c16a5acb54f5b82b97f4ead165bbbbb29982d0f96f20357b1fa0a1b2fde3445ecdc15
-DIST oslo.versionedobjects-1.26.0.tar.gz 146388 BLAKE2B a3c2d6effca31525c33631b40abe0c0507155106b3fc9917b2c13e8f2849036fc57a16075d06999a6212a11f7ea653c9a2c9d0fdc7d9b42e9bcef4b81253398e SHA512 633389177b0f4d62e77e5902011bc783f1e7d2993a3d8dee693526c8af435764b1a86e383f861192dfac8d93da7c49b11e16b08485027470107597804c72a81f
 DIST oslo.versionedobjects-1.26.1.tar.gz 148214 BLAKE2B fa449b57db3ae4148fa431616b49b83d6a1424cc5f1845546fc945270bfa1b470f376a52edb0426f1fd86783cfe25906f476fab3417b3944c5f3074548704c77 SHA512 13962e9cfd5c63d9691bef0e1b31aa1751a506dc7a8aa3031612220778ba887d3122eea205456809bed9cec12c8fd5debfdce827d59ad8fc991ff85de7f841a1
 EBUILD oslo-versionedobjects-1.21.1.ebuild 1377 BLAKE2B bcb8d5fffbf2eb745ed2c4291153546a0d0328fd87e80482175e14defddb6bd951b8758b5ecbe08a27aff3f173939c53e055b1853c7ab5c13a6e8d105f44bb99 SHA512 bb959ddf306a4ee951b118d14959de291221b399dd2f1bfd3754be1db9cb805cb8d8a41280a3c654e499686b4215052a6949f1d3d8a6f0b7dd3a6efb0d00cefe
-EBUILD oslo-versionedobjects-1.26.0.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
-EBUILD oslo-versionedobjects-1.26.1.ebuild 1613 BLAKE2B a7a68d5ce1f68be1da166650d7cd0f8600dde81a087c4e21c5680d3a4f54e6ed787244f6d86be0d4fbf5c82b39522b7b6539555083381a57b6b15c0e08e03d60 SHA512 9998ac410a9dfe0d93c8fb61fe1c194cb5bf1d2e59303fd0bdc957b427cb23721c7378c430a8d59b22c6ff2b39650907eb5e1f24bb09c6c142430eec5d301177
+EBUILD oslo-versionedobjects-1.26.1.ebuild 1611 BLAKE2B ea80caa853b82ab0ae6c723488c95190bad1304c3a945a1c9acf13b28161bc180a5c3933095036b3cbf5162287b66c98801c22f31dff7d908bc46abf386eaabb SHA512 87011ad8ffaa7b9cd17c6ebd1c021d262e9cb8bcc69b5a338ff39f5cee2bb92a7013315e0d8fa2660dc3a636ce158e4b805479d6f8ea42aa103e3a3486745dd9
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
deleted file mode 100644
index 589284cf89bd..000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
-HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
-S="${WORKDIR}/oslo.versionedobjects-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
index 6120b8f21bb6..589284cf89bd 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.26.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index bed65c373fdb..24261b329ad2 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
 DIST oslotest-2.4.0.tar.gz 26392 BLAKE2B b34d478f9d18cf6582544499555c6daae5cd47e47731b17c835833b7cbbb65c652602c6642c0c682b0690dde495f5014b454a3c9e0a56b2f69b278935ebadd7c SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886
-EBUILD oslotest-2.17.1.ebuild 1812 BLAKE2B 93311c5c47231e120c2818c3436ff22604166f1d874f4f9c3ce35053a0894a2400e80e3dc35e9e7befd57ffc0b31e995f8e515bcd90e86721084a52ec3c680ac SHA512 5f1919d1df7bb7a1ca2d175dac76aa2d5c3fdf6a6eed281dc688098c67027380398870157be6e524cb033c6ad983c68b043a22064fdd2d09689f4c886f06858f
+EBUILD oslotest-2.17.1.ebuild 1810 BLAKE2B 0596613272772ab853921abe8e261e998cd836515f1c19810b4ceaf48a03541b9ca7f9da0e5787e0a769f5eb3c961f064308853c991073dec6a28f3366e88840 SHA512 957fe51f09042979f9d65b867b71ba7579a0868b225a75a8490982bbb48ef0896634fd3d2cf18cbf46d4e93990919eff66d6c8fb97797d006161ba0cf9f9d656
 EBUILD oslotest-2.4.0.ebuild 1720 BLAKE2B 7d9c6693e8e416509829a3e670bddaf35437f3a7534e4dfd955a3bcb80ecc002154c92cf813f5a5c8a3b2794799de82fad7cfa950010016cafd6793f7d5b25d5 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.17.1.ebuild b/dev-python/oslotest/oslotest-2.17.1.ebuild
index c77840476418..ea3ef000dcb7 100644
--- a/dev-python/oslotest/oslotest-2.17.1.ebuild
+++ b/dev-python/oslotest/oslotest-2.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index b10830cc86d2..e4b3cea1b495 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -3,5 +3,5 @@ DIST PyGreSQL-4.2.zip 1377728 BLAKE2B bca6846881645e9ef9b29e2960b9db99b1029754a8
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
 EBUILD pygresql-4.1.1-r2.ebuild 1592 BLAKE2B cf71efda28ab0c4cd24540307c5b68d8585cc06ce92b415b399d4a2ce4bc70d2a9a2a4293061e75a3c3e061b37ae0d56165010ae7b048bf2512de46981ab87f4 SHA512 c862f696772b9b8d6242fc98721d8b1e7e608f3a54ddc2bd4b34e24e782390cb1ac8e4060ab13ae025b9d8c229d4b9bb03cc2a6facb254ec49073477cbe32c2d
 EBUILD pygresql-4.2.ebuild 1599 BLAKE2B 67c802c464a6e5baa9df016950a4764a732d848df73f876457fb63ae09aa9e405badc033d318784cf678951428a9cde0ac54fc546e842ce08a4f79a7829b2c31 SHA512 c1e92d885ad8d6adf971c4b9926f3b2bcecbcbc6a2392bf5da15dc7562deae453ae9ffdc06e80af3267ec8a79caebb70dc3f5822c4bfcab3a455751c066260bf
-EBUILD pygresql-5.0.4.ebuild 686 BLAKE2B e8d047b85a65a254d39059fb876a1d7bc73fe4b35b6c6bf638838b77228d2052b2964b0f006cc5c240cb18da9cbbdf12262d678ac981676f444629fd6efa9296 SHA512 e9e5994ecf05ae7838d4ffea8c60ed213045d9173011793408fed1d0c37c1199352b9c3d12ac71c43ba8e68cfe6f34c16697f44ca1712fec033b56e8d8524959
+EBUILD pygresql-5.0.4.ebuild 721 BLAKE2B ebb2e7266c6a1e545bb737835c00a032dc10ed09f111982f59e0a33ee20a6d0e712a9270b5fec10f201b8ded2953e974754e7b062f1b662f0dd10142983b094e SHA512 1f59f02b6e4e3c14d31e77260dec585ac143a5adda21f598c95a7392285f158b84349154cb018b3ebd39ca0de90e68fa741e9c2ab1b1d9898db910ee4113f7bd
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index e1d98174fea9..55f4eabc9023 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -16,9 +16,11 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE=""
 
+REQUIRED_USE="${POSTGRES_REQ_USE}"
+
 DEPEND="${POSTGRES_DEP}"
 
 RDEPEND="${DEPEND}"
diff --git a/dev-python/python-mistralclient/Manifest b/dev-python/python-mistralclient/Manifest
index 60409e8a67b7..25420ffde557 100644
--- a/dev-python/python-mistralclient/Manifest
+++ b/dev-python/python-mistralclient/Manifest
@@ -1,7 +1,5 @@
 DIST python-mistralclient-3.0.2.tar.gz 78255 BLAKE2B 58d9fda6ac9b87493008ebc809ae128b2e71443af854b7719928134f9802b0da7877eab79ad96b60e47f222815b4c4476ff93f43af557e79dc88c2f714e0eb3a SHA512 3f2bcdf7723e3acba9c34947fb26c2ad3814b89ee43a26d3779f4ac7ae0845c4129c98d1a5b6deca2e2dcf77aec128639af4e8e650863cc19b7c03864bae7ab4
-DIST python-mistralclient-3.1.3.tar.gz 78743 BLAKE2B f219028c563fe219c0715174cb53abb482732c74712eb7e89b129a001cd46e4e166bf557faf7a7c06036df9bf5d1804cedda334793e41cc1c66133a411051ac1 SHA512 d18c8ed486e83e91904a0bb0fe0cce21d4a603d383d309efa249f145cf89aff5b980828eb928d6cee92184e0444e49ac9e3aba0a3095ed9179c67cdbf82dd243
 DIST python-mistralclient-3.1.4.tar.gz 77670 BLAKE2B 37184cf32606affb1e08381c1a6f4d47a68d0dfc3abf4276110c7c667b12f8dc57f859f47561ff3368ccf36e684d63570dc1a82325f62a0d8e8e59366c7ba9e0 SHA512 dc9d79e79bf0f1829b218db43deb715ab000eb2dcf6d8cebfec912acac3b111d4dee9101aae7868d631a87fabe6014048709585e6817071c73ee95a8cd7f6baa
 EBUILD python-mistralclient-3.0.2.ebuild 1176 BLAKE2B cebc424d3ac9810ceb3ad4385692829e7f64b9919e2a2a85b805794c5d9b9d008aaec97714ad107ff7ab27c4460145056578a8e0afed9179db4c93cea87f5756 SHA512 eee25284ab2e9e244149e45ffe9b6f1d91f5e3f4098e687cbdfca2e15fe4cfeba4e152943b525a29a4b76e822f57f411fd35acccdc6d88f42234ef5b6536d3ad
-EBUILD python-mistralclient-3.1.3.ebuild 1203 BLAKE2B 9dad4d40f01ab134417386f34fa64ce911f6955f83b47bace58210077b863bebc31129b8f438346d4807e41daf2e77a256d9c9b262014261094d009aa6a80a78 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86
-EBUILD python-mistralclient-3.1.4.ebuild 1205 BLAKE2B e2cf623468ffdc8f22c41bb644368b346e5c5b2a5499fe6884889cdd6e4434e3f778ee75cd71dd734ff59596eeb2bbb21082d090f456f613e7daa84566720215 SHA512 262ae2d7a96201121f40a5f945292ed8286c267f397ed061f5c2d11139671fa83803a4c94a85f0bafaa5562df7893547fc6231e5d181467c805a80d6749583d1
+EBUILD python-mistralclient-3.1.4.ebuild 1203 BLAKE2B 9dad4d40f01ab134417386f34fa64ce911f6955f83b47bace58210077b863bebc31129b8f438346d4807e41daf2e77a256d9c9b262014261094d009aa6a80a78 SHA512 3e69628018dc33bc83d8fcf20715812ec8d96d6b4e78d6e13eb8c95dbc081ffa78df6f4e2969965807b7b97b4ca1f91b8ac911b6189bbd9d2033818b44356c86
 MISC metadata.xml 635 BLAKE2B 7d074b84873590ac98f48bfde93536bca796bf1544ee050a900f0e6dcaf9fc4f48e47dae31201e530cefe1cf58343d4bd13a07c0cb4314b05636c732e2ae47c1 SHA512 f3e92e2bb38afdbfc7605c5244d6f60b0c72843617197e7bdb08031d69ca283b544b88af340ce75382bf2135150f9314eaffbf1b0e45c16a9434e15c89131622
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
deleted file mode 100644
index 601d4f3fe550..000000000000
--- a/dev-python/python-mistralclient/python-mistralclient-3.1.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Mistral API"
-HOMEPAGE="https://github.com/openstack/python-mistralclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
index c1efe1be05ad..601d4f3fe550 100644
--- a/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
+++ b/dev-python/python-mistralclient/python-mistralclient-3.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/python-zunclient/Manifest b/dev-python/python-zunclient/Manifest
index 04dae4145ca9..6bd13e2946e1 100644
--- a/dev-python/python-zunclient/Manifest
+++ b/dev-python/python-zunclient/Manifest
@@ -1,5 +1,3 @@
-DIST python-zunclient-0.4.0.tar.gz 81489 BLAKE2B 20d2a22ac8b8319d8701c2a7021de28040b8e26e8d23351099025978a734799483b326015083d26a59312215d29330e10a1258b73d29bbefbeffc9bc5debedb0 SHA512 f8ba7ac60fe81c7d1deb7e5f758a7d7554c9f3578a4f84b4d38ff6b6514e846c18d0f92ef494e5257cab8eef981aef540440dfaa0c28348a8adec18c8c6007c4
 DIST python-zunclient-0.4.1.tar.gz 81441 BLAKE2B 9a8f1b21b9906d1b3e0cecf9525a6d5e8eae05aa8999a191625aac2701dc6997f53f2320f214e8e62b6be6357cc00945792ae7baf19b4be85499c5b1099259a2 SHA512 4e32f569d460fb1ef9eb0faef278b0842907103e6a56a951caec04b3b1544b093261db303d7f62b429c3dbfff7a97b9349b709e7cf62fbff9ca90ca9bb098ca1
-EBUILD python-zunclient-0.4.0.ebuild 1127 BLAKE2B a40ff93241c3329188a9f350f246691a86c815d5739d00b27259ba6a83646106d4dbf0843d363c627bd3ca5b9127ca78cc340e0b5870f18881382874f729c44f SHA512 03c17c9925ead1cce714de10f3db6b73c0100a639695f638e158a27ca7c4fb1de65678a9bb2821eb924abba68b46aabcfb96d42c3622887d1e5e3fa4a3673b82
-EBUILD python-zunclient-0.4.1.ebuild 1068 BLAKE2B 0a88e830c7010575b20f07545e9cdc19d26657d05ce9824e60791fb2afaecb63eadb7bd094fde14da7910401cbe0a2234989a9b9e171380acd81ef465729ad0a SHA512 340a5a7d377e86ca8488268434bd78ce6b1ac661367eefe11b470c284c46a2031e732fca04fd5f73d1248830d88c1b49dae6bcdf5b747e2aefd4e734ff36f84e
+EBUILD python-zunclient-0.4.1.ebuild 1066 BLAKE2B 561e42f577c1df3a270186efbf05c060de2a93b47310e0723fdef011f18e71fa41c660f179221c9d4ad943c133f0188bb250509ec8ff668e8d456599e798ffcc SHA512 5b1d91bddf3c54b23bc7682bb47c2fe970f1fa9bfc4cf33085b205bed73518832f99dd4a9907d9d7bf6ca0b89d49a4949e656d7932b9625dff4118f504d30828
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
deleted file mode 100644
index 6b3365583662..000000000000
--- a/dev-python/python-zunclient/python-zunclient-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Zun API"
-HOMEPAGE="https://github.com/openstack/python-zunclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-openstackclient-3.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
index cf67595f79a1..e573b87df465 100644
--- a/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
+++ b/dev-python/python-zunclient/python-zunclient-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]