2020-02-09 19:50:47 UTC

37 files changed, 73 insertions, 264 deletions

diff --git a/metadata/md5-cache/dev-python/oslo-config-6.11.2 b/metadata/md5-cache/dev-python/oslo-config-6.11.2
index 285d850ff719..0abadf4da66d 100644
--- a/metadata/md5-cache/dev-python/oslo-config-6.11.2
+++ b/metadata/md5-cache/dev-python/oslo-config-6.11.2
@@ -5,11 +5,11 @@ DESCRIPTION=Oslo Configuration API
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.11.2.tar.gz -> oslo-config-6.11.2.tar.gz
 _eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ec184d71d07ea5a85f0a1bc4a3d1f579
+_md5_=020e1e384a2b616c88f56faa32b30370
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.4.1 b/metadata/md5-cache/dev-python/oslo-config-6.4.1
deleted file mode 100644
index d029409b4b3f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-6.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testrepository-0.0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Oslo Configuration API
-EAPI=6
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-0.3.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.4.1.tar.gz -> oslo-config-6.4.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ca8e93b8500f81111ae3e94c28bacf9
diff --git a/metadata/md5-cache/dev-python/oslo-config-6.8.1 b/metadata/md5-cache/dev-python/oslo-config-6.8.1
deleted file mode 100644
index 2ec87202675f..000000000000
--- a/metadata/md5-cache/dev-python/oslo-config-6.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-mock-1.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Oslo Configuration API
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-enum34[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.config/oslo.config-6.8.1.tar.gz -> oslo-config-6.8.1.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=0869a9ef7d186de3f3b7ce8ca0a517cb
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2 b/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
deleted file mode 100644
index 726f31faa194..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-8.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/py-amqp-2.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pika-0.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pika-pool-0.1.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/tenacity-4.4.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-8.1.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d92850af64db36a3e296952875c18ab1
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-9.5.0 b/metadata/md5-cache/dev-python/oslo-messaging-9.5.0
deleted file mode 100644
index 268cee31b34b..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-9.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-9.5.0.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=fa9c06ab1b7a5af443417eba7aaee1b6
diff --git a/metadata/md5-cache/dev-python/oslo-messaging-9.5.1 b/metadata/md5-cache/dev-python/oslo-messaging-9.5.1
deleted file mode 100644
index d359715c76a7..000000000000
--- a/metadata/md5-cache/dev-python/oslo-messaging-9.5.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Messaging API for RPC and notifications over different messaging transports
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.messaging/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/futurist-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.24.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-service-1.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webob-1.7.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/py-amqp-2.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/kombu-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/kombu-4.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.messaging/oslo.messaging-9.5.1.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5ddf4302bc2bc46a7a0e6620842bbb36
diff --git a/metadata/md5-cache/dev-python/oslo-policy-1.38.1 b/metadata/md5-cache/dev-python/oslo-policy-1.38.1
deleted file mode 100644
index a0162cf87637..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-1.38.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=6
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-1.38.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f713589037068353c90cbc315331dfe4
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.1.1 b/metadata/md5-cache/dev-python/oslo-policy-2.1.1
deleted file mode 100644
index cd5ca8aee82c..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.1.1.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fd2ee33e1f43efd16e4e11767dec866
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.3.2 b/metadata/md5-cache/dev-python/oslo-policy-2.3.2
deleted file mode 100644
index d8dc2cc1ced9..000000000000
--- a/metadata/md5-cache/dev-python/oslo-policy-2.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
-EAPI=7
-HOMEPAGE=https://pypi.org/project/oslo.policy/
-IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.3.2.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9fd2ee33e1f43efd16e4e11767dec866
diff --git a/metadata/md5-cache/dev-python/oslo-policy-2.3.3 b/metadata/md5-cache/dev-python/oslo-policy-2.3.3
index 04f97bd710e4..3d88690f2aaa 100644
--- a/metadata/md5-cache/dev-python/oslo-policy-2.3.3
+++ b/metadata/md5-cache/dev-python/oslo-policy-2.3.3
@@ -5,11 +5,11 @@ DESCRIPTION=Support for RBAC policy enforcement across all OpenStack services
 EAPI=7
 HOMEPAGE=https://pypi.org/project/oslo.policy/
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.policy/oslo.policy-2.3.3.tar.gz
 _eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=9bf042400d9b5cb74f9e3119ce4f60f0
+_md5_=9fd2ee33e1f43efd16e4e11767dec866
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.41.3 b/metadata/md5-cache/dev-python/oslo-utils-3.41.3
deleted file mode 100644
index 9ee4e62a9579..000000000000
--- a/metadata/md5-cache/dev-python/oslo-utils-3.41.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( >=dev-python/eventlet-0.18.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.18.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.21.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/eventlet-0.23.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslotest-3.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/ddt-1.0.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stestr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/coverage-4.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/coverage-4.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/mock-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-config-5.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/bandit-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/bandit-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) doc? ( >=dev-python/sphinx-1.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/sphinx-1.6.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] <dev-python/sphinx-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/reno-2.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fixtures-3.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
-DESCRIPTION=Oslo Utility library
-EAPI=7
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.41.3.tar.gz -> oslo-utils-3.41.3.tar.gz
-_eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=604427bdd2b5053ec8d2bd4532ff9a43
diff --git a/metadata/md5-cache/dev-python/oslo-utils-3.41.4 b/metadata/md5-cache/dev-python/oslo-utils-3.41.4
index 50f26aa77424..152191bc541d 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-3.41.4
+++ b/metadata/md5-cache/dev-python/oslo-utils-3.41.4
@@ -5,7 +5,7 @@ DESCRIPTION=Oslo Utility library
 EAPI=7
 HOMEPAGE=https://launchpad.net/oslo
 IUSE=doc test python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/python-funcsigs[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/monotonic-0.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pytz-2013.6[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-3.41.4.tar.gz -> oslo-utils-3.41.4.tar.gz
 _eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=ed91847ba0e6ea1733852654981d99d2
+_md5_=604427bdd2b5053ec8d2bd4532ff9a43
diff --git a/metadata/md5-cache/dev-python/rootpy-1.0.1-r1 b/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
index 68c59f355be0..65e567c6359a 100644
--- a/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/rootpy-1.0.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/rootpy/rootpy-1.0.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a2e61a8728768ea4606ad8c892d9ec13
+_md5_=598e1101d0b6ff8e024faca21045084e
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.14.1 b/metadata/md5-cache/dev-qt/qtcore-5.14.1-r1
index 4447c5d50655..aeb7dbd4ad3e 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.14.1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.14.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5/5.14
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=29c317793f6169bdce9370fd7a2e8274
+_md5_=15c109c40bc086ad6936fdfd89f7b6f2
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.14.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.14.1-r2
index 06f4c2fcd5a3..b8b96e9b692f 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.14.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.14.1-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.14.1
 SRC_URI=https://download.qt.io/official_releases/qt/5.14/5.14.1/submodules/qtbase-everywhere-src-5.14.1.tar.xz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	qt5-build	8278bc0e7276be85c63dd0fd8b96c3b2	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	virtualx	e49dbce7ac14426e1155497476915307
-_md5_=68778f639f4cff0d7647143a6ce3ea43
+_md5_=836c52180ba8826d12c6c71bd27175c9
diff --git a/metadata/md5-cache/dev-util/wxglade-0.8.2-r1 b/metadata/md5-cache/dev-util/wxglade-0.8.2-r1
index a9e90d4dc121..70b06645677e 100644
--- a/metadata/md5-cache/dev-util/wxglade-0.8.2-r1
+++ b/metadata/md5-cache/dev-util/wxglade-0.8.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wxglade/wxGlade-0.8.2.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7629cc0572ed42bf39c823988925faa9
+_md5_=1e62a70e539929d21759e1bf60c92677
diff --git a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2 b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2
index c5fc6deed120..e0d655b2a76b 100644
--- a/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2
+++ b/metadata/md5-cache/dev-vcs/hgsvn-0.2.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-vcs/mercurial python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
+DEPEND=app-arch/unzip dev-vcs/mercurial python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( dev-python/setuptools[python_targets_python2_7(-)] )
 DESCRIPTION=A set of scripts to work locally on Subversion checkouts using Mercurial
 EAPI=5
 HOMEPAGE=https://pypi.org/project/hgsvn/
 IUSE=+python_targets_python2_7 +python_single_target_python2_7
 KEYWORDS=~amd64 ~ppc ~x86 ~x86-linux ~x86-macos
 LICENSE=GPL-3
-RDEPEND=dev-vcs/mercurial python_single_target_python2_7? ( dev-vcs/subversion[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
+RDEPEND=app-arch/unzip dev-vcs/mercurial python_single_target_python2_7? ( dev-vcs/subversion[python_targets_python2_7(-)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] )
 REQUIRED_USE=^^ ( python_single_target_python2_7 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hgsvn/hgsvn-0.2.3.zip
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dcde5876b4569256c9a0d05135f5011
+_md5_=66f7355b552bab5fd8e4a9d49180f8ad
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.6-r1 b/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
index b7460f6e012f..1586ba76c4a4 100644
--- a/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
+++ b/metadata/md5-cache/media-libs/oyranos-0.9.6-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.9.6 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Colour management system allowing to share settings across apps and services
 EAPI=6
 HOMEPAGE=https://www.oyranos.org/
-IUSE=cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X
+IUSE=cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc
-REQUIRED_USE=qt5? ( X ) test? ( static-libs )
+RDEPEND=app-admin/elektra dev-libs/libxml2 >=dev-libs/yajl-2.0.4-r1 media-libs/lcms:2 media-libs/libpng:0= >=media-libs/libXcm-0.5.4 media-libs/openicc cairo? ( x11-libs/cairo ) cups? ( net-print/cups ) exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXmu x11-libs/libXrandr x11-libs/libXxf86vm ) media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc
+REQUIRED_USE=test? ( static-libs )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/oyranos-cms/oyranos/archive/0.9.6.tar.gz -> oyranos-0.9.6.tar.gz https://dev.gentoo.org/~asturm/oyranos-0.9.6-patches.tar.xz
 _eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=814d956ab09832fb4b45a784377c35fe
+_md5_=39697dc1ff099f8a74114ac588443bcf
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2
index d56812169ae9..8a6fe0585724 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2-r2
@@ -12,4 +12,4 @@ RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	user	95500565ced27667aca7cf7da2d46068	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e62bebdd4b0089a283b4d553cfad9ccc
+_md5_=3bda132306eb1fcf40a2ebd12520c7c9
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1 b/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
index de85110a509c..fb36d0758812 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.18.4-r1
@@ -13,4 +13,4 @@ RESTRICT=bindist strip
 SLOT=0
 SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb ) x86? ( https://downloads.plex.tv/plex-media-server-new/1.18.4.2171-ac2afe5f8/debian/plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb )
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	unpacker	3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=e7474984ee11417ac3a31fb7a6d88640
+_md5_=adbfc5e5b404f873ca3a738bcca16138
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r2 b/metadata/md5-cache/net-im/gajim-1.0.3-r2
index d2031947acc8..340443f73de5 100644
--- a/metadata/md5-cache/net-im/gajim-1.0.3-r2
+++ b/metadata/md5-cache/net-im/gajim-1.0.3-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_targets_python3_6 +python_single_target_python3_6
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dbba9326ba7c5dea66ea2f708a89a953
+_md5_=b2fdad21b887d7a76d99eeeb56942787
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3-r3 b/metadata/md5-cache/net-im/gajim-1.0.3-r3
index eb4d7aba77fb..e387e21388bc 100644
--- a/metadata/md5-cache/net-im/gajim-1.0.3-r3
+++ b/metadata/md5-cache/net-im/gajim-1.0.3-r3
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle keyring networkmanager remote rst +spell upnp +webp +python_targets_python3_6 +python_single_target_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.6[python_targets_python3_6(-)] x11-libs/libXScrnSaver crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) keyring? ( app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	24ad93542cf9d80a03d58784093b1d44	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=37a404101c45d8d124d39033c7800128
+_md5_=c1238707d8ba5da458d727f3a9c65b3c
diff --git a/metadata/md5-cache/net-im/gajim-1.1.3-r1 b/metadata/md5-cache/net-im/gajim-1.1.3-r1
index 4283b7471ef4..70df85b14703 100644
--- a/metadata/md5-cache/net-im/gajim-1.1.3-r1
+++ b/metadata/md5-cache/net-im/gajim-1.1.3-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gajim.org/
 IUSE=+crypt geolocation jingle networkmanager remote rst +spell upnp +webp python_targets_python3_6 python_targets_python3_7 python_single_target_python3_6 python_single_target_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_6(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_6(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_6(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/idna[python_targets_python3_7(-)] dev-python/precis-i18n[python_targets_python3_7(-)] dev-python/pyasn1[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycurl[python_targets_python3_7(-)] dev-python/pygobject[cairo,python_targets_python3_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_7(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_7(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_7(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_7(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_7(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_7(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_7(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_7(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_7(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+RDEPEND=dev-libs/gobject-introspection[cairo] >=x11-libs/gtk+-3.22:3[introspection] python_single_target_python3_6? ( dev-python/idna[python_targets_python3_6(-)] dev-python/precis-i18n[python_targets_python3_6(-)] dev-python/pyasn1[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pycurl[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_6(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_6(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_6(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_6(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_6(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_6(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_6(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_6(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_6(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/idna[python_targets_python3_7(-)] dev-python/precis-i18n[python_targets_python3_7(-)] dev-python/pyasn1[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pycurl[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] >=dev-python/pyopenssl-0.14[python_targets_python3_7(-)] >=dev-python/python-nbxmpp-0.6.9[python_targets_python3_7(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_7(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_7(-)] >=dev-python/cssutils-1.0.2[python_targets_python3_7(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_7(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_7(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 ) networkmanager? ( net-misc/networkmanager[introspection] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_7(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_7(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_7(-)] ) ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite,xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.gajim.org/downloads/1.1/gajim-1.1.3.tar.bz2
 _eclasses_=distutils-r1	24ad93542cf9d80a03d58784093b1d44	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58dc97899f4679e955936e36a780ea8c
+_md5_=13af4a537494eaa8613f04366abf4534
diff --git a/metadata/md5-cache/net-libs/canlock-2b b/metadata/md5-cache/net-libs/canlock-2b
index a79239a43bc5..b770b39d0fd3 100644
--- a/metadata/md5-cache/net-libs/canlock-2b
+++ b/metadata/md5-cache/net-libs/canlock-2b
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=A library for creating and verifying Usenet cancel locks
-EAPI=4
+EAPI=7
 HOMEPAGE=https://packages.qa.debian.org/c/canlock.html
-IUSE=static-libs
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD MIT
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/canlock/canlock_2b.orig.tar.gz mirror://debian/pool/main/c/canlock/canlock_2b-6.diff.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70c6eb72f8cfabc6c2a2ee896da8281f
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b15d9189a51066d8222a599f379a0330
diff --git a/metadata/md5-cache/net-libs/libmrss-0.19.2 b/metadata/md5-cache/net-libs/libmrss-0.19.2
index 21b639dd1dec..c5571b753596 100644
--- a/metadata/md5-cache/net-libs/libmrss-0.19.2
+++ b/metadata/md5-cache/net-libs/libmrss-0.19.2
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=>=net-libs/libnxml-0.18.0 net-misc/curl virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=net-libs/libnxml net-misc/curl
 DESCRIPTION=A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.autistici.org/bakunin/libmrss/doc/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc x86
 LICENSE=LGPL-2.1
-RDEPEND=>=net-libs/libnxml-0.18.0 net-misc/curl
+RDEPEND=net-libs/libnxml net-misc/curl
 SLOT=0
 SRC_URI=http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz
-_md5_=2dbf893954ec5995313fa2c3de1cf4a0
+_md5_=f4bce901d633bb19b2e25af669e4c351
diff --git a/metadata/md5-cache/net-libs/libnatpmp-20150609 b/metadata/md5-cache/net-libs/libnatpmp-20150609
index 2af7370f937c..2c6961d8c17d 100644
--- a/metadata/md5-cache/net-libs/libnatpmp-20150609
+++ b/metadata/md5-cache/net-libs/libnatpmp-20150609
@@ -1,11 +1,10 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=configure install
 DESCRIPTION=An alternative protocol to UPnP IGD specification
-EAPI=5
+EAPI=7
 HOMEPAGE=http://miniupnp.free.fr/libnatpmp.html
-IUSE=static-libs
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://miniupnp.free.fr/files/download.php?file=libnatpmp-20150609.tar.gz -> libnatpmp-20150609.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a25c1de3fe0f77d2ef2a81ae150599f
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=a215834894cdc0b5045adec44454dc31
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
index d34d990b686c..b49a95243e84 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install prepare setup
+DEFINED_PHASES=configure install setup
 DESCRIPTION=the low-level library for netfilter related kernel/userspace communication
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.netfilter.org/projects/libnfnetlink/
-IUSE=static-libs kernel_linux
+IUSE=kernel_linux
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.1.tar.bz2 https://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch -> 04aef8a4dedf267dd5744afb134ef8046e77f613-musl-fix-includes.patch
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=609ecd09819b01182055eed0bdcedef1
+_eclasses_=linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4d5f4897c93675db28e9df87dff58034
diff --git a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1 b/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
deleted file mode 100644
index 13c02652b6ae..000000000000
--- a/metadata/md5-cache/net-libs/libnfsidmap-0.25-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ldap? ( net-nds/openldap ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=NFSv4 ID <-> name mapping library
-EAPI=4
-HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/
-IUSE=ldap static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
-LICENSE=BSD
-RDEPEND=ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
-SLOT=0
-SRC_URI=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.25.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=881e6a8f99e46a5d2e21cee0bc842231
diff --git a/metadata/md5-cache/net-libs/libnxml-0.18.3 b/metadata/md5-cache/net-libs/libnxml-0.18.3
index 86651b73afb5..c94c78bad470 100644
--- a/metadata/md5-cache/net-libs/libnxml-0.18.3
+++ b/metadata/md5-cache/net-libs/libnxml-0.18.3
@@ -1,12 +1,13 @@
+BDEPEND=doc? ( app-doc/doxygen )
 DEFINED_PHASES=compile configure install
-DEPEND=net-misc/curl doc? ( app-doc/doxygen )
+DEPEND=net-misc/curl
 DESCRIPTION=A C-library for parsing and writing XML 1.0/1.1 files or streams
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.autistici.org/bakunin/libnxml/doc/
-IUSE=doc examples static-libs
+IUSE=doc examples
 KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz
-_md5_=862abe736335f2724b6a5c5a6a6f92d5
+_md5_=7b4eebc41ea90bf9617e3468720c3996
diff --git a/metadata/md5-cache/net-libs/libpri-1.4.12-r2 b/metadata/md5-cache/net-libs/libpri-1.4.12-r2
deleted file mode 100644
index 4f4979acde2f..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.4.12-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=4
-HOMEPAGE=http://www.asterisk.org/
-IUSE=static-libs
-KEYWORDS=amd64 ~sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.4.12.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7b953b1e0cf0d3266c724242b22e4d9
diff --git a/metadata/md5-cache/net-libs/libpri-1.4.15 b/metadata/md5-cache/net-libs/libpri-1.4.15
deleted file mode 100644
index 65dd68a08ff7..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.4.15
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=5
-HOMEPAGE=http://www.asterisk.org/
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.4.15.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a5b34a00d33c423f2c30fd7b0792fb83
diff --git a/metadata/md5-cache/net-libs/libpri-1.5.0 b/metadata/md5-cache/net-libs/libpri-1.5.0
deleted file mode 100644
index 68feb33b163e..000000000000
--- a/metadata/md5-cache/net-libs/libpri-1.5.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Primary Rate ISDN (PRI) library
-EAPI=6
-HOMEPAGE=http://www.asterisk.org/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.5.0.tar.gz
-_md5_=7cb84c93a1fbfbf249497cdc5f8c84fa
diff --git a/metadata/md5-cache/net-libs/librouteros-1.1.2 b/metadata/md5-cache/net-libs/librouteros-1.1.2
index 240840b4857c..54cb715b31ff 100644
--- a/metadata/md5-cache/net-libs/librouteros-1.1.2
+++ b/metadata/md5-cache/net-libs/librouteros-1.1.2
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libgcrypt:0 >=app-portage/elt-patches-20170815
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0=
 DESCRIPTION=Library for accessing MikroTik's RouterOS via its API
-EAPI=4
+EAPI=7
 HOMEPAGE=http://verplant.org/librouteros/
-IUSE=debug static-libs
+IUSE=debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libgcrypt:0
+RDEPEND=dev-libs/libgcrypt:0=
 SLOT=0
 SRC_URI=http://verplant.org/librouteros/files/librouteros-1.1.2.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	autotools-utils	95db0904ad0f62535e18e5ccb67cce5e	base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cdc89b95fde49faca1a5aa17e07b2109
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=c51d7192d0121791e48f099f282a0d17
diff --git a/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1 b/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
index 0c57fc3446e1..b81d8f4f7ab6 100644
--- a/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
+++ b/metadata/md5-cache/net-libs/meanwhile-1.0.2-r1
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 dev-libs/gmp virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/glib:2 dev-libs/gmp
 DESCRIPTION=Meanwhile (Sametime protocol) library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://meanwhile.sourceforge.net/
 IUSE=doc debug
 KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2:2
+RDEPEND=dev-libs/glib:2
 SLOT=0
 SRC_URI=mirror://sourceforge/meanwhile/meanwhile-1.0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a266e82b2e23dbecfc8291a0908f060
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=5ddde384e2f43fd2203029974bc2df5e
diff --git a/metadata/md5-cache/net-libs/sofia-sip-1.12.11 b/metadata/md5-cache/net-libs/sofia-sip-1.12.11
index 1e0517c359f1..0632457a1443 100644
--- a/metadata/md5-cache/net-libs/sofia-sip-1.12.11
+++ b/metadata/md5-cache/net-libs/sofia-sip-1.12.11
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 DESCRIPTION=RFC3261 compliant SIP User-Agent library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://sofia-sip.sourceforge.net/
-IUSE=libressl ssl static-libs
+IUSE=libressl ssl
 KEYWORDS=~alpha amd64 ~arm arm64 ia64 ppc ~ppc64 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+ BSD public-domain
-RDEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl ) libressl? ( dev-libs/libressl ) )
+RDEPEND=dev-libs/glib:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/sofia-sip/sofia-sip-1.12.11.tar.gz
-_md5_=0ff2c72951a134d1847d3a14fb6cca39
+_md5_=92a4b4f9fadde565c0dd76af6c158560
diff --git a/metadata/md5-cache/net-libs/udns-0.4 b/metadata/md5-cache/net-libs/udns-0.4
index 75d6d7bd73b9..6e402683abb3 100644
--- a/metadata/md5-cache/net-libs/udns-0.4
+++ b/metadata/md5-cache/net-libs/udns-0.4
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install
 DESCRIPTION=Async-capable DNS stub resolver library
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.corpit.ru/mjt/udns.html
 IUSE=ipv6 static +tools
 KEYWORDS=amd64 ~hppa ppc ~ppc64 sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.corpit.ru/mjt/udns/udns-0.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b136cad22dc333605b44a0056f4384e7
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=6d914de2bffa9ff7670d690de1dd2d78
diff --git a/metadata/md5-cache/sci-geosciences/qgis-3.4.12 b/metadata/md5-cache/sci-geosciences/qgis-3.4.12
deleted file mode 100644
index a1f38d3701d2..000000000000
--- a/metadata/md5-cache/sci-geosciences/qgis-3.4.12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/linguist-tools-5.9.4:5 sys-devel/bison sys-devel/flex dev-util/ninja >=dev-util/cmake-3.9.6
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=User friendly Geographic Information System
-EAPI=7
-HOMEPAGE=https://www.qgis.org/
-IUSE=3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit +python_targets_python3_6 +python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/designer-5.9.4:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtcore-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5[ssl] >=dev-qt/qtpositioning-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtsql-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=sci-libs/gdal-2.2.3:=[geos] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj:= >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] 3d? ( >=dev-qt/qt3d-5.9.4:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( =sci-geosciences/grass-7*:= ) hdf5? ( sci-libs/hdf5:= ) mapserver? ( dev-libs/fcgi ) netcdf? ( sci-libs/netcdf:= ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_6? ( dev-python/future[python_targets_python3_6(-)] dev-python/httplib2[python_targets_python3_6(-)] dev-python/jinja[python_targets_python3_6(-)] dev-python/markupsafe[python_targets_python3_6(-)] dev-python/owslib[python_targets_python3_6(-)] dev-python/pygments[python_targets_python3_6(-)] dev-python/PyQt5[designer,network,sql,svg,webkit?,python_targets_python3_6(-)] dev-python/python-dateutil[python_targets_python3_6(-)] dev-python/pytz[python_targets_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_6(-)] dev-python/requests[python_targets_python3_6(-)] dev-python/sip:=[python_targets_python3_6(-)] dev-python/six[python_targets_python3_6(-)] >=sci-libs/gdal-2.2.3[python,python_targets_python3_6(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) ) ) qml? ( >=dev-qt/qtdeclarative-5.9.4:5 ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=^^ ( python_single_target_python3_6 ) python_single_target_python3_6? ( python_targets_python3_6 ) mapserver? ( python )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://qgis.org/downloads/qgis-3.4.12.tar.bz2 examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )
-_eclasses_=cmake-utils	be72eac95bd029ad1d81d5d656c3c83b	desktop	b1d22ac8bdd4679ab79c71aca235009d	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	dc34234e8c43343da45853da22dcf14b	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	36ac48e647d2627de28c87aaffb94753	python-utils-r1	611c493a4cfef5254350fabc04b606f5	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3712770c56e82dc84bc75460b454cb37